Changeset 2561

Timestamp:

09/11/23 14:47:01 (16 months ago)

Author:

jderouillat

Message:

Forced the request processing, on servers, to be ordered in the one-sided protocol

Location:

XIOS3/trunk/src/transport

Files:

• one_sided_context_server.cpp (modified) (2 diffs)
• one_sided_context_server.hpp (modified) (1 diff)

XIOS3/trunk/src/transport/one_sided_context_server.cpp

@@ -101 +101 @@
       if (flag==true)
       {
-        requests_.push_back(new CRequest(interCommMerged_, status)) ;
-        if (requests_.back()->test()) 
+        int rank=status.MPI_SOURCE ;
+        requests_[rank].push_back(new CRequest(interCommMerged_, status)) ;
+        // Test 1st request of the list, request treatment must be ordered 
+        if (requests_[rank].front()->test()) 
         {
-          processRequest(*(requests_.back())) ;
-          delete requests_.back();
-          requests_.pop_back() ;
+          processRequest(*(requests_[rank].front())) ;
+          delete requests_[rank].front();
+          requests_[rank].pop_front() ;
         }
       }
@@ -114 +116 @@
   void COneSidedContextServer::listenPendingRequest(void)
   {
-    auto it = requests_.begin() ;
-    while (it != requests_.end())
-    {
-      if ((*it)->test())
-      {
-        processRequest(*(*it)) ;
-        delete (*it);
-        auto it2=it ;
-        ++it ;
-        requests_.erase(it2) ;
-      }
-      else ++it ;
+    for(auto it_rank=requests_.begin() ; it_rank!=requests_.end() ; ++it_rank)
+    {
+      int rank = it_rank->first;
+      while ( (!requests_[rank].empty()) && (requests_[rank].front()->test()) )
+      {
+        processRequest( *(requests_[rank].front()) );
+        delete requests_[rank].front();
+        requests_[rank].pop_front() ;
+      }
     }
   }

XIOS3/trunk/src/transport/one_sided_context_server.hpp

@@ -106 +106 @@
       MPI_Request processEventRequest_ ;
 
-      std::list<CRequest*> requests_ ;
+      std::map<int,std::list<CRequest*> >requests_ ;
 
       std::map<size_t, SPendingEvent> pendingEvents_   ;