X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSMP.h;h=88fc33970b7f677a240e28d6a908e3eca0ad39e8;hb=4417e97d436e2796bed886cb1a830acb88d3da28;hp=cc959413d6e9b71001834ff267679d1e7d4ef931;hpb=55472d778c441b65e013d27f5228283eef85986c;p=ghc-hetmet.git

diff --git a/ghc/includes/SMP.h b/ghc/includes/SMP.h
index cc95941..88fc339 100644
--- a/ghc/includes/SMP.h
+++ b/ghc/includes/SMP.h
@@ -25,7 +25,7 @@
 
 /* 
  * XCHG - the atomic exchange instruction.  Used for locking closures
- * during updates (see LOCK_CLOSURE below) and the MVar primops.
+ * during updates (see lockClosure() below) and the MVar primops.
  *
  * NB: the xchg instruction is implicitly locked, so we do not need
  * a lock prefix here. 
@@ -57,14 +57,43 @@ cas(StgVolatilePtr p, StgWord o, StgWord n)
     return o;
 }
 
+/*
+ * Write barrier - ensure that all preceding writes have happened
+ * before all following writes.  
+ *
+ * We need to tell both the compiler AND the CPU about the barrier.
+ * This is a brute force solution; better results might be obtained by
+ * using volatile type declarations to get fine-grained ordering
+ * control in C, and optionally a memory barrier instruction on CPUs
+ * that require it (not x86 or x86_64).
+ */
+INLINE_HEADER void
+wb(void) {
+#if i386_HOST_ARCH || x86_64_HOST_ARCH
+    __asm__ __volatile__ ("" : : : "memory");
+#else
+#error memory barriers unimplemented on this architecture
+#endif
+}
+
+/*
+ * Locking/unlocking closures
+ *
+ * This is used primarily in the implementation of MVars.
+ */
+#define SPIN_COUNT 4000
+
 INLINE_HEADER StgInfoTable *
 lockClosure(StgClosure *p)
 {
 #if i386_HOST_ARCH || x86_64_HOST_ARCH
     StgWord info;
     do {
-	info = xchg((P_)&p->header.info, (W_)&stg_WHITEHOLE_info);
-	if (info != (W_)&stg_WHITEHOLE_info) return (StgInfoTable *)info;
+	nat i = 0;
+	do {
+	    info = xchg((P_)&p->header.info, (W_)&stg_WHITEHOLE_info);
+	    if (info != (W_)&stg_WHITEHOLE_info) return (StgInfoTable *)info;
+	} while (++i < SPIN_COUNT);
 	yieldThread();
     } while (1);
 #else
@@ -76,13 +105,26 @@ INLINE_HEADER void
 unlockClosure(StgClosure *p, StgInfoTable *info)
 {
 #if i386_HOST_ARCH || x86_64_HOST_ARCH
-    // This is safe enough, because lockClosure() does the memory barrier:
+    // This is a strictly ordered write, so we need a wb():
+    wb();
     p->header.info = info;
 #else
     RELEASE_SM_LOCK;
 #endif
 }
 
-#endif /* SMP */
+#else /* !SMP */
+
+#define wb() /* nothing */
+
+INLINE_HEADER StgWord
+xchg(StgPtr p, StgWord w)
+{
+    StgWord old = *p;
+    *p = w;
+    return old;
+}
+
+#endif /* !SMP */
 
 #endif /* SMP_H */