Changeset 1054 for XIOS/dev/dev_olga/src/node/context.cpp

Timestamp:

02/17/17 19:51:36 (7 years ago)

Author:

oabramkina

Message:

dev: intermediate commit.

File:

• XIOS/dev/dev_olga/src/node/context.cpp (modified) (10 diffs)

XIOS/dev/dev_olga/src/node/context.cpp

@@ -249 +249 @@
 
      hasClient = true;
+
      if (CServer::serverLevel != 1)
-//     if (CXios::serverLevel != 1)
-     // initClient is called by client pool
+     // initClient is called by client
      {
        client = new CContextClient(this, intraComm, interComm, cxtServer);
        server = new CContextServer(this, intraComm, interComm);
-     }
+       MPI_Comm intraCommServer, interCommServer;
+       if (cxtServer) // Attached mode
+       {
+         intraCommServer = intraComm;
+         interCommServer = interComm;
+       }
+       else
+       {
+//         MPI_Comm_dup(intraComm, &intraCommServer);
+//         comms.push_back(intraCommServer);
+//         MPI_Comm_dup(interComm, &interCommServer);
+//         comms.push_back(interCommServer);
+       }
+     }
+
      else
-     // initClient is called by primary server pool
+     // initClient is called by primary server
      {
        clientPrimServer.push_back(new CContextClient(this, intraComm, interComm));
@@ -263 +277 @@
      }
 
-     registryIn=new CRegistry(intraComm);
-     registryIn->setPath(getId()) ;
-     if (client->clientRank==0) registryIn->fromFile("xios_registry.bin") ;
-     registryIn->bcastRegistry() ;
-
-     registryOut=new CRegistry(intraComm) ;
-     registryOut->setPath(getId()) ;
-
-     MPI_Comm intraCommServer, interCommServer;
-     if (cxtServer) // Attached mode
-     {
-       intraCommServer = intraComm;
-       interCommServer = interComm;
-     }
-     else
-     {
-       MPI_Comm_dup(intraComm, &intraCommServer);
-       comms.push_back(intraCommServer);
-       MPI_Comm_dup(interComm, &interCommServer);
-       comms.push_back(interCommServer);
-     }
+
+
+//     registryIn=new CRegistry(intraComm);
+//     registryIn->setPath(getId()) ;
+//     if (client->clientRank==0) registryIn->fromFile("xios_registry.bin") ;
+//     registryIn->bcastRegistry() ;
+//
+//     registryOut=new CRegistry(intraComm) ;
+//     registryOut->setPath(getId()) ;
+
+
    }
 
@@ -353 +357 @@
 //     client = new CContextClient(this,intraComm,interComm, cxtClient);
 
-     registryIn=new CRegistry(intraComm);
-     registryIn->setPath(getId()) ;
-     if (server->intraCommRank==0) registryIn->fromFile("xios_registry.bin") ;
-     registryIn->bcastRegistry() ;
-     registryOut=new CRegistry(intraComm) ;
-     registryOut->setPath(getId()) ;
+//     registryIn=new CRegistry(intraComm);
+//     registryIn->setPath(getId()) ;
+//     if (server->intraCommRank==0) registryIn->fromFile("xios_registry.bin") ;
+//     registryIn->bcastRegistry() ;
+//     registryOut=new CRegistry(intraComm) ;
+//     registryOut->setPath(getId()) ;
 
      MPI_Comm intraCommClient, interCommClient;
@@ -368 +372 @@
      else
      {
-       MPI_Comm_dup(intraComm, &intraCommClient);
-       comms.push_back(intraCommClient);
-       MPI_Comm_dup(interComm, &interCommClient);
-       comms.push_back(interCommClient);
+//       MPI_Comm_dup(intraComm, &intraCommClient);
+//       comms.push_back(intraCommClient);
+//       MPI_Comm_dup(interComm, &interCommClient);
+//       comms.push_back(interCommClient);
      }
 
@@ -377 +381 @@
 
    //! Server side: Put server into a loop in order to listen message from client
-   bool CContext::eventLoop(void)
-   {
-     if (CServer::serverLevel == 0)
-     {
-       return server->eventLoop();
-     }
-     else if (CServer::serverLevel == 1)
-     {
-       bool serverFinished = server->eventLoop();
-       bool serverPrimFinished = true;
-       for (int i = 0; i < serverPrimServer.size(); ++i)
-       {
-         serverPrimFinished *= serverPrimServer[i]->eventLoop();
-       }
-       return ( serverFinished && serverPrimFinished);
-     }
-     else
-     {
-       return server->eventLoop();
-     }
-   }
+//   bool CContext::eventLoop(void)
+//   {
+//     if (CServer::serverLevel == 0)
+//     {
+//       return server->eventLoop();
+//     }
+//     else if (CServer::serverLevel == 1)
+//     {
+//       bool serverFinished = server->eventLoop();
+//       bool serverPrimFinished = true;
+//       for (int i = 0; i < serverPrimServer.size(); ++i)
+//       {
+//         serverPrimFinished *= serverPrimServer[i]->eventLoop();
+//       }
+//       return ( serverFinished && serverPrimFinished);
+//     }
+//     else
+//     {
+//       return server->eventLoop();
+//     }
+//   }
 
    //! Try to send the buffers and receive possible answers
@@ -405 +409 @@
      {
        client->checkBuffers();
-       return server->eventLoop();
-     }
+       bool hasTmpBufferedEvent = client->hasTemporarilyBufferedEvent();
+       if (hasTmpBufferedEvent)
+         hasTmpBufferedEvent = !client->sendTemporarilyBufferedEvent();
+
+       // Don't process events if there is a temporarily buffered event
+       return server->eventLoop(!hasTmpBufferedEvent);
+     }
+
      else if (CServer::serverLevel == 1)
      {
        client->checkBuffers();
+       bool hasTmpBufferedEvent = client->hasTemporarilyBufferedEvent();
+       if (hasTmpBufferedEvent)
+         hasTmpBufferedEvent = !client->sendTemporarilyBufferedEvent();
+       bool serverFinished = server->eventLoop(!hasTmpBufferedEvent);
+
+       bool serverPrimFinished = true;
        for (int i = 0; i < clientPrimServer.size(); ++i)
+       {
          clientPrimServer[i]->checkBuffers();
-       bool serverFinished = server->eventLoop();
-       bool serverPrimFinished = true;
-       for (int i = 0; i < serverPrimServer.size(); ++i)
-       {
-         serverPrimFinished *= serverPrimServer[i]->eventLoop();
+         bool hasTmpBufferedEventPrim = clientPrimServer[i]->hasTemporarilyBufferedEvent();
+         if (hasTmpBufferedEventPrim)
+           hasTmpBufferedEventPrim = !clientPrimServer[i]->sendTemporarilyBufferedEvent();
+         serverPrimFinished *= serverPrimServer[i]->eventLoop(hasTmpBufferedEventPrim);
        }
        return ( serverFinished && serverPrimFinished);
      }
+
      else if (CServer::serverLevel == 2)
      {
        client->checkBuffers();
-       return server->eventLoop();
+       bool hasTmpBufferedEvent = client->hasTemporarilyBufferedEvent();
+       if (hasTmpBufferedEvent)
+         hasTmpBufferedEvent = !client->sendTemporarilyBufferedEvent();
+       return server->eventLoop(!hasTmpBufferedEvent);
      }
    }
@@ -433 +453 @@
      {
        finalized = true;
-       if (hasClient) sendRegistry() ;
+//       if (hasClient) sendRegistry() ;
+
+       client->finalize();
+       while (!server->hasFinished())
+       {
+         server->eventLoop();
+       }
 
        if ((hasClient) && (hasServer))
@@ -450 +476 @@
        }
 
-       client->finalize();
-       while (!server->hasFinished())
-       {
-         server->eventLoop();
-       }
-
-       if (hasServer)
+       report(0)<< " Memory report : Context <"<<getId()<<"> : server side : total memory used for buffers "<<CContextServer::getTotalBuf()<<" bytes"<<endl;
+
+//       if (hasServer)
+       if (hasServer && !hasClient)
        {
          closeAllFile();
-         registryOut->hierarchicalGatherRegistry() ;
-         if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
+//         registryOut->hierarchicalGatherRegistry() ;
+//         if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
        }
 
@@ -472 +495 @@
          MPI_Comm_free(&(*it));
        comms.clear();
-
 
       }
@@ -1627 +1649 @@
   }
 
+  bool CContext::isFinalized(void)
+  {
+    return finalized;
+  }
+
 } // namespace xios