Changeset 179

Timestamp:

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

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (1 diff)
• src/xmlio/buffer.hpp (modified) (2 diffs)
• src/xmlio/fake_client/fake_nemo.f90 (modified) (1 diff)
• src/xmlio/fortran/ixmlioserver.f03.in (modified) (3 diffs)
• src/xmlio/iface/interface.cpp.in (modified) (3 diffs)
• src/xmlio/main_server.cpp (modified) (1 diff)
• src/xmlio/manager/mpi_manager.cpp (modified) (1 diff)
• src/xmlio/manager/tree_manager.cpp (modified) (2 diffs)
• src/xmlio/manager/tree_manager.hpp (modified) (1 diff)
• src/xmlio/manager/xios_manager.cpp (modified) (2 diffs)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -16 +16 @@
 GUI       = no
 NPROC     = 12
-CSUITE    = gnu
+CSUITE    = intel
 PFORME    = fedora-wk
 FORTEXT   = .f90

XMLIO_V2/dev/dev_rv/src/xmlio/buffer.hpp

@@ -23 +23 @@
 
             typedef struct  buffer_data
-            { CBufferDataType type; bool isArray; size_t size; size_t position;
+            { CBufferDataType type; bool isArray; StdSize size; StdSize position;
             } CBufferData;
 
@@ -127 +127 @@
             /// Mutateurs privés ///
             void setBufferData(const CBufferData & bufdata, StdSize position);
+            
          //--------------------------------------------------------------
 

XMLIO_V2/dev/dev_rv/src/xmlio/fake_client/fake_nemo.f90

@@ -373 +373 @@
       ! On choisit le context dans lequel on va travailler
       ! et on commence le traitement des données.
-      CALL dtreatment_start(nemo_style_ctxt, NETCDF4)
+      CALL dtreatment_start(nemo_style_ctxt, NETCDF4, comm_client_server)
+      
+      CALL dtreatment_end(nemo_style_ctxt)
 
    END SUBROUTINE NEMO_FAKE_ENTRY

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/ixmlioserver.f03.in

@@ -99 +99 @@
       END SUBROUTINE xios_context_create
 
-      SUBROUTINE xios_dtreatment_start(context_hdl, filetype) BIND(C)
+      SUBROUTINE xios_dtreatment_start(context_hdl, filetype, comm_client_server) BIND(C)
          import C_INTPTR_T, C_INT
          INTEGER  (kind = C_INTPTR_T), VALUE  :: context_hdl
-         INTEGER  (kind = C_INT), VALUE       :: filetype
+         INTEGER  (kind = C_INT), VALUE       :: filetype, comm_client_server
       END SUBROUTINE xios_dtreatment_start
 
@@ -233 +233 @@
    END SUBROUTINE context_create
 
-   SUBROUTINE dtreatment_start(context_hdl, filetype)
+   SUBROUTINE dtreatment_start(context_hdl, filetype, comm_client_server)
       TYPE(XHandle), INTENT(IN), VALUE :: context_hdl
-      INTEGER, INTENT(IN), OPTIONAL    :: filetype
-      INTEGER                          :: filetype_
+      INTEGER, INTENT(IN), OPTIONAL    :: filetype, comm_client_server
+      INTEGER                          :: filetype_, comm_client_server_
+      
       IF (PRESENT(filetype)) THEN
          filetype_ = filetype
@@ -242 +243 @@
          filetype_ = NETCDF4
       END IF
-         CALL context_set_current(context_hdl)
-         CALL xios_dtreatment_start(context_hdl%daddr, filetype_)
+      
+      IF (PRESENT(comm_client_server)) THEN
+         comm_client_server_ = comm_client_server
+      ELSE
+         comm_client_server_ = -1
+      END IF
+      
+      CALL context_set_current(context_hdl)
+      CALL xios_dtreatment_start(context_hdl%daddr, filetype_, comm_client_server_)
    END SUBROUTINE dtreatment_start
 

XMLIO_V2/dev/dev_rv/src/xmlio/iface/interface.cpp.in

@@ -117 +117 @@
       MAKE_STRING(__filename, _filename, _filename_len)
       CTreeManager::ParseFile(__filename);
-      StdOStringStream oss;
-      oss << StdString("data/def/def_client_pre.")
-          << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-      CTreeManager::PrintTreeToFile(oss.str());
+      //~ StdOStringStream oss;
+      //~ oss << StdString("data/def/def_client_pre.")
+      //~     << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+      //~ CTreeManager::PrintTreeToFile(oss.str());
    }
    catch (CException & exc)
@@ -135 +135 @@
       MAKE_STRING(__xmlcontent, _xmlcontent, _xmlcontent_len)
       CTreeManager::ParseString(__xmlcontent);
-      StdOStringStream oss;
-      oss << StdString("data/def/def_client_pre.")
-          << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-      CTreeManager::PrintTreeToFile(oss.str());
+      //~ StdOStringStream oss;
+      //~ oss << StdString("data/def/def_client_pre.")
+      //~     << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+      //~ CTreeManager::PrintTreeToFile(oss.str());
    }
    catch (CException & exc)
@@ -245 +245 @@
 }
 
-void xios_dtreatment_start(XPtr const _context, XFileType filetype)
+void xios_dtreatment_start(XPtr const _context, XFileType filetype, MPIComm comm_client_server)
 {
    try
    {
       StdOStringStream oss;
-      oss << StdString("data/def/def_client_next.")
-          << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-      CTreeManager::PrintTreeToFile(oss.str());
-
-      CDataTreatment dt;
-      dt.createDataOutput<CNc4DataOutput>();
-
-      oss.str("");
+      //~ oss << StdString("data/def/def_client_next.")
+      //~     << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+      //~ CTreeManager::PrintTreeToFile(oss.str());
+      //~ oss.str("");
+
+      CDataTreatment dt;   
       oss << StdString("data/def/def_client_end.")
           << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
       CTreeManager::PrintTreeToFile(oss.str());
+      
+      if ((comm_client_server != -1))
+      {
+         MPIRequest request = 0;
+         StdOStringStream ostrs;
+         if (CMPIManager::GetCommRank(comm_client_server) == 1)
+         {
+            CTreeManager::ToBinary(ostrs);      
+            CLinearBuffer lbuffer(ostrs.str().size()+13);           
+            lbuffer.appendString(ostrs.str()); 
+            CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
+            CMPIManager::Wait(request);  // Pas encore en mode RPC
+         }
+         else
+         {
+            CTreeManager::DomainsToBinary(ostrs);
+            CLinearBuffer lbuffer(ostrs.str().size()+13);
+            lbuffer.appendString(ostrs.str());
+            CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
+            CMPIManager::Wait(request);  // Pas encore en mode RPC
+         }
+      }
+      else
+      {
+         dt.createDataOutput<CNc4DataOutput>();
+      }      
    }
    catch (CException & exc)

XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp

@@ -16 +16 @@
       CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv);
       CXIOSManager::AddClient("nemo"    , 2, 2, &nemo_fake_entry);
-      CXIOSManager::AddClient("orchidee", 1, 1, &orchidee_fake_entry);
-      CXIOSManager::AddClient("lmdz"    , 4, 2, &lmdz_fake_entry);
+      //CXIOSManager::AddClient("orchidee", 1, 1, &orchidee_fake_entry);
+      //CXIOSManager::AddClient("lmdz"    , 4, 2, &lmdz_fake_entry);
       CXIOSManager::RunClientServer(comm::CMPIManager::GetCommWorld());
       CXIOSManager::Finalize();
+      
+      //comm::CMPIManager::Finalize(); // < seulement en mode connecté
 
    }

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());         
       }