Deleting a few handler never used
authorFilippo Gioachin <gioachin@uiuc.edu>
Tue, 26 Jan 2010 03:40:49 +0000 (21:40 -0600)
committerFilippo Gioachin <gioachin@uiuc.edu>
Tue, 26 Jan 2010 03:40:49 +0000 (21:40 -0600)
src/ck-core/init.C
src/ck-core/init.h

index f3d8d6c96d801b9d18497d9b755ce54b25e1cf94..94e2a68b40b33a15810ecfb1912b35e4f0ed4235 100644 (file)
@@ -75,10 +75,8 @@ CksvDeclare(UInt,_numInitNodeMsgs);
 int   _infoIdx;
 int   _charmHandlerIdx;
 int   _initHandlerIdx;
-int   _roHandlerIdx;
 int   _roRestartHandlerIdx;
 int   _bocHandlerIdx;
-int   _nodeBocHandlerIdx;
 int   _qdHandlerIdx;
 int   _qdCommHandlerIdx;
 int   _triggerHandlerIdx;
@@ -362,7 +360,6 @@ static void _exitHandler(envelope *env)
       _exitStarted = 1;
       CkNumberHandler(_charmHandlerIdx,(CmiHandler)_discardHandler);
       CkNumberHandler(_bocHandlerIdx, (CmiHandler)_discardHandler);
-      CkNumberHandler(_nodeBocHandlerIdx, (CmiHandler)_discardHandler);
       env->setMsgtype(ReqStatMsg);
       env->setSrcPe(CkMyPe());
       // if exit in ring, instead of broadcasting, send in ring
@@ -386,7 +383,6 @@ static void _exitHandler(envelope *env)
       DEBUGF(("ReqStatMsg on %d\n", CkMyPe()));
       CkNumberHandler(_charmHandlerIdx,(CmiHandler)_discardHandler);
       CkNumberHandler(_bocHandlerIdx, (CmiHandler)_discardHandler);
-      CkNumberHandler(_nodeBocHandlerIdx, (CmiHandler)_discardHandler);
        /*FAULT_EVAC*/
       if(CmiNodeAlive(CkMyPe())){
          _sendStats();
@@ -454,7 +450,6 @@ static inline void _processBufferedBocInits(void)
 static inline void _processBufferedNodeBocInits(void)
 {
   CkCoreState *ck = CkpvAccess(_coreState);
-  CkNumberHandlerEx(_nodeBocHandlerIdx,(CmiHandlerEx)_processHandler,ck);
   register int i = 0;
   PtrVec &inits=*CksvAccess(_nodeBocInitVec);
   register int len = inits.size();
@@ -560,12 +555,6 @@ static void _roRestartHandler(void *msg)
   _processRODataMsg(env);
 }
 
-static void _roHandler(void *msg)
-{
-  CpvAccess(_qd)->process();
-  _roRestartHandler(msg);
-}
-
 static void _initHandler(void *msg)
 {
   CkAssert(CkMyPe()!=0);
@@ -616,7 +605,6 @@ void _CkExit(void)
   //
   CkNumberHandler(_charmHandlerIdx,(CmiHandler)_discardHandler);
   CkNumberHandler(_bocHandlerIdx, (CmiHandler)_discardHandler);
-  CkNumberHandler(_nodeBocHandlerIdx, (CmiHandler)_discardHandler);
   DEBUGF(("[%d] CkExit - _exitStarted:%d %d\n", CkMyPe(), _exitStarted, _exitHandlerIdx));
 
   if(CkMyPe()==0) {
@@ -829,11 +817,9 @@ void _initCharm(int unused_argc, char **argv)
 
        _charmHandlerIdx = CkRegisterHandler((CmiHandler)_bufferHandler);
        _initHandlerIdx = CkRegisterHandler((CmiHandler)_initHandler);
-       _roHandlerIdx = CkRegisterHandler((CmiHandler)_roHandler);
        _roRestartHandlerIdx = CkRegisterHandler((CmiHandler)_roRestartHandler);
        _exitHandlerIdx = CkRegisterHandler((CmiHandler)_exitHandler);
        _bocHandlerIdx = CkRegisterHandler((CmiHandler)_initHandler);
-       _nodeBocHandlerIdx = CkRegisterHandler((CmiHandler)_initHandler);
        _infoIdx = CldRegisterInfoFn((CldInfoFn)_infoFn);
        _triggerHandlerIdx = CkRegisterHandler((CmiHandler)_triggerHandler);
        _ckModuleInit();
index 69578316cabe0ae7d906f48aba873aac201a9052..2df503bf0adddea6a5e58bb78c6f2a8ab3835599 100644 (file)
@@ -124,11 +124,8 @@ extern unsigned int    _printSS;
 
 extern int     _infoIdx;
 extern int     _charmHandlerIdx;
-extern int     _roHandlerIdx;
 extern int     _roRestartHandlerIdx;     /* for checkpoint/restart */
-extern int     _initHandlerIdx;
 extern int     _bocHandlerIdx;
-extern int     _nodeBocHandlerIdx;
 extern int     _qdHandlerIdx;
 extern unsigned int   _numInitMsgs;