Update calls for new, clearer envelope.h macro names.
authorOrion Lawlor <olawlor@acm.org>
Tue, 27 Jan 2004 22:06:40 +0000 (22:06 +0000)
committerOrion Lawlor <olawlor@acm.org>
Tue, 27 Jan 2004 22:06:40 +0000 (22:06 +0000)
src/ck-core/debug-charm.C
src/ck-core/debug-message.C
src/ck-core/msgalloc.C

index 85c0f8d7f5a0729d918153054797fa3af69f33a7..eb1b46c96c285a800e424fdf781fd081a85dc648 100644 (file)
@@ -136,7 +136,7 @@ void CpdPupMessage(PUP::er &p, void *msg)
   int prioBits=env->getPriobits();
   PUPn(wasPacked);
   PUPn(prioBits);
-  int userSize=size-sizeof(envelope)-sizeof(int)*PW(prioBits);
+  int userSize=size-sizeof(envelope)-sizeof(int)*CkPriobitsToInts(prioBits);
   PUPn(userSize);
   
   p.synchronize(PUP::sync_last_system);
index 503161ed5c70b144ade82f36153b498e7eefb581..0ed027f2398b9a421530bd516a321f19cff872c2 100644 (file)
@@ -56,7 +56,7 @@ void CkPupMessage(PUP::er &p,void **atMsg,int pack_mode) {
        p(size);
        p(prioBits);
        p(envSize);
-       int userSize=size-envSize-sizeof(int)*PW(prioBits);
+       int userSize=size-envSize-sizeof(int)*CkPriobitsToInts(prioBits);
        if (p.isUnpacking())
                env=_allocEnv(type,userSize,prioBits);
        if (pack_mode == 1) {
index 83b427deacdda6cdc495b254ee40eb17222bdec1..c4d73264334a95aa94942238217c11b721bbb158 100644 (file)
@@ -34,7 +34,7 @@ void* CkAllocMsg(int msgIdx, int msgBytes, int prioBits)
 extern "C"
 void* CkAllocBuffer(void *msg, int bufsize)
 {
-  bufsize = _ALIGN(bufsize);
+  bufsize = CkMsgAlignLength(bufsize);
   register envelope *env = UsrToEnv(msg);
   register envelope *packbuf;
   packbuf = _allocEnv(env->getMsgtype(), bufsize,