[mpich2-commits] r5497 - mpich2/trunk/src/include

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-10-20 15:35:27 -0500 (Tue, 20 Oct 2009)
New Revision: 5497

Modified:
   mpich2/trunk/src/include/mpiatomic.h
Log:
Remove references to non-existent OPA_busy_wait() macros.

At some point we need to define MPIDU_Busy_wait and MPIDU_Yield
operations that are similar to what's available in the process locks
code but without actually using that horrible mess itself.

No reviewer.

Modified: mpich2/trunk/src/include/mpiatomic.h
===================================================================
--- mpich2/trunk/src/include/mpiatomic.h	2009-10-20 20:35:24 UTC (rev 5496)
+++ mpich2/trunk/src/include/mpiatomic.h	2009-10-20 20:35:27 UTC (rev 5497)
@@ -31,6 +31,15 @@
       completeness and implementation of our atomic primitives in the future.
 */
 
+/* FIXME anything labeled MPIDU_ here should really be MPIU_ */
+
+/* TODO need actual yield and an busy wait impls */
+#define MPIDU_Busy_wait() do {} while (0)
+/* conflicts with the "process locks" definition for now, don't enable this or
+ * use it until we delete the process locks code
+#define MPIDU_Yield() do {} while (0)
+ */
+
 /* ======================================================
    reference counting routines
    ====================================================== */
@@ -535,7 +544,7 @@
     else {
         /* wait for the last arriving process to release us from the barrier */
         while (OPA_load_int(&barrier->sig) == cur_sig) {
-            OPA_busy_wait();
+            MPIDU_Busy_wait();
         }
     }
 
@@ -564,7 +573,7 @@
 
     if (rank == boss_rank) {
         while (0 == OPA_load_int(&barrier->sig_boss))
-            OPA_busy_wait_int();
+            MPIDU_Busy_wait();
     }
     else {
         cur_sig = OPA_load_int(&barrier->sig);
@@ -579,7 +588,7 @@
 
         /* wait to be released by the boss */
         while (OPA_load_int(&barrier->sig) == cur_sig)
-            OPA_busy_wait();
+            MPIDU_Busy_wait();
     }
 
 fn_exit: