Changeset 1765 for XIOS/dev/dev_ym/XIOS_SERVICES/src/manager

Timestamp:

11/06/19 11:03:38 (5 years ago)

Author:

ymipsl

Message:

Some cleaning On XIOS services branch

YM

Location:

XIOS/dev/dev_ym/XIOS_SERVICES/src/manager

Files:

• contexts_manager.cpp (modified) (1 diff)
• contexts_manager.hpp (modified) (1 diff)
• server_context.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/contexts_manager.cpp

@@ -101 +101 @@
     else return false ;
   }
-    
-/*
-    auto eventScheduler=CServer::getServersRessource()->getPoolRessource()->getService(serviceId,partitionId)->getEventScheduler() ;
-    std::hash<string> hashString ;
-    size_t hashId = hashString(getServerContextName(poolId, serviceId, partitionId, contextId)) ;
-    size_t currentTimeLine=0 ;
-    CServer::eventScheduler->registerEvent(currentTimeLine,hashId); 
-    while (!eventScheduler->queryEvent(currentTimeLine,hashId))
-    {
-       CXios::getDaemonsManager()->eventLoop() ;
-    }  
-    
-    MPI_Bcast(&ok, 1, MPI_INT, 0, intraComm) ;
-
-    if (ok)
-    {
-
-      MPI_Intercomm_create(intraComm, 0, xiosComm_, contextLeader, 3141, &interComm) ;
-      return true ;
-    }
-    else return false ;
-  }
-*/
-
 
   void CContextsManager::sendNotification(int rank)

XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/contexts_manager.hpp

@@ -31 +31 @@
     
     bool createServerContext(const std::string& poolId, const std::string& serviceId, const int& partitionId, const string& contextId, bool wait=true) ;
-/*    bool createServerContextIntercomm(const std::string& poolId, const std::string& serviceId, const int& partitionId, const std::string& contextId,
-                                      const MPI_Comm& intraComm, MPI_Comm& InterComm, bool wait=true) ;*/
-    
+   
     bool createServerContextIntercomm(const std::string& poolId, const std::string& serviceId, const int& partitionId, 
                                       const std::string& contextId, const string& sourceContext, bool wait=true) ;

XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/server_context.cpp

@@ -90 +90 @@
       MPI_Test(&req,&flag,&status) ;
     }
-//    auto eventScheduler=parentService_->getEventScheduler() ;
-//    std::hash<string> hashString ;
-//    size_t hashId = hashString(name_) ;
-//    size_t currentTimeLine=0 ;
-//    eventScheduler->registerEvent(currentTimeLine,hashId); 
-//
-//    while (!eventScheduler->queryEvent(currentTimeLine,hashId))
-//    {
-//       CXios::getDaemonsManager()->servicesEventLoop() ;
-//       eventScheduler->checkEvent() ;
-//    }  
-    
+
     MPI_Bcast(&ok, 1, MPI_INT, 0, intraComm) ;