Changeset 2526

Timestamp:

06/29/23 11:17:44 (19 months ago)

Author:

jderouillat

Message:

Backport intracommunicator probing and a nonblocking communication fix for the one_sided protocol (2524-2525) in trunk

Location:

XIOS3/trunk/src/transport

Files:

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

XIOS3/trunk/src/transport/one_sided_client_buffer.cpp

@@ -8 +8 @@
   extern CLogType logProtocol;
 
-  COneSidedClientBuffer::COneSidedClientBuffer(MPI_Comm& interComm, int serverRank, MPI_Comm& commSelf, MPI_Comm& interCommMerged, int intraServerRank) : interComm_(interComm), serverRank_(serverRank)
+  COneSidedClientBuffer::COneSidedClientBuffer(MPI_Comm& interComm, int serverRank, MPI_Comm& commSelf, MPI_Comm& interCommMerged, int intraServerRank) : interComm_(interComm), serverRank_(serverRank), interCommMerged_(interCommMerged), intraServerRank_(intraServerRank)
   {
     
@@ -261 +261 @@
     }
     if (info.isActive(logProtocol)) CTimer::get("sendTimelineEvent : MPI_Isend").resume() ;
-    MPI_Isend(request.buffer->start(),request.buffer->count(), MPI_CHAR, serverRank_, 20, interComm_, &request.mpiRequest ) ;
+    MPI_Isend(request.buffer->start(),request.buffer->count(), MPI_CHAR, intraServerRank_, 20, interCommMerged_, &request.mpiRequest ) ;
     if (info.isActive(logProtocol)) CTimer::get("sendTimelineEvent : MPI_Isend").suspend() ;
     info(logProtocol)<<outStr.str()<<endl ;
@@ -272 +272 @@
     request.buffer = new CBufferOut(sizeof(EVENT_BUFFER_RESIZE)+sizeof(timeline)+sizeof(size)) ; 
     *(request.buffer)<<EVENT_BUFFER_RESIZE<<timeline<<size ;
-    MPI_Isend(request.buffer->start(),request.buffer->count(), MPI_CHAR, serverRank_, 20, interComm_, &request.mpiRequest ) ;
+    MPI_Isend(request.buffer->start(),request.buffer->count(), MPI_CHAR, intraServerRank_, 20, interCommMerged_, &request.mpiRequest ) ;
     requests_.push_back(request) ;
   }
@@ -280 +280 @@
     MPI_Aint controlAddr ;
     MPI_Get_address(control_, &controlAddr) ;
-    MPI_Send(&controlAddr, 1, MPI_AINT, serverRank_, 20, interComm_) ;
+    MPI_Send(&controlAddr, 1, MPI_AINT, intraServerRank_, 20, interCommMerged_) ;
   }
 

XIOS3/trunk/src/transport/one_sided_client_buffer.hpp

@@ -182 +182 @@
       int serverRank_ ;
 
+      MPI_Comm interCommMerged_; 
+      int intraServerRank_ ;
+
       std::list<CBuffer*> buffers_ ;
       std::list<SBloc> blocs_ ;

XIOS3/trunk/src/transport/one_sided_context_server.cpp

@@ -98 +98 @@
     {
       traceOff();
-      MPI_Iprobe(MPI_ANY_SOURCE, 20,interComm, &flag, &status);
+      MPI_Iprobe(MPI_ANY_SOURCE, 20,interCommMerged_, &flag, &status);
       traceOn();
       if (flag==true)
       {
-        requests_.push_back(CRequest(interComm, status)) ;
-        if (requests_.back().test()) 
+        requests_.push_back(new CRequest(interCommMerged_, status)) ;
+        if (requests_.back()->test()) 
         {
-          processRequest(requests_.back()) ;
+          processRequest(*(requests_.back())) ;
+          delete requests_.back();
           requests_.pop_back() ;
         }
@@ -117 +118 @@
     while (it != requests_.end())
     {
-      if (it->test())
-      {
-        processRequest(*it) ;
+      if ((*it)->test())
+      {
+        processRequest(*(*it)) ;
+        delete (*it);
         auto it2=it ;
         ++it ;

XIOS3/trunk/src/transport/one_sided_context_server.hpp

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