Changeset 2399 for XIOS3/trunk/src/transport/one_sided_context_server.cpp

Timestamp:

09/09/22 17:23:16 (22 months ago)

Author:

ymipsl

Message:

-Fix performance issue in one_sided protocol

• better timer instrumentation of the protocol

YM

File:

• XIOS3/trunk/src/transport/one_sided_context_server.cpp (modified) (4 diffs)

XIOS3/trunk/src/transport/one_sided_context_server.cpp

@@ -93 +93 @@
     int flag;
     MPI_Status status;
-    
-    traceOff();
-    MPI_Iprobe(MPI_ANY_SOURCE, 20,interComm, &flag, &status);
-    traceOn();
-    if (flag==true)
-    {
-      requests_.push_back(CRequest(interComm, status)) ;
-      if (requests_.back().test()) 
-      {
-        processRequest(requests_.back()) ;
-        requests_.pop_back() ;
+    flag=true ;
+
+    while(flag)
+    {
+      traceOff();
+      MPI_Iprobe(MPI_ANY_SOURCE, 20,interComm, &flag, &status);
+      traceOn();
+      if (flag==true)
+      {
+        requests_.push_back(CRequest(interComm, status)) ;
+        if (requests_.back().test()) 
+        {
+          processRequest(requests_.back()) ;
+          requests_.pop_back() ;
+        }
       }
     }
@@ -139 +143 @@
     if (!pendingEvents_.empty())
     {
+/*
       SPendingEvent& nextEvent = pendingEvents_.begin()->second ;
       for(auto& buffer : nextEvent.buffers ) buffer->eventLoop() ;
       if (nextEvent.nbSenders==0) pendingEvents_.erase(pendingEvents_.begin()) ;
+*/
+      for(auto it=pendingEvents_.begin() ;  it!=pendingEvents_.end() ;)
+      {
+        SPendingEvent& nextEvent = it->second ;
+        for(auto& buffer : nextEvent.buffers ) buffer->eventLoop() ;
+        if (nextEvent.nbSenders==0) it=pendingEvents_.erase(it) ;
+        else ++it ;
+      }
     }
   }
@@ -188 +201 @@
           CEventServer event(this) ;
           for(auto& buffer : it->second.buffers) buffer->fillEventServer(currentTimeLine, event) ;
-
+          MPI_Barrier(intraComm) ;
           CTimer::get("Process events").resume();
           info(100)<<"Context id "<<context->getId()<<" : Process Event "<<currentTimeLine<<" of class "<<event.classId<<" of type "<<event.type<<endl ;
@@ -281 +294 @@
     else if (event.classId==CGrid::GetType()) CGrid::dispatchEvent(event);
     else if (event.classId==CGridGroup::GetType()) CGridGroup::dispatchEvent(event);
-    else if (event.classId==CField::GetType()) CField::dispatchEvent(event);
+    else if (event.classId==CField::GetType()) 
+    {
+      if (event.type==CField::EVENT_ID_UPDATE_DATA) CField::dispatchEvent(event);
+      else CField::dispatchEvent(event);
+    }
     else if (event.classId==CFieldGroup::GetType()) CFieldGroup::dispatchEvent(event);
     else if (event.classId==CFile::GetType()) CFile::dispatchEvent(event);