Changeset 492 for XIOS/trunk/src/server.cpp

Timestamp:

10/02/14 17:34:02 (10 years ago)

Author:

ymipsl

Message:

Add event scheduler functionnality in order to schedule events from different context, that cause Deadlock or crash when using collective MPI communication in netcdf/hdf5 library.

YM

File:

• XIOS/trunk/src/server.cpp (modified) (7 diffs)

XIOS/trunk/src/server.cpp

@@ -12 +12 @@
 #include "tracer.hpp"
 #include "timer.hpp"
+#include "event_scheduler.hpp"
 
 namespace xios
@@ -23 +24 @@
     bool CServer::finished=false ;
     bool CServer::is_MPI_Initialized ;
+    CEventScheduler* CServer::eventScheduler ;
 
     void CServer::initialize(void)
@@ -86 +88 @@
            {
              clientLeader=it->second ;
+             int intraCommSize, intraCommRank ;
+             MPI_Comm_size(intraComm,&intraCommSize) ;
+             MPI_Comm_rank(intraComm,&intraCommRank) ;
+             cout<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+                 <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
 
              MPI_Intercomm_create(intraComm,0,CXios::globalComm,clientLeader,0,&newComm) ;
@@ -122 +129 @@
           interComm.push_back(newComm) ;
         }
-        oasis_enddef() ;
+              oasis_enddef() ;
       }
 
@@ -129 +136 @@
       if (rank==0) isRoot=true;
       else isRoot=false;
-//      eventLoop() ;
-//      finalize() ;
+      
+      eventScheduler = new CEventScheduler(intraComm) ;
     }
 
@@ -136 +143 @@
     {
       CTimer::get("XIOS").suspend() ;
+      
+      delete eventScheduler ;
+      
       if (!is_MPI_Initialized)
       {
@@ -166 +176 @@
          contextEventLoop() ;
          if (finished && contextList.empty()) stop=true ;
+         if (! CXios::isServer) eventScheduler->checkEvent() ;
        }
        CTimer::get("XIOS server").suspend() ;