PR: Multithreaded traces, part 2 - with logger : orb as parameter of thread in charge...

diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx
index 029b7ad09901b1f92670c59f8d592d088ff4941b..ee3bf487f1b2a71250431be52672d7a2765ce988 100644 (file)
--- a/src/Container/SALOME_Container.cxx
+++ b/src/Container/SALOME_Container.cxx
@@ -52,7 +52,10 @@ static PyMethodDef MethodPyVoidMethod[] =
 
 int main(int argc, char* argv[])
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  // Initialise the ORB.
+  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
+  CORBA::ORB_var &orb = init( argc , argv ) ;
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
   INFOS_COMPILATION;
   BEGIN_OF(argv[0])
 
@@ -63,11 +66,6 @@ int main(int argc, char* argv[])
   try
     {
     
-      // Initialise the ORB.
-      ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
-      ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting()) ;
-      CORBA::ORB_var &orb = init( argc , argv ) ;
- 
       // Obtain a reference to the root POA.
       // obtain the root poa manager
       //

diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
index 1cc8e9c3137a976e92436027fb650a11127966b1..988cd896161285eec27e70914d055af93a47b6cf 100644 (file)
--- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
+++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
@@ -36,12 +36,12 @@ using namespace std;
 
 int main(int argc,char **argv)
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  // initialize the ORB
+  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
   try 
     {
       CosNaming::NamingContext_var _rootContext, catalogContext;
-      // initialize the ORB
-      CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
       // initialize POA
       //
       long TIMESleep = 250000000;

diff --git a/src/Loader/InquireServersQThread.cxx b/src/Loader/InquireServersQThread.cxx
index dcf0fb2a3c87115ea7281607a6ccad6889a82b85..e40309918a9e25134b50c67407e9229350658091 100644 (file)
--- a/src/Loader/InquireServersQThread.cxx
+++ b/src/Loader/InquireServersQThread.cxx
@@ -231,7 +231,7 @@ InquireServersQThread::InquireServersQThread( InquireServersGUI* r )
       myMessages[5] = str + "SALOME_Container FactoryServer" + "...";
       myServersCount++;
     }
-    if (strcmp(_argv[i],"PYTHON")==0) {
+    if (strcmp(_argv[i],"PY")==0) {
       myMessages[6] = str + "SALOME_ContainerPy.py FactoryServerPy" + "...";
       myServersCount++;
     }

diff --git a/src/Loader/SALOME_Session_Loader.cxx b/src/Loader/SALOME_Session_Loader.cxx
index dec6984f8a655ad4882a2a4d624ae15f5b44ac75..09cdad05e24a7b658ee469f2a1b2b44fa7b6989a 100644 (file)
--- a/src/Loader/SALOME_Session_Loader.cxx
+++ b/src/Loader/SALOME_Session_Loader.cxx
@@ -31,7 +31,8 @@ using namespace std;
 
 int main(int argc, char **argv)
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ;
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
 //VRV: T2.4 - Trace management improvement
   QApplication myQApp(argc, argv) ;
   InquireServersGUI myIS;
@@ -45,9 +46,7 @@ int main(int argc, char **argv)
 //VRV: T2.4 - Trace management improvement
   if (myIS.withGUI()) {
     try
-      {
-       CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ;
-       
+      {        
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance() ;
        ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting()) ;
        NS.init_orb( orb ) ;
@@ -88,6 +87,7 @@ int main(int argc, char **argv)
        INFOS("Caught unknown exception.");
       }
   }
+  INFOS("Normal Exit"); // without this trace, Splash remains on screen !
   delete myThreadTrace;
   return 0 ;
 }

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
index f6ddd8c83b15063183b5a2bd483f20873c6ab3b5..942c8f33d108fc7bb7ed2c25c0d94667c387a6d0 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx
@@ -39,15 +39,13 @@ using namespace std;
 
 int main(int argc,char **argv)
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  // initialize the ORB
+  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
   try 
     {
       CosNaming::NamingContext_var _rootContext, catalogContext;
 
-      // initialize the ORB
-
-      CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
-
       // initialize POA
       //
       long TIMESleep = 250000000;

diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index d973b2c971cc9fd95ead55a926d3169b1b1a682b..51036654786859e09a261e2124dfbc65645049f4 100644 (file)
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -52,7 +52,9 @@ using namespace std;
 
 int main( int argc , char **argv )
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
+  CORBA::ORB_var &orb = init( argc , argv ) ;
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
   BEGIN_OF( argv[0] )
     INFOS_COMPILATION 
     SCRUTE(argc) 
@@ -75,9 +77,6 @@ int main( int argc , char **argv )
   ASSERT(ptrSessionName) ;
   ASSERT(strlen( ptrSessionName )>0) ;
   const char *registryName = "Registry" ;
-  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
-  CORBA::ORB_var &orb = init( argc , argv ) ;
-  //
   long TIMESleep = 250000000;
   int NumberOfTries = 40;
   int a;

diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
index 0a4cb3b486438bc4d96867c10d30b3bb9d98dffc..f8018d340dd3956f0caced2f7df376ae8e76487c 100644 (file)
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx
@@ -36,15 +36,13 @@ using namespace std;
 
 int main(int argc,char **argv)
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  // initialize the ORB
+  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
   try
     {
       CosNaming::NamingContext_var _rootContext, catalogContext;
 
-      // initialize the ORB
-
-      CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
-
       // initialize POA
       //
       long TIMESleep = 250000000;

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index e79efe6daeadb58156cc19c3fee6c9667bb4c63e..cd9a08d4e24197c6098ed4ed47dbb046f1bb063c 100644 (file)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -89,14 +89,12 @@ using namespace std;
 
 int main(int argc, char **argv)
 {
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance();
+  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
+  int orbArgc = 1;
+  CORBA::ORB_var &orb = init( orbArgc , argv ) ;
+  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
   try
     {
-      ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
-      ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting()) ;
-      int orbArgc = 1;
-      CORBA::ORB_var &orb = init( orbArgc , argv ) ;
-
       CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
       PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);