Changeset 2309 for XIOS/dev

Timestamp:

03/14/22 14:33:17 (3 years ago)

Author:

ymipsl

Message:

Bug fix when resizing buffer on server size.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

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

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

@@ -156 +156 @@
       first=0 ;
       count-- ;
+      used-- ;
       end=size ;
     }
@@ -182 +183 @@
           ERROR("void CServerBuffer::freeBuffer(size_t count)",
                  <<"cannot free required size in buffer") ;
+      }
+    }
+    used-=count ;
+  }
+
+  void CServerBuffer::popBuffer(size_t count)
+  {
+    if (count==0) return ;
+
+    if (current==0)  
+    {
+      current = end ;
+      end=size ;
+    }
+    
+
+    if (first<=current)
+    {
+      if (current-count >first)
+      {
+        current-=count ;
+      }
+      else
+      {
+          ERROR("void CServerBuffer::popBuffer(size_t count)",
+                 <<"cannot pop required size in buffer") ;
+      }
+
+    }
+    else
+    {
+      if (current-count>=0)
+      {
+        current-=count ;
+      }
+      else
+      {
+          ERROR("void CServerBuffer::freeBuffer(size_t count)",
+                 <<"cannot pop required size in buffer") ;
       }
     }

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

@@ -20 +20 @@
       void* getBuffer(size_t count) ;
       void freeBuffer(size_t count) ;
+      void popBuffer(size_t count) ;
       void createWindows(MPI_Comm oneSidedComm) ;
       bool getBufferFromClient(size_t timeLine, char* & buffer, size_t& count) ;
@@ -28 +29 @@
       void notifyClientFinalize(void) ;
       void notifyBufferResizing(void) ;
+      size_t getUsed(void) { return used ;}
     private:
       char* buffer;

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

@@ -305 +305 @@
         buffers[rank]->notifyBufferResizing() ;
         buffers[rank]->updateCurrentWindows() ;
-        buffers[rank]->freeBuffer(count) ;
-        info(100)<<"Context id "<<context->getId()<<" : Receive NotifyChangeBufferSize from client rank "<<rank<<endl ;
+        buffers[rank]->popBuffer(count) ;
+        info(100)<<"Context id "<<context->getId()<<" : Receive NotifyChangeBufferSize from client rank "<<rank<<endl
+                 <<"isBufferEmpty ? "<<buffers[rank]->isBufferEmpty()<<"  remaining count : "<<buffers[rank]->getUsed()<<endl;
       } 
       else if (timeLine==timelineEventChangeBufferSize)