Changeset 2266 for XIOS/dev/dev_ym/XIOS_COUPLING/src/manager

Timestamp:

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

Author:

ymipsl

Message:

Fix problem from previous commit when deallocating context.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager

Files:

• daemons_manager.cpp (modified) (2 diffs)
• daemons_manager.hpp (modified) (1 diff)

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 ;
+    }
+  }
+
 }

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

@@ -20 +20 @@
     bool isScheduledContext(size_t hashId) { return scheduledContext_==hashId ;} //!< for attached mode, return true if context server is sceduled
     void unscheduleContext(void) { scheduledContext_=0 ;} //!< for attached mode : unschedule context
-
+    bool finalize(void) ;
     private:
     bool isServer_ ;
     size_t scheduledContext_ = 0 ; //!< Hash id of the next scehduled context for attached mode
+    bool isFinalized_=false ;
   } ;
 }