Changeset 2273

Timestamp:

12/09/21 12:25:17 (2 years ago)

Author:

ymipsl

Message:

Fix issue in protocol : buffer was not correctly released after resizing

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• buffer_server.hpp (modified) (1 diff)
• context_server.cpp (modified) (5 diffs)

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

@@ -17 +17 @@
 
       bool isBufferFree(size_t count) ;
+      bool isResizing(void) { return resizingBuffer_ ;}
       void* getBuffer(size_t count) ;
       void freeBuffer(size_t count) ;

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

@@ -207 +207 @@
         MPI_Get_count(&status,MPI_CHAR,&count);
         map<int,CServerBuffer*>::iterator it = buffers.find(rank);
-        if (it->second->isBufferFree(count))
+        if ( (it->second->isBufferFree(count) && !it->second->isResizing()) // accept new request if buffer is free
+          || (it->second->isResizing() && it->second->isBufferEmpty()) )    // or if resizing wait for buffer is empty
         {
           char * addr;
@@ -304 +305 @@
         buffers[rank]->notifyBufferResizing() ;
         buffers[rank]->updateCurrentWindows() ;
+        buffers[rank]->freeBuffer(count) ;
         info(100)<<"Receive NotifyChangeBufferSize from client rank "<<rank<<endl ;
       } 
@@ -311 +313 @@
         vector<MPI_Aint> winAdress(2) ;
         newBuffer>>newSize>>winAdress[0]>>winAdress[1] ;
-        buffers.erase(rank) ;
-        buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(windows_[rank], winAdress, 0, newSize)));
+        buffers[rank]->freeBuffer(count) ;
+        delete buffers[rank] ;
+        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, newSize) ;
         info(100)<<"Receive ChangeBufferSize from client rank "<<rank<<"  newSize : "<<newSize<<" Address : "<<winAdress[0]<<" & "<<winAdress[1]<<endl ;
       }
@@ -403 +406 @@
     map<int,CServerBuffer*>::iterator it;
     for(it=buffers.begin();it!=buffers.end();++it) delete it->second;
+    buffers.clear() ;
   }
 
@@ -452 +456 @@
       CTimer::get("receiving requests").suspend();
       context->finalize();
-      freeWindows() ;
-
+      
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                            iteMap = mapBufferSize_.end(), itMap;