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

Timestamp:

04/18/11 11:30:27 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio/manager

Files:

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

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

@@ -54 +54 @@
 
       MPIComm CMPIManager::GetCommWorld(void)
-      { return (mpi_comm_world); }
+      { 
+         return (mpi_comm_world); 
+      }
 
       bool CMPIManager::IsMaster(MPIComm comm)
-      { return (CMPIManager::GetCommRank(comm) == 0); }
+      { 
+         return (CMPIManager::GetCommRank(comm) == 0); 
+      }
 
       bool CMPIManager::IsRank(MPIComm comm, int rank)
-      { return (CMPIManager::GetCommRank(comm) == rank); }
+      { 
+         return (CMPIManager::GetCommRank(comm) == rank); 
+      }
 
       MPIComm CMPIManager::CreateComm(MPIGroup group, MPIComm pcomm)

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

@@ -33 +33 @@
       CXIOSManager::XIOSType CXIOSManager::Type = CLIENT;
 
-      StdString     CXIOSManager::ClientName;
-      comm::MPIComm CXIOSManager::Comm_Client_Server;
-      comm::MPIComm CXIOSManager::Comm_Server;
+      StdString     CXIOSManager::ClientName("unknown name");
+      comm::MPIComm CXIOSManager::Comm_Client_Server = -1;
+      comm::MPIComm CXIOSManager::Comm_Server = -1;
 
       xios_map<StdString, CXIOSManager::XIOSClient> CXIOSManager::Clients;
 
       ///--------------------------------------------------------------
+      
+      void CXIOSManager::RunServer
+         (StdString clientName, comm::MPIComm comm_client_server, comm::MPIComm comm_server)
+      {
+            
+      }
+      
+      //--------------------------------------------------------------
 
       void CXIOSManager::RunClientServer(comm::MPIComm comm_client_server)
@@ -45 +53 @@
          using namespace comm;
          typedef std::pair<StdString, XIOSClient> StdPairStrClient;
-
-         MPIComm  world_comm  = CMPIManager::GetCommWorld();
-         MPIGroup world_group = CMPIManager::GetGroupWorld();
 
          if (CMPIManager::IsMaster(comm_client_server))
@@ -71 +76 @@
                const StdPairStrClient & elem = *iit;
                std::cout << " - " << elem.first
-                         << " > nombre de clients : "             << elem.second.nbClient
-                         << " , nombre de clients par serveur : " << elem.second.nbClientPServer
-                         << " , nombre de serveurs : "            << elem.second.nbClient/elem.second.nbClientPServer
+                         << " > nombre de clients : "             
+                         << elem.second.nbClient
+                         << " , nombre de clients par serveur : " 
+                         << elem.second.nbClientPServer
+                         << " , nombre de serveurs : "            
+                         << elem.second.nbClient/elem.second.nbClientPServer
                          << std::endl;
             }
@@ -86 +94 @@
             iit  = CXIOSManager::Clients.begin(),
             eend = CXIOSManager::Clients.end();
+         
+         bool isClient = true, isIncl = false;
+         MPIComm comm_client = 0, comm_client_grp = 0; comm_client_server = 0;
 
          for (;iit != eend; iit++)
          {
             const StdPairStrClient & elem = *iit;
-            MPIComm comm_client = 0, comm_client_grp = 0; comm_client_server = 0;
-
-            int       currentRank     = CMPIManager::GetCommRank();
-            StdString clientName      = elem.first;
-            StdSize   nbClient        = elem.second.nbClient;
-            StdSize   nbClientPServer = elem.second.nbClientPServer;
-            StdSize   nbServer        = elem.second.nbClient/elem.second.nbClientPServer;
-            StdSize   totalproc       = nbClient + nbServer;
+
+            std::vector<int> clieindex, servindex ;
+            StdSize   currentRank      = CMPIManager::GetCommRank();
+            StdString clientName       = elem.first;
+            StdSize   nbClient         = elem.second.nbClient;
+            StdSize   nbClientPServer  = elem.second.nbClientPServer;
+            StdSize   nbServer         = (elem.second.nbClient)/(elem.second.nbClientPServer);
 
             for (StdSize i = 0; i<nbServer; i++)
             {
                end = start + nbClientPServer;
-               // Pas encore implémenté (interface de gestion de groupe/communicateur buggée)
+               MPIComm comm_  =  CMPIManager::CreateComm
+                  (CMPIManager::CreateSubGroup(CMPIManager::GetGroupWorld(), start, end));
+               MPIComm comm__ =  CMPIManager::CreateComm
+                  (CMPIManager::CreateSubGroup(CMPIManager::GetGroupWorld(), start+1, end));
+                  
+               servindex.push_back(start);
+               for (StdSize j = start+1; j <= end; j++)
+                  clieindex.push_back(j);
+                                
+               if ((currentRank >= start) && (currentRank <= end))
+               {
+                  comm_client_server = comm_;
+                  comm_client_grp    = comm__;
+                  isIncl = true;
+                  CXIOSManager::ClientName = clientName;
+               }
+               if (currentRank == start)
+               {
+                  isClient = false;
+                  CXIOSManager::Comm_Client_Server = comm_;
+               }               
+               if (clieindex.size() == nbClient)
+               {
+                  MPIComm comm___  =  CMPIManager::CreateComm
+                  (CMPIManager::CreateSubGroup(CMPIManager::GetGroupWorld(), clieindex));
+                  if (isIncl)
+                  {
+                     comm_client = comm___;
+                  }
+                  clieindex.clear();
+                  isIncl = false;
+               }
+               
                start = start + nbClientPServer + 1;
             }
+            CXIOSManager::Comm_Server =  CMPIManager::CreateComm
+               (CMPIManager::CreateSubGroup(CMPIManager::GetGroupWorld(), servindex));
+            
+         }
+         
+         if (isClient)
+         {
+            CXIOSManager::Clients[CXIOSManager::ClientName].entry
+               (comm_client, comm_client_grp, comm_client_server);
+         }
+         else
+         {
+            CXIOSManager::RunServer(CXIOSManager::ClientName, 
+                                    CXIOSManager::Comm_Client_Server,
+                                    CXIOSManager::Comm_Server);
          }
       }

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

@@ -24 +24 @@
             void (*entry)(comm::MPIComm, comm::MPIComm, comm::MPIComm) ;
          } XIOSClient;
+         
+      public:
 
          /// Initialisation et finalisation de la bibliothÚque ///
@@ -37 +39 @@
          /// Lancement des serveurs et/ou des clients ///
          static void RunServer(StdString clientName,
-                               comm::MPIComm comm_client_server, comm::MPIComm comm_server); // Not implemented yet.
+                               comm::MPIComm comm_client_server, comm::MPIComm comm_server);
          static void RunClient(comm::MPIComm comm_client =
-                               comm::CMPIManager::GetCommWorld());                           // Not implemented yet.
+                               comm::CMPIManager::GetCommWorld());
          static void RunClientServer(comm::MPIComm comm_client_server =
                                      comm::CMPIManager::GetCommWorld());