X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSparks.h;h=fd62c1288d35ddb833a656f50a262e4d476d38f6;hb=65914a2cb71caf01655b16a75b283871e2482041;hp=0d116bdbe450c3f04d066c19aa328e87a7d1773c;hpb=17a596022d01987d5ffe7db0742aa8db267b8cc3;p=ghc-hetmet.git

diff --git a/rts/Sparks.h b/rts/Sparks.h
index 0d116bd..fd62c12 100644
--- a/rts/Sparks.h
+++ b/rts/Sparks.h
@@ -51,17 +51,24 @@ typedef struct  SparkPool_ {
 } SparkPool;
 
 
-/* INVARIANTS, in this order: bottom/top consistent, reasonable size,
-   topBound consistent, space pointer, space accessible to us */
+/* INVARIANTS, in this order: reasonable size,
+   topBound consistent, space pointer, space accessible to us.
+   
+   NB. This is safe to use only (a) on a spark pool owned by the
+   current thread, or (b) when there's only one thread running, or no
+   stealing going on (e.g. during GC).
+*/
 #define ASSERT_SPARK_POOL_INVARIANTS(p)         \
-  ASSERT((p)->bottom >= (p)->top);              \
   ASSERT((p)->size > 0);                        \
-  ASSERT((p)->size > (p)->bottom - (p)->top);	\
   ASSERT((p)->topBound <= (p)->top);            \
   ASSERT((p)->elements != NULL);                \
   ASSERT(*((p)->elements) || 1);                \
   ASSERT(*((p)->elements - 1  + ((p)->size)) || 1);
 
+// No: it is possible that top > bottom when using reclaimSpark()
+//  ASSERT((p)->bottom >= (p)->top);           
+//  ASSERT((p)->size > (p)->bottom - (p)->top);
+
 // Initialisation
 void initSparkPools (void);
 
@@ -73,9 +80,9 @@ StgClosure* reclaimSpark(SparkPool *pool);
 // if the pool is almost empty).
 rtsBool looksEmpty(SparkPool* deque);
 
-StgClosure * tryStealSpark     (SparkPool *pool);
+StgClosure * tryStealSpark     (Capability *cap);
 void         freeSparkPool     (SparkPool *pool);
-void         createSparkThread (Capability *cap, StgClosure *p);
+void         createSparkThread (Capability *cap);
 void         traverseSparkQueue(evac_fn evac, void *user, Capability *cap);
 void         pruneSparkQueue   (evac_fn evac, void *user, Capability *cap);