*** empty log message ***
authorFilippo Gioachin <gioachin@illinois.edu>
Wed, 20 Apr 2005 18:42:09 +0000 (18:42 +0000)
committerFilippo Gioachin <gioachin@illinois.edu>
Wed, 20 Apr 2005 18:42:09 +0000 (18:42 +0000)
src/conv-com/3dgridrouter.C
src/conv-core/convcore.c
src/conv-core/converse.h

index e25cbe361e8c574582d74b89e147ae2af103f165..3bbc2594cfa352a9295aec37721cce2115fb0c1a 100644 (file)
@@ -20,7 +20,7 @@
         newmsg=PeGrid->ExtractAndVectorize(kid, u1, knpe, kpelist);\
        if (newmsg) {\
          CmiSetHandler(newmsg->msgs[0], khndl);\
-          CmiSyncVectorSendAndFreeSystem(knextpe, newmsg->count, newmsg->sizes, newmsg->msgs, 1);\
+          CmiSyncVectorSendAndFree(knextpe, -newmsg->count, newmsg->sizes, newmsg->msgs);\
         }\
        else {\
          SendDummyMsg(kid, knextpe, u2);\
index 6245199acd094a487f696a0902d6b01c6523f309..d53a2f0f17e1346d3f6fcf759eab0ccbf64c2aca 100644 (file)
@@ -1496,7 +1496,7 @@ void CsdInit(argv)
 void CmiSyncVectorSend(int destPE, int n, int *sizes, char **msgs) {
   int total;
   char *mesg;
-  COMPACT_VECTOR(total, mesg, n, sizes, msgs);
+  VECTOR_COMPACT(total, mesg, n, sizes, msgs);
   CmiSyncSendAndFree(destPE, total, mesg);
 }
 
index 4997bbe8144d4103f4083ca071ffc4e4f2133608..c1602a02f182202a1b757f4bc5db101b59dcdf80 100644 (file)
@@ -764,21 +764,21 @@ void     CmiLookupGroup(CmiGroup grp, int *npes, int **pes);
   int i;\
   char *tmp;\
   outsize=0;\
-  if (ndata>=0) for(i=0; i<ndata; ++i) outsize += insizes[i];\
+  if (inndata>=0) for(i=0; i<inndata; ++i) outsize += insizes[i];\
   else {\
-    for(i=0; i<-ndata; ++i) outsize += ALIGN8(insizes[i]);\
-    outsize -= (ndata+1) * sizeof(CmiChunkHeader);\
+    for(i=0; i<-inndata; ++i) outsize += ALIGN8(insizes[i]);\
+    outsize -= (inndata+1) * sizeof(CmiChunkHeader);\
   }\
   outdata = (char *)CmiAlloc(outsize);\
-  if (!outdata) fprintf(stderr, "%d: Out of mem\n", _Cmi_mynode);\
-  tmp = data;\
-  if (ndata>=0) for (i=0; i<ndata; ++i) {\
+  if (!outdata) fprintf(stderr, "%d: Out of mem\n", CmiMyNode());\
+  tmp = outdata;\
+  if (inndata>=0) for (i=0; i<inndata; ++i) {\
     memcpy(tmp, indatas[i]; insizes[i]);\
-    tmp += sizes[i];\
+    tmp += insizes[i];\
   } else {\
     memcpy(tmp, indatas[0]; insizes[0]);\
     tmp += ALIGN8(insizes[0]);\
-    for (i=0; i<-ndata; ++i) {\
+    for (i=0; i<-inndata; ++i) {\
       memcpy(tmp, indatas[i]-sizeof(CmiChunkHeader), insizes[i]+sizeof(CmiChunkHeader));\
       tmp += ALIGN8(insizes[i])+sizeof(CmiChunkHeader);\
     }\