diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 120 |
1 files changed, 59 insertions, 61 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 1aad53134c1..d78d4e1ff44 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -200,14 +200,14 @@ ImR_Locator_i::run (void) "\tPing Interval : %dms\n" "\tStartup Timeout : %ds\n" "\tPersistence : %s\n" - "\tMulticast : %C\n", + "\tMulticast : %s\n", ping_interval_.msec (), startup_timeout_.sec (), repository_.repo_mode (), ior_multicast_.reactor () != 0 ? "Enabled" : "Disabled")); ACE_DEBUG ((LM_DEBUG, "\tDebug : %d\n" - "\tLocked : %C\n\n", + "\tLocked : %s\n\n", debug (), read_only_ ? "True" : "False")); } @@ -387,7 +387,7 @@ ImR_Locator_i::register_activator (const char* aname, ACE_UNUSED_ARG (err); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Activator registered for %C.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Activator registered for %s.\n", aname)); return token; } @@ -403,19 +403,19 @@ ImR_Locator_i::unregister_activator (const char* aname, { if (info->token != token && this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%C. Wrong token.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Wrong token.\n", aname)); return; } this->unregister_activator_i (aname); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Activator %C unregistered.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Activator %s unregistered.\n", aname)); } else { if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator: %C. Unknown activator.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Unknown activator.\n", aname)); } } @@ -433,7 +433,7 @@ ImR_Locator_i::notify_child_death (const char* name) ACE_ASSERT (name != 0); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Server has died <%C>.\n", name)); + ACE_DEBUG ((LM_DEBUG, "ImR: Server has died <%s>.\n", name)); Server_Info_Ptr info = this->repository_.get_server (name); if (! info.null ()) @@ -457,9 +457,7 @@ void ImR_Locator_i::activate_server (const char* server) { if (debug_ > 1) - { - ACE_DEBUG ((LM_DEBUG, "ImR: Manually activating server <%C>\n", server)); - } + ACE_DEBUG ((LM_DEBUG, "ImR: Manually activating server <%s>\n", server)); // This is the version called by tao_imr to activate the server, manually // starting it if necessary. @@ -477,7 +475,7 @@ ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start) Server_Info_Ptr info = this->repository_.get_server (name); if (info.null ()) { - ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%C>\n", name)); + ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%s>\n", name)); throw ImplementationRepository::NotFound (); } @@ -513,7 +511,7 @@ ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%C> at \n\t%C\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n", info.name.c_str (), info.partial_ior.c_str ())); } info.start_count = 0; @@ -530,7 +528,7 @@ ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start) if (this->debug_ > 0) { ACE_DEBUG ((LM_DEBUG, - "ImR: Cannot Activate <%C>.\n", info.name.c_str ())); + "ImR: Cannot Activate <%s>.\n", info.name.c_str ())); } waiter_svt_.unblock_all (info.name.c_str ()); @@ -566,7 +564,7 @@ ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%C> at \n\t%C\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n", info.name.c_str (), info.partial_ior.c_str ())); } return CORBA::string_dup (info.partial_ior.c_str ()); @@ -578,7 +576,7 @@ ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start) if (this->debug_ > 0) { ACE_DEBUG ((LM_DEBUG, - "ImR: Cannot Activate <%C>.\n", info.name.c_str ())); + "ImR: Cannot Activate <%s>.\n", info.name.c_str ())); } throw ImplementationRepository::CannotActivate( CORBA::string_dup ( @@ -592,7 +590,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (info.activation_mode == ImplementationRepository::MANUAL && ! manual_start) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%C>. ActivationMode=MANUAL\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. ActivationMode=MANUAL\n", info.name.c_str ())); throw ImplementationRepository::CannotActivate( CORBA::string_dup ( "Cannot implicitly activate MANUAL server.")); @@ -600,7 +598,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (info.cmdline.length () == 0) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%C>." + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>." " No command line.\n", info.name.c_str ())); throw ImplementationRepository::CannotActivate( CORBA::string_dup ( @@ -612,8 +610,8 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (ainfo.null () || CORBA::is_nil (ainfo->activator.in ())) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%C>. " - "Activator <%C> not found.\n", info.name.c_str (), info.activator.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. " + "Activator <%s> not found.\n", info.name.c_str (), info.activator.c_str ())); throw ImplementationRepository::CannotActivate( CORBA::string_dup ( "No activator registered for server.")); @@ -631,7 +629,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, ACE_ASSERT (info.start_count <= info.start_limit); if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: Starting server <%C>. Attempt %d/%d.\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Starting server <%s>. Attempt %d/%d.\n", info.name.c_str (), info.start_count, info.start_limit)); } ainfo->activator->start_server ( @@ -645,7 +643,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: Waiting for <%C> to start...\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Waiting for <%s> to start...\n", info.name.c_str ())); } ImplementationRepository::StartupInfo_var si = @@ -660,7 +658,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: <%C> Skipping wait. Already started.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Skipping wait. Already started.\n", info.name.c_str ())); } --waiting_clients; info.starting = false; @@ -676,7 +674,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (info.partial_ior.length () == 0) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR : Timeout waiting for <%C> to start.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR : Timeout waiting for <%s> to start.\n", info.name.c_str ())); info.reset (); } } @@ -686,14 +684,14 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, info.starting = false; info.reset (); if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%C>.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str ())); } catch (const CORBA::Exception& ex) { --waiting_clients; info.starting = false; if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%C>.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%s>.\n", info.name.c_str ())); if (debug_ > 1) ex._tao_print_exception (""); info.reset (); @@ -768,7 +766,7 @@ ImR_Locator_i::add_or_update_server (const char* server, if (this->read_only_) { - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%C> due to locked database.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%s> due to locked database.\n", server)); throw CORBA::NO_PERMISSION ( CORBA::SystemException::_tao_minor_code ( TAO_IMPLREPO_MINOR_CODE, @@ -777,7 +775,7 @@ ImR_Locator_i::add_or_update_server (const char* server, } if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Add/Update server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Add/Update server <%s>.\n", server)); int limit = options.start_limit; if (limit < 0) @@ -793,7 +791,7 @@ ImR_Locator_i::add_or_update_server (const char* server, if (info.null ()) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Adding server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Adding server <%s>.\n", server)); this->repository_.add_server ("", server, @@ -807,7 +805,7 @@ ImR_Locator_i::add_or_update_server (const char* server, else { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Updating server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Updating server <%s>.\n", server)); info->activator = options.activator.in (); info->cmdline = options.command_line.in (); @@ -871,7 +869,7 @@ ImR_Locator_i::remove_server (const char* name) if (this->repository_.remove_server (name) == 0) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%C>...\n", name)); + ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%s>...\n", name)); PortableServer::POA_var poa = findPOA (name); if (! CORBA::is_nil (poa.in ())) @@ -881,7 +879,7 @@ ImR_Locator_i::remove_server (const char* name) poa->destroy (etherealize, wait); } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%C>.\n", name)); + ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name)); } } else @@ -912,13 +910,13 @@ ImR_Locator_i::shutdown_server (const char* server) ACE_ASSERT (server != 0); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down server <%s>.\n", server)); Server_Info_Ptr info = this->repository_.get_server (server); if (info.null ()) { ACE_ERROR ((LM_ERROR, - "ImR: shutdown_server () Cannot find info for server <%C>\n", server)); + "ImR: shutdown_server () Cannot find info for server <%s>\n", server)); throw ImplementationRepository::NotFound (); } @@ -927,7 +925,7 @@ ImR_Locator_i::shutdown_server (const char* server) if (CORBA::is_nil (info->server.in ())) { ACE_ERROR ((LM_ERROR, - "ImR: shutdown_server () Cannot connect to server <%C>\n", server)); + "ImR: shutdown_server () Cannot connect to server <%s>\n", server)); throw ImplementationRepository::NotFound (); } @@ -948,7 +946,7 @@ ImR_Locator_i::shutdown_server (const char* server) // the server to finish shutting down. if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%C> shutdown.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%s> shutdown.\n", server)); } throw; } @@ -956,7 +954,7 @@ ImR_Locator_i::shutdown_server (const char* server) { if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%C>\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server)); } } @@ -994,14 +992,14 @@ ImR_Locator_i::server_is_running (const char* id, } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Server %C is running at %C.\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Server %s is running at %s.\n", name.c_str (), partial_ior)); CORBA::String_var ior = orb_->object_to_string (server); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Server %C callback at %C.\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name.c_str (), ior.in ())); if (this->unregister_if_address_reused_) @@ -1011,7 +1009,7 @@ ImR_Locator_i::server_is_running (const char* id, if (info.null ()) { if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Auto adding NORMAL server <%C>.\n", name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Auto adding NORMAL server <%s>.\n", name.c_str ())); ImplementationRepository::EnvironmentList env (0); this->repository_.add_server (server_id, @@ -1033,8 +1031,8 @@ ImR_Locator_i::server_is_running (const char* id, { if (! info->server_id.empty()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ImR - WARNING: server \"%C\" changed server id from ") - ACE_TEXT ("\"%C\" to \"%C\" waiting PER_CLIENT clients.\n"), + ACE_TEXT ("ImR - WARNING: server \"%s\" changed server id from ") + ACE_TEXT ("\"%s\" to \"%s\" waiting PER_CLIENT clients.\n"), name.c_str (), info->server_id.c_str (), server_id.c_str ())); info->server_id = server_id; } @@ -1043,7 +1041,7 @@ ImR_Locator_i::server_is_running (const char* id, info->ior = ior.in (); info->partial_ior = partial_ior; info->server = ImplementationRepository::ServerObject::_nil (); // Will connect at first access - + int err = this->repository_.update_server (*info); ACE_ASSERT (err == 0); ACE_UNUSED_ARG (err); @@ -1076,13 +1074,13 @@ ImR_Locator_i::server_is_shutting_down (const char* server) if (this->debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR_Locator_i::server_is_shutting_down: Unknown server:%C\n", server)); + "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server)); } return; } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Server <%C> is shutting down.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Server <%s> is shutting down.\n", server)); info->reset (); @@ -1103,14 +1101,14 @@ ImR_Locator_i::find (const char* server, imr_info = info->createImRServerInfo (); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Found server %C.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Found server %s.\n", server)); } else { ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ()); if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%C>\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%s>\n", server)); } } @@ -1226,7 +1224,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info) } if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%C>\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str ())); } catch (const CORBA::Exception&) { @@ -1265,7 +1263,7 @@ ImR_Locator_i::auto_start_servers (void) if (this->debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: AUTO_START Could not activate <%C>\n", + "ImR: AUTO_START Could not activate <%s>\n", server_entry->ext_id_.c_str ())); ex._tao_print_exception ("AUTO_START"); } @@ -1310,7 +1308,7 @@ ImR_Locator_i::connect_server (Server_Info& info) } if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%C>\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str ())); } catch (const CORBA::Exception&) { @@ -1355,7 +1353,7 @@ ImR_Locator_i::is_alive (Server_Info& info) if (debug_ > 0) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping retry count exceeded. alive=maybe.\n", info.name.c_str ())); + "ImR: <%s> Ping retry count exceeded. alive=maybe.\n", info.name.c_str ())); } // We return true here, because the server *might* be alive, it's just not starting in a timely // manner. We can't return false, because then we'll just try to start another instance, and the @@ -1374,7 +1372,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> not running. alive=false.\n", info.name.c_str ())); + "ImR: <%s> not running. alive=false.\n", info.name.c_str ())); } info.last_ping = ACE_Time_Value::zero; return 0; @@ -1385,7 +1383,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping verification disabled. alive=true.\n", info.name.c_str ())); + "ImR: <%s> Ping verification disabled. alive=true.\n", info.name.c_str ())); } return 1; } @@ -1395,7 +1393,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> within ping interval. alive=true.\n", info.name.c_str ())); + "ImR: <%s> within ping interval. alive=true.\n", info.name.c_str ())); } return 1; } @@ -1408,7 +1406,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: Ping verification skipped. <%C> not startable.\n", info.name.c_str ())); + "ImR: Ping verification skipped. <%s> not startable.\n", info.name.c_str ())); } return 1; } @@ -1420,7 +1418,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Could not connect. alive=false.\n", info.name.c_str ())); + "ImR: <%s> Could not connect. alive=false.\n", info.name.c_str ())); } return 0; } @@ -1436,7 +1434,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping successful. alive=true\n", info.name.c_str ())); + "ImR: <%s> Ping successful. alive=true\n", info.name.c_str ())); } info.last_ping = ACE_OS::gettimeofday (); } @@ -1450,7 +1448,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Local TRANSIENT. alive=false.\n", info.name.c_str ())); + "ImR: <%s> Local TRANSIENT. alive=false.\n", info.name.c_str ())); } } info.last_ping = ACE_Time_Value::zero; @@ -1461,7 +1459,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Remote TRANSIENT. alive=maybe.\n", info.name.c_str ())); + "ImR: <%s> Remote TRANSIENT. alive=maybe.\n", info.name.c_str ())); } } return -1; // We keep trying to ping, because returning 1 now, would just lead @@ -1472,7 +1470,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> TRANSIENT exception. alive=false.\n", info.name.c_str ())); + "ImR: <%s> TRANSIENT exception. alive=false.\n", info.name.c_str ())); } info.last_ping = ACE_Time_Value::zero; } @@ -1484,7 +1482,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping timed out. alive=true.\n", info.name.c_str ())); + "ImR: <%s> Ping timed out. alive=true.\n", info.name.c_str ())); } return 1; // This is "alive" as far as we're concerned. Presumably the client // will have a less stringent timeout policy, or will want to know @@ -1495,7 +1493,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: <%C> Unexpected Ping exception. alive=false\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Unexpected Ping exception. alive=false\n", info.name.c_str ())); ex._tao_print_exception ("\n"); } info.last_ping = ACE_Time_Value::zero; |