Commit 797d6341 authored by sof's avatar sof
Browse files

[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.)
parent b502893a
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
* $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 * (c) The GHC Team, 1998-2000
* *
...@@ -306,7 +306,7 @@ char *threadReturnCode_strs[] = { ...@@ -306,7 +306,7 @@ char *threadReturnCode_strs[] = {
}; };
#endif #endif
#ifdef PAR #if defined(PAR)
StgTSO * createSparkThread(rtsSpark spark); StgTSO * createSparkThread(rtsSpark spark);
StgTSO * activateSpark (rtsSpark spark); StgTSO * activateSpark (rtsSpark spark);
#endif #endif
...@@ -494,8 +494,11 @@ schedule( void ) ...@@ -494,8 +494,11 @@ schedule( void )
/* Top up the run queue from our spark pool. We try to make the /* 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 * number of threads in the run queue equal to the number of
* free capabilities. * 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; nat n = n_free_capabilities;
StgTSO *tso = run_queue_hd; StgTSO *tso = run_queue_hd;
...@@ -2256,7 +2259,7 @@ GetRoots(evac_fn evac) ...@@ -2256,7 +2259,7 @@ GetRoots(evac_fn evac)
evac((StgClosure **)&suspended_ccalling_threads); evac((StgClosure **)&suspended_ccalling_threads);
} }
#if defined(SMP) || defined(PAR) || defined(GRAN) #if defined(PAR) || defined(GRAN)
markSparkQueue(evac); markSparkQueue(evac);
#endif #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 * (c) The GHC Team, 2000
* *
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
# endif # endif
#include "Sparks.h" #include "Sparks.h"
#if defined(SMP) || defined(PAR) #if /*defined(SMP) ||*/ defined(PAR)
//@node GUM code, GranSim code, Includes, Spark Management Routines //@node GUM code, GranSim code, Includes, Spark Management Routines
//@subsection GUM code //@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 * (c) The GHC Team, 2000
* *
...@@ -25,14 +25,15 @@ void markSparkQueue(void); ...@@ -25,14 +25,15 @@ void markSparkQueue(void);
#elif defined(PAR) || defined(SMP) #elif defined(PAR) || defined(SMP)
StgClosure *findSpark( rtsBool );
rtsBool initSparkPools( void ); rtsBool initSparkPools( void );
void markSparkQueue( void ); void markSparkQueue( void );
StgClosure *findSpark( rtsBool ); #if defined(PAR)
StgTSO *activateSpark (rtsSpark spark) ; StgTSO *activateSpark (rtsSpark spark) ;
rtsBool add_to_spark_queue( StgClosure *closure, StgSparkPool *pool ); rtsBool add_to_spark_queue( StgClosure *closure, StgSparkPool *pool );
void markSparkQueue( void ); void markSparkQueue( void );
nat spark_queue_len( StgSparkPool *pool ); nat spark_queue_len( StgSparkPool *pool );
void disposeSpark( StgClosure *spark ); void disposeSpark( StgClosure *spark );
#endif
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment