More changes which i missed earlier
authorNikhil Jain <nikhil@illinois.edu>
Fri, 2 Mar 2012 20:50:32 +0000 (14:50 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Fri, 2 Mar 2012 20:50:32 +0000 (14:50 -0600)
src/arch/mpi/machine.c
src/ck-core/init.C

index 1d74e884b63d615c1415b5fdbc3ac10ad22e781e..03b8ab08777ea725aeefc5e6e24a6eb9973006b4 100644 (file)
@@ -906,10 +906,12 @@ static void PumpMsgsBlocking(void) {
     char *msg;
     int recd=0;
 
+#if !CMK_INTER_OPERATE
     if (!PCQueueEmpty(CmiGetState()->recv)) return;
     if (!CdsFifo_Empty(CpvAccess(CmiLocalQueue))) return;
     if (!CqsEmpty(CpvAccess(CsdSchedQueue))) return;
     if (CpvAccess(sent_msgs))  return;
+#endif
 
 #if 0
     CmiPrintf("[%d] PumpMsgsBlocking. \n", CmiMyPe());
index 8d76bc554bcef6b468d8f3feda915c9161283a70..d6b288fcbb7bb40b1cf38b2344a73e3c04dcb31b 100644 (file)
@@ -507,7 +507,7 @@ static void _exitHandler(envelope *env)
 #endif
        /*FAULT_EVAC*/
       if(CmiNodeAlive(CkMyPe())){
-         _sendStats();
+      //   _sendStats();
       }
 #if !CMK_INTER_OPERATE
       _mainDone = 1; // This is needed because the destructors for
@@ -529,9 +529,10 @@ static void _exitHandler(envelope *env)
       }
       else
         CmiFree(env);
-      if(CkMyPe()){
+      if(1 || CkMyPe()){
        DEBUGF(("[%d] Calling converse exit \n",CkMyPe()));
 #if CMK_INTER_OPERATE
+        _exitStarted = 0;
         CpvAccess(charmLibExitFlag) = 1;
 #else
         ConverseExit();