turn NODE_QUEUE off for non-smp of lapi, fixed some compilation errors in machine...
authorGengbin Zheng <gzheng@bp-login1.(none)>
Sat, 24 Apr 2010 05:54:23 +0000 (00:54 -0500)
committerGengbin Zheng <gzheng@bp-login1.(none)>
Sat, 24 Apr 2010 05:54:23 +0000 (00:54 -0500)
src/arch/lapi/conv-mach.h
src/arch/lapi/machine.c

index c6692c2f64568bc9b16ca59d391af6e1356feb23..c67b4e00f1be09335c315c7231920ff0a2b73391 100644 (file)
@@ -18,7 +18,7 @@
 #define CMK_MEMORY_PAGESIZE                                8192
 #define CMK_MEMORY_PROTECTABLE                             0
 
-#define CMK_NODE_QUEUE_AVAILABLE                           1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
 #define CMK_SHARED_VARS_UNAVAILABLE                        1 /* non SMP versions */
 #define CMK_SHARED_VARS_POSIX_THREADS_SMP                  0 /* SMP versions */
index 7ebf7a73d46affcbd37e80078b42a2c5c9deac23..d48c8421aef13067ec006c16d15d5e4ba268c4e8 100755 (executable)
@@ -90,11 +90,11 @@ Chao Mei 01/28/2010
 
 /* Redefine CmiNodeLocks only for PCQueue data structure */
 #define CmiNodeLock CmiNodeLock_nonsmp
-#undef CmiCreateLock()
-#undef CmiLock(lock)
-#undef CmiUnlock(lock)
-#undef CmiTryLock(lock)
-#undef CmiDestroyLock(lock)
+#undef CmiCreateLock
+#undef CmiLock
+#undef CmiUnlock
+#undef CmiTryLock
+#undef CmiDestroyLock
 typedef pthread_mutex_t *CmiNodeLock_nonsmp;
 CmiNodeLock CmiCreateLock(){
   CmiNodeLock lk = (CmiNodeLock)malloc(sizeof(pthread_mutex_t));  
@@ -829,7 +829,12 @@ static void PumpMsgsComplete(lapi_handle_t *myLapiContext, void *am_info) {
     broot = CMI_BROADCAST_ROOT(msg);
     destrank = CMI_DEST_RANK(msg);
     /* Only check proc-level msgs */
-    if (broot>=0 && destrank != DGRAM_NODEMESSAGE){
+    if (broot>=0
+#if CMK_NODE_QUEUE_AVAILABLE
+        && destrank != DGRAM_NODEMESSAGE)
+#endif
+    )
+    {
         MsgOrderInfo *info;        
         if(broot>0){
             info = &CpvAccessOther(bcastMsgSeqInfo, destrank);
@@ -2092,7 +2097,7 @@ void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
     if (CmiGetArgFlag(argv,"++debug")) {  /*Pause so user has a chance to start and attach debugger*/
         printf("CHARMDEBUG> Processor %d has PID %d\n",CmiMyNode(),getpid());
         if (!CmiGetArgFlag(argv,"++debug-no-pause"))
-            sleep(10);
+            sleep(120);
     }
 
 #if CMK_NODE_QUEUE_AVAILABLE