Changeset 2326 for XIOS/dev

Timestamp:

04/22/22 11:46:41 (3 years ago)

Author:

ymipsl

Message:

Fix Deadlock from reading phase.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• context_client.cpp (modified) (1 diff)
• context_server.cpp (modified) (5 diffs)
• context_server.hpp (modified) (1 diff)
• node/axis.hpp (modified) (1 diff)
• node/context.cpp (modified) (1 diff)
• node/context.hpp (modified) (2 diffs)
• node/coupler_in.hpp (modified) (1 diff)
• node/coupler_out.hpp (modified) (1 diff)
• node/domain.hpp (modified) (1 diff)
• node/field.cpp (modified) (3 diffs)
• node/field.hpp (modified) (1 diff)
• node/file.hpp (modified) (1 diff)
• node/grid.hpp (modified) (1 diff)
• node/scalar.hpp (modified) (1 diff)
• node/variable.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp

@@ -449 +449 @@
    void CContextClient::setBufferSize(const std::map<int,StdSize>& mapSize)
    {
-     for(auto& it : mapSize) 
-      buffers[it.first]->fixBufferSize(std::max(CXios::minBufferSize*1.0,std::min(it.second*CXios::bufferSizeFactor*1.01,CXios::maxBufferSize*1.0)));
+     setFixedBuffer() ;
+     for(auto& it : mapSize)
+     {
+      size_t size=std::max(CXios::minBufferSize*1.0,std::min(it.second*CXios::bufferSizeFactor*1.01,CXios::maxBufferSize*1.0)) ;
+      mapBufferSize_[it.first]=size ;
+      if (buffers.count(it.first)>0) buffers[it.first]->fixBufferSize(size);
+     }
    }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp

@@ -115 +115 @@
     CTimer::get("check pending request").suspend();
     CTimer::get("check event process").resume();
-    if (enableEventsProcessing)  processEvents();
+    processEvents(enableEventsProcessing);
     CTimer::get("check event process").suspend();
     return finished;
@@ -320 +320 @@
         buffers[rank]->freeBuffer(count) ;
         delete buffers[rank] ;
-        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, newSize) ;
+        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, 2*newSize) ;
         info(100)<<"Context id "<<context->getId()<<" : Receive ChangeBufferSize from client rank "<<rank
                  <<"  newSize : "<<newSize<<" Address : "<<winAdress[0]<<" & "<<winAdress[1]<<endl ;
@@ -339 +339 @@
   }
 
-  void CContextServer::processEvents(void)
+  void CContextServer::processEvents(bool enableEventsProcessing)
   {
     map<size_t,CEventServer*>::iterator it;
@@ -363 +363 @@
         else if (isAttachedModeEnabled() || eventScheduler_->queryEvent(currentTimeLine,hashId) )
         {
+          if (!enableEventsProcessing && isCollectiveEvent(*event)) return ;
 
           if (!eventScheduled_) 
@@ -498 +499 @@
   bool CContextServer::isCollectiveEvent(CEventServer& event)
   {
-    if (event.classId==CField::GetType()) return CField::isCollectiveEvent(event);
+    if (event.type>1000) return false ;
     else return true ;
   }

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.hpp

@@ -25 +25 @@
     void getBufferFromClient(size_t timeLine) ;
     void processRequest(int rank, char* buff,int count) ;
-    void processEvents(void) ;
+    void processEvents(bool enableEventsProcessing) ;
     bool hasFinished(void);
     void dispatchEvent(CEventServer& event) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp

@@ -55 +55 @@
          enum EEventId
          {
+           EVENT_ID_COLLECTIVE=100,
            EVENT_ID_AXIS_DISTRIBUTION,
-           EVENT_ID_SEND_DISTRIBUTED_ATTRIBUTE
+           EVENT_ID_SEND_DISTRIBUTED_ATTRIBUTE,
+           EVENT_ID_NO_COLLECTIVE=1000,
          } ;
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -1130 +1130 @@
     for(auto field : fileOutField) field->evaluateBufferSize(fieldBufferEvaluation, CXios::isOptPerformance) ; // output to server
     for(auto field : couplerOutField) field->evaluateBufferSize(fieldBufferEvaluation, CXios::isOptPerformance) ; // output to coupler
-    for(auto field : fieldModelIn) field->evaluateBufferSize(fieldBufferEvaluation, CXios::isOptPerformance) ; // server to client (for io servers)
+    for(auto field : fileInField) field->evaluateBufferSize(fieldBufferEvaluation, CXios::isOptPerformance) ; // server to client (for io servers)
     
     // fix size for each context client

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.hpp

@@ -53 +53 @@
          enum EEventId
          {
+           EVENT_ID_COLLECTIVE=100,
            EVENT_ID_CLOSE_DEFINITION,EVENT_ID_UPDATE_CALENDAR,
            EVENT_ID_CREATE_FILE_HEADER,EVENT_ID_CONTEXT_FINALIZE,
@@ -59 +60 @@
            EVENT_ID_COUPLER_IN_CLOSE_DEFINITION,
            EVENT_ID_COUPLER_IN_CONTEXT_FINALIZED,
+           EVENT_ID_NO_COLLECTIVE=1000,
          };
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/coupler_in.hpp

@@ -52 +52 @@
          enum EEventId
          {
-           NO_EVENT
+           EVENT_ID_COLLECTIVE=100,
+           NO_EVENT,
+           EVENT_ID_NO_COLLECTIVE=1000,
          };
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/coupler_out.hpp

@@ -47 +47 @@
          enum EEventId
          {
-           NO_EVENT
+           EVENT_ID_COLLECTIVE=100,
+           NO_EVENT,
+           EVENT_ID_NO_COLLECTIVE=1000,
          };
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp

@@ -58 +58 @@
          enum EEventId
          {
-           EVENT_ID_DOMAIN_DISTRIBUTION, EVENT_ID_SEND_DISTRIBUTED_ATTRIBUTE
+           EVENT_ID_COLLECTIVE=100,
+           EVENT_ID_DOMAIN_DISTRIBUTION, EVENT_ID_SEND_DISTRIBUTED_ATTRIBUTE,
+           EVENT_ID_NO_COLLECTIVE=100,
          } ;
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -558 +558 @@
   {
     CContextClient* client=nullptr ;
+    const size_t headerSize=100 ;
 
     for(int i=0;i<2;i++)
@@ -569 +570 @@
         map<int,size_t> bufferSize ;
    
-        if (evaluateBuffer.count(client)!=0) bufferSize = evaluateBuffer[client] ;
+        bufferSize = evaluateBuffer[client] ;
         if (isOptPerformance)
         {
           for(auto& it : dataSize) 
           {
-            if (bufferSize.count(it.first)==0) bufferSize[it.first]=it.second ;
-            else bufferSize[it.first]+=it.second ;
+            if (bufferSize.count(it.first)==0) bufferSize[it.first]=it.second+headerSize ;
+            else bufferSize[it.first]+=it.second+headerSize ;
           }
         }
@@ -582 +583 @@
           for(auto& it : dataSize) 
           {
-            if (bufferSize.count(it.first)==0) bufferSize[it.first]=it.second ;
-            else bufferSize[it.first]=std::max(bufferSize[it.first],(size_t)it.second) ;
+              if (bufferSize.count(it.first)==0) bufferSize[it.first]=it.second+headerSize ;
+              else bufferSize[it.first]=std::max(bufferSize[it.first],(size_t)(it.second+headerSize)) ;
           }
         }

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

@@ -90 +90 @@
          enum EEventId
          {
+           EVENT_ID_COLLECTIVE=100,
            EVENT_ID_UPDATE_DATA, EVENT_ID_READ_DATA, EVENT_ID_READ_DATA_READY,
-           EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP, EVENT_ID_GRID_COMPLETED
+           EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP, EVENT_ID_GRID_COMPLETED,
+           EVENT_ID_NO_COLLECTIVE=1000,
          };
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.hpp

@@ -52 +52 @@
          enum EEventId
          {
+           EVENT_ID_COLLECTIVE=100,
            EVENT_ID_ADD_FIELD, EVENT_ID_ADD_FIELD_GROUP, EVENT_ID_ADD_VARIABLE,
-           EVENT_ID_ADD_VARIABLE_GROUP, EVENT_ID_CREATE_ENABLED_FIELDS
+           EVENT_ID_ADD_VARIABLE_GROUP, EVENT_ID_CREATE_ENABLED_FIELDS,
+           EVENT_ID_NO_COLLECTIVE=1000,
          };
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp

@@ -77 +77 @@
          enum EEventId
          {
+           EVENT_ID_COLLECTIVE=100,
            EVENT_ID_ADD_DOMAIN, EVENT_ID_ADD_AXIS, EVENT_ID_ADD_SCALAR,
            EVENT_ID_SEND_MASK,
+           EVENT_ID_NO_COLLECTIVE=1000,
 
          };

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.hpp

@@ -52 +52 @@
       enum EEventId
       {
+        EVENT_ID_COLLECTIVE=100,
         EVENT_ID_SCALAR_DISTRIBUTION,
         EVENT_ID_SEND_DISTRIBUTED_ATTRIBUTE,
+        EVENT_ID_NO_COLLECTIVE=1000,
       } ;
       static bool dispatchEvent(CEventServer& event);      

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/variable.hpp

@@ -39 +39 @@
             enum EEventId
             {
-             EVENT_ID_VARIABLE_VALUE
+             EVENT_ID_COLLECTIVE=100,
+             EVENT_ID_VARIABLE_VALUE,
+             EVENT_ID_NO_COLLECTIVE=1000,
             };