Renaming a couple control point functions.
authorIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Mon, 18 Jan 2010 21:02:57 +0000 (15:02 -0600)
committerIsaac Dooley <isaacdooley@hope.cs.uiuc.edu>
Mon, 18 Jan 2010 21:02:57 +0000 (15:02 -0600)
src/ck-cp/controlPoints.C
src/ck-cp/controlPoints.h

index c650e2d6ec511143eb989323c82e9ea515910d9e..880b5bb1d8aa7ddf864574de730fd0f12a98afcd 100644 (file)
@@ -315,7 +315,7 @@ controlPointManager::controlPointManager(){
   }
 
   /// User can register a callback that is called when application should advance to next phase
-  void controlPointManager::setGranularityCallback(CkCallback cb, bool _frameworkShouldAdvancePhase){
+  void controlPointManager::setCPCallback(CkCallback cb, bool _frameworkShouldAdvancePhase){
     frameworkShouldAdvancePhase = _frameworkShouldAdvancePhase;
     granularityCallback = cb;
     haveGranularityCallback = true;
@@ -973,10 +973,10 @@ public:
 };
 
 /// An interface callable by the application.
-void registerGranularityChangeCallback(CkCallback cb, bool frameworkShouldAdvancePhase){
+void registerCPChangeCallback(CkCallback cb, bool frameworkShouldAdvancePhase){
   CkAssert(CkMyPe() == 0);
   CkPrintf("Application has registered a control point change callback\n");
-  controlPointManagerProxy.ckLocalBranch()->setGranularityCallback(cb, frameworkShouldAdvancePhase);
+  controlPointManagerProxy.ckLocalBranch()->setCPCallback(cb, frameworkShouldAdvancePhase);
 }
 
 /// An interface callable by the application.
index 9abc9f1173e83f5a69045826a393a75d52c13bba..6879e090f837a4dac12f30b9ee07acaa1ff0afd2 100644 (file)
@@ -50,7 +50,7 @@
 
 
 
-void registerGranularityChangeCallback(CkCallback cb, bool frameworkShouldAdvancePhase);
+void registerCPChangeCallback(CkCallback cb, bool frameworkShouldAdvancePhase);
 
 
 void registerControlPointTiming(double time);
@@ -560,7 +560,7 @@ public:
   void writeDataFile();
 
   /// User can register a callback that is called when application should advance to next phase
-  void setGranularityCallback(CkCallback cb, bool _frameworkShouldAdvancePhase);
+  void setCPCallback(CkCallback cb, bool _frameworkShouldAdvancePhase);
 
   /// Called periodically by the runtime to handle the control points
   /// Currently called on each PE