Changeset 492 for XIOS/trunk/src/context_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/context_server.cpp (modified) (4 diffs)

XIOS/trunk/src/context_server.cpp

@@ -14 +14 @@
 #include "timer.hpp"
 #include "cxios.hpp"
+#include "event_scheduler.hpp"
+#include "server.hpp"
+#include <boost/functional/hash.hpp>
 
 
@@ -32 +35 @@
     else  MPI_Comm_size(interComm,&commSize) ;
     currentTimeLine=0 ;
+    scheduled=false ;
     finished=false ;
+    
+    boost::hash<string> hashString ;
+    hashId=hashString(context->getId()) ;
+
   }
   void CContextServer::setPendingEvent(void)
@@ -150 +158 @@
     {
       event=it->second ;
+      
       if (event->isFull())
       {
+        if (!scheduled && !CXios::isServer)
+        {
+          CServer::eventScheduler->registerEvent(currentTimeLine,hashId) ;  
+          scheduled=true ;
+        }
+        else if (CXios::isServer || CServer::eventScheduler->queryEvent(currentTimeLine,hashId) ) 
+        {
          CTimer::get("Process events").resume() ;
          dispatchEvent(*event) ;
@@ -159 +175 @@
          events.erase(it) ;
          currentTimeLine++ ;
-       }
-     }
-   }
+         scheduled = false ;
+        }
+      }
+    }
+  }
 
   CContextServer::~CContextServer()