Changeset 179 for XMLIO_V2/dev/dev_rv/src/xmlio/manager

Timestamp:

04/18/11 17:02:22 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio/manager

Files:

• mpi_manager.cpp (modified) (1 diff)
• tree_manager.cpp (modified) (2 diffs)
• tree_manager.hpp (modified) (1 diff)
• xios_manager.cpp (modified) (2 diffs)

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

@@ -206 +206 @@
          if (error != mpi_success)
             ERROR("CMPIManager::Receive (comm, src_rank, data)", << " MPI Error !");
-         CMPIManager::Wait (req);
+         CMPIManager::Wait (req); // Temporaire
       }
 

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

@@ -158 +158 @@
       }
       
+      void CTreeManager::FromBinary(StdString & str)
+      {
+         StdIStringStream istrs(str);
+         CTreeManager::FromBinary(istrs);
+      }
+            
+
       //--------------------------------------------------------------
       
@@ -307 +314 @@
          }
       }
+      
+      void CTreeManager::DomainsFromBinary(StdString & str)
+      {
+         StdIStringStream istrs(str);
+         CTreeManager::DomainsFromBinary(istrs);
+      }
 
       ///-------------------------------------------------------------

XMLIO_V2/dev/dev_rv/src/xmlio/manager/tree_manager.hpp

@@ -37 +37 @@
             static void ToBinary  (StdOStream & os);
             static void FromBinary(StdIStream & is);
+            static void FromBinary(StdString & str);
             
             static void DomainsToBinary  (StdOStream & os);
             static void DomainsFromBinary(StdIStream & is);
+            static void DomainsFromBinary(StdString & str);
 
       }; // class CTreeManager

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

@@ -1 +1 @@
 #include "xios_manager.hpp"
+
+#include "tree_manager.hpp"
 
 namespace xmlioserver
@@ -44 +46 @@
          (StdString clientName, comm::MPIComm comm_client_server, comm::MPIComm comm_server)
       {
-
+         using namespace comm;
+         
+         // Reconstruction de l'arborescence d'objet à l'aide des données envoyées par chacun des
+         // clients associés à ce serveur.
+         std::vector<boost::shared_ptr<CLinearBuffer> > clientBuffer;
+         for (int i = 1; i < CMPIManager::GetCommSize(comm_client_server); i++)
+         {
+            while (!CMPIManager::HasReceivedData(comm_client_server, i)){}
+            clientBuffer.push_back(CMPIManager::ReceiveLinearBuffer(comm_client_server, i));
+         }
+         
+         // La quasi-totalité de l'arborescence est obtenue depuis les informations
+         // fournies par le client 1 du sous-groupe.
+         StdString main_data_tree = clientBuffer[0]->getString(0);        
+         tree::CTreeManager::FromBinary(main_data_tree);
+         
+         // Obtention des sous-domaines clients.
+         for (int j = 1; j < clientBuffer.size(); j++)
+         {
+            main_data_tree = clientBuffer[j]->getString(0);
+            tree::CTreeManager::DomainsFromBinary(main_data_tree);
+         }
+         
+         StdOStringStream oss;
+         oss << StdString("data/def/def_server_end.")
+             << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+         CTreeManager::PrintTreeToFile(oss.str());         
       }