X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.h;h=d2fcc5ed7bfdb90449773560938618a59cc18a72;hb=de75026f5a48d3d052135a973ab4dff76c5b20f5;hp=77132e318ea57891833f19161fbf09fdb66148b6;hpb=6a405b1efd138a4af4ed93ce4ff173a4c5704512;p=ghc-hetmet.git

diff --git a/rts/Capability.h b/rts/Capability.h
index 77132e3..d2fcc5e 100644
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -148,7 +148,7 @@ struct Capability_ {
 INLINE_HEADER Capability *
 regTableToCapability (StgRegTable *reg)
 {
-    return (Capability *)((void *)((unsigned char*)reg - FIELD_OFFSET(Capability,r)));
+    return (Capability *)((void *)((unsigned char*)reg - STG_FIELD_OFFSET(Capability,r)));
 }
 
 // Initialise the available capabilities.
@@ -276,6 +276,7 @@ extern void grabCapability (Capability **pCap);
 
 // cause all capabilities to context switch as soon as possible.
 void setContextSwitches(void);
+INLINE_HEADER void contextSwitchCapability(Capability *cap);
 
 // Free all capabilities
 void freeCapabilities (void);
@@ -322,4 +323,16 @@ discardSparksCap (Capability *cap)
 { return discardSparks(cap->sparks); }
 #endif
 
+INLINE_HEADER void
+contextSwitchCapability (Capability *cap)
+{
+    // setting HpLim to NULL ensures that the next heap check will
+    // fail, and the thread will return to the scheduler.
+    cap->r.rHpLim = NULL;
+    // But just in case it didn't work (the target thread might be
+    // modifying HpLim at the same time), we set the end-of-block
+    // context-switch flag too:
+    cap->context_switch = 1;
+}
+
 #endif /* CAPABILITY_H */