Changeset 1225

Timestamp:

07/25/17 15:12:17 (6 years ago)

Author:

ymipsl

Message:

Improvment of XIOS protocal on server side.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• context_server.cpp (modified) (4 diffs)
• context_server.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/context_server.cpp

@@ -79 +79 @@
     map<int,CServerBuffer*>::iterator it;
 
-    for(rank=0;rank<commSize;rank++)
-    {
-      if (pendingRequest.find(rank)==pendingRequest.end())
-      {
-        traceOff();
-        MPI_Iprobe(rank,20,interComm,&flag,&status);
-        traceOn();
-        if (flag==true)
+    traceOff();
+    MPI_Iprobe(MPI_ANY_SOURCE, 20,interComm,&flag,&status);
+    traceOn();
+
+    if (flag==true)
+    {
+      rank=status.MPI_SOURCE ;
+
+      if (pendingRequest.find(rank)==pendingRequest.end()) listenPendingRequest(status) ;
+      else
+      {
+        for(rank=0;rank<commSize;rank++)
         {
-          it=buffers.find(rank);
-          if (it==buffers.end()) // Receive the buffer size and allocate the buffer
+          if (pendingRequest.find(rank)==pendingRequest.end())
           {
-            StdSize buffSize = 0;
-            MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
-            mapBufferSize_.insert(std::make_pair(rank, buffSize));
-            it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first;
-          }
-          else
-          {
-            MPI_Get_count(&status,MPI_CHAR,&count);
-            if (it->second->isBufferFree(count))
-            {
-              addr=(char*)it->second->getBuffer(count);
-              MPI_Irecv(addr,count,MPI_CHAR,rank,20,interComm,&pendingRequest[rank]);
-              bufferRequest[rank]=addr;
-            }
+
+            traceOff();
+            MPI_Iprobe(rank, 20,interComm,&flag,&status);
+            traceOn();
+            if (flag==true) listenPendingRequest(status) ;
           }
         }
@@ -110 +104 @@
     }
   }
+
+  void CContextServer::listenPendingRequest(MPI_Status& status)
+  {
+    int count;
+    char * addr;
+    map<int,CServerBuffer*>::iterator it;
+    int rank=status.MPI_SOURCE ;
+
+    it=buffers.find(rank);
+    if (it==buffers.end()) // Receive the buffer size and allocate the buffer
+    {
+       StdSize buffSize = 0;
+       MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
+       mapBufferSize_.insert(std::make_pair(rank, buffSize));
+       it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first;
+    }
+    else
+    {
+      MPI_Get_count(&status,MPI_CHAR,&count);
+      if (it->second->isBufferFree(count))
+      {
+         addr=(char*)it->second->getBuffer(count);
+         MPI_Irecv(addr,count,MPI_CHAR,rank,20,interComm,&pendingRequest[rank]);
+         bufferRequest[rank]=addr;
+       }
+    }
+  }
+
 
   void CContextServer::checkPendingRequest(void)
@@ -151 +173 @@
     map<size_t,CEventServer*>::iterator it;
 
+    CTimer::get("Process request").resume();
     while(count>0)
     {
@@ -164 +187 @@
       count=buffer.remain();
     }
+    CTimer::get("Process request").suspend();
   }
 

XIOS/dev/XIOS_DEV_CMIP6/src/context_server.hpp

@@ -17 +17 @@
     bool eventLoop(bool enableEventsProcessing = true);
     void listen(void) ;
+    void listenPendingRequest(MPI_Status& status) ;
     void checkPendingRequest(void) ;
     void processRequest(int rank, char* buff,int count) ;