Changes to fix reset

Author: AdvaitTahilyani

src/libs/ck-libs/collide/collidecharm.C

@@ -314,7 +314,6 @@ void CollisionAggregator::compact(void)
 
 /********************* syncReductionMgr ******************/
 syncReductionMgr::syncReductionMgr()
-  :thisproxy(thisgroup)
 {
   stepCount=-1;
   stepFinished=true;
@@ -339,10 +338,12 @@ void syncReductionMgr::startStep(int stepNo,bool withProd)
   stepFinished=false;
   localFinished=false;
   childrenCount=0;
-  if (nChildren>0)
+  if (nChildren>0) {
+    CProxy_syncReductionMgr proxy(ckGetGroupID());
     for (int i=0;i<TREE_WID;i++)
       if (treeChildStart+i<CkNumPes())
-        thisproxy[treeChildStart+i].childProd(stepCount);
+        proxy[treeChildStart+i].childProd(stepCount);
+  }
   if (withProd)
     pleaseAdvance();//Advise subclass to advance
 }
@@ -373,7 +374,7 @@ void syncReductionMgr::tryFinish(void) //Try to finish reduction
   {
     stepFinished=true;
     if (treeParent!=-1)
-      thisproxy[treeParent].childDone(stepCount);
+      CProxy_syncReductionMgr(ckGetGroupID())[treeParent].childDone(stepCount);
     else
       reductionFinished();
   }
@@ -437,7 +438,7 @@ static const char * voxName(const CkIndex3D &idx,char *buf) {
 collideMgr::collideMgr(const CollideGrid3d &gridMap_,
     const CProxy_collideClient &client_,
     const CProxy_collideVoxel &voxels)
-  :thisproxy(thisgroup), voxelProxy(voxels),
+  :voxelProxy(voxels),
   gridMap(gridMap_), client(client_), aggregator(gridMap,this)
 {
   steps=0;

src/libs/ck-libs/collide/collidecharm_impl.h

@@ -96,7 +96,6 @@ class CollisionAggregator {
   */
 class syncReductionMgr : public CBase_syncReductionMgr
 {
-  CProxy_syncReductionMgr thisproxy;
   void status(const char *msg) {
     CkPrintf("SRMgr pe %d> %s\n",CkMyPe(),msg);
   }
@@ -176,6 +175,11 @@ class collideMgr : public CBase_collideMgr
   collideMgr(CkMigrateMessage* m);
 
   void pup(PUP::er &p) {
+    // thisgroup is a protected member of IrrGroup.  It is not saved/restored
+    // by the migrate constructor, so we do it here.  syncReductionMgr uses
+    // CProxy_syncReductionMgr(ckGetGroupID()) at call time, which requires
+    // thisgroup to be valid when startStep()/tryFinish() are invoked.
+    p | thisgroup;
     p | thisproxy;
     //p | steps;
     p | voxelProxy;
@@ -246,6 +250,10 @@ class serialCollideClient : public collideClient {
   serialCollideClient(CkCallback clientCb_);
   serialCollideClient(CkMigrateMessage *m);
   void pup(PUP::er &p) {
+    // thisgroup must be saved: collisions() uses it to construct the
+    // reduction callback CkCallback(..., thisgroup).  Without this, thisgroup
+    // is 0 after restart and the callback targets a non-existent group.
+    p | thisgroup;
     p | useCb;
   }