From: sof <unknown>
Date: Thu, 24 Jan 2002 02:06:49 +0000 (+0000)
Subject: [project @ 2002-01-24 02:06:48 by sof]
X-Git-Tag: Approximately_9120_patches~263
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=797d634182ab6f63c5e51e44a567ba8f7bc8b074;p=ghc-hetmet.git

[project @ 2002-01-24 02:06:48 by sof]
SMP: disable spark support (only a little bit of header file re-jigging is reqd to get it going again, I suspect.)
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index 9ccaf90..86a725f 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -1,5 +1,5 @@
 /* ---------------------------------------------------------------------------
- * $Id: Schedule.c,v 1.111 2002/01/22 13:54:22 simonmar Exp $
+ * $Id: Schedule.c,v 1.112 2002/01/24 02:06:48 sof Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -306,7 +306,7 @@ char *threadReturnCode_strs[] = {
 };
 #endif
 
-#ifdef PAR
+#if defined(PAR)
 StgTSO * createSparkThread(rtsSpark spark);
 StgTSO * activateSpark (rtsSpark spark);  
 #endif
@@ -494,8 +494,11 @@ schedule( void )
     /* Top up the run queue from our spark pool.  We try to make the
      * number of threads in the run queue equal to the number of
      * free capabilities.
+     *
+     * Disable spark support in SMP for now, non-essential & requires
+     * a little bit of work to make it compile cleanly. -- sof 1/02.
      */
-#if defined(SMP)
+#if 0 /* defined(SMP) */
     {
       nat n = n_free_capabilities;
       StgTSO *tso = run_queue_hd;
@@ -2256,7 +2259,7 @@ GetRoots(evac_fn evac)
       evac((StgClosure **)&suspended_ccalling_threads);
   }
 
-#if defined(SMP) || defined(PAR) || defined(GRAN)
+#if defined(PAR) || defined(GRAN)
   markSparkQueue(evac);
 #endif
 }
diff --git a/ghc/rts/Sparks.c b/ghc/rts/Sparks.c
index 46c3225..f71af9c 100644
--- a/ghc/rts/Sparks.c
+++ b/ghc/rts/Sparks.c
@@ -1,5 +1,5 @@
 /* ---------------------------------------------------------------------------
- * $Id: Sparks.c,v 1.4 2001/08/14 13:40:09 sewardj Exp $
+ * $Id: Sparks.c,v 1.5 2002/01/24 02:06:49 sof Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -36,7 +36,7 @@
 # endif
 #include "Sparks.h"
 
-#if defined(SMP) || defined(PAR)
+#if /*defined(SMP) ||*/ defined(PAR)
 
 //@node GUM code, GranSim code, Includes, Spark Management Routines
 //@subsection GUM code
diff --git a/ghc/rts/Sparks.h b/ghc/rts/Sparks.h
index 74f9809..25a9d77 100644
--- a/ghc/rts/Sparks.h
+++ b/ghc/rts/Sparks.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Sparks.h,v 1.3 2001/03/22 03:51:10 hwloidl Exp $
+ * $Id: Sparks.h,v 1.4 2002/01/24 02:06:49 sof Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -25,14 +25,15 @@ void      markSparkQueue(void);
 
 #elif defined(PAR) || defined(SMP)
 
+StgClosure  *findSpark( rtsBool );
 rtsBool      initSparkPools( void );
 void         markSparkQueue( void );
-StgClosure  *findSpark( rtsBool );
+#if defined(PAR)
 StgTSO      *activateSpark (rtsSpark spark) ;
 rtsBool      add_to_spark_queue( StgClosure *closure, StgSparkPool *pool );
 void         markSparkQueue( void );
 nat          spark_queue_len( StgSparkPool *pool );
 void         disposeSpark( StgClosure *spark );
-
+#endif
 
 #endif