Changeset 2559

Timestamp:

09/11/23 10:44:17 (16 months ago)

Author:

jderouillat

Message:

Forced the request processing, on servers, to start with the buffer creation in P2P

Location:

XIOS3/trunk/src/transport

Files:

• p2p_context_server.cpp (modified) (3 diffs)
• p2p_context_server.hpp (modified) (1 diff)

XIOS3/trunk/src/transport/p2p_context_server.cpp

@@ -104 +104 @@
         if (requests_.back()->test()) 
         {
-          processRequest(*(requests_.back())) ;
-          delete requests_.back();
-          requests_.pop_back() ;
+          if ( processRequest( *(requests_.back()) ) )
+          {
+            delete requests_.back();
+            requests_.pop_back() ;
+          }
         }
       }
@@ -119 +121 @@
       if ((*it)->test())
       {
-        processRequest(*(*it)) ;
-        delete (*it);
-        auto it2=it ;
-        ++it ;
-        requests_.erase(it2) ;
+        if (processRequest(*(*it)))
+        {
+          delete (*it);
+          auto it2=it ;
+          ++it ;
+          requests_.erase(it2) ;
+        }
       }
       else ++it ;
@@ -129 +133 @@
   }
 
-  void CP2pContextServer::processRequest(CRequest& request)
+  bool CP2pContextServer::processRequest(CRequest& request)
   {
     int rank = request.getRank() ;
     auto it=buffers_.find(rank);
-    if (it==buffers_.end())
+    // getCount(new CP2pServerBuffer) = sizeof(MPI_AINT)
+    // getCount(RESIZE) : size_t timeline, size_t size + size_t EVENT_BUFFER_RESIZE = 24
+    // getCount(HEADER) : size_t timeline, int nbSenders, int nbBlocs
+    //                     + nbBlocs * (sizeof(MPI_Aint) addr + int count + int window) = 16 + nbBlocs * 16
+    if ((it==buffers_.end())&&(request.getCount() < 3*sizeof(size_t)))
     {
       buffers_[rank] = new CP2pServerBuffer(rank, commSelf_, interCommMerged_, pendingEvents_, completedEvents_, request.getBuffer()) ;
-    }
-    else it->second->receivedRequest(request.getBuffer()) ;
+      return true;
+    }
+    else if (it!=buffers_.end()) {
+      it->second->receivedRequest(request.getBuffer()) ;
+      return true;
+    }
+    else
+      return false;
   }
 

XIOS3/trunk/src/transport/p2p_context_server.hpp

@@ -63 +63 @@
     void listen(void) ;
     void listenPendingRequest(void) ;
-    void processRequest(CRequest& request) ;
+    bool processRequest(CRequest& request) ;
     void checkBuffers(void) ;
     void processEvents(bool enableEventsProcessing) ;