From 81f2484efc5e05a7a562b22350105efba2d6f6dc Mon Sep 17 00:00:00 2001 From: mkr Date: Tue, 23 Jan 2007 06:15:49 +0000 Subject: [PATCH] Fix for NPAL14147 : Remove a lot of trace at launching. --- src/Session/SALOME_Session_Server.cxx | 6 +++--- src/Session/Session_ServerLauncher.cxx | 4 ++-- src/Session/Session_ServerThread.cxx | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx index 8ae2b1d72..8ae6b7d2f 100755 --- a/src/Session/SALOME_Session_Server.cxx +++ b/src/Session/SALOME_Session_Server.cxx @@ -425,7 +425,7 @@ int main( int argc, char **argv ) PortableServer::POAManager_var pman = poa->the_POAManager(); pman->activate() ; - INFOS( "pman->activate()" ); + MESSAGE( "pman->activate()" ); _NS = new SALOME_NamingService( orb ); @@ -499,7 +499,7 @@ int main( int argc, char **argv ) SALOME::Session_var session = SALOME::Session::_narrow( obj ) ; ASSERT ( ! CORBA::is_nil( session ) ); // ...create GUI launcher - INFOS( "Session activated, Launch IAPP..." ); + MESSAGE( "Session activated, Launch IAPP..." ); guiThread = new GetInterfaceThread( session ); } @@ -518,7 +518,7 @@ int main( int argc, char **argv ) aGUISession = new SALOME_Session(); // Load SalomeApp dynamic library - INFOS( "creation SUIT_Application" ); + MESSAGE( "creation SUIT_Application" ); SUIT_Application* aGUIApp = aGUISession->startApplication( "SalomeApp", 0, 0 ); if ( aGUIApp ) { diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx index d4b055416..32b124f59 100755 --- a/src/Session/Session_ServerLauncher.cxx +++ b/src/Session/Session_ServerLauncher.cxx @@ -193,7 +193,7 @@ void Session_ServerLauncher::ActivateAll() argv[i+1] = _argv[(*itServ)._firstArg + i]; } - std::cout << "*** activating [" << argc << "] : " << argv[0] << std::endl; + MESSAGE("*** activating [" << argc << "] : " << argv[0]); Session_ServerThread* aServerThread = new Session_ServerThread(argc, argv, _orb,_root_poa); @@ -203,7 +203,7 @@ void Session_ServerLauncher::ActivateAll() } // Always launch Session Server - std::cout << "*** activating [ SESSION ] " << std::endl; + MESSAGE("*** activating [ SESSION ] "); int argc=1; char** argv = new char*[argc]; diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx index d9ef4f806..8e972b041 100755 --- a/src/Session/Session_ServerThread.cxx +++ b/src/Session/Session_ServerThread.cxx @@ -177,7 +177,7 @@ void Session_ServerThread::ActivateModuleCatalog(int argc, { try { - INFOS("ModuleCatalog thread started"); + MESSAGE("ModuleCatalog thread started"); // allocation on heap to allow destruction by POA SALOME_ModuleCatalogImpl* Catalogue_i @@ -216,7 +216,7 @@ void Session_ServerThread::ActivateSALOMEDS(int argc, { try { - INFOS("SALOMEDS thread started"); + MESSAGE("SALOMEDS thread started"); // We allocate the objects on the heap. Since these are reference // counted objects, they will be deleted by the POA when they are no // longer needed. @@ -247,7 +247,7 @@ void Session_ServerThread::ActivateSALOMEDS(int argc, void Session_ServerThread::ActivateRegistry(int argc, char ** argv) { - INFOS("Registry thread started"); + MESSAGE("Registry thread started"); SCRUTE(argc); if( argc<3 ) { @@ -337,7 +337,7 @@ void Session_ServerThread::ActivateContainer(int argc, { try { - INFOS("Container thread started"); + MESSAGE("Container thread started"); // get or create the child POA @@ -349,7 +349,7 @@ void Session_ServerThread::ActivateContainer(int argc, } catch (PortableServer::POA::AdapterNonExistent&) { - INFOS("factory_poa does not exists, create..."); + MESSAGE("factory_poa does not exists, create..."); // define policy objects PortableServer::ImplicitActivationPolicy_var implicitActivation = _root_poa->create_implicit_activation_policy( @@ -420,10 +420,10 @@ void Session_ServerThread::ActivateEngine(int /*argc*/, char ** /*argv*/) { try { - INFOS("SalomeApp_Engine thread started"); + MESSAGE("SalomeApp_Engine thread started"); SalomeApp_Engine_i* anEngine = new SalomeApp_Engine_i(); /*PortableServer::ObjectId_var id = */_root_poa->activate_object( anEngine ); - INFOS("poa->activate_object( SalomeApp_Engine )"); + MESSAGE("poa->activate_object( SalomeApp_Engine )"); CORBA::Object_ptr obj = anEngine->_this(); _NS->Register( obj ,"/SalomeAppEngine"); @@ -476,12 +476,12 @@ void Session_SessionThread::ActivateSession(int argc, { try { - INFOS("Session thread started"); + MESSAGE("Session thread started"); SALOME_Session_i * mySALOME_Session = new SALOME_Session_i(argc, argv, _orb, _root_poa, _GUIMutex, _GUILauncher) ; PortableServer::ObjectId_var mySALOME_Sessionid = _root_poa->activate_object(mySALOME_Session); - INFOS("poa->activate_object(mySALOME_Session)"); + MESSAGE("poa->activate_object(mySALOME_Session)"); CORBA::Object_var obj = mySALOME_Session->_this(); CORBA::String_var sior(_orb->object_to_string(obj)); -- 2.39.2