Converse: Apply minor cleanup to call_startfn

Author: evan-charmworks

src/arch/util/machine-smp.C

@@ -164,19 +164,16 @@ static DWORD WINAPI call_startfn(LPVOID vindex)
   ConverseRunPE(0);
 
   if(CharmLibInterOperate) {
-    while(1) {
-      if(!_cleanUp.load()) {
-        StartInteropScheduler();
-        CmiNodeAllBarrier();
-      } else {
-        if (CmiMyRank() == CmiMyNodeSize()) {
-          while (ckExitComplete.load() == 0) { CommunicationServerThread(5); }
-        } else {
-          CsdScheduler(-1);
-          CmiNodeAllBarrier();
-        }
-        break;
-      }
+    while(!_cleanUp.load()) {
+      StartInteropScheduler();
+      CmiNodeAllBarrier();
+    }
+
+    if (CmiMyRank() == CmiMyNodeSize()) {
+      while (ckExitComplete.load() == 0) { CommunicationServerThread(5); }
+    } else {
+      CsdScheduler(-1);
+      CmiNodeAllBarrier();
     }
   }
 
@@ -373,19 +370,16 @@ static void *call_startfn(void *vindex)
   ConverseRunPE(0);
 
   if(CharmLibInterOperate) {
-    while(1) {
-      if(!_cleanUp.load()) {
-        StartInteropScheduler();
-        CmiNodeAllBarrier();
-      } else {
-        if (CmiMyRank() == CmiMyNodeSize()) {
-          while (ckExitComplete.load() == 0) { CommunicationServerThread(5); }
-        } else { 
-          CsdScheduler(-1);
-          CmiNodeAllBarrier();
-        }
-        break;
-      }
+    while(!_cleanUp.load()) {
+      StartInteropScheduler();
+      CmiNodeAllBarrier();
+    }
+
+    if (CmiMyRank() == CmiMyNodeSize()) {
+      while (ckExitComplete.load() == 0) { CommunicationServerThread(5); }
+    } else {
+      CsdScheduler(-1);
+      CmiNodeAllBarrier();
     }
   }