Revert "Adapt checkpointing code to call base_pup methods"
authorPhil Miller <mille121@illinois.edu>
Sat, 7 Jan 2012 07:51:24 +0000 (01:51 -0600)
committerPhil Miller <mille121@illinois.edu>
Sat, 7 Jan 2012 07:52:10 +0000 (01:52 -0600)
This reverts commit 60eaf3ad33cf4d6777d6dcb5f54509afb612f571.

src/ck-core/ckcheckpoint.C

index 6ffd95e97e963c88f9e6423b1e100dab74717f90..7f31c73f3a5bced3749b8ada30a52c3b58fea0b1 100644 (file)
@@ -208,7 +208,6 @@ void CkPupMainChareData(PUP::er &p, CkArgMsg *args)
                        }
                        else 
                                obj = (Chare *)_mainTable[i]->getObj();
-                       obj->base_pup(p);
                        obj->pup(p);
                }
        }
@@ -252,7 +251,6 @@ void CkPupChareData(PUP::er &p)
                CkFreeSysMsg(m);
        }
        Chare *obj = (Chare*)CkpvAccess(chare_objs)[i];
-       obj->base_pup(p);
        obj->pup(p);
   }
 
@@ -332,7 +330,6 @@ void CkPupGroupData(PUP::er &p, CmiBool create)
          // if using migration constructor, you'd better have a pup
                if(!create)
                        gobj->mlogData->teamRecoveryFlag = 1;
-          gobj->base_pup(p);
           gobj->pup(p);
          // CkPrintf("Group PUP'ed: gid = %d, name = %s\n",gobj->ckGetGroupID().idx, tmpInfo[i].name);
        }
@@ -383,7 +380,6 @@ void CkPupNodeGroupData(PUP::er &p, CmiBool create)
                }
                TableEntry ent2 = CksvAccess(_nodeGroupTable)->find(gID);
                IrrGroup *obj = ent2.getObj();
-               obj->base_pup(p);
                obj->pup(p);
                if(CkMyPe() == 3) CkPrintf("Nodegroup PUP'ed: gid = %d, name = %s\n",
                        obj->ckGetGroupID().idx,
@@ -445,7 +441,6 @@ void CkPupGroupData(PUP::er &p)
          }   // end of unPacking
          IrrGroup *gobj = CkpvAccess(_groupTable)->find(gID).getObj();
          // if using migration constructor, you'd better have a pup
-          gobj->base_pup(p);
           gobj->pup(p);
           DEBCHK("Group PUP'ed: gid = %d, name = %s\n",
                        gobj->ckGetGroupID().idx, tmpInfo[i].name);
@@ -494,7 +489,6 @@ void CkPupNodeGroupData(PUP::er &p)
                }
                TableEntry ent2 = CksvAccess(_nodeGroupTable)->find(gID);
                IrrGroup *obj = ent2.getObj();
-               obj->base_pup(p);
                obj->pup(p);
                DEBCHK("Nodegroup PUP'ed: gid = %d, name = %s\n",
                        obj->ckGetGroupID().idx,