From: caremoli <caremoli>
Date: Sun, 8 Jun 2008 13:18:40 +0000 (+0000)
Subject: CCAR: solve some problems during shutdown
X-Git-Tag: V4_1_3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2FV4_1_3rc2;p=modules%2Fkernel.git

CCAR: solve some problems during shutdown
- singletons are deleted at exit (atexit function is called at the beginning of programs)
but order is important. Trace singleton must be destroyed last because MESSAGE
and others are called in destructor of other singletons.
So I have enforced local trace initialization in ATEXIT_ class from Utils directory

- Improve Registry shutdown (called _remove_ref to delete RegistryService object)
- add a delay between shutdown servers and kill omninames in shutdownSalome.py
---

diff --git a/bin/shutdownSalome.py b/bin/shutdownSalome.py
index 491266662..9f9cd6d80 100755
--- a/bin/shutdownSalome.py
+++ b/bin/shutdownSalome.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
+import time
 import salome
 salome.salome_init()
 salome.lcc.shutdownServers()
-salome.SALOME_LifeCycleCORBA_killOmniNames()
+#give some time to shutdown to complete
+time.sleep(1)
+salome.LifeCycleCORBA.killOmniNames()
diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx
index 9b26f41f8..bc6097fcd 100644
--- a/src/Registry/RegistryService.hxx
+++ b/src/Registry/RegistryService.hxx
@@ -89,7 +89,7 @@ public :
 
 	void SessionName( const char *sessionName ) ;
 
-        void SetOrb( CORBA::ORB_ptr orb ) { _orb = orb; return; }
+        void SetOrb( CORBA::ORB_ptr orb ) { _orb = CORBA::ORB::_duplicate(orb); return; }
 
         void Shutdown() { if(!CORBA::is_nil(_orb)) _orb->shutdown(0); }
 
diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index 50e608f31..8183340c2 100644
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -170,6 +170,7 @@ int main( int argc , char **argv )
       ptrRegistry->SessionName( ptrSessionName ) ;
       ptrRegistry->SetOrb(orb);
       varComponents = ptrRegistry->_this() ;
+      ptrRegistry->_remove_ref(); //let poa manage registryservice deletion
       // The RegistryService must not already exist.
 	    
       try
diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
index 61239063a..71818af97 100644
--- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
+++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx
@@ -36,6 +36,7 @@ extern "C"
 
 # include "Utils_DESTRUCTEUR_GENERIQUE.hxx"
 //# include "utilities.h"
+# include "LocalTraceBufferPool.hxx"
 void Nettoyage();
 
 #ifdef _DEBUG_
@@ -83,6 +84,8 @@ public :
 		DESTRUCTEUR_GENERIQUE_::Destructeurs = 
                       new std::list<DESTRUCTEUR_GENERIQUE_*> ; // Destructeur alloue dynamiquement (cf. ci-dessous) ,
 								   // il est utilise puis detruit par la fonction Nettoyage
+                //To be sure the trace singleton will be the last one to be destroyed initialize it here before calling atexit
+                LocalTraceBufferPool::instance();
 		int cr = atexit( Nettoyage );                      // execute Nettoyage lors de exit, aprs la destruction des donnees statiques !
 		assert(cr==0) ;
 		ATEXIT_Done = true ;
diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
index 9ae866266..54e0bcd22 100644
--- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
+++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx
@@ -140,4 +140,4 @@ private :
 };
 
 
-# endif		/* # if !defined( __SINGLETON__H__ ) */
+# endif		/* # if !defined( __DESTRUCTEUR_GENERIQUE__H__ ) */