Changeset 2594 for XIOS3/trunk/src/transport/p2p_server_buffer.hpp

Timestamp:

10/25/23 11:40:07 (9 months ago)

Author:

jderouillat

Message:

Update the p2p protocol as a mirror protocol : the servers buffers will strictly mirror (number of buffers, positions of messages in the buffers) the clients buffers. The memory consumption of servers will be capped impplicitly by the clients behavior where the time spent to wait for free buffers could be present again.

File:

• XIOS3/trunk/src/transport/p2p_server_buffer.hpp (modified) (10 diffs)

XIOS3/trunk/src/transport/p2p_server_buffer.hpp

@@ -46 +46 @@
               if (start_-end_ >= size)
               {
+                //if (start!=end_) info(logProtocol)<<" CASE 0, recv/computed : " << start << "/" << end_ << endl;
                 count=size ;
                 size = 0 ;
@@ -54 +55 @@
               else
               {
+                // Server buffers get blocs from clients, they should not be splitted (mirrors the client buffers)
+                //if (start!=end_) info(logProtocol)<<" CASE 1"<< endl;
+                //info(logProtocol)<<" CASE 1 : start/end/count - size : "<< start_ << ", " << end_ << ", " << count_ << " " << size_ << " vs size " << size << endl;
+                ERROR("COneSidedServerBuffer::reserve()",<<"This should be the case of the 2nd part of a splitted message"<<std::endl);
                 //count = start_-end_ ;
                 //size -= count ;
@@ -66 +71 @@
               if (size_-end_ >= size)
               {
+                //if (start!=end_ ) info(logProtocol)<<" CASE 2, recv/computed : "<< start << "/" << end_ << endl;
                 count = size ;
                 size = 0;
@@ -74 +80 @@
               else
               {
+                // Server buffers get blocs from clients, they should not be splitted (mirrors the client buffers)
+                //     1st part of a splitted message, fill the end of the buffer
+                //     end_ must be set to 0 like on clients
+                //if (start!=end_) info(logProtocol)<<" CASE 3"<< endl;
+                //  info(logProtocol)<<" CASE 3 : start/end/count - size : "<< start_ << ", " << end_ << ", " << count_ << " " << size_ << " vs size " << size << endl;
                 //count = size_ - end_ ;
                 //size -= count ;
                 //start=end_ ;
-                //end_ = 0 ;
+                end_ = 0 ;
                 //count_+= count ;
                 count = 0 ;
@@ -94 +105 @@
           }
 
-          size_t remain(void) { return size_-count_; }
+          size_t remain(void) {
+            if (count_==0)
+              return size_;
+            else if (end_<start_)
+              return start_-end_;
+            else
+              return size_-end_;
+          }
           size_t getSize(void) { return size_ ;}
           size_t getCount(void) {return count_ ;}
@@ -110 +128 @@
           while (!buffers_.empty()) {
               delete buffers_.front();
-              buffers_.pop_front() ; // if buffer is empty free buffer
+              buffers_.erase(buffers_.begin()) ; // if buffer is empty free buffer
+              countDeletedBuffers_++;
           }
       };
@@ -135 +154 @@
       void transferRmaRequest(size_t timeline, MPI_Aint addr, MPI_Aint offset, CBuffer* buffer, size_t start, int count, int window) ;
       size_t remainSize(void) ;
+      size_t remainSize(int bufferId) ;
 
 
@@ -144 +164 @@
       double bufferServerFactor_=1. ;
       
-      std::list<CBuffer*> buffers_ ;
+      std::vector<CBuffer*> buffers_ ;
       CBuffer* currentBuffer_=nullptr ;
 
@@ -151 +171 @@
 
       map<size_t, int> nbSenders_ ;
-      map<size_t, list<tuple<MPI_Aint,int,int>>> pendingBlocs_;
+      map<size_t, list<tuple<MPI_Aint,int,int,size_t>>> pendingBlocs_;
      
       vector<MPI_Request> pendingRmaRequests_ ;
@@ -176 +196 @@
       const int windowRank_=0 ;
       MPI_Aint lastBlocToFree_=0 ;
+      int countDeletedBuffers_;
 
   } ;