Changeset 2607

Timestamp:

01/29/24 10:39:01 (3 months ago)

Author:

jderouillat

Message:

In the P2P protocol, forces to allocate the fixed buffer if it is defined, accept more buffers in the growth phase. Add a missing timer in the interface

Location:

XIOS3/trunk/src

Files:

• interface/c/iccontext.cpp (modified) (1 diff)
• transport/p2p_client_buffer.cpp (modified) (3 diffs)
• transport/p2p_cs_buffer_base.hpp (modified) (1 diff)

XIOS3/trunk/src/interface/c/iccontext.cpp

@@ -98 +98 @@
       {
         *_ret = true;
+        CTimer::get("XIOS").suspend();
         return;
       }

XIOS3/trunk/src/transport/p2p_client_buffer.cpp

@@ -69 +69 @@
     buffers_.push_back(new CBuffer(windows_[currentMirror_], size, fixed)); 
     currentBuffer_=buffers_.back() ;
-    info(logProtocol)<<"   Nb attached memory blocs="<<buffers_.size()<<endl ;
+    info(logProtocol)<<"   Nb attached memory blocs="<<buffers_.size()<<", size of the last buffer = " << size << endl ;
   }
 
@@ -88 +88 @@
         {
           if ( size > buffer->getSize()) return true ;
+          else if ( currentBufferSize_ < fixedSize_ ) return true ;
           else return false ;
         }
@@ -117 +118 @@
             newBuffer(currentBufferSize_, fixed_) ;
           }
+        }
+        else if ((currentBufferSize_ < fixedSize_)&&(fixed_))
+        {
+          // Forces to allocate the fixed buffer if defined
+          //   without this test, could be not done if each field size is < currentBufferSize_
+          currentBufferSize_ = fixedSize_ ;
+          newBuffer(currentBufferSize_, fixed_) ;
         }
         CBuffer* currentBuffer = buffers_.back() ;

XIOS3/trunk/src/transport/p2p_cs_buffer_base.hpp

@@ -20 +20 @@
 
       const size_t EVENT_BUFFER_RESIZE = std::numeric_limits<size_t>::max()-1 ;
-      const int MAX_WINDOWS=6 ;
+      const int MAX_WINDOWS=60 ;