Changeset 1761 for XIOS/dev/dev_ym/XIOS_SERVICES/src/cxios.cpp

Timestamp:

10/18/19 15:40:35 (5 years ago)

Author:

ymipsl

Message:

implementing first guess for service functionnalities.

YM

File:

• XIOS/dev/dev_ym/XIOS_SERVICES/src/cxios.cpp (modified) (10 diffs)

XIOS/dev/dev_ym/XIOS_SERVICES/src/cxios.cpp

@@ -11 +11 @@
 #include "memtrack.hpp"
 #include "registry.hpp"
+#include "ressources_manager.hpp"
+#include "services_manager.hpp"
+#include "servers_ressource.hpp"
 
 namespace xios
@@ -20 +23 @@
   string CXios::serverPrmFile="./xios_server1";
   string CXios::serverSndFile="./xios_server2";
-
+  const string CXios::defaultPoolId="default_pool_id" ;
+  const string CXios::defaultServerId="default_server_id" ;
+  const string CXios::defaultGathererId="default_gatherer_id" ;
+  
   bool CXios::xiosStack = true;
   bool CXios::systemStack = false;
@@ -26 +32 @@
   bool CXios::isClient ;
   bool CXios::isServer ;
+  
   MPI_Comm CXios::globalComm ;
+  MPI_Comm CXios::xiosComm ;
+
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
@@ -41 +50 @@
   double CXios::recvFieldTimeout = 300.0;
   bool CXios::checkEventSync=false ;
- 
+
+  CDaemonsManager*    CXios::daemonsManager_=nullptr ;
+  CRessourcesManager* CXios::ressourcesManager_=nullptr ;
+  CServicesManager*   CXios::servicesManager_=nullptr ;
+  CContextsManager*   CXios::contextsManager_=nullptr ;
+
   //! Parse configuration file and create some objects from it
   void CXios::initialize()
@@ -107 +121 @@
     isClient = true;
 
+    //CClient::initialize(codeId,localComm,returnComm) ;
     CClient::initialize(codeId,localComm,returnComm) ;
-    if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
-
+    
     // If there are no server processes then we are in attached mode
     // and the clients are also servers
@@ -130 +144 @@
   {
      CClient::finalize() ;
-     if (CClient::getRank()==0)
-     {
-       info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
-       globalRegistry->toFile("xios_registry.bin") ;
-       delete globalRegistry ;
-     }
-
+          
 #ifdef XIOS_MEMTRACK
 
@@ -172 +180 @@
 
     // Initialize all aspects MPI
+   // CServer::initialize();
+
     CServer::initialize();
-    if (CServer::getRank()==0 && CServer::serverLevel != 1) globalRegistry = new CRegistry(CServer::intraComm) ;
-    
+
+    //if (CServer::getRank()==0 && CServer::serverLevel != 1) globalRegistry = new CRegistry(CServer::intraComm) ;
+
+/*    
     if (printLogs2Files)
     {
@@ -201 +213 @@
     // Enter the loop to listen message from Client
     CServer::eventLoop();
-
+*/
     // Finalize
+/*    
     if (CServer::serverLevel == 0)
     {
@@ -271 +284 @@
       delete globalRegistry;
     }
+  */
+
     CServer::finalize();
 
@@ -305 +320 @@
     usingServer = false;
   }
+
+  void CXios::launchRessourcesManager(bool isXiosServer)
+  {
+    ressourcesManager_ = new CRessourcesManager(isXiosServer) ;
+  }
+
+  void CXios::launchServicesManager(bool isXiosServer)
+  {
+    servicesManager_ = new CServicesManager(isXiosServer) ;
+  }
+
+  void CXios::launchContextsManager(bool isXiosServer)
+  {
+    contextsManager_ = new CContextsManager(isXiosServer) ;
+  }
+  
+  void CXios::launchDaemonsManager(bool isXiosServer)
+  {
+    daemonsManager_ = new CDaemonsManager(isXiosServer) ;
+  }
+
+  CPoolRessource* CXios::getPoolRessource(void)
+  {
+    if (isClient) return CClient::getPoolRessource() ;
+    else if (isServer) return CServer::getServersRessource()->getPoolRessource() ;
+  }
 }
+