Fix isomalloc_sync crash in SMP OMP mode

Author: evan-charmworks

src/arch/util/machine-common-core.C

@@ -1556,10 +1556,6 @@ static void ConverseRunPE(int everReturn) {
     CpvAccess(networkProgressCount) = 0;
 
     ConverseCommonInit(CmiMyArgv);
-#if CMK_OMP
-    CpvAccess(CmiSuspendedTaskQueue) = (void *)CMIQueueCreate();
-    CmiNodeAllBarrier();
-#endif
 
     // register idle events
 

src/conv-core/convcore.C

@@ -75,6 +75,9 @@
 #if CMK_SMP && CMK_TASKQUEUE
 #include "taskqueue.h"
 #include "conv-taskQ.h"
+#if CMK_OMP
+#include "pcqueue.h"
+#endif
 #endif
 #include "conv-ccs.h"
 #include "ccs-server.h"
@@ -2295,6 +2298,10 @@ void CsdInit(char **argv)
   CpvInitialize(Queue, CsdTaskQueue);
   CpvInitialize(void *, CmiSuspendedTaskQueue);
   CpvAccess(CsdTaskQueue) = (Queue)TaskQueueCreate();
+#if CMK_OMP
+  CpvAccess(CmiSuspendedTaskQueue) = CMIQueueCreate();
+  CmiNodeAllBarrier();
+#endif
 #endif
   CpvAccess(CsdStopFlag)  = 0;
   CpvInitialize(int, isHelperOn);