Modifies converse schedeuler to prioritize NodeGroup messages

src/conv-core/convcore.C

@@ -1657,6 +1657,7 @@ void CsdSchedulerState_new(CsdSchedulerState_t *s)
 #if CMK_NODE_QUEUE_AVAILABLE
 	s->nodeQ=CsvAccess(CsdNodeQueue);
 	s->nodeLock=CsvAccess(CsdNodeQueueLock);
+	s->nodeGrpFreq=4; 
 #endif
 #if CMK_GRID_QUEUE_AVAILABLE
 	s->gridQ=CpvAccess(CsdGridQueue);
@@ -1665,6 +1666,7 @@ void CsdSchedulerState_new(CsdSchedulerState_t *s)
 	s->taskQ = CpvAccess(CsdTaskQueue);
 	s->suspendedTaskQ = CpvAccess(CmiSuspendedTaskQueue);
 #endif
+
 }
 
 
@@ -1720,7 +1722,19 @@ void CsdSchedulerState_new(CsdSchedulerState_t *s)
  */
 void *CsdNextMessage(CsdSchedulerState_t *s) {
 	void *msg;
-	if((*(s->localCounter))-- >0)
+
+	s->iter++;
+
+#if CMK_NODE_QUEUE_AVAILABLE
+ // we use nodeGrpFreq == 0 to mean
+ // don't check NodeQ with high priority
+ if (s->nodeGrpFreq && (0 == (s->iter % s->nodeGrpFreq)))
+	{
+	  msg = CmiGetNonLocalNodeQ();
+	  if (NULL != msg) return msg;
+	}
+#endif
+        if((*(s->localCounter))-- >0)
 	  {
               /* This avoids a race condition with migration detected by megatest*/
               msg=CdsFifo_Dequeue(s->localQ);

src/conv-core/converse.h

@@ -1129,6 +1129,12 @@ typedef struct {
   void *localQ;
   Queue nodeQ;
   Queue schedQ;
+  unsigned short iter; // counting number of sched iterations (hopefully of for it to roll over	 
+  unsigned short nodeGrpFreq; // call nodegroup queue once every nodeGrpFreq iterations with high prio 
+	// should add a function to change this from the program for advanced users. One obstacle: 
+        // it is inside a struct that is on stack, and so not accessible for standalone functions. Need to
+        // resolve this by making a schedule a c++ object, but even then we need a ptr to the currently-running scheduler
+	// 0 means do not check nodegroup queue with high prio.. will be checked with low prio after other Qs
   int *localCounter;
 #if CMK_OBJECT_QUEUE_AVAILABLE
   Queue objQ;