SMP: disable spark support (only a little bit of header file re-jigging is reqd to get it going again, I suspect.)
/* ---------------------------------------------------------------------------
- * $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
*
};
#endif
-#ifdef PAR
+#if defined(PAR)
StgTSO * createSparkThread(rtsSpark spark);
StgTSO * activateSpark (rtsSpark spark);
#endif
/* 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;
evac((StgClosure **)&suspended_ccalling_threads);
}
-#if defined(SMP) || defined(PAR) || defined(GRAN)
+#if defined(PAR) || defined(GRAN)
markSparkQueue(evac);
#endif
}
/* ---------------------------------------------------------------------------
- * $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
*
# 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
/* -----------------------------------------------------------------------------
- * $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
*
#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