Changeset 1139 for XIOS/dev/dev_olga/src/context_server.cpp

Timestamp:

05/18/17 19:27:26 (4 years ago)

Author:

oabramkina

Message:

Fixing a bug in context finalization. Now context finalization is done in two stages.
Tested on Cure with test_regular and test_xios2_cmip6.

File:

• XIOS/dev/dev_olga/src/context_server.cpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/context_server.cpp

@@ -225 +225 @@
     {
       finished=true;
-//      info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<endl;   // moved to CContext::finalize()
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                            iteMap = mapBufferSize_.end(), itMap;
@@ -237 +236 @@
       context->finalize();
       report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
+    }
+    else if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_POST_FINALIZE)
+    {
+      info(20)<<"Server side context <"<<context->getId()<<"> finalized."<<endl;
+      context->postFinalize();
     }
     else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event);