Changeset 2432

Timestamp:

11/25/22 14:48:06 (17 months ago)

Author:

jderouillat

Message:

Fix the evaluated buffer sizes for fields, and shrink the memory overbooking of buffers on servers (legacy)

Location:

XIOS3/branches/xios-3.0-beta/src

Files:

• node/field.cpp (modified) (2 diffs)
• transport/legacy_context_server.cpp (modified) (1 diff)

XIOS3/branches/xios-3.0-beta/src/node/field.cpp

@@ -575 +575 @@
           for(auto& it : dataSize) 
           {
-            if (bufferSize.count(it.first)==0) bufferSize[it.first]=it.second+headerSize ;
-            else bufferSize[it.first]+=it.second+headerSize ;
+            if (bufferSize.count(it.first)==0) bufferSize[it.first]=sizeof(double)*it.second+headerSize ;
+            else bufferSize[it.first]+=sizeof(double)*it.second+headerSize ;
           }
         }
@@ -583 +583 @@
           for(auto& it : dataSize) 
           {
-              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)) ;
+              if (bufferSize.count(it.first)==0) bufferSize[it.first]=sizeof(double)*it.second+headerSize ;
+              else bufferSize[it.first]=std::max(bufferSize[it.first],(size_t)(sizeof(double)*it.second+headerSize)) ;
           }
         }

XIOS3/branches/xios-3.0-beta/src/transport/legacy_context_server.cpp

@@ -283 +283 @@
         buffers[rank]->freeBuffer(count) ;
         delete buffers[rank] ;
-        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, 2*newSize) ;
+        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, newSize) ;
         info(100)<<"Context id "<<context->getId()<<" : Receive ChangeBufferSize from client rank "<<rank
                  <<"  newSize : "<<newSize<<" Address : "<<winAdress[0]<<" & "<<winAdress[1]<<endl ;