Moved some variables so Converse programs compile
authorFilippo Gioachin <gioachin@uiuc.edu>
Tue, 1 Jun 2010 22:19:25 +0000 (17:19 -0500)
committerFilippo Gioachin <gioachin@uiuc.edu>
Tue, 1 Jun 2010 22:19:25 +0000 (17:19 -0500)
src/ck-core/debug-charm.C
src/ck-perf/trace-converse.c
src/conv-core/debug-conv.c

index 39563d492d06927af56b3268a3fd21db14a8c01b..dc385a4477ef6fd2d8d9364035a02d0f76c56bc5 100644 (file)
@@ -431,8 +431,7 @@ struct ConditionalList {
   int msgs[1];
 };
 CkpvStaticDeclare(void *, lastBreakPointMsg);
-int conditionalPipe[2] = {0, 0};
-CkpvDeclare(void*, conditionalQueue);
+CpvExtern(void*, conditionalQueue);
 ConditionalList * conditionalShm = NULL;
 
 //Cpd Lists for local and scheduler queues
@@ -454,8 +453,8 @@ public:
     int curObj=0;
     void *msg;
 
-    length = CdsFifo_Length((CdsFifo)(CkpvAccess(conditionalQueue)));
-    messages = CdsFifo_Enumerate(CkpvAccess(conditionalQueue));
+    length = CdsFifo_Length((CdsFifo)(CpvAccess(conditionalQueue)));
+    messages = CdsFifo_Enumerate(CpvAccess(conditionalQueue));
     for (curObj=-length; curObj<0; curObj++) {
       void *msg = messages[length+curObj];
       pupSingleMessage(p, curObj-1, msg);
@@ -549,7 +548,7 @@ static void CpdDeliverMessageInt(int msgNum) {
   if (_conditionalDelivery==1) conditionalShm->msgs[conditionalShm->count++] = msgNum;
   if (_conditionalDelivery) {
     CmiReference(queuedMsg);
-    CdsFifo_Enqueue(CkpvAccess(conditionalQueue), queuedMsg);
+    CdsFifo_Enqueue(CpvAccess(conditionalQueue), queuedMsg);
   }  
 #if CMK_BLUEGENE_CHARM
   stopVTimer();
@@ -761,7 +760,7 @@ void CpdDeliverSingleMessage () {
         if (_conditionalDelivery==1) conditionalShm->msgs[conditionalShm->count++] = -1;
         void *env = UsrToEnv(CkpvAccess(lastBreakPointMsg));
         CmiReference(env);
-        CdsFifo_Enqueue(CkpvAccess(conditionalQueue),env);
+        CdsFifo_Enqueue(CpvAccess(conditionalQueue),env);
       }
       breakPointEntryInfo->call(CkpvAccess(lastBreakPointMsg), CkpvAccess(lastBreakPointObject));
     }
@@ -779,7 +778,7 @@ void CpdDeliverSingleMessage () {
       if (_conditionalDelivery) {
         if (_conditionalDelivery==1) conditionalShm->msgs[conditionalShm->count++] = 0;
         CmiReference(queuedMsg);
-        CdsFifo_Enqueue(CkpvAccess(conditionalQueue),queuedMsg);
+        CdsFifo_Enqueue(CpvAccess(conditionalQueue),queuedMsg);
       }
 #if CMK_BLUEGENE_CHARM
       stopVTimer();
index cb9e5129fb4745fd5f8026814f86bcf035446490..b7961bb9f85c2a21b3abfba892fd7add88f1e1be 100644 (file)
@@ -51,3 +51,4 @@ void traceUserSuppliedNote(char *note) {}
 /* This routine, included in Charm++ programs from init.C, needs to be present in converse as well.
    Here is a place where it gets included only in converse, and not in Charm++ (thus not generating conflicts). */
 void EmergencyExit(void) {}
+void CpdEndConditionalDeliver_master() {}
index 50daa8d50c2b353ac7f1dfa40c17a5876dd28fbc..c5570fa85c4c1d21805aecc428ed0981e5da7e1a 100644 (file)
@@ -16,7 +16,8 @@ CpvExtern(int, freezeModeFlag);
 CpvStaticDeclare(int, continueFlag);
 CpvStaticDeclare(int, stepFlag);
 CpvExtern(void *, debugQueue);
-CpvExtern(void *, conditionalQueue);
+CpvDeclare(void*, conditionalQueue);
+int conditionalPipe[2] = {0, 0};
 int _debugHandlerIdx;
 
 char ** memoryBackup;