Changeset 2266 for XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/daemons_manager.cpp

Timestamp:

12/01/21 14:29:36 (3 years ago)

Author:

ymipsl

Message:

Fix problem from previous commit when deallocating context.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/daemons_manager.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/daemons_manager.cpp

@@ -32 +32 @@
   CDaemonsManager::~CDaemonsManager()
   {
-    CXios::finalizeContextsManager() ;
-    CXios::finalizeCouplerManager() ;
-    CXios::finalizeServicesManager() ;
-    CXios::finalizeRessourcesManager() ;
-    CXios::finalizeRegistryManager() ;
+    finalize() ;
   }
 
@@ -58 +54 @@
   } 
 
+  bool CDaemonsManager::finalize(void)
+  {
+    if (!isFinalized_)
+    {
+      if (isServer_) CServer::getServersRessource()->finalizeSignal() ;
+      else CXios::getPoolRessource()->finalizeSignal() ;
+      while(!eventLoop()) ;
+      MPI_Barrier( CXios::getXiosComm()) ;
+      CXios::finalizeContextsManager() ;
+      CXios::finalizeCouplerManager() ;
+      CXios::finalizeServicesManager() ;
+      CXios::finalizeRessourcesManager() ;
+      CXios::finalizeRegistryManager() ;
+      isFinalized_=true ;
+    }
+  }
+
 }