remove CMK_IMMEDIATE_MSG macros and define CmiImmIsRunning as macro.
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 7 Jun 2003 03:40:44 +0000 (03:40 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 7 Jun 2003 03:40:44 +0000 (03:40 +0000)
src/conv-ldb/cldb.rand.c

index b10116924cad8c708dd2c016fb0151675f1d78da..899ecb8580cc7109a03992b84bce1ff2e00825c3 100644 (file)
@@ -64,12 +64,7 @@ void CldEnqueue(int pe, void *msg, int infofn)
     if (pe != CmiMyPe())
       CpvAccess(CldRelocatedMessages)++;
   }
-  if (pe == CmiMyPe()
-#if CMK_IMMEDIATE_MSG
-      && !CmiIsImmRunning()
-#endif
-     ) 
-  {
+  if (pe == CmiMyPe() && !CmiImmIsRunning()) {
     ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
     /* CsdEnqueueGeneral is not thread or SIGIO safe */
     CsdEnqueueGeneral(msg, queueing, priobits, prioptr);
@@ -97,12 +92,7 @@ void CldNodeEnqueue(int node, void *msg, int infofn)
     if (node != CmiMyNode())
       CpvAccess(CldRelocatedMessages)++;
   }
-  if (node == CmiMyNode()
-#if CMK_IMMEDIATE_MSG
-      && !CmiIsImmRunning()
-#endif
-     )
-  {
+  if (node == CmiMyNode() && !CmiImmIsRunning()) {
     ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
     CsdNodeEnqueueGeneral(msg, queueing, priobits, prioptr);
   } else {