Changeset 180 for XMLIO_V2/dev/dev_rv/src/xmlio/manager/xios_manager.cpp

Timestamp:

04/19/11 15:06:51 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/manager/xios_manager.cpp (modified) (8 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/manager/xios_manager.cpp

@@ -2 +2 @@
 
 #include "tree_manager.hpp"
+#include "data_treatment.hpp"
 
 namespace xmlioserver
 {
       /// ////////////////////// Définitions ////////////////////// ///
+      
       void CXIOSManager::Initialise(XIOSType type, int * argc, char *** argv)
       {
@@ -33 +35 @@
       std::vector<StdString> CXIOSManager::ExeOptions;
 
-      CXIOSManager::XIOSType CXIOSManager::Type = CLIENT;
+      CXIOSManager::XIOSType   CXIOSManager::Type    = CLIENT;
+      CXIOSManager::XIOSStatus CXIOSManager::Status  = LOC_UNUSED;
 
       StdString     CXIOSManager::ClientName("unknown name");
@@ -72 +75 @@
          oss << StdString("data/def/def_server_end.")
              << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-         CTreeManager::PrintTreeToFile(oss.str());         
+         CTreeManager::PrintTreeToFile(oss.str());
+         
+         //data::CDataTreatment dt;      
       }
       
@@ -166 +171 @@
                   isIncl = true;
                   CXIOSManager::ClientName = clientName;
+                  CXIOSManager::Status = LOC_CLIENT;
                }
                if (currentRank == start)
@@ -171 +177 @@
                   isClient = false; isIncl_  = true;
                   CXIOSManager::Comm_Client_Server = comm_;
+                  CXIOSManager::Status = LOC_SERVER;
                }               
                if (clieindex.size() == nbClient)
@@ -209 +216 @@
       void CXIOSManager::RunClient(comm::MPIComm comm_client)
       {
+         CXIOSManager::Status  = LOC_CLIENT_SERVER;
          (CXIOSManager::Clients.begin()->second.entry)(comm_client, comm_client, comm_client);
       }
@@ -221 +229 @@
 
          if (nbClient < nbClientPServer)
-            ERROR("CXIOSManager::AddClient(clientName, nbClient, nbClientPServer, entry_point)",
+            ERROR("CXIOSManager::AddClient(...)", 
                   << "nbClient < nbClientPServer");
+                  
          if ((nbClient % nbClientPServer) != 0)
-            ERROR("CXIOSManager::AddClient(clientName, nbClient, nbClientPServer, entry_point)",
+            ERROR("CXIOSManager::AddClient(...)",
                   << " (nbClient % nbClientPServer) != 0 !");
+                  
          if ((nbprocess-nbprocess_used) < (nbClient + nbClient/nbClientPServer))
-            ERROR("CXIOSManager::AddClient(clientName, nbClient, nbClientPServer, entry_point)",
+            ERROR("CXIOSManager::AddClient(...)",
                   << " Pas assez de processus disponibles !");
+                  
          if (CXIOSManager::Clients.find(clientName) != CXIOSManager::Clients.end())
-            ERROR("CXIOSManager::AddClient(clientName, nbClient, nbClientPServer, entry_point)",
+            ERROR("CXIOSManager::AddClient(...)",
                   << " Un client portant le même nom existe déjà !");
 
@@ -332 +343 @@
          }
       }
+      
+      //---------------------------------------------------------------
+      
+      CXIOSManager::XIOSType   CXIOSManager::GetType(void)
+      {
+         return (CXIOSManager::Type);
+      }
+      
+      //---------------------------------------------------------------
+      
+      CXIOSManager::XIOSStatus CXIOSManager::GetStatus(void)
+      {
+         return (CXIOSManager::Status);
+      }
+      
+      //---------------------------------------------------------------
+      
+      StdString  CXIOSManager::GetClientName(void)
+      {
+         return (CXIOSManager::ClientName);
+      }
 
       ///--------------------------------------------------------------