Changeset 2326 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

Timestamp:

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

Author:

ymipsl

Message:

Fix Deadlock from reading phase.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp (modified) (3 diffs)

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)) ;
           }
         }