From ed2f9bd776a0eb3c725a7acb893e021d931a6b33 Mon Sep 17 00:00:00 2001 From: prascle Date: Mon, 26 Sep 2005 07:20:43 +0000 Subject: [PATCH] PR: Automatic trace collector start --- src/Container/SALOME_Container.cxx | 2 +- src/Container/SALOME_ContainerManagerServer.cxx | 2 +- .../SALOME_DataTypeCatalog_Server.cxx | 2 +- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx | 2 +- src/LifeCycleCORBA/TestLifeCycleCORBA.cxx | 2 +- src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx | 2 +- src/Registry/SALOME_Registry_Server.cxx | 2 +- src/ResourcesManager/SALOME_ResourcesManager.cxx | 2 ++ .../SALOME_RessourcesCatalog_Server.cxx | 2 +- src/SALOMELocalTrace/LocalTraceCollector.hxx | 1 - src/SALOMETraceCollector/SALOMETraceCollector.cxx | 12 +----------- src/SALOMETraceCollector/SALOMETraceCollector.hxx | 14 +++++--------- src/TestContainer/TestContainer.cxx | 2 +- 13 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index 451523f29..8c8249158 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -69,7 +69,7 @@ int main(int argc, char* argv[]) ASSERT(SINGLETON_::IsAlreadyExisting()); CORBA::ORB_var orb = init(0 , 0 ) ; - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); INFOS_COMPILATION; BEGIN_OF(argv[0]); diff --git a/src/Container/SALOME_ContainerManagerServer.cxx b/src/Container/SALOME_ContainerManagerServer.cxx index b63bca837..5968657a8 100644 --- a/src/Container/SALOME_ContainerManagerServer.cxx +++ b/src/Container/SALOME_ContainerManagerServer.cxx @@ -9,7 +9,7 @@ int main(int argc, char* argv[]) CORBA::Object_var obj; CORBA::ORB_var orb = CORBA::ORB_init( argc , argv ) ; - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); INFOS_COMPILATION; BEGIN_OF(argv[0]); try{ diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx index 12eb91004..0f288ed9e 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx @@ -38,7 +38,7 @@ int main(int argc,char **argv) { // initialize the ORB CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); try { CosNaming::NamingContext_var _rootContext, catalogContext; diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index fc6ee8201..46fa00409 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -73,7 +73,7 @@ SALOME_LifeCycleCORBA::SALOME_LifeCycleCORBA(SALOME_NamingService *ns) char *xargv = ""; char **argv = &xargv; CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); if (!ns) { _NS = new SALOME_NamingService(orb); diff --git a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx index 78716e123..1d097ece8 100644 --- a/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/TestLifeCycleCORBA.cxx @@ -53,7 +53,7 @@ int main (int argc, char * argv[]) { // Initializing omniORB CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); // Obtain a reference to the root POA CORBA::Object_var obj = orb->resolve_initial_references("RootPOA") ; diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx index 4f8425f91..fe32cd71d 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Server.cxx @@ -41,7 +41,7 @@ int main(int argc,char **argv) { // initialize the ORB CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); try { CosNaming::NamingContext_var _rootContext, catalogContext; diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx index ab79d199a..7105c5134 100644 --- a/src/Registry/SALOME_Registry_Server.cxx +++ b/src/Registry/SALOME_Registry_Server.cxx @@ -54,7 +54,7 @@ int main( int argc , char **argv ) { ORB_INIT &init = *SINGLETON_::Instance() ; CORBA::ORB_var &orb = init( argc , argv ) ; - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); BEGIN_OF( argv[0] ) INFOS_COMPILATION SCRUTE(argc) diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index 2e826f613..02feab8b0 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -282,6 +282,7 @@ string SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer(const strin command = "ssh "; else throw SALOME_Exception("Unknown protocol"); + // command+=machine; // _CommandForRemAccess=command; // command+=" "; @@ -293,6 +294,7 @@ string SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer(const strin // command += machine; // command += ".log 2>&1 &"; // cout << "Command is ... " << command << endl; + command += machine; // on suppose le même user par defaut command += " "; command += getenv("APPLI"); // chemin relatif a $HOME diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx index f6f930a79..a9612ec6c 100644 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx +++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx @@ -38,7 +38,7 @@ int main(int argc,char **argv) { // initialize the ORB CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); try { CosNaming::NamingContext_var _rootContext, catalogContext; diff --git a/src/SALOMELocalTrace/LocalTraceCollector.hxx b/src/SALOMELocalTrace/LocalTraceCollector.hxx index 01c5f35e8..5551b41fa 100644 --- a/src/SALOMELocalTrace/LocalTraceCollector.hxx +++ b/src/SALOMELocalTrace/LocalTraceCollector.hxx @@ -42,7 +42,6 @@ class SALOMELOCALTRACE_EXPORT LocalTraceCollector protected: LocalTraceCollector(); - private: static int _threadToClose; static int _toFile; static LocalTraceCollector* _singleton; diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.cxx b/src/SALOMETraceCollector/SALOMETraceCollector.cxx index b9c2914b6..8a7eb8905 100644 --- a/src/SALOMETraceCollector/SALOMETraceCollector.cxx +++ b/src/SALOMETraceCollector/SALOMETraceCollector.cxx @@ -40,16 +40,6 @@ using namespace std; // Class attributes initialisation, for class method SALOMETraceCollector::run -SALOMETraceCollector* SALOMETraceCollector::_singleton = 0; -#ifndef WNT -pthread_mutex_t SALOMETraceCollector::_singletonMutex; -#else -pthread_mutex_t SALOMETraceCollector::_singletonMutex = PTHREAD_MUTEX_INITIALIZER; -#endif -int SALOMETraceCollector::_threadToClose = 0; -pthread_t* SALOMETraceCollector::_threadId = 0; // used to control single run -int SALOMETraceCollector::_toFile = 0; -std::string SALOMETraceCollector::_fileName = ""; CORBA::ORB_ptr SALOMETraceCollector::_orb = 0; // ============================================================================ @@ -68,7 +58,7 @@ CORBA::ORB_ptr SALOMETraceCollector::_orb = 0; */ // ============================================================================ -SALOMETraceCollector* SALOMETraceCollector::instance(CORBA::ORB_ptr theOrb, +LocalTraceCollector* SALOMETraceCollector::instance(CORBA::ORB_ptr theOrb, int typeTrace) { if (_singleton == 0) // no need of lock when singleton already exists diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.hxx b/src/SALOMETraceCollector/SALOMETraceCollector.hxx index a726be3e1..f439ac492 100644 --- a/src/SALOMETraceCollector/SALOMETraceCollector.hxx +++ b/src/SALOMETraceCollector/SALOMETraceCollector.hxx @@ -29,9 +29,11 @@ #include #include +#include "LocalTraceCollector.hxx" #include "LocalTraceBufferPool.hxx" -//! See LocalTraceCollector instead of SALOMETraceCollector for usage without CORBA +//! See LocalTraceCollector instead of SALOMETraceCollector, +//! for usage without CORBA #if defined SALOMETRACECOLLECTOR_EXPORTS #if defined WIN32 @@ -47,10 +49,10 @@ #endif #endif -class SALOMETRACECOLLECTOR_EXPORT SALOMETraceCollector +class SALOMETRACECOLLECTOR_EXPORT SALOMETraceCollector: LocalTraceCollector { public: - static SALOMETraceCollector* instance(CORBA::ORB_ptr theOrb, int typeTrace=0); + static LocalTraceCollector* instance(CORBA::ORB_ptr theOrb, int typeTrace=0); static void *run(void *bid); ~SALOMETraceCollector(); @@ -58,12 +60,6 @@ class SALOMETRACECOLLECTOR_EXPORT SALOMETraceCollector SALOMETraceCollector(); private: - static int _threadToClose; - static int _toFile; - static SALOMETraceCollector* _singleton; - static pthread_mutex_t _singletonMutex; - static pthread_t* _threadId; - static std::string _fileName; static CORBA::ORB_ptr _orb; }; diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx index 89137f358..fea1b4f21 100644 --- a/src/TestContainer/TestContainer.cxx +++ b/src/TestContainer/TestContainer.cxx @@ -82,7 +82,7 @@ int main (int argc, char * argv[]) // Initializing omniORB ORB_INIT &init = *SINGLETON_::Instance() ; CORBA::ORB_var &orb = init( argc , argv ) ; - SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); + LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); try { -- 2.39.2