Changeset 1761 for XIOS/dev/dev_ym/XIOS_SERVICES/src/context_client.cpp

Timestamp:

10/18/19 15:40:35 (5 years ago)

Author:

ymipsl

Message:

implementing first guess for service functionnalities.

YM

File:

• XIOS/dev/dev_ym/XIOS_SERVICES/src/context_client.cpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_SERVICES/src/context_client.cpp

@@ -24 +24 @@
      : mapBufferSize_(), parentServer(cxtSer), maxBufferedEvents(4)
     {
-      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
-      if (isAttachedModeEnabled()) pureOneSided=false ; // no one sided in attach mode
       
       context = parent;
@@ -35 +33 @@
       int flag;
       MPI_Comm_test_inter(interComm, &flag);
+      if (flag) isAttached_=false ;
+      else  isAttached_=true ;
+
+      pureOneSided=CXios::getin<bool>("pure_one_sided",false); // pure one sided communication (for test)
+      if (isAttachedModeEnabled()) pureOneSided=false ; // no one sided in attach mode
+      
+
+
       if (flag) MPI_Comm_remote_size(interComm, &serverSize);
       else  MPI_Comm_size(interComm, &serverSize);
@@ -151 +157 @@
           
         checkBuffers(ranks);
-
-        if (isAttachedModeEnabled()) // couldBuffer is always true in attached mode
-        {
-          waitEvent(ranks);
-          CContext::setCurrent(context->getId());
-        }
-      }
-
+      }
+      
+      if (isAttachedModeEnabled()) // couldBuffer is always true in attached mode
+      {
+        waitEvent(ranks);
+        CContext::setCurrent(context->getId());
+      }
+      
       timeLine++;
     }
@@ -168 +174 @@
     */
     void CContextClient::waitEvent(list<int>& ranks)
+    {
+      while (checkBuffers(ranks))
+      {
+        CXios::getDaemonsManager()->eventLoop() ;
+      }
+
+      MPI_Request req ;
+      MPI_Status status ;
+
+      MPI_Ibarrier(intraComm,&req) ;
+      int flag=false ;
+
+      do  
+      {
+        CXios::getDaemonsManager()->eventLoop() ;
+        MPI_Test(&req,&flag,&status) ;
+      } while (!flag) ;
+
+
+    }
+
+
+    void CContextClient::waitEvent_old(list<int>& ranks)
     {
       parentServer->server->setPendingEvent();
@@ -227 +256 @@
           for (itBuffer = bufferList.begin(); itBuffer != bufferList.end(); itBuffer++) (*itBuffer)->unlockBuffer();
           checkBuffers();
-          if (CServer::serverLevel == 0)  context->server->listen();
-          else if (CServer::serverLevel == 1)
+          
+          context->server->listen();
+
+          if (context->serverPrimServer.size()>0)
           {
-            context->server->listen();
             for (int i = 0; i < context->serverPrimServer.size(); ++i)  context->serverPrimServer[i]->listen();
             CServer::contextEventLoop(false) ; // avoid dead-lock at finalize...
           }
-
-          else if (CServer::serverLevel == 2) context->server->listen();
 
         }
@@ -320 +348 @@
         }
       } 
-   }
 */
+   }
+
       
   /*!
@@ -402 +431 @@
   {
     return !ranksServerLeader.empty();
-  }
-
-  /*!
-   * Check if the attached mode is used.
-   *
-   * \return true if and only if attached mode is used
-   */
-  bool CContextClient::isAttachedModeEnabled() const
-  {
-    return (parentServer != 0);
   }