Changeset 1193 for XIOS/dev

Timestamp:

07/03/17 16:45:10 (7 years ago)

Author:

oabramkina

Message:

Two server levels: fixing a bug during context finalization. The last buffer check for the connection from server (classical or primary) to client must be blocking. Otherwise it's possible to have lost messages sent by server to client causing a deadlock on the side of client at context finalization.

Location:

XIOS/dev/dev_olga/src

Files:

• context_client.cpp (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• node/context.cpp (modified) (5 diffs)

XIOS/dev/dev_olga/src/context_client.cpp

@@ -451 +451 @@
 
    CTimer::get("Blocking time").resume();
-//    while (!stop)
+//   while (!stop)
    {
      checkBuffers();
      if (hasTemporarilyBufferedEvent())
        sendTemporarilyBufferedEvent();
-
      stop = true;
+//     for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) stop &= !itBuff->second->hasPendingRequest();
    }
    CTimer::get("Blocking time").suspend();

XIOS/dev/dev_olga/src/context_server.cpp

@@ -237 +237 @@
     else if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_POST_FINALIZE)
     {
-      info(20)<<"Server side context <"<<context->getId()<<"> finalized."<<endl;
+      info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
       context->postFinalize();
     }

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

@@ -444 +444 @@
 
        // (Last) context finalized message received
-       // Close files, gather registries, send context finalize to its parent context
        if (countChildCtx_ == clientPrimServer.size())
          client->finalize();
@@ -455 +454 @@
    * \fn void CContext::postFinalize(void)
    * Close files, gather registries, and make deallocations.
-   * Function is called when a context is finalized (it has nothing to receive and nothing to send).
+   * Function is called when a context is finalized.
    */
    void CContext::postFinalize(void)
@@ -475 +474 @@
      } while (!buffersReleased);
 
-     info(20)<<"Context <"<<getId()<<"> is finalized."<<endl;
+     // Primary or classical server: block until all messages are sent to model
+     // Client (model): block until all messages are sent to server
+     if ( CServer::serverLevel==0 || CServer::serverLevel==1 || !hasServer)
+     do
+     {
+       client->checkBuffers();
+       buffersReleased = !client->havePendingRequests();
+     } while (!buffersReleased);
 
      if (hasServer && !hasClient)
@@ -493 +499 @@
        MPI_Comm_free(&(*it));
      comms.clear();
+
+     info(20)<<"CContext: Context <"<<getId()<<"> is finalized."<<endl;
 
    }
@@ -1239 +1247 @@
      {
        CFile* file = this->enabledFiles[i];
-//       if (file->getContextClient() == contextClient)
+       if (file->getContextClient() == contextClient)
        {
          CFile::mode_attr::t_enum fileMode = file->mode.isEmpty() ? CFile::mode_attr::write : file->mode.getValue();