diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2013-04-12 21:13:53 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2013-04-12 21:13:53 +0000 |
| commit | 1ab92f376f58869d17d551af55c55f27e03a5567 (patch) | |
| tree | a535a548f220c2d83b2bc81fb46d7f8593e8259f | |
| parent | fae6828bea69c8971506389eb885b689ff695c5e (diff) | |
| download | ATCD-1ab92f376f58869d17d551af55c55f27e03a5567.tar.gz | |
work in progress, using new macros for orbsvcs logging
319 files changed, 2535 insertions, 2447 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 141f5e2f51b..7c5ca3871eb 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -30,7 +30,7 @@ Concurrency_Service::Concurrency_Service (void) ior_file_name_ (0), pid_file_name_ (0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n"))); } @@ -39,7 +39,7 @@ Concurrency_Service::Concurrency_Service (void) Concurrency_Service::Concurrency_Service (int argc, ACE_TCHAR** argv) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Concurrency_Service::Concurrency_Service (...)\n"))); this->init (argc, argv); } @@ -47,7 +47,7 @@ Concurrency_Service::Concurrency_Service (int argc, int Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Concurrency_Service::parse_args\n"))); ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:p:s")); @@ -69,7 +69,7 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv) this->use_naming_service_ = 0; break; default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("usage: %s") ACE_TEXT(" [-d]") ACE_TEXT(" [-o] <ior_output_file>") @@ -87,7 +87,7 @@ int Concurrency_Service::init (int argc, ACE_TCHAR **argv) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::init\n")); // Check if -ORBDaemon is specified and if so, daemonize at this moment, @@ -100,18 +100,18 @@ Concurrency_Service::init (int argc, if (this->orb_manager_.init_child_poa (command_line.get_argc(), command_line.get_TCHAR_argv(), "child_poa") == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("init_child_poa")), -1); if (this->parse_args (command_line.get_argc(), command_line.get_TCHAR_argv())!=0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Could not parse command line\n")), -1); CORBA::String_var str = this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "The IOR is: <%C>\n", str.in ())); @@ -120,7 +120,7 @@ Concurrency_Service::init (int argc, FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", ior_file_name_), -1); @@ -151,7 +151,7 @@ Concurrency_Service::init (int argc, int Concurrency_Service::init_naming_service (void) { - ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n")); CORBA::ORB_var orb; PortableServer::POA_var child_poa; @@ -184,12 +184,12 @@ Concurrency_Service::init_naming_service (void) int Concurrency_Service::run (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::run (...)\n")); int retval = this->orb_manager_.run (); if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Concurrency_Service::run"), -1); return 0; @@ -199,7 +199,7 @@ Concurrency_Service::run (void) Concurrency_Service::~Concurrency_Service (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Concurrency_Service::~Concurrency_Service (void)\n")); } @@ -208,7 +208,7 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv) { Concurrency_Service concurrency_service; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\n \t Concurrency Service:SERVER \n\n")); try diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index f7177bc7980..5ca969ac318 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -26,7 +26,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->resolve_initial_references ("NameService"); if (CORBA::is_nil(naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to find the Naming Service\n"), 1); diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 6bd2a73c0e6..ad28516517d 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -79,7 +79,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) CORBA::Object_var root_poa_object = this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (root_poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the root POA.\n"), 1); @@ -107,7 +107,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the Naming Service.\n"), 1); @@ -147,7 +147,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()); if (CORBA::is_nil (scheduler.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the Scheduling Service.\n"), 1); } @@ -224,7 +224,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) } if (CORBA::is_nil (child_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the child POA.\n"), 1); @@ -249,7 +249,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) ACE_OS::fopen (this->ior_file_name_.c_str(), ACE_TEXT("w")); if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", this->ior_file_name_.c_str()), 1); @@ -271,7 +271,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) } } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("The EC IOR is <%C>\n"), str.in ())); @@ -283,7 +283,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) naming_context->rebind (channel_name, ec.in ()); } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("%C; running event service\n"), __FILE__)); @@ -372,7 +372,7 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Unknown scheduling type <%s> ") ACE_TEXT("defaulting to none\n"), get_opt.opt_arg ())); @@ -382,7 +382,7 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Usage: %s ") ACE_TEXT("-a ") ACE_TEXT("-n service_name ") diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index eade1aa488f..55af9291c30 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -48,7 +48,7 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[]) CORBA::Object_var root_poa_object = orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (root_poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the root POA.\n"), 1); @@ -63,7 +63,7 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[]) CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the Naming Service.\n"), 1); @@ -154,7 +154,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Unknown scheduling type <%s> ") ACE_TEXT("defaulting to local\n"), get_opt.opt_arg ())); @@ -164,7 +164,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Usage: %s\n") ACE_TEXT(" -j join the object group\n") ACE_TEXT(" -p set as primary\n") @@ -176,7 +176,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) } if (this->num_threads_ < 1) - ACE_ERROR_RETURN((LM_ERROR, "Invalid number of threads specified\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "Invalid number of threads specified\n"), -1); return 0; } @@ -193,7 +193,7 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context) scheduler = this->sched_impl_->_this (); if (ACE_Scheduler_Factory::server(scheduler.in()) == -1) - ACE_ERROR((LM_ERROR,"Unable to install scheduler\n")); + ORBSVCS_ERROR((LM_ERROR,"Unable to install scheduler\n")); } else { // This is the name we (potentially) register the Scheduling @@ -242,17 +242,17 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb, ACE_SOCK_Connector connector; ACE_SOCK_Stream stream; - ACE_DEBUG((LM_DEBUG,"connecting to %s\n",addr)); + ORBSVCS_DEBUG((LM_DEBUG,"connecting to %s\n",addr)); if (connector.connect(stream, factory_addr) == -1) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Invalid Factory Address\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "(%P|%t) Invalid Factory Address\n"), -1); - ACE_DEBUG((LM_DEBUG,"Factory connected\n")); + ORBSVCS_DEBUG((LM_DEBUG,"Factory connected\n")); CORBA::String_var my_ior_string = orb->object_to_string(ec); int len = ACE_OS::strlen(my_ior_string.in()) ; if (stream.send_n(my_ior_string.in(), len) != len) - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1); stream.close(); } diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 60988ef91a8..cf3861e8463 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -23,7 +23,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( ) { - ACE_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n")); + ORBSVCS_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n")); FILE* file = 0; char *id_str=0, *prog=0; @@ -123,7 +123,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( } } - ACE_DEBUG((LM_DEBUG, "Command Line : %s\n", str.c_str())); + ORBSVCS_DEBUG((LM_DEBUG, "Command Line : %s\n", str.c_str())); options.command_line(str.c_str()); @@ -135,7 +135,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( if (new_process.spawn (options) == -1) { int error = ACE_OS::last_error (); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%p errno = %d.\n", str.c_str(), error)); @@ -145,12 +145,12 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( ACE_INET_Addr client_addr; ACE_SOCK_Stream stream; - ACE_DEBUG((LM_DEBUG, "accepting connection from event channel\n")); + ORBSVCS_DEBUG((LM_DEBUG, "accepting connection from event channel\n")); if (acceptor.accept(stream, &client_addr, &timeout) == -1) - ACE_ERROR_RETURN((LM_ERROR, "accept fail\n"), 0); + ORBSVCS_ERROR_RETURN((LM_ERROR, "accept fail\n"), 0); - ACE_DEBUG((LM_DEBUG, "Factory Connect established with %s:%d\n", + ORBSVCS_DEBUG((LM_DEBUG, "Factory Connect established with %s:%d\n", client_addr.get_host_name(), client_addr.get_port_number() )); // receive the ior string from the created object diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 862d36c2877..575f5711937 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -37,7 +37,7 @@ int parse_args(int argc, ACE_TCHAR* argv[]) if (result == -1 || (id.length () == 0 && output.length () == 0)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Usage: %s\n") ACE_TEXT(" [-i id] set the id that is used to register to the naming service\n") ACE_TEXT(" [-k kind] set the kind that is used to register to the naming service\n") @@ -91,10 +91,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) naming_context->bind(name, event_channel_factory.in()); - ACE_DEBUG((LM_DEBUG, "Register to naming service with %s", id.c_str())); + ORBSVCS_DEBUG((LM_DEBUG, "Register to naming service with %s", id.c_str())); if (kind.length()) - ACE_DEBUG((LM_DEBUG, ", %s", kind.c_str())); - ACE_DEBUG((LM_DEBUG,"\n")); + ORBSVCS_DEBUG((LM_DEBUG, ", %s", kind.c_str())); + ORBSVCS_DEBUG((LM_DEBUG,"\n")); } if (output.length()) { @@ -107,7 +107,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::fopen (output.c_str(), ACE_TEXT("w")); if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", output.c_str()), 1); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 1aae289ca4e..af5a753136a 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -55,11 +55,11 @@ int parse_args (int argc, ACE_TCHAR *argv[]) name); if (CORBA::is_nil(ftec.in())) - ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1); } } catch (const CORBA::Exception&){ - ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1); } return 0; } @@ -95,7 +95,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) FILE *output_file= ACE_OS::fopen (ior_file_name.c_str(), "w"); if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", ior_file_name.c_str()), 1); diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp index 40f3a831ee1..68320d797c0 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp @@ -27,7 +27,7 @@ void Naming_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("FT Name Service: shutting down on signal %d\n"), which_signal)); (void) this->ns_.shutdown (); @@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Service_Shutdown kill_contractor(killer); if (naming_service.init (argc, argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Failed to start the Naming Service.\n")), 1); try diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 5b4e4c34e88..6667bec9440 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -64,7 +64,7 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( { if (TAO_debug_level > 6) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") ACE_TEXT ("Received invalid event type.\n") ACE_TEXT ("EventType domain: <%s>\n") @@ -103,7 +103,7 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( { if (TAO_debug_level > 6) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") ACE_TEXT ("Received invalid structured event.\n") ACE_TEXT ("filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"), @@ -117,7 +117,7 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( { if (TAO_debug_level > 6) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") ACE_TEXT ("Received invalid structured event.\n") ACE_TEXT ("filterable_data[1] must be \"Location\", not \"%s\"\n"), @@ -131,7 +131,7 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( { if (TAO_debug_level > 6) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") ACE_TEXT ("Received invalid structured event.\n") ACE_TEXT ("There must be at least two name/value pairs in ") @@ -152,7 +152,7 @@ int TAO::FT_DefaultFaultAnalyzer::analyze_fault_event ( ACE_UNUSED_ARG (event); if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ( "In TAO::FT_DefaultFaultAnalyzer::analyze_fault_event.\n") )); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 16c935d118f..51a0f956516 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -58,7 +58,7 @@ int TAO::FT_FaultConsumer::init ( if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ( "Enter TAO::FT_FaultConsumer::init.\n") )); @@ -100,7 +100,7 @@ int TAO::FT_FaultConsumer::init ( if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ( "Leave TAO::FT_FaultConsumer::init.\n") )); @@ -120,7 +120,7 @@ int TAO::FT_FaultConsumer::fini (void) if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Enter TAO::FT_FaultConsumer::fini.\n") )); } @@ -134,7 +134,7 @@ int TAO::FT_FaultConsumer::fini (void) if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") ACE_TEXT ("Disconnecting consumer from FaultNotifier.\n") )); @@ -145,7 +145,7 @@ int TAO::FT_FaultConsumer::fini (void) if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") ACE_TEXT ("Deactivating from POA.\n") )); @@ -165,7 +165,7 @@ int TAO::FT_FaultConsumer::fini (void) if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") ACE_TEXT ("Setting our object reference to nil.\n") )); @@ -175,7 +175,7 @@ int TAO::FT_FaultConsumer::fini (void) if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Leave TAO::FT_FaultConsumer::fini.\n") )); } @@ -212,7 +212,7 @@ void TAO::FT_FaultConsumer::push_structured_event ( this->notifications_ += 1; if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") ACE_TEXT ("Received Fault notification(%d):\n"), static_cast<unsigned int> (this->notifications_) @@ -227,7 +227,7 @@ void TAO::FT_FaultConsumer::push_structured_event ( result = this->fault_analyzer_->validate_event_type (event); if (result != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") ACE_TEXT ("Received invalid fault event type.\n") )); @@ -240,7 +240,7 @@ void TAO::FT_FaultConsumer::push_structured_event ( result = this->fault_analyzer_->analyze_fault_event (event); if (result != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") ACE_TEXT ("Could not analyze fault event.\n") )); @@ -257,7 +257,7 @@ void TAO::FT_FaultConsumer::offer_change ( { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO::FT_FaultConsumer::offer_change() call ignored.\n") )); } @@ -266,7 +266,7 @@ void TAO::FT_FaultConsumer::disconnect_structured_push_consumer ( ) { //TODO: For now, we are just ignoring the disconnect callback. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() ") ACE_TEXT("call ignored.\n") )); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp index 4fe713cc68a..ae69d1df695 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp @@ -46,7 +46,7 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->all_at_location_failed == 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") ACE_TEXT ("All objects at location <%s> failed.\n"), loc_as_string.c_str() @@ -55,7 +55,7 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->all_of_type_at_location_failed == 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") ACE_TEXT ("All objects of type <%s> at location <%s> failed.\n"), this->type_id.in(), @@ -65,7 +65,7 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->object_at_location_failed == 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") ACE_TEXT ("Replica of type <%s> with ObjectGroupId <%Q> ") ACE_TEXT ("at location <%s> failed.\n"), @@ -77,7 +77,7 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->object_is_primary == 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") ACE_TEXT ("Primary replica of ObjectGroupId <%Q> failed.\n"), this->object_group_id diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index f5f1e4087f6..af1f070bca0 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -36,7 +36,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %s\n", #name \ )); \ } @@ -55,7 +55,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %s\n", #name \ )); \ } \ @@ -112,7 +112,7 @@ int TAO::FT_ReplicationManager::parse_args (int argc, ACE_TCHAR * argv[]) case '?': // fall thru default: - ACE_ERROR_RETURN ( (LM_ERROR, + ORBSVCS_ERROR_RETURN ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - usage: %s") ACE_TEXT (" -o <iorfile (for testing)>") ACE_TEXT (" -f <fault notifier IOR (for testing)>") @@ -140,7 +140,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb) if (TAO_debug_level > 1) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ( "%T %n (%P|%t) - Enter TAO::FT_ReplicationManager::init.\n") )); @@ -191,7 +191,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb) } else { - ACE_ERROR_RETURN ( (LM_ERROR, + ORBSVCS_ERROR_RETURN ( (LM_ERROR, ACE_TEXT ( "%T %n (%P|%t) - Could not resolve notifier IOR.\n")), -1); @@ -213,7 +213,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb) IORTable::Table::_narrow (ior_table_obj.in ()); if (CORBA::is_nil (ior_table.in ())) { - ACE_ERROR_RETURN ( (LM_ERROR, + ORBSVCS_ERROR_RETURN ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - Unable to resolve the IORTable.\n")), -1); } @@ -246,7 +246,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb) if (CORBA::is_nil (this->naming_context_.in ())) { - ACE_ERROR_RETURN ( (LM_ERROR, + ORBSVCS_ERROR_RETURN ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - Unable to find the Naming Service.\n")), -1); } @@ -263,14 +263,14 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb) { if (result == 0) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ( "%T %n (%P|%t) - Leave TAO::FT_ReplicationManager::init.\n") )); } else { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ( "%T %n (%P|%t) - FT_ReplicationManager::init failed.\n") )); @@ -360,7 +360,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( { if (CORBA::is_nil (fault_notifier)) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ( "%T %n (%P|%t) - Bad Fault Notifier object reference provided.\n") )); @@ -393,7 +393,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( TAO::FT_ReplicationManagerFaultAnalyzer (this)); if (analyzer == 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ( "%T %n (%P|%t) - Error creating FaultAnalyzer.\n" ) @@ -418,7 +418,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (result != 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ( "%T %n (%P|%t) - Could not re-initialize FT_FaultConsumer.\n") )); @@ -632,7 +632,7 @@ TAO::FT_ReplicationManager::create_member ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::create_member: unknown group\n") )); } @@ -667,7 +667,7 @@ TAO::FT_ReplicationManager::add_member ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::add_member to unknown group\n") )); } @@ -721,7 +721,7 @@ TAO::FT_ReplicationManager::locations_of_members ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::locations_of_members: unknown group\n") )); } @@ -754,7 +754,7 @@ TAO::FT_ReplicationManager::get_object_group_id ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_object_group_id: unknown group\n") )); } @@ -780,7 +780,7 @@ TAO::FT_ReplicationManager::get_object_group_ref ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_object_group_ref: unknown group\n") )); } @@ -806,7 +806,7 @@ TAO::FT_ReplicationManager::get_object_group_ref_from_id ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_object_group_ref_from_id: unknown group\n") )); } @@ -833,7 +833,7 @@ TAO::FT_ReplicationManager::get_member_ref ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - FT_ReplicationManager::get_member_ref: unknown group\n") )); } @@ -923,7 +923,7 @@ int TAO::FT_ReplicationManager::write_ior () } else { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - Open failed for %s\n"), this->ior_output_file_ )); } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index aa3e2e8e9c8..70a5dd8a074 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -63,7 +63,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event ( { for (CORBA::ULong n_prop = 0; n_prop < item_count; ++n_prop) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: ") ACE_TEXT("Property Name: <%C>\n"), filterable[n_prop].name.in() @@ -154,7 +154,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id ( const char* type_id_value; if ((val >>= type_id_value) == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: ") ACE_TEXT("Could not extract TypeId value from any.\n")), -1); @@ -172,7 +172,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id ( PortableGroup::ObjectGroupId temp_id = (PortableGroup::ObjectGroupId)0; if ((val >>= temp_id) == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: ") ACE_TEXT("Could not extract ObjectGroupId value from any.\n")), -1); @@ -187,7 +187,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_location ( const PortableGroup::Location* temp_loc; if ((val >>= temp_loc) == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_location: ") ACE_TEXT("Could not extract Location value from fault event.\n")), -1); @@ -218,7 +218,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: ") ACE_TEXT("MembershipStyle is <%d>:\n"), membership_style @@ -248,7 +248,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: ") ACE_TEXT ("ReplicationStyle is <%d>:\n"), replication_style @@ -278,7 +278,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: ") ACE_TEXT ("MinimumNumberMembers is <%d>:\n"), minimum_number_members @@ -308,7 +308,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: ") ACE_TEXT ("InitialNumberMembers is <%d>:\n"), initial_number_members @@ -338,7 +338,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories ( { if ((value >>= temp_factories) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ") ACE_TEXT ("Could not extract Factories from properties.\n") )); @@ -353,7 +353,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ") ACE_TEXT ("Could not find Factories property.\n") )); @@ -402,7 +402,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( iogr); if (CORBA::is_nil (primary_obj.in())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") ACE_TEXT ("Could not get primary IOR from IOGR.\n")), -1); @@ -414,7 +414,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( iogr, location); if (CORBA::is_nil (failed_obj.in())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") ACE_TEXT ("Could not get IOR of failed member from IOGR.\n")), -1); @@ -431,7 +431,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( } else // primary is not set { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") ACE_TEXT ("Primary is not set on IOGR.\n") )); @@ -440,7 +440,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( } else // could not get tagged component { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") ACE_TEXT ("Could not get tagged component from IOGR.\n") )); @@ -475,7 +475,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( // This should not happen, but let us be safe. if (CORBA::is_nil (the_object_group.in())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"), fault_event_desc.object_group_id @@ -503,7 +503,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (result != 0) { //@@ it seems a shame to fail here. We should at least remove the failed replica from the group. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Could not extract MembershipStyle from properties on ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -515,7 +515,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( fault_event_desc.membership_style = membership_style; if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("MembershipStyleValue = <%d>"), fault_event_desc.membership_style @@ -529,7 +529,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (result != 0) { //@@ it seems a shame to fail here. We should at least remove the failed replica from the group. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Could not extract ReplicationStyle from properties on ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -541,7 +541,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( fault_event_desc.replication_style = replication_style; if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("ReplicationStyleValue = <%d>"), fault_event_desc.replication_style @@ -559,7 +559,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( result = 0; if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Could not extract MinimumNumberMembers from properties on ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -571,7 +571,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( fault_event_desc.minimum_number_members = minimum_number_members; if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("MinimumNumberMembers = <%d>"), fault_event_desc.minimum_number_members @@ -589,7 +589,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( result = 0; if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Could not extract InitialNumberMembers from properties on ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -601,7 +601,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( fault_event_desc.initial_number_members = initial_number_members; if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("InitialNumberMembers = <%d>"), fault_event_desc.initial_number_members @@ -619,7 +619,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( result = 0; if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Could not extract Factories from properties on ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -630,7 +630,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Got Factories from properties on ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -651,7 +651,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Checking to see if failed replica was the primary for ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -685,7 +685,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Setting new primary for ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -713,7 +713,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") ACE_TEXT ("Potentially adding new members to ") ACE_TEXT ("ObjectGroup with id <%Q>.\n"), @@ -784,7 +784,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary ( } else { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: ") ACE_TEXT ("No locations remaining in ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 8f11a1aa71b..1fafb530f8f 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -21,7 +21,7 @@ // Use this macro at the beginning of CORBA methods // to aid in debugging. #define METHOD_ENTRY(name) \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %s\n", #name \ )) @@ -37,7 +37,7 @@ // if (cave_is_closing) METHOD_RETURN(Plugh::pirate) aarrggh; // Moral: Always use braces. #define METHOD_RETURN(name) \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %s\n", #name \ )); \ return /* value goes here */ @@ -115,7 +115,7 @@ int TAO::FT_FaultDetectorFactory_i::write_ior(void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Open failed for %s\n", ior_output_file_ )); } @@ -164,7 +164,7 @@ int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, ACE_TCHAR * argv[]) case '?': // fall thru default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "usage: %s" " -d <FT Domain>" " -l <FT Location>" @@ -195,7 +195,7 @@ int TAO::FT_FaultDetectorFactory_i::idle (int & result) // don't quitOnIdle until something has happened if (this->quit_on_idle_ && this->empty_slots_ != 0) { - ACE_ERROR (( LM_INFO, + ORBSVCS_ERROR (( LM_INFO, "FaultDetectorFactory exits due to quit on idle option.\n" )); quit = 1; @@ -216,7 +216,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA); if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the POA.\n")), -1); @@ -227,7 +227,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) if (CORBA::is_nil(this->poa_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")), -1); } @@ -277,7 +277,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) info.the_criteria[0].nam[0].id = CORBA::string_dup(PortableGroup::role_criterion); info.the_criteria[0].val <<= CORBA::string_dup(FT::FAULT_DETECTOR_ROLE_NAME); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultDetector registering with ReplicationManager.\n" )); this->factory_registry_->register_factory( @@ -285,19 +285,19 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) FT::FAULT_DETECTOR_ROLE_NAME, info); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultDetector Registration complete.\n" )); this->registered_ = 1; } else { - ACE_ERROR ((LM_ERROR,"FaultNotifier: ReplicationManager doesn't have RegistrationFactory.\n" )); + ORBSVCS_ERROR ((LM_ERROR,"FaultNotifier: ReplicationManager doesn't have RegistrationFactory.\n" )); } } else { - ACE_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" )); + ORBSVCS_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" )); } } catch (const CORBA::Exception& ex) @@ -308,7 +308,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultNotifier: ReplicationManager registration disabled.\n" )); } @@ -329,7 +329,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb) this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil(naming_obj.in ())){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%T %n (%P|%t) Unable to find the Naming Service\n"), 1); } @@ -404,14 +404,14 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault this->empty_slots_ += 1; if (this->empty_slots_ == this->detectors_.size()) { - ACE_ERROR (( LM_INFO, + ORBSVCS_ERROR (( LM_INFO, "FaultDetectorFactory is idle.\n" )); } } else { - ACE_ERROR (( LM_ERROR, + ORBSVCS_ERROR (( LM_ERROR, "Remove detector %d mismatch.\n", static_cast<int> (id) )); @@ -419,7 +419,7 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault } else { - ACE_ERROR (( LM_ERROR, + ORBSVCS_ERROR (( LM_ERROR, "Attempt to remove invalid detector %d. Limit %d.\n", static_cast<int> (id), static_cast<int> (this->detectors_.size()) @@ -453,7 +453,7 @@ void TAO::FT_FaultDetectorFactory_i::change_properties ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Throwing Invalid Property: %s\n", FT::FT_FAULT_MONITORING_INTERVAL )); @@ -499,7 +499,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "FaultDetectorFactory::create_object: Missing parameter %s\n", ::FT::FT_NOTIFIER )); @@ -511,7 +511,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( FT::PullMonitorable_ptr monitorable; if (! ::TAO::find (decoder, ::FT::FT_MONITORABLE, monitorable) ) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "FaultDetectorFactory::create_object: Missing parameter %s\n", ::FT::FT_MONITORABLE )); @@ -531,7 +531,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( { domain_id = this->domain_; -// ACE_ERROR ((LM_ERROR, +// ORBSVCS_ERROR ((LM_ERROR, // "FaultDetectorFactory::create_object: Missing parameter %s\n", // ::FT::FT_DOMAIN_ID // )); @@ -544,7 +544,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( { object_location = & this->location_; -// ACE_ERROR ((LM_ERROR, +// ORBSVCS_ERROR ((LM_ERROR, // "FaultDetectorFactory::create_object: Missing parameter %s\n", // ::FT::FT_LOCATION // )); @@ -562,7 +562,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( { object_type = const_cast<char *> ("unknown"); // Not required: missingParameter = 1; - ACE_DEBUG ((LM_DEBUG, "Object type not given.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Object type not given.\n")); } FT::ObjectGroupId group_id = 0; @@ -573,7 +573,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( if (missingParameter) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Throwing 'InvalidCriteria' due to missing %s\n", missingParameterName )); @@ -597,7 +597,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( group_id)); if (pFD == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "New FaultDetector_i returned NULL. Throwing ObjectNotCreated.\n" )); throw PortableGroup::ObjectNotCreated(); @@ -608,7 +608,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( PortableGroup::GenericFactory::FactoryCreationId); if (factory_creation_id.ptr() == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "New factory_creation_id returned NULL. Throwing ObjectNotCreated.\n" )); diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index 6d8174af809..75ed93963e0 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -55,7 +55,7 @@ TAO::Fault_Detector_i::Fault_Detector_i ( { this->notifier_ = FT::FaultNotifier::_duplicate(notifier); this->monitorable_ = FT::PullMonitorable::_duplicate(monitorable); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Object type %s\n", object_type )); } @@ -97,7 +97,7 @@ void TAO::Fault_Detector_i::run() } else { - ACE_ERROR ((LM_INFO, + ORBSVCS_ERROR ((LM_INFO, "FaultDetector%d FAULT: not alive.\n", id_ )); @@ -107,7 +107,7 @@ void TAO::Fault_Detector_i::run() } catch (const CORBA::Exception&)// todo refine this { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "FaultDetector FAULT: exception.\n" )); notify(); @@ -159,7 +159,7 @@ void TAO::Fault_Detector_i::notify() { if (TAO_debug_level > 5) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "call Fault Detector push Structured Event.\n" )); } @@ -167,7 +167,7 @@ void TAO::Fault_Detector_i::notify() if (TAO_debug_level > 5) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "return from Fault Detector push Structured Event.\n" )); } @@ -179,7 +179,7 @@ void TAO::Fault_Detector_i::notify() } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Fault Detector cannot create Structured Event.\n" )); } diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index f712f56b8eb..43c998faf83 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -23,7 +23,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %C\n", #name \ )); \ } @@ -42,7 +42,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %C\n", #name \ )); \ } \ @@ -100,13 +100,13 @@ int TAO::FT_FaultNotifier_i::idle(int &result) { if ( linger == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "FaultNotifier (%P|%t) Begin linger.\n" )); } if(++linger > 5)//10) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "FaultNotifier (%P|%t) idle returnning gone\n" )); } @@ -135,7 +135,7 @@ int TAO::FT_FaultNotifier_i::write_ior() } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%T %n (%P|%t) Open failed for %s\n", ior_output_file_ )); } @@ -173,7 +173,7 @@ int TAO::FT_FaultNotifier_i::parse_args (int argc, ACE_TCHAR * argv[]) // fall thru default: { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "usage: %s" " -o <iorfile>" " -r disable registration with ReplicationManager" @@ -204,7 +204,7 @@ void TAO::FT_FaultNotifier_i::_remove_ref (void) { notify_channel_->destroy(); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "FaultNotifier (%P|%t) _remove_ref setting gone\n" )); this->gone_ = 1; @@ -228,13 +228,13 @@ int TAO::FT_FaultNotifier_i::fini (void) try { this->replication_manager_->register_fault_notifier(::FT::FaultNotifier::_nil ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultNotifier unregistered from ReplicationManager.\n" )); } catch (const CORBA::Exception&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultNotifier Can't unregister from ReplicationManager.\n" )); // complain, but otherwise ignore this error @@ -256,7 +256,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA); if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the POA.\n")), -1); @@ -267,7 +267,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) if (CORBA::is_nil(this->poa_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")), -1); } @@ -320,7 +320,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) = ::CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(consumer.in ()); if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%T %n (%P|%t) Should not occur: Unable to narrow Structured Proxy Push Consumer\n"), 1); } @@ -342,7 +342,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) = ::CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(consumer.in ()); if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%T %n (%P|%t) Should not occur: Unable to narrow Sequence Proxy Push Consumer\n"), 1); } @@ -359,7 +359,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) this->consumer_admin_ = this->notify_channel_->default_consumer_admin (); if (CORBA::is_nil (this->consumer_admin_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%T %n (%P|%t) NIL consumer admin\n" )); result = -1; @@ -381,21 +381,21 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) if (! CORBA::is_nil (notifier.in ())) { this->replication_manager_->register_fault_notifier(notifier.in ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultNotifier registered with ReplicationManager.\n" )); this->registered_ = 1; } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: Registration failed. This is not a FaultNotifier (should not occur.)\n" )); } } else { - ACE_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" )); + ORBSVCS_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" )); } } catch (const CORBA::Exception& ex) @@ -406,7 +406,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "FaultNotifier: ReplicationManager registration disabled.\n" )); } @@ -435,7 +435,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil(naming_obj.in ())){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%T %n (%P|%t) Unable to find the Naming Service\n"), 1); } @@ -444,7 +444,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) CosNaming::NamingContext::_narrow (naming_obj.in ()); if (CORBA::is_nil(this->naming_context_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%T %n (%P|%t) Should not occur: Can't narrow initial reference to naming context.\n"), 1); } @@ -542,7 +542,7 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_ { // this is a shoould-not-occur situation. The consumer admin returned // the wrong kind of object. - ACE_ERROR(( LM_ERROR, + ORBSVCS_ERROR(( LM_ERROR, "%T %n (%P|%t) Unexpected result: Wrong type of object returned from obtain_notification_push_supplier\n" )); } @@ -603,7 +603,7 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co { // this is a shoould-not-occur situation. The consumer admin returned // the wrong kind of object. - ACE_ERROR(( LM_ERROR, + ORBSVCS_ERROR(( LM_ERROR, "%T %n (%P|%t) Unexpected result: Wrong type of object returned from obtain_notification_push_supplier\n" )); } @@ -653,7 +653,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer ( } else { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, "%T %n (%P|%t) Unexpected proxy supplier type\n" )); throw CosEventComm::Disconnected(); @@ -672,7 +672,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer ( if (! this->quitting_ && this->consumer_connects_ == this->consumer_disconnects_) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, "FaultNotifier (%P|%t) quit on idle: connects %d, disconnects %d\n", static_cast<unsigned int> (this->consumer_connects_), static_cast<unsigned int> (this->consumer_disconnects_) diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp index 548a5188d00..0979f80ca5f 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -24,7 +24,7 @@ void IFR_Service_Shutdown_Functor::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "shutting down on signal %d\n", which_signal)); (void) this->ifr_.shutdown (); } diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index f010d756b33..cf9886a504a 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -169,7 +169,7 @@ BE_GlobalData::parse_args (long &i, char **av) } else { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("IDL: I don't understand the '%s' option\n"), av[i] @@ -182,7 +182,7 @@ BE_GlobalData::parse_args (long &i, char **av) be_global->allow_duplicate_typedefs (true); break; default: - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("IDL: I don't understand the '%s' option\n"), av[i] diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp index ed178ae3f0c..0408343cc65 100644 --- a/TAO/orbsvcs/IFR_Service/be_init.cpp +++ b/TAO/orbsvcs/IFR_Service/be_init.cpp @@ -89,7 +89,7 @@ BE_ifr_orb_init (int &ac, ACE_TCHAR *av[]) TAO_IFR_BE_Export void BE_version (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s %s\n", ACE_TEXT ("TAO_IFR_BE, version"), ACE_TEXT (TAO_VERSION))); diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index de1670fbbcb..b15b89c29bf 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -87,7 +87,7 @@ BE_cleanup (void) TAO_IFR_BE_Export void BE_abort (void) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Fatal Error - Aborting\n"))); // BE_cleanup will be called after the exception is caught. @@ -104,7 +104,7 @@ BE_ifr_repo_init (void) if (CORBA::is_nil (object.in ())) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Null objref from resolve_initial_references\n") ), @@ -117,7 +117,7 @@ BE_ifr_repo_init (void) if (CORBA::is_nil (repo.in ())) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("CORBA::Repository::_narrow failed\n") ), @@ -129,7 +129,7 @@ BE_ifr_repo_init (void) } catch (CORBA::ORB::InvalidName &) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("resolution of Interface Repository failed\n"))); throw Bailout (); } @@ -156,7 +156,7 @@ BE_produce (void) if (root == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce - ") ACE_TEXT ("No Root\n"))); @@ -173,7 +173,7 @@ BE_produce (void) // only visit_scope() for the removing visitor. if (visitor.visit_scope (root) == -1) { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce -") ACE_TEXT (" failed to accept removing visitor\n") @@ -190,7 +190,7 @@ BE_produce (void) if (root->ast_accept (&visitor) == -1) { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce -") ACE_TEXT (" failed to accept adding visitor\n") diff --git a/TAO/orbsvcs/IFR_Service/be_util.cpp b/TAO/orbsvcs/IFR_Service/be_util.cpp index b1feb7ce332..1287b79926e 100644 --- a/TAO/orbsvcs/IFR_Service/be_util.cpp +++ b/TAO/orbsvcs/IFR_Service/be_util.cpp @@ -17,7 +17,7 @@ #include "ast_generator.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" // Prepare an argument for a BE. void @@ -33,12 +33,12 @@ be_util::arg_post_proc (void) void be_util::usage (void) { - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT (" -o <dir>\t\tOutput directory for the generated file.") ACE_TEXT (" Default is current directory\n") )); - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT (" -e\t\t\tGenerate just an include of original IDL file") ACE_TEXT (" if no IDL3 declarations are found\n") diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index f40deb210c4..266dcedbca2 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -85,7 +85,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) if (d == 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -") ACE_TEXT (" bad node in this scope\n") @@ -104,7 +104,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) if (d->ast_accept (this) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -") ACE_TEXT (" failed to accept visitor\n") @@ -173,7 +173,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -") ACE_TEXT (" scope stack is empty\n") @@ -204,7 +204,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) if (be_global->ifr_scopes ().push (new_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -") ACE_TEXT (" scope push failed\n") @@ -215,7 +215,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -") ACE_TEXT (" visit_scope failed\n") @@ -230,7 +230,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) if (be_global->ifr_scopes ().pop (tmp) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -") ACE_TEXT (" scope pop failed\n") @@ -350,7 +350,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) if (CORBA::is_nil (bases[i])) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_interface -") @@ -371,7 +371,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // Push the new IR object onto the scope stack. if (be_global->ifr_scopes ().push (extant_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_interface -") @@ -384,7 +384,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_interface -") @@ -408,7 +408,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_interface -") @@ -496,7 +496,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_interface_fwd -") @@ -548,7 +548,7 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_valuebox -") ACE_TEXT (" scope stack is empty\n") @@ -696,7 +696,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node) // the new object's scope. if (be_global->ifr_scopes ().push (extant_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_valuetype -") @@ -709,7 +709,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_valuetype -") @@ -733,7 +733,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_valuetype -") @@ -820,7 +820,7 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_valuetype_fwd -") @@ -947,7 +947,7 @@ ifr_adding_visitor::visit_component (AST_Component *node) // the new object's scope. if (be_global->ifr_scopes ().push (extant_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_component -") @@ -968,7 +968,7 @@ ifr_adding_visitor::visit_component (AST_Component *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_component -") @@ -984,7 +984,7 @@ ifr_adding_visitor::visit_component (AST_Component *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_interface -") @@ -1076,7 +1076,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_component_fwd -") @@ -1365,7 +1365,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node) // the new object's scope. if (be_global->ifr_scopes ().push (extant_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_eventtype -") @@ -1378,7 +1378,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_eventtype -") @@ -1402,7 +1402,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_eventtype -") @@ -1494,7 +1494,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_eventtype_fwd -") @@ -1718,7 +1718,7 @@ ifr_adding_visitor::visit_structure_fwd (AST_StructureFwd *node) if (be_global->ifr_scopes ().top (current_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_structure_fwd -") @@ -1818,7 +1818,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_enum -") ACE_TEXT (" scope stack is empty\n") @@ -1881,7 +1881,7 @@ ifr_adding_visitor::visit_field (AST_Field *node) if (ft == 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_field - ") @@ -1893,7 +1893,7 @@ ifr_adding_visitor::visit_field (AST_Field *node) if (ft->ast_accept (this) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_field - ") @@ -1978,7 +1978,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_attribute -") ACE_TEXT (" scope stack is empty\n") @@ -2095,7 +2095,7 @@ ifr_adding_visitor::visit_union_fwd (AST_UnionFwd *node) if (be_global->ifr_scopes ().top (current_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("visit_union_fwd -") @@ -2219,7 +2219,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_constant -") ACE_TEXT (" scope stack is empty\n") @@ -2366,7 +2366,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -") ACE_TEXT (" scope stack is empty\n") @@ -2387,7 +2387,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s %s\n", ACE_TEXT ("ifr_adding_visitor::visit_typedef - ignoring duplicate typedef"), node->local_name ()->get_string ())); @@ -2402,7 +2402,7 @@ ifr_adding_visitor::visit_root (AST_Root *node) { if (be_global->ifr_scopes ().push (be_global->repository ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -") ACE_TEXT (" scope push failed\n") @@ -2413,7 +2413,7 @@ ifr_adding_visitor::visit_root (AST_Root *node) if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -") ACE_TEXT (" visit_scope failed\n") @@ -2427,7 +2427,7 @@ ifr_adding_visitor::visit_root (AST_Root *node) if (be_global->ifr_scopes ().pop (tmp) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -") ACE_TEXT (" scope pop failed\n") @@ -2468,7 +2468,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_native -") ACE_TEXT (" scope stack is empty\n") @@ -2697,7 +2697,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type, bool owned) { if (base_type->ast_accept (this) == -1) { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::element_type -") ACE_TEXT (" failed to accept visitor\n") @@ -2713,7 +2713,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type, bool owned) if (CORBA::is_nil (contained.in ())) { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::element_type -") ACE_TEXT (" lookup_id failed\n") @@ -2747,7 +2747,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (intf == 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2767,7 +2767,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (status != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2786,7 +2786,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (CORBA::is_nil (abs_bases[i])) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2809,7 +2809,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (intf == 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2829,7 +2829,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (status != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2848,7 +2848,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (CORBA::is_nil (bases[i])) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2907,7 +2907,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2920,7 +2920,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2945,7 +2945,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_interface_def -") @@ -2957,7 +2957,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_interface_def -") ACE_TEXT (" scope stack is empty\n") @@ -3015,7 +3015,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node) if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_value_def -") @@ -3028,7 +3028,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_value_def -") @@ -3053,7 +3053,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_value_def -") @@ -3065,7 +3065,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_value_def -") ACE_TEXT (" scope stack is empty\n") @@ -3107,7 +3107,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node) if (be_global->ifr_scopes ().push (new_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_component_def -") @@ -3129,7 +3129,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_component_def -") @@ -3145,7 +3145,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_component_def -") @@ -3157,7 +3157,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_component_def -") ACE_TEXT (" scope stack is empty\n") @@ -3213,7 +3213,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node) if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_home_def -") @@ -3226,7 +3226,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_home_def -") @@ -3259,7 +3259,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_home_def -") @@ -3271,7 +3271,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_home_def -") ACE_TEXT (" scope stack is empty\n") @@ -3332,7 +3332,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node) if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_event_def -") @@ -3345,7 +3345,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node) // Visit the members, if any. if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_event_def -") @@ -3370,7 +3370,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_event_def -") @@ -3382,7 +3382,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_event_def -") ACE_TEXT (" scope stack is empty\n") @@ -3413,7 +3413,7 @@ ifr_adding_visitor::create_value_member (AST_Field *node) /// This will put the repo entry into ir_current_. if (bt->ast_accept (this) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_value_member -") @@ -3443,7 +3443,7 @@ ifr_adding_visitor::create_value_member (AST_Field *node) vis = CORBA::PRIVATE_MEMBER; break; default: - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_value_member -") ACE_TEXT (" bad visibility value in node\n") @@ -3456,7 +3456,7 @@ ifr_adding_visitor::create_value_member (AST_Field *node) if (be_global->ifr_scopes ().top (current_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("create_value_member -") @@ -3501,7 +3501,7 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node) case AST_Decl::NT_sequence: if (node->ast_accept (this) == -1) { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("get_scope_member -") @@ -3834,7 +3834,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result, /// to the repository if it's not already there. if (arg->field_type ()->ast_accept (this) != 0) { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::") ACE_TEXT ("fill_initializers -") diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index 52c791072d7..7b5d44cbfe8 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -51,7 +51,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) { if (e->field (f, i) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_scope -") @@ -71,7 +71,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) { if (ft->ast_accept (this) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_scope -") @@ -183,7 +183,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) if (be_global->ifr_scopes ().top (current_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -201,7 +201,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) if (be_global->ifr_scopes ().push (new_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -214,7 +214,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // Then add the real exception members. if (this->add_members (node, new_def.in ()) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -228,7 +228,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -244,7 +244,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) if (be_global->ifr_scopes ().push (new_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -257,7 +257,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // Then add the real exception members. if (this->add_members (node, new_def.in ()) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -271,7 +271,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") @@ -430,7 +430,7 @@ ifr_adding_visitor_exception::add_members (AST_Exception *node, { if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::") ACE_TEXT ("visit_exception -") diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp index 4ac03717560..e4407a63170 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp @@ -51,7 +51,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::") ACE_TEXT ("visit_operation -") @@ -179,7 +179,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::") ACE_TEXT ("visit_operation -") diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 74a8b36f80d..ccbd0df428f 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -42,7 +42,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) { if (s->field (f, i) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_scope -") @@ -66,7 +66,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) if (ft->ast_accept (&visitor) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_scope -") @@ -81,7 +81,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) { if (ft->ast_accept (this) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_scope -") @@ -139,7 +139,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) if (be_global->ifr_scopes ().top (current_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -158,7 +158,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) if (be_global->ifr_scopes ().push (struct_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -171,7 +171,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // Then add the real structure members (which corrupts ir_current_). if (this->add_members (node, struct_def.in ()) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -187,7 +187,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -207,7 +207,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) if (be_global->ifr_scopes ().push (struct_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -219,7 +219,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) if (this->add_members (node, struct_def.in ()) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -235,7 +235,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") @@ -395,7 +395,7 @@ ifr_adding_visitor_structure::add_members (AST_Structure *node, { if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::") ACE_TEXT ("visit_structure -") diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp index b331f4ef0a2..f964c749c24 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -52,7 +52,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) { if (u->field (f, i) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_scope -") @@ -79,7 +79,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) if (ft->ast_accept (&visitor) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_scope -") @@ -94,7 +94,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) { if (ft->ast_accept (this) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_scope -") @@ -317,7 +317,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // This will put the discriminator in ir_current_. if (node->disc_type ()->ast_accept (this) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -339,7 +339,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) if (be_global->ifr_scopes ().top (current_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -359,7 +359,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) if (be_global->ifr_scopes ().push (union_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -372,7 +372,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // Then add the real union members (which corrupts ir_current_). if (this->add_members (node, union_def.in ()) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -") ACE_TEXT (" visit_scope failed\n")), @@ -387,7 +387,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -408,7 +408,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) if (be_global->ifr_scopes ().push (union_def.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -420,7 +420,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) if (this->add_members (node, union_def.in ()) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -436,7 +436,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // Pop the new IR object back off the scope stack. if (be_global->ifr_scopes ().pop (used_scope) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::") ACE_TEXT ("visit_union -") @@ -471,7 +471,7 @@ ifr_adding_visitor_union::add_members (AST_Union *node, { if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -") ACE_TEXT (" visit_scope failed\n")), diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp index 1dd38fffbe3..cb4e962df43 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -34,7 +34,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) if (d == 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_scope -") ACE_TEXT (" bad node in this scope\n") @@ -87,7 +87,7 @@ ifr_removing_visitor::visit_root (AST_Root *node) if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_root -") ACE_TEXT (" scope push failed\n") @@ -98,7 +98,7 @@ ifr_removing_visitor::visit_root (AST_Root *node) if (this->visit_scope (node) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_root -") ACE_TEXT (" visit_scope failed\n") @@ -111,7 +111,7 @@ ifr_removing_visitor::visit_root (AST_Root *node) if (be_global->ifr_scopes ().pop (tmp) != 0) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_root -") ACE_TEXT (" scope pop failed\n") diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp index a9c866e799e..ccf846dbff0 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp @@ -91,7 +91,7 @@ ImR_Activator_Loader::run (void) } catch (...) { - ACE_ERROR ((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n")); + ORBSVCS_ERROR ((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n")); return -1; } } diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index f65379351a6..d3425fc8bd7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -11,7 +11,7 @@ #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #if defined (ACE_WIN32) static const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE; @@ -44,7 +44,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -c option needs a command\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -c option needs a command\n")); this->print_usage (); return -1; } @@ -66,7 +66,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current())); + ORBSVCS_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current())); this->print_usage (); return -1; } @@ -78,7 +78,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -d option needs a debuglevel\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -d option needs a debuglevel\n")); this->print_usage (); return -1; } @@ -92,7 +92,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -e option needs " + ORBSVCS_ERROR ((LM_ERROR, "Error: -e option needs " "an environment buffer length\n")); this->print_usage (); return -1; @@ -107,7 +107,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -m option needs " + ORBSVCS_ERROR ((LM_ERROR, "Error: -m option needs " "a maximum number of environment vars\n")); this->print_usage (); return -1; @@ -122,7 +122,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -o option needs a filename\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -o option needs a filename\n")); this->print_usage (); return -1; } @@ -148,7 +148,7 @@ Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -n option needs a name\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -n option needs a name\n")); this->print_usage (); return -1; } @@ -199,7 +199,7 @@ Activator_Options::init_from_registry (void) void Activator_Options::print_usage (void) const { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Usage:\n" "\n" "ImR_Activator [-c cmd] [-d 0|1|2] [-e buflen] [-o file] [-l] [-n name] [-m maxenv]\n" diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp index 7901744ad84..605bfb6a268 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp @@ -11,7 +11,7 @@ #include "Adapter_Activator.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "tao/PortableServer/Servant_Base.h" ImR_Adapter::ImR_Adapter (void) @@ -22,7 +22,7 @@ ImR_Adapter::ImR_Adapter (void) void ImR_Adapter::init (TAO_ServantBase * servant) { - ACE_DEBUG ((LM_DEBUG, "ImR_Adapter::init with default servant\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR_Adapter::init with default servant\n")); default_servant_ = servant; } @@ -75,7 +75,7 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent, } catch (const CORBA::Exception& ex) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "IMR_Adapter_Activator::unknown_adapter - %s\n", exception_message)); ex._tao_print_exception ("System Exception"); diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp index 75094848da1..80e352d26d7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp @@ -140,7 +140,7 @@ Config_Backing_Store::remove (const ACE_CString& name, const ACE_TCHAR* key) { if (this->opts_.debug () > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("could not remove %C, already gone!\n"), + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("could not remove %C, already gone!\n"), name.c_str())); } return 0; // Already gone. @@ -156,14 +156,14 @@ static int get_key (ACE_Configuration& cfg, const ACE_CString& name, int err = cfg.open_section (cfg.root_section(), sub_section, 1, root); if (err != 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to open config section:%s\n"), + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unable to open config section:%s\n"), sub_section)); return err; } err = cfg.open_section (root, name.c_str (), 1, key); if (err != 0) { - ACE_ERROR((LM_ERROR, ACE_TEXT ("Unable to open config section:%C\n"), + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT ("Unable to open config section:%C\n"), name.c_str ())); } return err; @@ -176,14 +176,14 @@ Config_Backing_Store::persistent_update(const Server_Info_Ptr& info, bool ) int err = get_key(this->config_, info->name, SERVERS_ROOT_KEY, key); if (err != 0) { - ACE_ERROR((LM_ERROR, ACE_TEXT ("ERROR: could not get key for %C\n"), + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT ("ERROR: could not get key for %C\n"), info->name.c_str ())); return err; } if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("updating %C\n"), info->name.c_str())); + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("updating %C\n"), info->name.c_str())); } ACE_CString envstr = ImR_Utils::envListToString(info->env_vars); @@ -208,7 +208,7 @@ Config_Backing_Store::persistent_update(const Activator_Info_Ptr& info, bool ) int err = get_key (this->config_, info->name, ACTIVATORS_ROOT_KEY, key); if (err != 0) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("ERROR: could not get key for activator %C\n"), info->name.c_str ())); return err; @@ -216,7 +216,7 @@ Config_Backing_Store::persistent_update(const Activator_Info_Ptr& info, bool ) if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("updating activator %C\n"), + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("updating activator %C\n"), info->name.c_str ())); } this->config_.set_integer_value (key, TOKEN, info->token); @@ -232,7 +232,7 @@ Config_Backing_Store::init_repo (PortableServer::POA_ptr ) { if (this->opts_.debug () > 9) { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("not loading\n"))); + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("not loading\n"))); } return status_; } @@ -252,7 +252,7 @@ Heap_Backing_Store::Heap_Backing_Store (const Options& opts, { if (this->opts_.debug () > 9) { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Heap start clean\n"))); + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("Heap start clean\n"))); } ACE_OS::unlink ( this->filename_.c_str() ); } @@ -298,7 +298,7 @@ Registry_Backing_Store::Registry_Backing_Store(const Options& opts, #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) status_ = 0; #else - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Registry persistence is only ") + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Registry persistence is only ") ACE_TEXT ("supported on Windows\n"))); status_ = -1; #endif diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index c6b7b470c39..c8fc129382f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -205,14 +205,14 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ImR_DSI_ResponseHandler::send_ior (): Forward_to ") ACE_TEXT ("reference is nil.\n"))); } } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ImR_ResponseHandler::send_ior (): Invalid corbaloc ior.\n") ACE_TEXT ("\t<%s>\n"), ior.c_str())); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index 4e9843969ea..54480a133db 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -92,7 +92,7 @@ run_service (void) ACE_NT_SERVICE_RUN (service, SERVICE::instance (), ret); if (ret == 0) - ACE_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); return ret; #else /* ACE_WIN32 */ @@ -124,7 +124,7 @@ run_service_command (Activator_Options& opts) DWORD length = ACE_TEXT_GetModuleFileName(0, pathname, MAX_PATH_LENGTH); if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s")) { - ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: Could not get module file name\n")); return -1; } @@ -152,12 +152,12 @@ run_service_command (Activator_Options& opts) } if (ret != -1) { - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n")); opts.save_registry_options (); } else { - ACE_ERROR ((LM_ERROR, "Error: Failed to install service.\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: Failed to install service.\n")); } if (ret == 0) return 1; @@ -165,13 +165,13 @@ run_service_command (Activator_Options& opts) else if (opts.service_command () == Activator_Options::SC_REMOVE) { int ret = SERVICE::instance ()->remove (); - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n")); if (ret == 0) return 1; // If successful, then we don't want to continue. } else { - ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d\n", + ORBSVCS_ERROR ((LM_ERROR, "Error: Unknown service command :%d\n", opts.service_command ())); return -1; } @@ -179,7 +179,7 @@ run_service_command (Activator_Options& opts) return -1; #else /* ACE_WIN32 */ - ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform")); + ORBSVCS_ERROR ((LM_ERROR, "NT Service not supported on this platform")); return -1; #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index ad7f91357c7..a42272245ce 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -63,7 +63,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti try { if (this->debug_ > 1) - ACE_DEBUG( (LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n")); + ORBSVCS_DEBUG( (LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n")); // First, resolve the ImR, without this we can go no further CORBA::Object_var obj = @@ -79,7 +79,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti if (this->debug_ > 9) { CORBA::String_var ior = orb_->object_to_string (obj.in ()); - ACE_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService ior=<%s>\n", + ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService ior=<%s>\n", ior.in())); } @@ -87,12 +87,12 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti locator_->register_activator (name_.c_str (), activator); if (debug_ > 0) - ACE_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n")); + ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n")); return; } else if (this->debug_ > 1) - ACE_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService not found\n")); + ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService not found\n")); } catch (const CORBA::Exception& ex) { @@ -102,7 +102,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti } if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Not registered with ImR.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Not registered with ImR.\n")); } int @@ -144,7 +144,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt CORBA::String_var ior = this->orb_->object_to_string (activator.in ()); if (this->debug_ > 0) - ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ())); + ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ())); // initialize our process manager. // This requires a reactor that has signal handling. @@ -153,7 +153,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt { if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "The ACE_Process_Manager didnt get initialized\n"), -1); } } @@ -166,7 +166,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: The Activator IOR is: <%s>\n", ior.in ())); } @@ -177,7 +177,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt FILE* fp = ACE_OS::fopen (opts.ior_filename ().c_str (), "w"); if (fp == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "ImR Activator: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1); } ACE_OS::fprintf (fp, "%s", ior.in ()); @@ -217,7 +217,7 @@ ImR_Activator_i::fini (void) try { if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down...\n")); this->process_mgr_.close (); @@ -232,12 +232,12 @@ ImR_Activator_i::fini (void) catch (const CORBA::COMM_FAILURE&) { if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n")); } catch (const CORBA::TRANSIENT&) { if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n")); } catch (const CORBA::Exception& ex) { @@ -250,7 +250,7 @@ ImR_Activator_i::fini (void) this->orb_->destroy (); if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shut down successfully.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Shut down successfully.\n")); } catch (const CORBA::Exception& ex) { @@ -286,12 +286,12 @@ ImR_Activator_i::start_server(const char* name, const ImplementationRepository::EnvironmentList & env) { if (debug_ > 1) - ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting server <%s>...\n", name)); + ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: Starting server <%s>...\n", name)); ACE_TString cmdline_tstr(ACE_TEXT_CHAR_TO_TCHAR(cmdline)); size_t cmdline_buf_len = cmdline_tstr.length(); if (debug_ > 1) - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, "\tcommand line : len=%d <%s>\n\tdirectory : <%C>\n", cmdline_buf_len, cmdline_tstr.c_str(), dir) ); @@ -328,7 +328,7 @@ ImR_Activator_i::start_server(const char* name, int pid = this->process_mgr_.spawn (proc_opts); if (pid == ACE_INVALID_PID) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ImR Activator: Cannot start server <%s> using <%s>\n", name, cmdline)); throw ImplementationRepository::CannotActivate( @@ -340,7 +340,7 @@ ImR_Activator_i::start_server(const char* name, { if (debug_ > 1) { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: register death handler for process %d\n", pid)); } this->process_mgr_.register_handler (this, pid); @@ -355,7 +355,7 @@ ImR_Activator_i::start_server(const char* name, if (debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR Activator: Successfully started <%s>, pid=%d\n", name, pid)); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Successfully started <%s>, pid=%d\n", name, pid)); } } @@ -368,7 +368,7 @@ ImR_Activator_i::handle_exit (ACE_Process * process) if (debug_ > 0) { - ACE_DEBUG + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Process %d exited with exit code %d\n"), process->getpid (), process->return_value ())); @@ -383,7 +383,7 @@ ImR_Activator_i::handle_exit (ACE_Process * process) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR Activator: Notifying ImR that %s has exited.\n"), name.c_str())); } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp index d244e2b2baf..2a7b5aeb786 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp @@ -91,7 +91,7 @@ run_service (void) ACE_NT_SERVICE_RUN (service, SERVICE::instance (), ret); if (ret == 0) - ACE_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); return ret; #else /* ACE_WIN32 */ @@ -122,7 +122,7 @@ run_service_command (Options& opts) DWORD length = ACE_TEXT_GetModuleFileName (0, pathname, MAX_PATH_LENGTH); if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s")) { - ACE_ERROR ((LM_ERROR, "Error: Could not get module file name\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: Could not get module file name\n")); return -1; } @@ -134,12 +134,12 @@ run_service_command (Options& opts) pathname); if (ret != -1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Service installed.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR: Service installed.\n")); opts.save_registry_options (); } else { - ACE_ERROR ((LM_ERROR, "Error: Failed to install service. error:%d\n", errno)); + ORBSVCS_ERROR ((LM_ERROR, "Error: Failed to install service. error:%d\n", errno)); } if (ret == 0) return 1; @@ -147,13 +147,13 @@ run_service_command (Options& opts) else if (opts.service_command () == Options::SC_REMOVE) { int ret = SERVICE::instance ()->remove (); - ACE_DEBUG ((LM_DEBUG, "ImR: Service removed.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR: Service removed.\n")); if (ret == 0) return 1; // If successful, then we don't want to continue. } else { - ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d\n", + ORBSVCS_ERROR ((LM_ERROR, "Error: Unknown service command :%d\n", opts.service_command ())); return -1; } @@ -161,7 +161,7 @@ run_service_command (Options& opts) return -1; #else /* ACE_WIN32 */ - ACE_ERROR ((LM_ERROR, "NT Service not supported on this platform")); + ORBSVCS_ERROR ((LM_ERROR, "NT Service not supported on this platform")); return -1; #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index f2ea2b9de4f..8ac9a116de5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -149,7 +149,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts) bool invalid_rmode_specified = false; ACE_ASSERT (invalid_rmode_specified); ACE_UNUSED_ARG (invalid_rmode_specified); - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Repository failed to initialize\n")), -1); } } @@ -191,7 +191,7 @@ ImR_Locator_i::run (void) // When this was a single debug message, the value for // debug () came out garbled and the read-only string // caused an ACCESS VIOLATION -- Chad Elliott 10/4/2006 - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Implementation Repository: Running\n") ACE_TEXT ("\tPing Interval : %dms\n") ACE_TEXT ("\tStartup Timeout : %ds\n") @@ -202,7 +202,7 @@ ImR_Locator_i::run (void) this->repository_->repo_mode (), (this->repository_->multicast () != 0 ? "Enabled" : "Disabled"))); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\tDebug : %d\n") ACE_TEXT ("\tLocked : %C\n\n"), debug (), @@ -224,7 +224,7 @@ ImR_Locator_i::shutdown if (servers != 0 && this->repository_->servers ().current_size () > 0) { // Note : shutdown is oneway, so we can't throw - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("ImR: Shutdown of all servers not implemented.\n"))); } @@ -263,7 +263,7 @@ ImR_Locator_i::shutdown } if (debug_ > 0 && shutdown_errs > 0) { - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("ImR: Some activators could not be shut down.\n"))); } @@ -287,14 +287,14 @@ ImR_Locator_i::fini (void) try { if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shutting down...\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shutting down...\n"))); this->root_poa_->destroy (1, 1); this->orb_->destroy (); if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shut down successfully.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shut down successfully.\n"))); } catch (CORBA::Exception& ex) { @@ -327,7 +327,7 @@ ImR_Locator_i::register_activator ACE_UNUSED_ARG (err); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator registered for %C.\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator registered for %C.\n"), aname)); _tao_rh->register_activator (token); @@ -346,7 +346,7 @@ ImR_Locator_i::unregister_activator { if (info->token != token && this->debug_ > 0) { - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("ImR: Ignoring unregister activator:%C. Wrong token.\n"), aname)); @@ -357,13 +357,13 @@ ImR_Locator_i::unregister_activator this->unregister_activator_i (aname); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator %C unregistered.\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator %C unregistered.\n"), aname)); } else { if (this->debug_ > 0) - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("ImR: Ignoring unregister activator: %C. ") ACE_TEXT ("Unknown activator.\n"), @@ -388,7 +388,7 @@ ImR_Locator_i::notify_child_death ACE_ASSERT (name != 0); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server has died <%C>.\n"), name)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server has died <%C>.\n"), name)); UpdateableServerInfo info(this->repository_.get(), name); if (! info.null ()) @@ -399,7 +399,7 @@ ImR_Locator_i::notify_child_death else { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Failed to find server in repository.\n"))); } _tao_rh->notify_child_death (); @@ -435,7 +435,7 @@ ImR_Locator_i::activate_server { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Manually activating server <%C>\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Manually activating server <%C>\n"), server)); } @@ -561,7 +561,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Unable to set timeout policy.\n"))); } ret = CORBA::Object::_duplicate (obj); @@ -586,7 +586,7 @@ ImR_Locator_i::add_or_update_server if (this->read_only_) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Cannot add/update server <%C> due to locked ") ACE_TEXT ("database.\n"), server)); @@ -600,7 +600,7 @@ ImR_Locator_i::add_or_update_server } if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Add/Update server <%C>.\n"), server)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Add/Update server <%C>.\n"), server)); int limit = options.start_limit; if (limit < 0) @@ -620,7 +620,7 @@ ImR_Locator_i::add_or_update_server if (info.null ()) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Adding server <%C>.\n"), server)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Adding server <%C>.\n"), server)); this->repository_->add_server ("", serverKey, @@ -635,7 +635,7 @@ ImR_Locator_i::add_or_update_server else { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Updating server <%C>.\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Updating server <%C>.\n"), server)); info.edit ()->activator = options.activator.in (); @@ -652,7 +652,7 @@ ImR_Locator_i::add_or_update_server if (this->debug_ > 1) { // Note : The info var may be null, so we use options. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server: %C\n") + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server: %C\n") ACE_TEXT ("\tActivator: %C\n") ACE_TEXT ("\tCommand Line: %C\n") ACE_TEXT ("\tWorking Directory: %C\n") @@ -668,7 +668,7 @@ ImR_Locator_i::add_or_update_server )); for (CORBA::ULong i = 0; i < options.environment.length (); ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Environment variable %C=%C\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Environment variable %C=%C\n"), options.environment[i].name.in (), options.environment[i].value.in ())); } @@ -709,7 +709,7 @@ ImR_Locator_i::remove_server ACE_ASSERT (name != 0); if (this->read_only_) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ImR: Can't remove server <%C> due to locked database.\n"), name)); CORBA::Exception *ex = @@ -735,7 +735,7 @@ ImR_Locator_i::remove_server if (this->repository_->remove_server (serverKey) == 0) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Removing Server <%C>...\n"), name)); @@ -747,14 +747,14 @@ ImR_Locator_i::remove_server poa->destroy (etherealize, wait); } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Removed Server <%C>.\n"), name)); } } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ImR: Can't remove unknown server <%C>.\n"), name)); CORBA::Exception *ex = new ImplementationRepository::NotFound; ImplementationRepository::AMH_AdministrationExceptionHolder h (ex); @@ -786,7 +786,7 @@ ImR_Locator_i::shutdown_server ACE_ASSERT (server != 0); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shutting down server <%C>.\n"), server)); @@ -798,7 +798,7 @@ ImR_Locator_i::shutdown_server UpdateableServerInfo info(this->repository_.get(), name); if (info.null ()) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ImR: shutdown_server () Cannot find info for server <%C>\n"), server)); CORBA::Exception *ex = new ImplementationRepository::NotFound; @@ -811,7 +811,7 @@ ImR_Locator_i::shutdown_server if (CORBA::is_nil (info->server.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ImR: shutdown_server () Cannot connect to server <%C>\n"), server)); CORBA::Exception *ex = new ImplementationRepository::NotFound; @@ -842,7 +842,7 @@ ImR_Locator_i::shutdown_server // the server to finish shutting down. if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Timeout while waiting for <%C> shutdown.\n"), server)); } @@ -854,7 +854,7 @@ ImR_Locator_i::shutdown_server { if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Exception ignored while shutting down <%C>\n"), server)); } @@ -883,7 +883,7 @@ ImR_Locator_i::server_is_running this->parse_id(id, server_id, name, jacorb_server); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %C is running at %C.\n"), name.c_str (), partial_ior)); @@ -891,7 +891,7 @@ ImR_Locator_i::server_is_running CORBA::String_var ior = orb_->object_to_string (server); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %C callback at %C.\n"), name.c_str (), ior.in ())); @@ -907,7 +907,7 @@ ImR_Locator_i::server_is_running { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Auto adding NORMAL server <%C>.\n"), name.c_str ())); } @@ -932,7 +932,7 @@ ImR_Locator_i::server_is_running { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Auto adding failed, giving up <%C>\n"), name.c_str ())); } @@ -953,7 +953,7 @@ ImR_Locator_i::server_is_running if (info->server_id != server_id) { if (! info->server_id.empty()) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR - WARNING: server \"%C\" changed server id from ") ACE_TEXT ("\"%C\" to \"%C\" waiting PER_CLIENT clients.\n"), name.c_str (), info->server_id.c_str (), server_id.c_str ())); @@ -999,7 +999,7 @@ ImR_Locator_i::server_is_shutting_down { if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR_Locator_i::server_is_shutting_down: ") ACE_TEXT ("Unknown server:%C\n"), server)); @@ -1009,7 +1009,7 @@ ImR_Locator_i::server_is_shutting_down } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server <%C> is shutting down.\n"), server)); @@ -1048,7 +1048,7 @@ ImR_Locator_i::find imr_info = info->createImRServerInfo (); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Found server %C.\n"), server)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Found server %C.\n"), server)); } else { @@ -1056,7 +1056,7 @@ ImR_Locator_i::find CORBA::NO_MEMORY ()); imr_info->startup.activation= ImplementationRepository::NORMAL; if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Cannot find server <%C>\n"), server)); } @@ -1081,7 +1081,7 @@ ImR_Locator_i::list ImplementationRepository::ServerInformationIterator_var server_iterator; if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: List servers.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: List servers.\n"))); // Initialize the out variables, so if we return early, they will // not be dangling. @@ -1114,7 +1114,7 @@ ImR_Locator_i::list if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR_Locator_i::list: Filling ServerList with %d servers\n"), n)); } @@ -1141,7 +1141,7 @@ ImR_Locator_i::list imr_info->activeStatus = ImplementationRepository::ACTIVE_NO; if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %s is not active\n"), info.name.c_str ())); } @@ -1153,7 +1153,7 @@ ImR_Locator_i::list if (this->repository_->servers ().current_size () > n) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR_Locator_i::list: Creating ServerInformation ") ACE_TEXT ("Iterator\n"))); @@ -1224,7 +1224,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info) } if (debug_ > 1) - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("ImR: Connected to activator <%C>\n"), info.name.c_str ())); @@ -1265,7 +1265,7 @@ ImR_Locator_i::auto_start_servers (void) { if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: AUTO_START Could not activate <%C>\n"), server_entry->ext_id_.c_str ())); ex._tao_print_exception ("AUTO_START"); @@ -1311,7 +1311,7 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info) } if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Connected to server <%C>\n"), info->name.c_str ())); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp index 55c0d283a25..052b78c9e82 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp @@ -85,7 +85,7 @@ ImR_Locator_Loader::run(void) } catch (...) { - ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner ()\n")); + ORBSVCS_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner ()\n")); return -1; } } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 1d8881e67c0..fc91e77e592 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -10,7 +10,7 @@ #include "Locator_Options.h" #include "ace/Arg_Shifter.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_strings.h" #if defined (ACE_WIN32) @@ -57,7 +57,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -c option needs a command\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -c option needs a command\n")); this->print_usage (); return -1; } @@ -74,7 +74,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("Error: Unknown service command : %s\n"), shifter.get_current ())); @@ -89,7 +89,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -d option needs a debuglevel\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -d option needs a debuglevel\n")); this->print_usage (); return -1; } @@ -108,7 +108,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -o option needs a filename\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -o option needs a filename\n")); this->print_usage (); return -1; } @@ -140,7 +140,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -p option needs a filename\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -p option needs a filename\n")); this->print_usage (); return -1; } @@ -166,7 +166,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, "Error: -x option needs a filename\n")); + ORBSVCS_ERROR ((LM_ERROR, "Error: -x option needs a filename\n")); this->print_usage (); return -1; } @@ -192,7 +192,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error: --directory option needs a filename\n"))); this->print_usage (); return -1; @@ -220,7 +220,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error: -t option needs a value\n"))); this->print_usage (); return -1; @@ -235,7 +235,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if (!shifter.is_anything_left () || shifter.get_current ()[0] == '-') { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error: -v option needs a value\n"))); this->print_usage (); return -1; @@ -255,7 +255,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) if ((this->imr_type_ == BACKUP_IMR || this->imr_type_ == PRIMARY_IMR) && !directory_persistence_used) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: Redundancy is used but the " "--directory option is not passed\n")); this->print_usage (); @@ -266,7 +266,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) xml_persistence_used) > 1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: Only one persistence option can be used\n")); this->print_usage (); return -1; @@ -304,7 +304,7 @@ Options::init_from_registry (void) void Options::print_usage (void) const { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Usage:\n") ACE_TEXT ("\n") ACE_TEXT ("ImplRepo_Service [-c cmd] [-d 0|1|2] [-e] [-m] [-o file]\n") diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index 93c311a3591..ef727e97f33 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -52,13 +52,13 @@ Locator_Repository::report_ior (PortableServer::POA_ptr ) { if (this->registered_) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Repository already reported IOR\n")), -1); } if (this->opts_.debug () > 0) { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("report_ior <%C>\n"), + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("report_ior <%C>\n"), this->imr_ior_.in ())); } @@ -106,7 +106,7 @@ Locator_Repository::report_ior (PortableServer::POA_ptr ) ACE_TEXT("w")); if (fp == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ImR: Could not open file: %s\n"), this->opts_.ior_filename ().c_str ()), -1); } @@ -125,14 +125,14 @@ Locator_Repository::recover_ior (void) { if (this->registered_) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Repository already registered IOR. ") ACE_TEXT ("recover_ior should not be called.\n")), -1); } if (this->opts_.debug () > 0) { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("recover_ior <%C>\n"), + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("recover_ior <%C>\n"), this->opts_.ior_filename ().c_str())); } @@ -230,7 +230,7 @@ Locator_Repository::setup_multicast (ACE_Reactor* reactor, const char* ior) ACE_Event_Handler::READ_MASK) == -1) { if (this->opts_.debug() > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: cannot register Event handler\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR: cannot register Event handler\n")); return -1; } #else /* ACE_HAS_IP_MULTICAST*/ @@ -275,7 +275,7 @@ Locator_Repository::unregister_if_address_reused ( { if (this->opts_.debug() > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: checking reuse address ") ACE_TEXT ("for server \"%C %C\" ior \"%C\"\n"), server_id.c_str(), @@ -293,7 +293,7 @@ Locator_Repository::unregister_if_address_reused ( if (this->opts_.debug() > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: iterating - registered server") ACE_TEXT ("\"%C %C\" ior \"%C\"\n"), info->server_id.c_str(), info->name.c_str (), info->partial_ior.c_str ())); @@ -305,7 +305,7 @@ Locator_Repository::unregister_if_address_reused ( { if (this->opts_.debug() > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: reuse address %C so remove server %C \n"), info->partial_ior.c_str (), info->name.c_str ())); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 2b8dbf523f4..5d9af0cd9f9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -124,7 +124,7 @@ namespace { if (file_lock_.get () == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: attempting to lock ") ACE_TEXT ("an uninitialized Lockable_File."))); this->locked_ = false; @@ -199,17 +199,17 @@ namespace { } catch (const CORBA::COMM_FAILURE&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Replicated ImR: COMM_FAILURE Exception\n"))); } catch (const CORBA::TRANSIENT&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Replicated ImR: TRANSIENT Exception\n"))); } catch (const CORBA::OBJECT_NOT_EXIST&) { - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT("(%P|%t) Replicated ImR: OBJECT_NOT_EXIST ") ACE_TEXT("Exception, dropping replica\n"))); @@ -319,7 +319,7 @@ namespace { entry_repo_type != id.repo_type) { // if already existed, replace the contents - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: replacing %C with existing repo_id=%d ") ACE_TEXT("and imr_type=%d, with repo_id=%d and imr_type=%d\n"), identify_key(key).c_str(), id.repo_id, id.repo_type, @@ -350,7 +350,7 @@ namespace { const int err = unique_ids.find(key, entry); if (err != 0) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) Couldn't find unique repo id for %C\n"), identify_key(key).c_str())); return err; @@ -392,7 +392,7 @@ namespace { const size_t size = extra_params.size(); if ((size != 2) && (debug > 4)) { - ACE_ERROR(( + ORBSVCS_ERROR(( LM_ERROR, ACE_TEXT("(%P|%t) Persisted server id=%C name=%C doesn't have all ") ACE_TEXT("unique id params. (%d of 2)\n"), @@ -404,7 +404,7 @@ namespace { Options::ImrType repo_type = this_repo_type; for (unsigned int i = 0; i < size; ++i) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("name values %C=%C (%C)\n"), extra_params[i].first.c_str(), extra_params[i].second.c_str(), @@ -423,7 +423,7 @@ namespace { ACE_OS::atoi(extra_params[Shared_Backing_Store::REPO_ID].second.c_str()); else { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) Persisted %C did not supply a repo_id\n"), identify_key(key).c_str())); } @@ -509,7 +509,7 @@ Shared_Backing_Store::persistent_update(const Server_Info_Ptr& info, bool add) const ACE_TString fname = this->filename_ + entry.int_id_.unique_filename; if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("Persisting to %s(%C)\n"), + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("Persisting to %s(%C)\n"), fname.c_str(), info->name.c_str())); } Lockable_File server_file(fname, O_WRONLY); @@ -517,7 +517,7 @@ Shared_Backing_Store::persistent_update(const Server_Info_Ptr& info, bool add) FILE* fp = server_file.get_file(); if (fp == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), fname.c_str())); return -1; } @@ -568,7 +568,7 @@ Shared_Backing_Store::persistent_update(const Activator_Info_Ptr& info, const ACE_TString fname = this->filename_ + entry.int_id_.unique_filename; if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("Persisting to %s(%C)\n"), + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("Persisting to %s(%C)\n"), fname.c_str(), info->name.c_str())); } Lockable_File activator_file(fname, O_WRONLY); @@ -576,7 +576,7 @@ Shared_Backing_Store::persistent_update(const Activator_Info_Ptr& info, FILE* fp = activator_file.get_file(); if (fp == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), fname.c_str())); return -1; } @@ -617,7 +617,7 @@ Shared_Backing_Store::connect_replicas (Replica_ptr this_replica) const ACE_TString& replica_ior_file = replica_ior_filename(true); if (this->opts_.debug() > 1) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("Resolving ImR replica %s\n"), replica_ior_file.c_str())); } @@ -677,7 +677,7 @@ Shared_Backing_Store::connect_replicas (Replica_ptr this_replica) // Verify that we recovered the IOR successfully. If we did not // then fail startup of the backup IMR Locator. if (this->recover_ior () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error: Unable to retrieve IOR from combined IOR ") ACE_TEXT ("file: %C\n"), replica_ior_file.c_str()), @@ -686,7 +686,7 @@ Shared_Backing_Store::connect_replicas (Replica_ptr this_replica) else { // There has been a startup error. The backup can only be started // after the primary has been successfully started. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error: Primary has not been started previously.\n ") ACE_TEXT ("file: %C\n"), replica_ior_file.c_str()), @@ -700,7 +700,7 @@ Shared_Backing_Store::connect_replicas (Replica_ptr this_replica) if (opts_.debug() > 1) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("Registering with previously running ImR replica\n"))); } @@ -712,14 +712,14 @@ Shared_Backing_Store::connect_replicas (Replica_ptr this_replica) } catch (const ImplementationRepository::InvalidPeer& ip) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error: obj key <%s> is an invalid ImR replica because %s\n"), replica_ior_file.c_str(), ip.reason.in()), -1); } if (opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("Initializing repository with ft ior=<%C> ") ACE_TEXT("and replica seq number %d\n"), this->imr_ior_.in(), replica_seq_num_)); @@ -759,7 +759,7 @@ Shared_Backing_Store::init_repo(PortableServer::POA_ptr imr_poa) { if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("Persisted Repository already empty\n"))); } } @@ -771,7 +771,7 @@ Shared_Backing_Store::init_repo(PortableServer::POA_ptr imr_poa) { if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("Removing %s\n"), + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("Removing %s\n"), filenames[i].c_str())); } ACE_OS::unlink ( filenames[i].c_str () ); @@ -779,7 +779,7 @@ Shared_Backing_Store::init_repo(PortableServer::POA_ptr imr_poa) if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("Removing %s\n"), + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("Removing %s\n"), this->listing_file_.c_str())); } ACE_OS::unlink ( this->listing_file_.c_str () ); @@ -791,7 +791,7 @@ Shared_Backing_Store::init_repo(PortableServer::POA_ptr imr_poa) if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("ImR Repository initialized\n"))); } @@ -818,7 +818,7 @@ Shared_Backing_Store::persistent_load (bool only_changes) size_t sz = filenames.size (); if (this->opts_.debug() > 9) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("persistent_load %d files\n"), sz)); + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT ("persistent_load %d files\n"), sz)); } for (CORBA::ULong i = 0; i < sz; ++i) { @@ -872,7 +872,7 @@ Shared_Backing_Store::sync_load () int err = 0; if (this->opts_.debug() > 5) { - ACE_DEBUG(( + ORBSVCS_DEBUG(( LM_INFO, ACE_TEXT("(%P|%t) sync_load %d, %d\n"), this->sync_needed_, this->sync_files_.size())); @@ -888,7 +888,7 @@ Shared_Backing_Store::sync_load () { if (this->opts_.debug() > 6) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) sync_load %s\n"), fname->c_str())); } @@ -949,7 +949,7 @@ Shared_Backing_Store::persist_listings (Lockable_File& listing_lf) FILE* list = listing_lf.get_file(this->listing_file_, O_WRONLY); if (list == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), this->listing_file_.c_str())); return -1; } @@ -962,7 +962,7 @@ Shared_Backing_Store::persist_listings (Lockable_File& listing_lf) FILE* baklist = ACE_OS::fopen(bfname.c_str(),ACE_TEXT("w")); if (baklist == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %s\n"), bfname.c_str())); return -1; } @@ -991,7 +991,7 @@ Shared_Backing_Store::report_ior(PortableServer::POA_ptr imr_poa) FILE* fp = ACE_OS::fopen (replica_filename.c_str (), "w"); if (fp == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ImR: Could not open file: %s\n"), replica_filename.c_str ()), -1); } @@ -1114,7 +1114,7 @@ Shared_Backing_Store::notify_updated_server( { if (this->opts_.debug() > 5) { - ACE_DEBUG(( + ORBSVCS_DEBUG(( LM_INFO, ACE_TEXT("(%P|%t) notify_updated_server=%C\n"), server.name.in())); @@ -1153,7 +1153,7 @@ Shared_Backing_Store::notify_updated_activator( { if (this->opts_.debug() > 5) { - ACE_DEBUG(( + ORBSVCS_DEBUG(( LM_INFO, ACE_TEXT("(%P|%t) notify_updated_activator=%C\n"), activator.name.in())); @@ -1199,7 +1199,7 @@ Shared_Backing_Store::register_replica( seq_num = this->seq_num_; if (this->imr_type_ == Options::STANDALONE_IMR) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT("Error: Non-replicated ImR receiving replica ") ACE_TEXT("registration <%s>\n"), ft_imr_ior)); @@ -1217,7 +1217,7 @@ Shared_Backing_Store::register_replica( { if (this->opts_.debug() > 2) { - ACE_DEBUG(( + ORBSVCS_DEBUG(( LM_INFO, ACE_TEXT("(%P|%t) Already registered <%C>\n"), this->imr_ior_.in())); @@ -1254,7 +1254,7 @@ Shared_Backing_Store::register_replica( { // give back the original pointer and don't clean it up ft_imr_ior = ior._retn(); - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, "ERROR: Failed to create Fault Tolerant ImR, reason=%s\n", reason.in())); throw ImplementationRepository::InvalidPeer(reason.in()); @@ -1347,7 +1347,7 @@ Shared_Backing_Store::LocatorListings_XMLHandler::startElement ( } } else - ACE_DEBUG(( + ORBSVCS_DEBUG(( LM_INFO, ACE_TEXT ("LocatorListings_XMLHandler::startElement ") ACE_TEXT ("incorrect number of attrs (%d)\n"), @@ -1374,7 +1374,7 @@ Shared_Backing_Store::LocatorListings_XMLHandler::remove_unmatched( int ret = repo.servers().unbind (sientry->ext_id_); if (ret != 0) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT ("ERROR: could not remove server: %s\n"), sientry->int_id_->name.c_str())); } @@ -1387,7 +1387,7 @@ Shared_Backing_Store::LocatorListings_XMLHandler::remove_unmatched( int ret = repo.activators().unbind (aientry->ext_id_); if (ret != 0) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT ("ERROR: could not remove activator: %s\n"), aientry->int_id_->name.c_str())); } diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp index 285ad7f2e5d..497f78a6736 100644 --- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp @@ -56,7 +56,7 @@ XML_Backing_Store::persist () FILE* fp = ACE_OS::fopen (this->filename_.c_str (), "w"); if (fp == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %C\n"), + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Couldn't write to file %C\n"), this->filename_.c_str())); return -1; } @@ -205,7 +205,7 @@ XML_Backing_Store::load (const ACE_TString& filename, if (debug > 9) { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("load %s%C\n"), filename.c_str(), + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("load %s%C\n"), filename.c_str(), ((err == 0) ? ACE_TEXT ("") : ACE_TEXT (" (file doesn't exist)")))); } @@ -232,7 +232,7 @@ XML_Backing_Store::load (const ACE_TString& filename, } catch ( const ACEXML_SAXParseException* sax_ex) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error during load of ImR persistence xml file (%s)."), filename.c_str())); sax_ex->print (); @@ -240,7 +240,7 @@ XML_Backing_Store::load (const ACE_TString& filename, } catch (const ACEXML_Exception& ex) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error during load of ImR persistence xml file (%s)."), filename.c_str())); ex.print (); diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 2cc1c06a8e4..fefee797014 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -29,7 +29,7 @@ TAO_IMR_i::run () { if (this->op_.get () == 0) { - ACE_ERROR ((LM_ERROR, "Unknown operation")); + ORBSVCS_ERROR ((LM_ERROR, "Unknown operation")); return TAO_IMR_Op::UNKNOWN; } @@ -59,7 +59,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv) if (CORBA::is_nil (obj.in ())) { - ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR.\n")); + ORBSVCS_ERROR ((LM_ERROR, "Unable to resolve the ImR.\n")); return -1; } @@ -70,7 +70,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv) if (CORBA::is_nil (imr_.in ())) { - ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR.\n")); + ORBSVCS_ERROR ((LM_ERROR, "Unable to narrow the ImR.\n")); return -1; } @@ -78,7 +78,7 @@ TAO_IMR_i::init (int argc, ACE_TCHAR **argv) } catch (const CORBA::Exception& ex) { - ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message)); + ORBSVCS_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message)); ex._tao_print_exception ("Exception"); return -1; } @@ -95,7 +95,7 @@ TAO_IMR_i::parse_args (void) // Make sure one command was given if (this->argc_ < 2) { - ACE_ERROR((LM_ERROR, "Error: No operation specified.\n")); + ORBSVCS_ERROR((LM_ERROR, "Error: No operation specified.\n")); this->print_usage (); return -1; } @@ -106,7 +106,7 @@ TAO_IMR_i::parse_args (void) if (this->op_.get () == 0) { - ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", this->argv_[1])); + ORBSVCS_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", this->argv_[1])); this->print_usage (); return -1; } @@ -121,7 +121,7 @@ TAO_IMR_i::parse_args (void) void TAO_IMR_i::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n" + ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n" " where [options] are ORB options\n" " where command is one of the following:\n" " start Start a server through the ImR\n" @@ -144,7 +144,7 @@ TAO_IMR_Op::make_op (const ACE_TCHAR *op_name) { if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("activate")) == 0) { - ACE_ERROR((LM_ERROR, "Warning: The activate option has been renamed to start.\n")); + ORBSVCS_ERROR((LM_ERROR, "Warning: The activate option has been renamed to start.\n")); return new TAO_IMR_Op_Activate (); } else if (ACE_OS::strcasecmp (op_name, ACE_TEXT ("start")) == 0) @@ -196,7 +196,7 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn act = "AUTO_START"; // Print out information - ACE_DEBUG ((LM_DEBUG, "Server <%s>\n", info.server.in ())); + ORBSVCS_DEBUG ((LM_DEBUG, "Server <%s>\n", info.server.in ())); const char * locked_out = ""; @@ -207,7 +207,7 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn locked_out = " Locked Out\n"; } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " Activator: %s\n" " Command Line: %s\n" " Working Directory: %s\n" @@ -221,22 +221,22 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn limit - 1, locked_out)); for (CORBA::ULong i = 0; i < info.startup.environment.length (); ++i) - ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s\n", info.startup.environment[i].name.in (), info.startup.environment[i].value.in ())); if (info.startup.activation == ImplementationRepository::PER_CLIENT) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " No running info available for PER_CLIENT mode\n")); else if (ACE_OS::strlen (info.partial_ior.in ()) > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " Running at endpoint: %s\n", info.partial_ior.in ())); else // I am assuming that a blank partial_ior means currently not running. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " Not currently running\n")); - ACE_DEBUG ((LM_DEBUG, "\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "\n")); } TAO_IMR_Op_List::TAO_IMR_Op_List (void) @@ -263,7 +263,7 @@ TAO_IMR_Op_Register::TAO_IMR_Op_Register (bool is_add) void TAO_IMR_Op_Activate::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Starts a server using its registered Activator.\n" + ORBSVCS_ERROR ((LM_ERROR, "Starts a server using its registered Activator.\n" "\n" "Usage: tao_imr [options] start <name>\n" " where [options] are ORB options\n" @@ -295,7 +295,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -306,7 +306,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv) void TAO_IMR_Op_Autostart::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n" + ORBSVCS_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n" " where [options] are ORB options\n" " -h Displays this\n")); } @@ -327,7 +327,7 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -338,7 +338,7 @@ TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv) void TAO_IMR_Op_IOR::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n" + ORBSVCS_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n" "the InterOperable Naming Service. Please see the documentation for\n" "more information on which server configurations work with this command.\n" "\n" @@ -366,7 +366,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) this->server_name_ = ACE_TEXT_ALWAYS_CHAR(argv[1]); if (this->server_name_.length() == 0 || this->server_name_[0] == '-') { - ACE_ERROR((LM_ERROR, "ERROR : name is required.\n")); + ORBSVCS_ERROR((LM_ERROR, "ERROR : name is required.\n")); this->print_usage (); return -1; } @@ -384,7 +384,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -395,7 +395,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) void TAO_IMR_Op_List::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n" + ORBSVCS_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n" "\n" "Usage: tao_imr [options] list [name] [command-arguments]\n" " where [options] are ORB options\n" @@ -437,7 +437,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -448,7 +448,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv) void TAO_IMR_Op_Remove::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Removes a server entry\n" + ORBSVCS_ERROR ((LM_ERROR, "Removes a server entry\n" "\n" "Usage: tao_imr [options] remove <name>\n" " where [options] are ORB options\n" @@ -480,7 +480,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -491,7 +491,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) void TAO_IMR_Op_Shutdown::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Shuts down a server\n" + ORBSVCS_ERROR ((LM_ERROR, "Shuts down a server\n" "\n" "Usage: tao_imr [options] shutdown <name>\n" " where [options] are ORB options\n" @@ -523,7 +523,7 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -539,7 +539,7 @@ TAO_IMR_Op_ShutdownRepo::TAO_IMR_Op_ShutdownRepo() void TAO_IMR_Op_ShutdownRepo::print_usage (void) { - ACE_ERROR ((LM_ERROR, "Shuts down the ImR\n" + ORBSVCS_ERROR ((LM_ERROR, "Shuts down the ImR\n" "\n" "Usage: tao_imr [options] shutdown-repo [-a]\n" " where [options] are ORB options\n" @@ -573,7 +573,7 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv) activators_ = true; break; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -600,7 +600,7 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt) void TAO_IMR_Op_Register::print_usage (void) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Adds/Updates a server entry\n" "\n" "Usage: tao_imr [options] <add|update> <name> [command-arguments]\n" @@ -622,7 +622,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) // Check for enough arguments (we need at least one for the server name) if (argc < 2) { - ACE_ERROR((LM_ERROR, "Error: Must supply at least a server name.\n")); + ORBSVCS_ERROR((LM_ERROR, "Error: Must supply at least a server name.\n")); this->print_usage (); return -1; } @@ -660,7 +660,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("AUTO_START")) == 0) this->activation_ = ImplementationRepository::AUTO_START; else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unknown Activation Mode <%s>.\n", get_opts.opt_arg ()), -1); @@ -682,7 +682,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) this->print_usage (); return -1; default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + ORBSVCS_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); this->print_usage (); return -1; } @@ -702,20 +702,20 @@ TAO_IMR_Op_Activate::run (void) try { this->imr_->activate_server (this->server_name_.c_str ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Successfully Activated server <%C>\n", this->server_name_.c_str ())); } catch (const ImplementationRepository::CannotActivate& ex) { - ACE_ERROR ((LM_ERROR, "Cannot activate server <%C>, reason: <%s>\n", + ORBSVCS_ERROR ((LM_ERROR, "Cannot activate server <%C>, reason: <%s>\n", this->server_name_.c_str (), ex.reason.in ())); return TAO_IMR_Op::CANNOT_ACTIVATE; } catch (const ImplementationRepository::NotFound&) { - ACE_ERROR ((LM_ERROR, "Could not find server <%C>.\n", this->server_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Could not find server <%C>.\n", this->server_name_.c_str ())); return TAO_IMR_Op::NOT_FOUND; } catch (const PortableServer::ForwardRequest&) @@ -786,7 +786,7 @@ TAO_IMR_Op_IOR::run (void) || !this->imr_->_stubobj () || !this->imr_->_stubobj ()->profile_in_use ()) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Invalid ImR IOR.\n") ), -1); @@ -803,7 +803,7 @@ TAO_IMR_Op_IOR::run (void) if (pos == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); } else { @@ -817,7 +817,7 @@ TAO_IMR_Op_IOR::run (void) } else { - ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); } } ACE_CString ior (imr_str.in ()); @@ -834,7 +834,7 @@ TAO_IMR_Op_IOR::run (void) ior += this->server_name_; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s\n"), ior.c_str ())); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%s\n"), ior.c_str ())); if (this->filename_.length () > 0) { @@ -842,7 +842,7 @@ TAO_IMR_Op_IOR::run (void) if (file == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error: Unable to open %s for writing: %p\n"), this->filename_.c_str ()), -1); @@ -882,7 +882,7 @@ TAO_IMR_Op_List::run (void) if (server_list->length() == 0) { - ACE_DEBUG((LM_DEBUG, "No servers found.\n")); + ORBSVCS_DEBUG((LM_DEBUG, "No servers found.\n")); return TAO_IMR_Op::NORMAL; } @@ -904,7 +904,7 @@ TAO_IMR_Op_List::run (void) } catch (const ImplementationRepository::NotFound&) { - ACE_ERROR ((LM_ERROR, "Could not find server <%C>.\n", this->server_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Could not find server <%C>.\n", this->server_name_.c_str ())); return TAO_IMR_Op::NOT_FOUND; } catch (const CORBA::Exception& ex) @@ -925,18 +925,18 @@ TAO_IMR_Op_Remove::run (void) { this->imr_->remove_server (this->server_name_.c_str ()); - ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%C>\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Successfully removed server <%C>\n", this->server_name_.c_str ())); } catch (const ImplementationRepository::NotFound&) { - ACE_ERROR ((LM_ERROR, "Could not find server <%C>.\n", + ORBSVCS_ERROR ((LM_ERROR, "Could not find server <%C>.\n", this->server_name_.c_str ())); return TAO_IMR_Op::NOT_FOUND; } catch (const CORBA::NO_PERMISSION&) { - ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n")); + ORBSVCS_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n")); return TAO_IMR_Op::NO_PERMISSION; } catch (const CORBA::Exception& ex) @@ -957,17 +957,17 @@ TAO_IMR_Op_Shutdown::run (void) { this->imr_->shutdown_server (this->server_name_.c_str ()); - ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%C>\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Successfully shut down server <%C>\n", this->server_name_.c_str ())); } catch (const ImplementationRepository::NotFound&) { - ACE_ERROR ((LM_ERROR, "Server <%C> already shut down.\n", this->server_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Server <%C> already shut down.\n", this->server_name_.c_str ())); return TAO_IMR_Op::NOT_FOUND; } catch (const CORBA::TIMEOUT&) { - ACE_DEBUG ((LM_DEBUG, "Timeout waiting for <%C> to shutdown.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Timeout waiting for <%C> to shutdown.\n", this->server_name_.c_str ())); } catch (const CORBA::Exception& ex) @@ -989,11 +989,11 @@ TAO_IMR_Op_ShutdownRepo::run (void) bool servers = false; // not implemented yet, if ever this->imr_->shutdown (activators_, servers); - ACE_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n")); } catch (const CORBA::TIMEOUT&) { - ACE_DEBUG ((LM_DEBUG, "Timeout waiting for ImR shutdown.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Timeout waiting for ImR shutdown.\n")); } catch (const CORBA::Exception& ex) { @@ -1022,7 +1022,7 @@ TAO_IMR_Op_Register::run (void) { if (is_add_) { - ACE_DEBUG((LM_DEBUG, "Server <%C> already registered.\n", this->server_name_.c_str ())); + ORBSVCS_DEBUG((LM_DEBUG, "Server <%C> already registered.\n", this->server_name_.c_str ())); return ALREADY_REGISTERED; } options = &server_information->startup; @@ -1031,7 +1031,7 @@ TAO_IMR_Op_Register::run (void) { if (!is_add_) { - ACE_DEBUG((LM_DEBUG, "Adding Server <%C> on update command.\n", this->server_name_.c_str ())); + ORBSVCS_DEBUG((LM_DEBUG, "Adding Server <%C> on update command.\n", this->server_name_.c_str ())); is_add_ = true; } local.activation= ImplementationRepository::NORMAL; @@ -1062,17 +1062,17 @@ TAO_IMR_Op_Register::run (void) char host_name[MAXHOSTNAMELEN + 1]; ACE_OS::hostname (host_name, MAXHOSTNAMELEN); options->activator = CORBA::string_dup (host_name); - ACE_DEBUG ((LM_DEBUG, "Updating Server <%C> with default activator of <%s>.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Updating Server <%C> with default activator of <%s>.\n", this->server_name_.c_str (), options->activator.in ())); } this->imr_->add_or_update_server (this->server_name_.c_str (), *options); - ACE_DEBUG((LM_DEBUG, "Successfully registered <%C>.\n", this->server_name_.c_str ())); + ORBSVCS_DEBUG((LM_DEBUG, "Successfully registered <%C>.\n", this->server_name_.c_str ())); } catch (const CORBA::NO_PERMISSION&) { - ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n")); + ORBSVCS_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n")); return TAO_IMR_Op::NO_PERMISSION; } catch (const CORBA::Exception& ex) @@ -1097,5 +1097,5 @@ TAO_IMR_Op_List::display_server_information (const ImplementationRepository::Ser if (this->verbose_server_information_) TAO_IMR_Op::display_server_information (info); else - ACE_DEBUG ((LM_DEBUG, "<%s>\n", info.server.in ())); + ORBSVCS_DEBUG ((LM_DEBUG, "<%s>\n", info.server.in ())); } diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index aced8420040..1e7b7d26d54 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -116,7 +116,7 @@ Factory_Trader::_cxx_export (const char * name, { if (CORBA::is_nil(object_ptr)) { - ACE_ERROR ((LM_ERROR, "LifeCycle Server (Factory_Trader::export): " + ORBSVCS_ERROR ((LM_ERROR, "LifeCycle Server (Factory_Trader::export): " "Object pointer is nil, cannot export!\n")); return; } @@ -197,13 +197,13 @@ Factory_Trader::query (const char* constraint) object_ptr = CORBA::Object::_duplicate (offerSeq_var[0u].reference.in()); if (CORBA::is_nil (object_ptr)) - ACE_ERROR_RETURN ((LM_ERROR,"Factory_Trader::query: Object reference is nil.\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"Factory_Trader::query: Object reference is nil.\n"), 0); else if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Factory_Trader::query: Received a proper object reference.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Factory_Trader::query: Received a proper object reference.\n")); } else - ACE_ERROR ((LM_ERROR, "Factory_Trader::query: OfferSequence.length is smaller than 1.\n")); + ORBSVCS_ERROR ((LM_ERROR, "Factory_Trader::query: OfferSequence.length is smaller than 1.\n")); } return object_ptr; } diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index fad363a4c76..f307f797a23 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -52,7 +52,7 @@ Life_Cycle_Service_Server::init (int argc, command.get_TCHAR_argv()); if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("init")), -1); @@ -61,7 +61,7 @@ Life_Cycle_Service_Server::init (int argc, retval = this->orb_manager_.activate_poa_manager (); if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1); this->parse_args (command.get_argc(), command.get_TCHAR_argv()); @@ -75,13 +75,13 @@ Life_Cycle_Service_Server::init (int argc, this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%C>\n", str.in ())); + ORBSVCS_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%C>\n", str.in ())); // Register the LifeCycle Service with the Naming Service. try { if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("LifeCycle_Service: Trying to get a reference to the Naming Service.\n"))); // Get the Naming Service object reference. @@ -89,7 +89,7 @@ Life_Cycle_Service_Server::init (int argc, orb_manager_.orb()->resolve_initial_references ("NameService"); if (CORBA::is_nil (namingObj_var.in ())) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, " LifeCycle_Service: Unable get the Naming Service.\n")); // Narrow the object reference to a Naming Context. @@ -97,11 +97,11 @@ Life_Cycle_Service_Server::init (int argc, if (CORBA::is_nil (namingContext_var_.in ())) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "LifeCycle_Service: Unable get the Naming Service.\n")); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("LifeCycle_Service: Have a proper reference to the Naming Service.\n"))); CosNaming::Name life_Cycle_Service_Name (1); @@ -114,7 +114,7 @@ Life_Cycle_Service_Server::init (int argc, tmp); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("LifeCycle_Service: Bound the LifeCycle Service to the Naming Context.\n"))); } catch (const CORBA::Exception& ex) @@ -131,7 +131,7 @@ int Life_Cycle_Service_Server::run (void) { if (this->debug_level_ >= 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("\nLifeCycle Service: Life_Cycle_Service_Server is running\n"))); orb_manager_.orb()->run (); @@ -158,11 +158,11 @@ Life_Cycle_Service_Server::parse_args (int argc, break; default: exit_code = 1; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%s: unknown arg, -%c\n", argv[0], char(opt))); case '?': - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("usage: %s") ACE_TEXT(" [-d] <debug level> - Set the debug level\n") ACE_TEXT(" [-?] - Prints this message\n") diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index fed71de5836..f87a57b51d9 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -43,7 +43,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria) { if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: called.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: called.\n")); // Exceptions are forwarded, not handled !! if (factory_trader_ptr_ != 0) @@ -51,28 +51,28 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, Criteria_Evaluator criteria_Evaluator(the_criteria); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: new evaluator.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: new evaluator.\n")); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n")); char* filter = criteria_Evaluator.getFilter (); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query(%s) will be called.\n",filter)); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query(%s) will be called.\n",filter)); CORBA::Object_ptr genericFactoryObj_ptr = factory_trader_ptr_->query (filter); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query was called.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query was called.\n")); if (CORBA::is_nil (genericFactoryObj_ptr)) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Life_Cycle_Service_i::create_object: Factory is nil!\n"), 0); else // everyting is ok if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Object reference OK.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Object reference OK.\n")); // Now we have a proper reference to a Generic Factory // the create_object call will be forwarded to this factory @@ -97,28 +97,28 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, } if (CORBA::is_nil (genericFactory_var.in())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Life_Cycle_Service_i::create_object: Invalid Generic Factory.\n"), 0); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Generic Factory reference OK.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Generic Factory reference OK.\n")); // Now retrieve the Object obj ref corresponding to the key. CORBA::Object_var object_var = genericFactory_var->create_object (factory_key, the_criteria); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Forwarded request.\n")); if (CORBA::is_nil (object_var.in())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Life_Cycle_Service_i::create_object: Null object refeference returned by factory.\n"), 0); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Return a object reference to a new object.\n")); return CORBA::Object::_duplicate (object_var.in()); @@ -145,7 +145,7 @@ Life_Cycle_Service_i::register_factory (const char * name, factory_trader_ptr_->_cxx_export (name, location, description, object); if (this->debug_level_ >= 1) - ACE_DEBUG ((LM_DEBUG, "LifeCycle Server: Registered %s\n" + ORBSVCS_DEBUG ((LM_DEBUG, "LifeCycle Server: Registered %s\n" " Location: %s\n" " Description: %s\n", name, location, description)); diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index 237047cce37..d02dbf8b0f3 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -20,7 +20,7 @@ static int ping_interval_seconds = 0; void usage (const ACE_TCHAR * cmd) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("Usage:\n") ACE_TEXT (" %s\n") ACE_TEXT (" -o <ior_output_file>\n") @@ -62,7 +62,7 @@ parse_args (int argc, ACE_TEXT("LeastLoaded")) == 0) default_strategy = 2; else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Unknown strategy, using RoundRobin\n"))); break; case 'i': @@ -182,7 +182,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) strategy_info.name = CORBA::string_dup ("LeastLoaded"); break; default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: LoadBalancer internal error.\n") ACE_TEXT (" Unknown built-in strategy.\n")), -1); @@ -215,7 +215,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (ACE_Thread_Manager::instance ()->spawn (::TAO_LB_run_load_manager, orb.in ()) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "ERROR: Unable to spawn TAO LoadManager's " "ORB thread.\n"), -1); @@ -230,7 +230,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Block waiting for the registered signals. if (ACE_OS::sigwait (sigset, &signum) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "ERROR waiting on signal"), -1); @@ -245,7 +245,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (signal_handler.activate () != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error: can't activate LB signal handler, exiting.\n"), -1); } @@ -265,7 +265,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // catch (const PortableGroup::InvalidProperty& ex) // { -// ACE_DEBUG ((LM_DEBUG, "Property ----> %s\n", ex.nam[0].id.in ())); +// ORBSVCS_DEBUG ((LM_DEBUG, "Property ----> %s\n", ex.nam[0].id.in ())); // } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index 7f6e6b8f473..815527f2281 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -26,7 +26,7 @@ static long push_interval = TAO_LB_PULL_HANDLER_INTERVAL; void usage (const ACE_TCHAR * cmd) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("Usage:\n") ACE_TEXT (" %s\n") ACE_TEXT (" -l <location_id>\n") @@ -79,7 +79,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) push_interval = ACE_OS::atoi (s); if (push_interval < 1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Invalid push interval: %s\n"), s)); @@ -167,7 +167,7 @@ get_load_monitor (CORBA::ORB_ptr orb, || ACE_OS::strcasecmp (::mtype, ACE_TEXT("Memory")) == 0 || ACE_OS::strcasecmp (::mtype, ACE_TEXT("Network")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: \"%s\" load monitor currently ") ACE_TEXT ("unimplemented.\n"), ::mtype)); @@ -176,7 +176,7 @@ get_load_monitor (CORBA::ORB_ptr orb, } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unrecognized built-in load monitor ") ACE_TEXT ("type: <%s>.\n"), ::mtype)); @@ -212,7 +212,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, if (timer_id == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to schedule timer for ") ACE_TEXT ("\"PUSH\" style load monitoring.\n"))); @@ -221,7 +221,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unrecognized load monitoring ") ACE_TEXT ("style: <%s>.\n"), ::mstyle)); @@ -283,7 +283,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (ACE_Thread_Manager::instance ()->spawn (::TAO_LB_run_load_monitor, orb.in ()) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "ERROR: Unable to spawn TAO LoadMonitor's " "ORB thread.\n"), -1); @@ -298,7 +298,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Block waiting for the registered signals. if (ACE_OS::sigwait (sigset, &signum) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "ERROR waiting on signal"), -1); @@ -346,7 +346,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (timer_id != -1 && reactor->cancel_timer (timer_id) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to cancel \"push\" load ") ACE_TEXT ("monitoring timer.\n"))); diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp index 985cf5267be..80984b64f60 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp @@ -30,7 +30,7 @@ TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum) { ex._tao_print_exception ("Caught exception"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Problem during LoadMonitor cleanup " "initiated by signal %d.\n", signum), diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp index a11f4723eeb..b1883c310b7 100644 --- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp @@ -23,7 +23,7 @@ TAO_LB_Push_Handler::handle_timeout ( CosLoadBalancing::LoadList_var loads = this->monitor_->loads (); -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "PUSHING LOAD:\n" // " id: %u\n" // " value: %f\n", diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp index dc1f3acf257..0d9fbc27eef 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -30,7 +30,7 @@ TAO_LB_Signal_Handler::svc (void) // Block waiting for the registered signals. if (ACE_OS::sigwait (this->sigset_, &signum) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "ERROR waiting on signal"), -1); @@ -38,7 +38,7 @@ TAO_LB_Signal_Handler::svc (void) ACE_ASSERT (signum == SIGINT || signum == SIGTERM); -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // ACE_TEXT ("(%P|%t) synchronous signal handler done\n"))); return this->perform_cleanup (signum); @@ -95,7 +95,7 @@ TAO_LB_Signal_Handler::activate (long flags, int TAO_LB_Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) { -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // ACE_TEXT ("(%P|%t) ASYNCHRONOUS signal handler done\n"))); // This method is only used in the asynchronous signal handling case @@ -128,7 +128,7 @@ TAO_LB_Signal_Handler::perform_cleanup (int signum) { ex._tao_print_exception ("Caught exception"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Problem during cleanup initiated by signal %d.\n", signum), -1); diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp index 7ca6044c88c..5957b9683d3 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp @@ -27,7 +27,7 @@ void Logging_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Basic_Logging_Service: shutting down on signal %d\n", which_signal)); @@ -50,13 +50,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) rc = service.init (argc, argv); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to initialize the Telecom Log Service.\n"), 1); rc = service.run (); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to start the Telecom Log Service.\n"), 1); } diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index 5df01ba1da6..9946f7caa5f 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -71,7 +71,7 @@ Basic_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Usage: %s " "-n service_name " "-o ior_file_name " @@ -121,7 +121,7 @@ Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[]) FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", this->ior_file_name_), -1); diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp index a17b9eb00f1..565956c67b6 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp @@ -27,7 +27,7 @@ void Logging_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Event_Logging_Service: shutting down on signal %d\n", which_signal)); @@ -50,13 +50,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int rc = service.init (argc, argv); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to initialize the Telecom Log Service.\n"), 1); rc = service.run (); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to start the Telecom Log Service.\n"), 1); } diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index 4e0fa703fc0..4e3ec979e9c 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -72,7 +72,7 @@ Event_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Usage: %s " "-n service_name " "-o ior_file_name " @@ -126,7 +126,7 @@ Event_Logging_Service::init (int argc, ACE_TCHAR *argv[]) FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", this->ior_file_name_), -1); diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp index 4d40592098a..ac29a4f1a80 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp @@ -26,7 +26,7 @@ void Logging_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Notify_Logging_Service: shutting down on signal %d\n", which_signal)); @@ -49,13 +49,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) rc = service.init (argc, argv); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to initialize the Telecom Log Service.\n"), 1); rc = service.run (); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to start the Telecom Log Service.\n"), 1); } diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 8ffcc60902d..fc3fbe145bc 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -32,7 +32,7 @@ Notify_Logging_Service::init_ORB (int& argc, ACE_TCHAR *argv []) if (this->notify_service_ == 0) { - ACE_DEBUG ((LM_DEBUG, "Notify Service not found! check conf. file\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify Service not found! check conf. file\n")); return -1; } @@ -40,7 +40,7 @@ Notify_Logging_Service::init_ORB (int& argc, ACE_TCHAR *argv []) this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n"), -1); @@ -87,7 +87,7 @@ Notify_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Usage: %s " "-n service_name " "-o ior_file_name " @@ -147,7 +147,7 @@ Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[]) FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", this->ior_file_name_), -1); diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp index 533ff147b66..86d8c03770f 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp @@ -28,7 +28,7 @@ void Logging_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "RTEvent_Logging_Service: shutting down on signal %d\n", which_signal)); @@ -53,13 +53,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) rc = service.init (argc, argv); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to initialize the Telecom Log Service.\n"), 1); rc = service.run (); if (rc == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to start the Telecom Log Service.\n"), 1); } diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 76f6a1b22bb..4d978ce4b51 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -71,7 +71,7 @@ RTEvent_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Usage: %s " "-n service_name " "-o ior_file_name " @@ -104,7 +104,7 @@ RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[]) if (this->rtevent_log_factory_->init (orb_.in (), poa_.in ()) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to initialize " "the factory.\n"), -1); @@ -132,7 +132,7 @@ RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[]) FILE* iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", this->ior_file_name_), -1); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index f13ebbcbe59..f100dc7b3c3 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -15,14 +15,14 @@ //============================================================================= -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) int ACE_TMAIN(int, ACE_TCHAR *[]) { - ACE_ERROR ((LM_INFO, + ORBSVCS_ERROR ((LM_INFO, "This program is only supported " "on Win32 platforms\n")); return 1; @@ -93,7 +93,7 @@ Options::~Options (void) void Options::print_usage_and_die (void) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("Usage: %s") ACE_TEXT(" -in -r -s -k -tn -d\n") ACE_TEXT(" -i: Install this program as an NT service, with specified startup\n") @@ -207,7 +207,7 @@ Options::run (int argc, ACE_TCHAR* argv[]) SERVICE::instance (), ret); if (ret == 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); } diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index a0a3a84fac8..da1f93d7f5f 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -23,7 +23,7 @@ AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service) AutoFinalizer::~AutoFinalizer () { service_.report_status (SERVICE_STOPPED); - ACE_DEBUG ((LM_DEBUG, "Reported service stoped\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Reported service stoped\n")); } @@ -171,19 +171,19 @@ TAO_NT_Naming_Service::svc (void) // destructor will inform the OS of our demise. AutoFinalizer afinalizer (*this); - ACE_DEBUG ((LM_INFO, "Notifying Windows of service startup\n")); + ORBSVCS_DEBUG ((LM_INFO, "Notifying Windows of service startup\n")); report_status (SERVICE_RUNNING); naming_service.run (); } catch (const CORBA::Exception& ex) { - ACE_DEBUG ((LM_INFO, "Exception in service - exitting\n")); + ORBSVCS_DEBUG ((LM_INFO, "Exception in service - exitting\n")); ex._tao_print_exception ("TAO NT Naming Service"); return -1; } - ACE_DEBUG ((LM_INFO, "Exiting gracefully\n")); + ORBSVCS_DEBUG ((LM_INFO, "Exiting gracefully\n")); return 0; } diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp index 0bfcc78a1fc..1ecffede500 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -27,7 +27,7 @@ void Naming_Svc_Shutdown::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Name Service: shutting down on signal %d\n", which_signal)); (void) this->ns_.shutdown (); @@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Service_Shutdown kill_contractor(killer); if (naming_service.init (argc, argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Failed to start the Naming Service.\n")), 1); diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 703e27f02a2..24c55fd04eb 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -17,14 +17,14 @@ //============================================================================= -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) int ACE_TMAIN(int, ACE_TCHAR *[]) { - ACE_ERROR ((LM_INFO, + ORBSVCS_ERROR ((LM_INFO, "This program is only supported " "on Win32 platforms\n")); return 1; @@ -97,7 +97,7 @@ Options::~Options (void) void Options::print_usage_and_die (void) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, "Usage: %s" " -in -r -s -k -tn -d\n" " -i: Install this program as an NT service, with specified startup\n" @@ -211,7 +211,7 @@ Options::run (int argc, ACE_TCHAR* argv[]) SERVICE::instance (), ret); if (ret == 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "Couldn't start service")); } diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp index 16554fa8e2c..f3f6ededce6 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp @@ -33,7 +33,7 @@ void Notify_Service_Shutdown_Functor::operator() (int which_signal) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "shutting down on signal %d\n", which_signal)); (void) this->svc_.fini (); } @@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { if (notify_service.init (argc, argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Failed to initialize the Notification Service.\n")), 1); diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index c23a5471344..818920c08d7 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -66,7 +66,7 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []) this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n"), -1); @@ -142,7 +142,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Service not found. Check service ") ACE_TEXT ("configurator file.\n"))); } @@ -169,7 +169,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Running %d ORB threads\n"), this->nthreads_)); } @@ -188,7 +188,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (worker_.activate (flags, this->nthreads_, 0, priority) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot activate client threads\n"), -1); } } @@ -205,7 +205,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("\nStarting up the Notification Service...\n"))); } @@ -228,7 +228,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Nil IORTable. corbaloc support not enabled.\n")); } } @@ -251,7 +251,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Registered with the naming service as: %C\n", this->notify_factory_name_.c_str())); } @@ -296,7 +296,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Registered an Event Channel with the naming " "service as: %C\n", (*ci).c_str())); @@ -316,7 +316,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) ACE_TEXT("w")); if (ior_output_file == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", this->ior_output_file_name_, "Notify_Service"), -1); @@ -327,7 +327,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]) } else if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("The Notification Event Channel Factory IOR is <%C>\n"), str.in ())); } @@ -345,7 +345,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void) // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the Naming Service.\n"), -1); @@ -353,13 +353,13 @@ TAO_Notify_Service_Driver::resolve_naming_service (void) } catch (CORBA::Exception &) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the Naming Service.\n"), -1); } catch (...) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the Naming Service.\n"), -1); } @@ -370,7 +370,7 @@ int TAO_Notify_Service_Driver::run (void) { if (TAO_debug_level > 0 ) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C: Running the Notification Service\n"), __FILE__)); @@ -523,7 +523,7 @@ TAO_Notify_Service_Driver::parse_args (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Using separate dispatching ORB\n"))); } this->separate_dispatching_orb_ = @@ -533,7 +533,7 @@ TAO_Notify_Service_Driver::parse_args (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("WARNING: Unrecognized ") ACE_TEXT ("argument (%s) to ") ACE_TEXT ("-UseSeparateDispatchingORB.\n"), @@ -585,7 +585,7 @@ TAO_Notify_Service_Driver::parse_args (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT ("-Notify_TPReactor option is deprecated, ") ACE_TEXT ("use -RunThreads option\n"))); } @@ -606,7 +606,7 @@ TAO_Notify_Service_Driver::parse_args (int argc, ACE_TCHAR *argv[]) #else if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT ("WARNING: CORBA Messaging has been disabled.") ACE_TExT ("The timeout will not be applied.\n"))); } @@ -619,7 +619,7 @@ TAO_Notify_Service_Driver::parse_args (int argc, ACE_TCHAR *argv[]) } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0) { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT ("usage: %s -Factory factory_name ") ACE_TEXT ("-Boot -[No]NameSvc ") ACE_TEXT ("-IORoutput file_name ") @@ -660,7 +660,7 @@ LoggingWorker::start () ACE_Dynamic_Service<ACE_Logging_Strategy>::instance ("Logging_Strategy"); if (logging_strategy == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) logging_strategy == 0\n"))); + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) logging_strategy == 0\n"))); } else { @@ -668,7 +668,7 @@ LoggingWorker::start () { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Can not activate the ") ACE_TEXT ("logging event thread\n"))); } @@ -681,7 +681,7 @@ LoggingWorker::start () this->ns_->logging_interval_); if (timer_id_ == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) Failed to schedule ") ACE_TEXT("logging switch timer\n"))); } @@ -695,7 +695,7 @@ LoggingWorker::svc (void) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Running logging reactor \n"))); } started_ = true; @@ -749,7 +749,7 @@ Worker::svc (void) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Failed to get ") ACE_TEXT ("Worker thread priority\n"))); } @@ -758,7 +758,7 @@ Worker::svc (void) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated Worker Thread to run ") ACE_TEXT ("the ORB @ priority:%d\n", priority)); } diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 678584016bf..8a70f9bfb5f 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -77,7 +77,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) break; default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_Scheduling_Service::init: " "unrecognized Scheduler_Type"), -1); } @@ -87,7 +87,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) orb->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to locate the Naming Service.\n"), -1); CosNaming::NamingContext_var naming_context = @@ -99,7 +99,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) CORBA::String_var scheduler_ior_string = orb->object_to_string (scheduler.in ()); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%C>\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%C>\n"), scheduler_ior_string.in ())); // Register the servant with the Naming Context.... @@ -187,7 +187,7 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Usage: %s " "[-n service_name] " "[-p pid_file_name] " @@ -203,7 +203,7 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) case '?': default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Usage: %s " "[-n service_name] " "[-p pid_file_name] " @@ -225,13 +225,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { TAO_Scheduling_Service scheduling_service; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s; initializing scheduling service\n", __FILE__)); if (scheduling_service.init (argc, argv) < 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), 1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), 1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s; running scheduling service\n", __FILE__)); scheduling_service.run (); diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp index a5b9df174b5..44ef5c5ef25 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -18,7 +18,7 @@ #include "tao/ORB_Constants.h" #include "tao/ORB.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Signal.h" #include "ace/Time_Value.h" #include "ace/Argv_Type_Converter.h" @@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->perform_work (tv); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Reconfig flag = %d\n", ACE_Service_Config::reconfig_occurred ())); diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index 189991f6f26..e2271357e74 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -42,7 +42,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) ACE_HANDLE f_handle = ACE_OS::open (filename, 0); if (f_handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[CLIENT] Process/Thread Id : (%P/%t) Unable to open %s for writing: %p\n"), filename), -1); @@ -53,7 +53,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) char *data = ior_buffer.read (EOF,'\n','\n'); if (data == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[CLIENT] Process/Thread Id : (%P/%t) Unable to read ior: %p\n")), -1); @@ -65,7 +65,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) str != 0 ; str = ACE_OS::strtok (0, "\n")) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("iors -> |%C|\n"), str)); @@ -75,7 +75,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) // Return if the server reference is nil. if (CORBA::is_nil (objref.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("IOR for the server is Null\n"))); result = -1; break; @@ -129,7 +129,7 @@ Clerk_i::parse_args (int argc, result = this->read_ior (get_opts.opt_arg ()); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to read ior from %s : %p\n"), get_opts.opt_arg ()), -1); @@ -140,7 +140,7 @@ Clerk_i::parse_args (int argc, ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %\n"), get_opts.opt_arg ()), -1); break; @@ -148,7 +148,7 @@ Clerk_i::parse_args (int argc, case '?': // display help for use of the server. /* FALLTHRU */ default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)") ACE_TEXT("usage: %s") ACE_TEXT(" [-d]") @@ -194,7 +194,7 @@ Clerk_i::get_first_IOR (void) CosNaming::NamingContext::_narrow (temp_object.in ()); if (CORBA::is_nil (server_context.in ())) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO_Time_Service_Clerk::get_server_IORs:") ACE_TEXT("No Active Servers in the Network\n"))); @@ -214,7 +214,7 @@ Clerk_i::get_first_IOR (void) CosTime::TimeService::_narrow (temp_object.in ()); if (CORBA::is_nil (obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to Resolve ") ACE_TEXT("Server Reference\n")), -1); @@ -227,7 +227,7 @@ Clerk_i::get_first_IOR (void) // Iterate over the server context to get the next N IORs. if (next_n_IORs (iter, server_context) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs ")), -1);; } @@ -257,7 +257,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, while (iter->next_one (binding.out ())) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Getting IOR of the server: %C\n\n"), binding->binding_name[0].id.in ())); @@ -321,7 +321,7 @@ Clerk_i::create_clerk (void) this->orb_->object_to_string (this->time_service_clerk_.in ()); // Print the clerk IOR on the console. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%C>\n"), objref_clerk.in ())); @@ -420,7 +420,7 @@ Clerk_i::init (int argc, if (this->orb_manager_.init_child_poa (command.get_argc(), command.get_TCHAR_argv(), "child_poa") == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("init_child_poa")), -1); @@ -437,7 +437,7 @@ Clerk_i::init (int argc, if (!this->ior_fp_) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("IOR file not specified. Using the Naming Service instead\n"))); // Initialize the Naming Service. @@ -485,7 +485,7 @@ Clerk_i::run (void) int r = this->orb_manager_.run (); if (r == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) Clerk_i::run")), -1); } diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index c90b4e3999e..c13a8c72100 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -45,13 +45,13 @@ Server_i::parse_args (int argc, ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("a")); if (this->ior_output_file_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %p\n"), get_opts.opt_arg ()), -1); break; case '?': // display help for use of the server. default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)") ACE_TEXT("usage: %s") ACE_TEXT(" [-d]") @@ -111,7 +111,7 @@ Server_i::create_server (void) this->orb_->object_to_string (server_ref.in ()); // Print the server IOR on the console. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ") ACE_TEXT("SERVER IOR: <%C>\n"), objref_server.in ())); @@ -176,7 +176,7 @@ Server_i::register_server (void) this->naming_client_->rebind (server_name, this->time_service_server_.in ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Binding ServerContext -> %C\n"), server_name[1].id.in ())); } @@ -212,7 +212,7 @@ Server_i::init (int argc, "time_server"); if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("init_child_poa")), -1); @@ -256,7 +256,7 @@ Server_i::run (void) int retval = this->orb_manager_.run (); if (retval == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) Server_i::run")), -1); return 0; diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp index 79649db92a1..74687b7e268 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp @@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { Clerk_i clerk; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n")); try diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp index fe0c8e9c885..1acbcb97934 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp @@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { Server_i server; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n")); try diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp index e8532920f93..b7b8853f90d 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp @@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) trader.run (); } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to initialize the trader.\n"), 1); } diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 95566172a03..0a9f3da4347 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -8,14 +8,14 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader) { if (this->shutdown_.register_handler (SIGINT, this) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("register_handler"))); #ifndef ACE_HAS_WINCE if (this->shutdown_.register_handler (SIGTERM, this) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("register_handler"))); #endif // ACE_HAS_WINCE diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 22198e3a91d..7b1a5fe2dce 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -229,7 +229,7 @@ void TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) Recieved event \"")); + ORBSVCS_DEBUG ((LM_DEBUG, "\n(%P|%t) Recieved event \"")); } // Sets the flow protocol status. @@ -256,7 +256,7 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name) return flow_connection_entry._retn(); } else{ - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name )); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name )); throw AVStreams::noSuchFlow (); } } @@ -283,7 +283,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, ACE_CString flow_name_key (flow_name); if (this->flow_connection_map_.bind (flow_name_key, flow_connection) != 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name )); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name )); throw AVStreams::noSuchFlow ();// is this right? } } @@ -300,7 +300,7 @@ CORBA::Boolean TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */, const AVStreams::streamQoS &/* qos_spec */) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Negotiator::negotiate\n")); return 0; } @@ -531,7 +531,7 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec) int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::destroy failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::destroy failed\n")); } // request the two MMDevices to create vdev and stream endpoints. save @@ -547,13 +547,13 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, try { if (CORBA::is_nil (a_party) && CORBA::is_nil (b_party)) - ACE_ERROR_RETURN ((LM_ERROR, "Both parties are nil\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Both parties are nil\n"), 0); // Check to see if we have non-nil parties to bind! if (TAO_debug_level > 0) if (CORBA::is_nil (a_party) || CORBA::is_nil (b_party)) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::bind_devs: " "a_party or b_party is null" "Multicast mode\n")); @@ -574,7 +574,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, { // Already in the map. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "mmdevice a_party is already bound\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "mmdevice a_party is already bound\n")); } return 1; } @@ -589,7 +589,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, the_flows); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n")); // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); @@ -623,7 +623,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->mmdevice_a_map_.bind (key, map_entry); if (result < 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Error binding mmdevice entry in the a_map")); + ORBSVCS_DEBUG ((LM_DEBUG, "Error binding mmdevice entry in the a_map")); } } // Request b_party to create the endpoint and vdev @@ -636,7 +636,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (result == 0) { // Already in the map. - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "mmdevice b_party is already bound\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "mmdevice b_party is already bound\n")); return 1; } else @@ -649,9 +649,9 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, named_vdev.inout (), the_flows); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "\n(%P|%t)stream_endpoint_b_ = %s", TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()))); // Define ourselves as the related_streamctrl property of the sep. @@ -685,7 +685,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, int result = this->mmdevice_b_map_.bind (key, map_entry); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Error binding mmdevice entry in the b_map")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Error binding mmdevice entry in the b_map")); } } @@ -728,7 +728,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, catch (const CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, " %s ", static_cast<char const*>(flows[i]))); + ORBSVCS_DEBUG ((LM_DEBUG, " %s ", static_cast<char const*>(flows[i]))); ex._tao_print_exception ( "producer_check: not a producer"); @@ -760,7 +760,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, the_qos, the_flows); if (!result) - ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0); } if (CORBA::is_nil (a_party)) @@ -769,7 +769,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, { // Multicast sink being added. if (!this->mcastconfigif_) - ACE_ERROR_RETURN ((LM_ERROR, "first add a source and then a sink\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "first add a source and then a sink\n"), 0); this->mcastconfigif_->set_peer (this->vdev_b_.in (), the_qos, the_flows); @@ -787,7 +787,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, } catch (const AVStreams::notSupported&) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "connect_leaf failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "connect_leaf failed\n")); connect_leaf_success = 0; } catch (const CORBA::Exception& ex) @@ -798,7 +798,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (!connect_leaf_success) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n")); AVStreams::flowSpec connect_flows = the_flows; this->sep_a_->multiconnect (the_qos, connect_flows); this->sep_b_->multiconnect (the_qos, connect_flows); @@ -816,7 +816,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, { if (TAO_debug_level > 0) { //FUZZ: disable check_for_lack_ACE_OS - ACE_DEBUG ((LM_DEBUG, "(%N,%l) Full profile, invoking bind()\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Full profile, invoking bind()\n")); //FUZZ: enable check_for_lack_ACE_OS } @@ -836,7 +836,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, { if (TAO_debug_level > 0) { //FUZZ: disable check_for_lack_ACE_OS - ACE_DEBUG ((LM_DEBUG, "(%N,%l) Light profile, invoking connect()\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Light profile, invoking connect()\n")); //FUZZ: enable check_for_lack_ACE_OS } @@ -859,7 +859,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, the_qos, the_flows); if (result == 0) - ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0); } } } @@ -887,7 +887,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { if (CORBA::is_nil (sep_a_.in() ) || CORBA::is_nil (sep_b_.in() )) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_StreamCtrl::bind:" "a_party or b_party null!"), 0); @@ -932,7 +932,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_CString fep_key (flowname); result = a_fep_map->bind (fep_key, fep); if (result == -1) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::bind failed for %s\n", flowname)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::bind failed for %s\n", flowname)); } // get the flowendpoints for streamendpoint_b for (i=0;i<b_flows.length ();i++) @@ -946,7 +946,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_CString fep_key (flowname); result = b_fep_map->bind (fep_key, fep); if (result == -1) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::bind failed for %s\n", flowname)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::bind failed for %s\n", flowname)); } FlowEndPoint_Map *map_a = 0, *map_b = 0; if (flow_spec.length () == 0) @@ -974,19 +974,19 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::FlowEndPoint_var fep; result = a_fep_map->find (fep_key, fep); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on A side for flowname: %s\n", flow_spec[i].in ()), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Fep not found on A side for flowname: %s\n", flow_spec[i].in ()), 0); result = spec_fep_map_a->bind (fep_key, fep); if (result == -1) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i].in ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i].in ())); result = b_fep_map->find (fep_key, fep); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "Fep not found on B side for flowname: %s\n", flow_spec[i].in ()), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Fep not found on B side for flowname: %s\n", flow_spec[i].in ()), 0); result = spec_fep_map_b->bind (fep_key, fep); if (result == -1) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i].in ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Bind failed for %s\n", flow_spec[i].in ())); } map_a = spec_fep_map_a; map_b = spec_fep_map_b; @@ -1111,7 +1111,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, result = qos.get_flow_qos (fep_b_name.in (), flow_qos); if (result == -1 && TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "No QoS Specified for this flow <%s>\n", flowname)); } flow_connection->connect (producer.in (), @@ -1204,14 +1204,14 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::modify_QoS\n")); if (this->mcastconfigif_ != 0) { // call modify_Qos on the root VDev which is the mcast configif. - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Cannot Modify the Qos for multipoint streams\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Cannot Modify the Qos for multipoint streams\n")); } else { @@ -1244,7 +1244,7 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamCtrl::modify_QoS\n")); @@ -1526,11 +1526,11 @@ TAO_Base_StreamEndPoint::set_flow_handler (const char *flowname, { if(TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, "(%N,%l) TAO_Base_StreamEndPoint::set_flow_handler(), flowname: %s\n", flowname)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_Base_StreamEndPoint::set_flow_handler(), flowname: %s\n", flowname)); } ACE_CString flow_name_key (flowname); if (this->flow_handler_map_.bind (flow_name_key, handler) != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error in storing flow handler\n")); } @@ -1540,7 +1540,7 @@ TAO_Base_StreamEndPoint::set_control_flow_handler (const char *flowname, { ACE_CString flow_name_key (flowname); if (this->control_flow_handler_map_.bind (flow_name_key, handler) != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error in storing control flow handler\n")); } @@ -1557,7 +1557,7 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void) { //is->mcast_addr_ = ACE_OS::inet_addr (ACE_DEFAULT_MULTICAST_ADDR); this->mcast_addr_.set (ACE_DEFAULT_MULTICAST_ADDR); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::TAO_StreamEndPoint::mcast_addr = %s", this->mcast_addr_.c_str ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::TAO_StreamEndPoint::mcast_addr = %s", this->mcast_addr_.c_str ())); // this->handle_open (); } @@ -1568,14 +1568,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, const AVStreams::flowSpec &the_spec) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n")); CORBA::Boolean retv = 0; this->peer_sep_ = AVStreams::StreamEndPoint::_duplicate (responder); try { if (!CORBA::is_nil (this->negotiator_.in ())) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "NEGOTIATOR AVIALABLE\n")); CORBA::Any_var negotiator_any = responder->get_property_value ("Negotiator"); @@ -1589,7 +1589,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, qos); if (!result) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect (): negotiate failed\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect (): negotiate failed\n")); } } } @@ -1624,7 +1624,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, } catch (const CORBA::Exception&) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Availableprotocols property not defined\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Availableprotocols property not defined\n")); } try { @@ -1632,14 +1632,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, if (qos.length () > 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "QoS is Specified\n")); int result = this->translate_qos (qos, network_qos); if (result != 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "QoS translation failed\n")); this->qos ().set (network_qos); @@ -1650,7 +1650,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, this->handle_preconnect (flow_spec); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::connect: flow_spec_length = %d\n", flow_spec.length ())); u_int i; @@ -1665,7 +1665,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, return 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect: %s\n", entry->entry_to_string ())); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect: %s\n", entry->entry_to_string ())); this->forward_flow_spec_set.insert (entry); } @@ -1677,7 +1677,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0); AVStreams::StreamEndPoint_var streamendpoint = this->_this (); @@ -1688,7 +1688,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, flow_spec); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "%N:%l request_connection returned %d\n", retv)); + ORBSVCS_DEBUG ((LM_DEBUG, "%N:%l request_connection returned %d\n", retv)); if (retv == 0) return retv; @@ -1699,12 +1699,12 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, TAO_Reverse_FlowSpec_Entry, 0); if (entry->parse (flow_spec[i]) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Reverse_Flow_Spec_Set::parse failed\n"), 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n", entry->entry_to_string ())); @@ -1716,7 +1716,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, this->reverse_flow_spec_set, TAO_AV_Core::TAO_AV_ENDPOINT_A); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_Core::init_reverse_flows failed\n"), 0); @@ -1799,7 +1799,7 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec) void TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n")); // Make the upcall into the app this->handle_start (flow_spec); @@ -1919,7 +1919,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec) int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::destroy failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::destroy failed\n")); if (flow_spec.length () > 0) { @@ -2018,7 +2018,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection called")); int result = 0; @@ -2028,19 +2028,19 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato if (qos.length () > 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "QoS is Specified\n")); int result = this->translate_qos (qos, network_qos); if (result != 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "QoS translation failed\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "QoS translation failed\n")); this->qos ().set (network_qos); } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection: " "flowspec has length = %d and the strings are:\n", flow_spec.length ())); @@ -2056,20 +2056,20 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato CORBA::String_var string_entry = CORBA::string_dup (flow_spec[i]); if(TAO_debug_level > 0) - ACE_DEBUG(( LM_DEBUG, + ORBSVCS_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: [%s]\n", string_entry.in ())); if (entry->parse (string_entry.in ()) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%N:%l Error parsing flow_spec: [%s]\n", string_entry.in ())); return 0; } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::request_connection flow spec [%s]\n", entry->entry_to_string ())); @@ -2100,7 +2100,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::change_qos\n")); TAO_AV_QoS qos (new_qos); @@ -2115,13 +2115,13 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, { AVStreams::QoS flow_qos; if (qos.get_flow_qos (entry.flowname (), flow_qos) != 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "New QoS for the flow %s is not specified\n", entry.flowname ())); int result; result = handler_entry->int_id_->change_qos (flow_qos); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Modifying QoS Failed\n"), -1); @@ -2136,7 +2136,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::modify_QoS\n")); int result = this->change_qos (new_qos, the_flows); @@ -2370,7 +2370,7 @@ TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/, AVStreams::flowSpec &/*flow_spec*/) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n")); return 0; } @@ -2411,7 +2411,7 @@ TAO_StreamEndPoint::~TAO_StreamEndPoint (void) TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamEndPoint_A::TAO_StreamEndPoint_A: created\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamEndPoint_A::TAO_StreamEndPoint_A: created\n")); } // IP Multicast style connect. @@ -2419,7 +2419,7 @@ CORBA::Boolean TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n")); try { int result = 0; @@ -2449,7 +2449,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::QoS flow_qos; result = qos.get_flow_qos (forward_entry->flowname (), flow_qos); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s\n", forward_entry->flowname ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "QoS not found for %s\n", forward_entry->flowname ())); // Narrow it to FlowProducer. AVStreams::FlowProducer_var producer; producer = AVStreams::FlowProducer::_narrow (flow_endpoint.in()); @@ -2496,7 +2496,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, result = flow_connection->add_producer (producer.in (), flow_qos); if (result == 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0); } } catch (const CORBA::Exception& ex) @@ -2504,7 +2504,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, // Narrow failed and since its not a flowproducer its an error. ex._tao_print_exception ( "FlowProducer::_narrow"); - ACE_ERROR_RETURN ((LM_ERROR, "sep_a doesn't contain a flowproducer"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "sep_a doesn't contain a flowproducer"), 0); } } else @@ -2518,8 +2518,8 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, ACE_TCHAR str_addr [BUFSIZ]; result = mcast_addr->addr_to_string (str_addr, BUFSIZ); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPointA::multiconnect ::addr_to_string failed\n"), 0); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_A::multiconnect:%s\n", str_addr)); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPointA::multiconnect ::addr_to_string failed\n"), 0); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_A::multiconnect:%s\n", str_addr)); TAO_Forward_FlowSpec_Entry new_entry (entry->flowname (), entry->direction_str (), entry->format (), @@ -2542,7 +2542,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, this->mcast_port_++; ACE_TCHAR buf[BUFSIZ]; mcast_addr->addr_to_string (buf, BUFSIZ); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", buf)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "%s\n", buf)); TAO_Forward_FlowSpec_Entry *new_entry; ACE_NEW_RETURN (new_entry, TAO_Forward_FlowSpec_Entry (forward_entry->flowname (), @@ -2561,10 +2561,10 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, TAO_AV_CORE::instance (), this->forward_flow_spec_set); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "Acceptor_Registry::open failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Acceptor_Registry::open failed\n"), 0); result = this->mcast_entry_map_.bind (mcast_key, new_entry); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "mcast_entry::bind failed"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "mcast_entry::bind failed"), 0); } break; case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT: @@ -2616,7 +2616,7 @@ TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B: created")); } @@ -2624,7 +2624,7 @@ CORBA::Boolean TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_B::multiconnect\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_B::multiconnect\n")); try { int result = 0; @@ -2649,12 +2649,12 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, { ex._tao_print_exception ( "FlowConsumer::_narrow"); - ACE_ERROR_RETURN ((LM_ERROR, "sep_b doesn't contain a flowconsumer"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "sep_b doesn't contain a flowconsumer"), 0); } AVStreams::QoS flow_qos; result = qos.get_flow_qos (forward_entry->flowname (), flow_qos); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ())); AVStreams::FlowConnection_var flow_connection; try { @@ -2679,7 +2679,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, result = flow_connection->add_consumer (consumer.in (), flow_qos); if (result == 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0); } else { @@ -2687,11 +2687,11 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, ACE_INET_Addr *mcast_addr; mcast_addr = dynamic_cast<ACE_INET_Addr *> (forward_entry->address ()); if (mcast_addr == 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect::Address missing in flowspec_entry\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect::Address missing in flowspec_entry\n"), 0); result = this->mcast_entry_map_.find (mcast_key, mcast_entry); if (result == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect::handler already found\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect::handler already found\n"), 0); } else { @@ -2711,10 +2711,10 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, TAO_AV_CORE::instance (), this->forward_flow_spec_set); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "connector_registry::open failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "connector_registry::open failed\n"), 0); result = this->mcast_entry_map_.bind (mcast_key, forward_entry); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "dgram_mcast_handler::bind failed"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "dgram_mcast_handler::bind failed"), 0); } break; case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT: @@ -2746,7 +2746,7 @@ TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void) TAO_VDev::TAO_VDev (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::TAO_VDev: created\n")); } @@ -2765,7 +2765,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, try { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called\n")); CORBA::Any anyval; @@ -2830,7 +2830,7 @@ TAO_VDev::set_format (const char *flowName, try { if (flowName == 0 || format_name == 0) - ACE_ERROR ((LM_ERROR, "TAO_VDev::set_format: flowName or format_name is null\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_VDev::set_format: flowName or format_name is null\n")); char format_property [BUFSIZ]; ACE_OS::sprintf (format_property, "%s_currFormat", flowName); CORBA::Any format; @@ -2854,7 +2854,7 @@ TAO_VDev::set_dev_params (const char *flowName, try { if (flowName == 0) - ACE_ERROR ((LM_ERROR, "TAO_VDev::set_dev_params:flowName is null\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_VDev::set_dev_params:flowName is null\n")); char devParams_property[BUFSIZ]; ACE_OS::sprintf (devParams_property, "%s_devParams", flowName); CORBA::Any devParams; @@ -2876,7 +2876,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &flowspec) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_VDev::modify_QoS\n")); if (flowspec.length () != 0) @@ -2896,7 +2896,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, { sep_a->modify_QoS (the_qos, flowspec); } - else ACE_DEBUG ((LM_DEBUG, + else ORBSVCS_DEBUG ((LM_DEBUG, "Stream EndPoint Not Found\n")); } else @@ -2994,7 +2994,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { if (this->endpoint_strategy_->create_A (sep_a, the_vdev) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_A\n"), 0); @@ -3005,7 +3005,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { if (this->endpoint_strategy_->create_B (sep_b, the_vdev) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_B\n"), 0); @@ -3057,14 +3057,14 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, int result = this->fdev_map_.find (flow_key, flow_dev); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "(%N,%l) fdev_map::find failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) fdev_map::find failed\n"), 0); CORBA::String_var named_fdev; AVStreams::FlowEndPoint_var flow_endpoint; AVStreams::QoS flow_qos; result = qos.get_flow_qos (forward_entry.flowname (), flow_qos); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) get_flow_qos failed for %s\n", forward_entry.flowname ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) get_flow_qos failed for %s\n", forward_entry.flowname ())); switch (forward_entry.direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: @@ -3208,7 +3208,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, // on this servant are complete. int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_MMDevice::destroy failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_MMDevice::destroy failed\n")); } char * @@ -3478,7 +3478,7 @@ TAO_FlowConnection::destroy (void) } int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::destroy failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowConnection::destroy failed\n")); } // modify the QoS for this flow. @@ -3605,7 +3605,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, } else { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::connect_to_peer addres: %s", consumer_address)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowConnection::connect_to_peer addres: %s", consumer_address)); flow_producer->connect_to_peer (the_qos, consumer_address, this->fp_name_.inout ()); @@ -3644,7 +3644,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, { if ((*begin)->_is_equivalent (producer)) // producer exists in the set, a duplicate. - ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); + ORBSVCS_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); } // We need to check the return value of the insert into the flow producer // set, since multiconnect could be called many times which will lead to @@ -3654,7 +3654,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, if (result == 1) { // producer exists in the set, a duplicate. - ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); + ORBSVCS_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); } CORBA::Boolean met_qos; char mcast_address[BUFSIZ]; @@ -3729,13 +3729,13 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, { if ((*begin)->_is_equivalent (consumer)) // Consumer exists in the set, a duplicate. - ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1); + ORBSVCS_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1); } int result = this->flow_consumer_set_.insert (flow_consumer); if (result == 1) { // consumer exists in the set, a duplicate. - ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_consumer: consumer already exists\n"), 1); + ORBSVCS_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_consumer: consumer already exists\n"), 1); } FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin (); @@ -3783,7 +3783,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, } if (CORBA::is_nil (this->mcastconfigif_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0); // @@ Is this the right place to do set_peer? AVStreams::flowSpec flow_spec; AVStreams::streamQoS stream_qos (1); @@ -3840,7 +3840,7 @@ TAO_FlowEndPoint::open (const char *flowname, this->flowname_ = flowname; this->format_ = format; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n")); try { CORBA::Any flowname_any; @@ -3851,14 +3851,14 @@ TAO_FlowEndPoint::open (const char *flowname, this->protocol_addresses_ = protocols; AVStreams::protocolSpec protocol_spec (protocols.length ()); protocol_spec.length (protocols.length ()); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "%N:%l\n")); for (u_int i=0;i<protocols.length ();i++) { CORBA::String_var address = CORBA::string_dup (protocols [i]); TAO_Forward_FlowSpec_Entry entry ("", "", "", "", address.in ()); protocol_spec [i] = CORBA::string_dup (entry.carrier_protocol_str ()); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "[%s]\n", static_cast<char const*>(protocol_spec[i]))); } @@ -3906,7 +3906,7 @@ TAO_FlowEndPoint::destroy (void) { int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::destroy failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::destroy failed\n")); TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); begin != end; ++begin) @@ -4009,11 +4009,11 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot try { u_int i = 0; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "%N:%l\n")); for (i=0;i<protocols.length ();i++) { const char *protocol = (protocols)[i]; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "%s\n", protocol)); } CORBA::Any AvailableProtocols_property; AvailableProtocols_property <<= protocols; @@ -4022,11 +4022,11 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot AVStreams::protocolSpec *temp_spec = 0; CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"); temp_any.in () >>= temp_spec; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "%N:%l\n")); for (i=0;i<temp_spec->length ();i++) { const char *protocol = (*temp_spec)[i]; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "%s\n", protocol)); } this->protocols_ = protocols; } @@ -4184,7 +4184,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, break; } if (!protocol_match) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_FlowEndPoint::go_to_listen failed: no protoocol match\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowEndPoint::go_to_listen failed: no protoocol match\n"), 0); for (u_int j=0;j<this->protocol_addresses_.length ();j++) if (ACE_OS::strncmp (this->protocol_addresses_ [j], listen_protocol.in (), ACE_OS::strlen (listen_protocol.in ())) == 0) @@ -4250,7 +4250,7 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role, TAO_AV_CORE::instance (), this->flow_spec_set_); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_FlowEndPoint::connector_registry::open failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowEndPoint::connector_registry::open failed\n"), 0); this->reverse_channel_ = entry->get_local_addr_str (); return 1; } @@ -4356,7 +4356,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, if (address == 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_FlowProducer::connect_mcast address is 0\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowProducer::connect_mcast address is 0\n")); TAO_Forward_FlowSpec_Entry *entry; ACE_NEW_RETURN (entry, TAO_Forward_FlowSpec_Entry(this->flowname_.in (), @@ -4373,7 +4373,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, TAO_AV_CORE::instance (), this->flow_spec_set_); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_FlowProducer::connect_mcast:acceptor_registry open failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowProducer::connect_mcast:acceptor_registry open failed\n"), 0); // Now remove our handler from the reactor since we're a producer and dont want to get called for // multicast packets. ACE_Event_Handler *event_handler = entry->handler ()->event_handler (); @@ -4515,7 +4515,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter) this->token_array_.size (this->token_array_.size ()*2); result = this->token_array_.set (token, count); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_Tokenizer::parse error"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_Tokenizer::parse error"), -1); } count++; } @@ -4534,7 +4534,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter) this->token_array_.size (this->token_array_.size ()*2); result = this->token_array_.set (token, count); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_Tokenizer::parse error"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_Tokenizer::parse error"), -1); } token = ACE_OS::strtok (0, delimiter_str); count++; diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl index d16b471fc27..fe235ecc8e7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl @@ -22,7 +22,7 @@ TAO_AV_QoS::set (AVStreams::streamQoS &stream_qos) ACE_CString qos_key (CORBA::string_dup (this->stream_qos_[j].QoSType)); int result = this->qos_map_.bind (qos_key,this->stream_qos_[j]); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) TAO_AV_QoS::set qos_map::bind failed\n"), -1); } @@ -40,18 +40,18 @@ TAO_AV_QoS::get_flow_qos (const char *flowname, if (result < 0) { if (TAO_debug_level > 0 ) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) qos_map contains the flows:\n")); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) qos_map contains the flows:\n")); ACE_Hash_Map_Manager<ACE_CString,AVStreams::QoS,ACE_Null_Mutex>::ITERATOR iter = qos_map_.begin(); while( iter != qos_map_.end() ) { - ACE_DEBUG((LM_DEBUG, " %s\n", (*iter).ext_id_.c_str() )); + ORBSVCS_DEBUG((LM_DEBUG, " %s\n", (*iter).ext_id_.c_str() )); ++iter; } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_QOS::get_flow_qos qos_map::find failed for %s\n", flowname)); } return -1; diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index b53ac941df0..017c27dfb2d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -156,7 +156,7 @@ int TAO_AV_Core::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Core::init ")); this->orb_ = CORBA::ORB::_duplicate (orb); this->poa_ = PortableServer::POA::_duplicate (poa); this->reactor (this->orb_->orb_core ()->reactor ()); @@ -172,7 +172,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, AVStreams::flowSpec &flow_spec) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Core::init_forward_flows\n")); TAO_AV_FlowSpecSet address_flow_set; @@ -221,7 +221,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, if (address != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "address given for flow %s\n", entry->flowname ())); @@ -242,7 +242,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, this, address_flow_set); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"), -1); TAO_AV_FlowSpecSetItor end = address_flow_set.end (); @@ -268,7 +268,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, if (result < 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Core::init_forward_flows: remove_handler failed\n")); } #endif //ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS @@ -294,14 +294,14 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { if (address_flow_set.size () > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) This connector registry is called\n")); result = this->connector_registry_->open (endpoint, this, address_flow_set); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Core::init_Forward_flows: connector_registry open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_Core::init_Forward_flows: connector_registry open failed\n"),-1); TAO_AV_FlowSpecSetItor end = address_flow_set.end (); for (TAO_AV_FlowSpecSetItor start = address_flow_set.begin (); start != end; ++start) @@ -320,7 +320,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, ACE_Event_Handler::READ_MASK); if (result < 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Core::init_forward_flows: remove_handler failed\n")); } } @@ -357,7 +357,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, this, flow_set); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Core::init_Forward_flows: Acceptor_registry open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_Core::init_Forward_flows: Acceptor_registry open failed\n"),-1); end = address_flow_set.end (); start = address_flow_set.begin (); for (; start != end; ++start) @@ -375,7 +375,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, ACE_Event_Handler::READ_MASK); if (result < 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Core::init_forward_flows: remove_handler failed\n")); } } @@ -423,7 +423,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, new_flowspec.length (len+1); new_flowspec [i++] = entry.entry_to_string (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "reverse Flow Spec Is %s\n", entry.entry_to_string ())); + ORBSVCS_DEBUG ((LM_DEBUG, "reverse Flow Spec Is %s\n", entry.entry_to_string ())); } } connect_end = flow_set.end (); @@ -472,7 +472,7 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, TAO_AV_FlowSpecSet &reverse_flow_spec_set, TAO_AV_Core::EndPoint direction) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Core::init_reverse_flows\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Core::init_reverse_flows\n")); TAO_AV_FlowSpecSet acceptor_flow_set; TAO_AV_FlowSpecSet connector_flow_set; TAO_AV_FlowSpecSetItor end = reverse_flow_spec_set.end (); @@ -542,7 +542,7 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, break; } if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR,"acceptor_registry::open"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"acceptor_registry::open"),-1); return 0; } @@ -707,7 +707,7 @@ TAO_AV_Core::load_default_transport_factories (void) if (udp_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "UDP Factory")); @@ -731,7 +731,7 @@ TAO_AV_Core::load_default_transport_factories (void) if (tcp_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "TCP Factory")); @@ -758,7 +758,7 @@ TAO_AV_Core::load_default_transport_factories (void) if (udp_qos_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "UDP QoS Factory")); @@ -789,7 +789,7 @@ TAO_AV_Core::load_default_transport_factories (void) if (sctp_seq_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "SCTP SEQ Factory")); @@ -822,7 +822,7 @@ TAO_AV_Core::init_transport_factories (void) if (factory == end) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Loading default transport protocols\n")); this->load_default_transport_factories (); } @@ -832,7 +832,7 @@ TAO_AV_Core::init_transport_factories (void) { const ACE_CString &name = (*factory)->name (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s\n", name.c_str ())); @@ -840,7 +840,7 @@ TAO_AV_Core::init_transport_factories (void) ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (name.c_str ())); if ((*factory)->factory () == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to load ") ACE_TEXT ("protocol <%s>, %p\n"), name.c_str (), ""), @@ -850,7 +850,7 @@ TAO_AV_Core::init_transport_factories (void) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"), name.c_str ())); } @@ -877,7 +877,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (udp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "UDP Flow Factory")); @@ -904,7 +904,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (udp_qos_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "UDP QoS Flow Factory")); @@ -933,7 +933,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (sctp_seq_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "SCTP SEQ Flow Factory")); @@ -959,7 +959,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (tcp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "TCP Flow Factory")); @@ -983,7 +983,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (rtp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "RTP Flow Factory")); @@ -1007,7 +1007,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (rtcp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "RTCP Flow Factory")); @@ -1031,7 +1031,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (sfp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, + ORBSVCS_ERROR ((LM_WARNING, "(%P|%t) WARNING - No %s found in Service Repository." " Using default instance.\n", "SFP Flow Factory")); @@ -1058,7 +1058,7 @@ TAO_AV_Core::init_flow_protocol_factories (void) if (factory == end) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Loading default flow protocol factories\n")); this->load_default_flow_protocol_factories (); @@ -1069,7 +1069,7 @@ TAO_AV_Core::init_flow_protocol_factories (void) { const ACE_CString &name = (*factory)->name (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s\n", name.c_str ())); @@ -1077,7 +1077,7 @@ TAO_AV_Core::init_flow_protocol_factories (void) ACE_Dynamic_Service<TAO_AV_Flow_Protocol_Factory>::instance (name.c_str ())); if ((*factory)->factory () == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to load ") ACE_TEXT ("protocol <%s>, %p\n"), name.c_str (), ""), @@ -1088,7 +1088,7 @@ TAO_AV_Core::init_flow_protocol_factories (void) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"), name.c_str ())); } diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 8793ff67520..d2c659deaa5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -44,7 +44,7 @@ int TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */, AVStreams::VDev_ptr & /* vdev */) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating A endpoint\n"), -1); } @@ -57,7 +57,7 @@ int TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */, AVStreams::VDev_ptr & /*vdev */) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating B endpoint\n"), -1); } @@ -95,7 +95,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // Process creation failed if (this->pid_ == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) ACE_Process:: spawn failed: %p\n", "spawn"), -1); @@ -110,7 +110,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) this->host_, static_cast<long int> (this->pid_)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) semaphore is %s\n", sem_str)); // Create the semaphore @@ -126,7 +126,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // See if my child process is still alive -- if not, return an error if (ACE_OS::kill (this->pid_, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Process_Strategy: Process being waited on died unexpectedly.\n"), -1); // if we were not interrupted due to a EINTR, break @@ -139,7 +139,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // The job of the semaphore is done, remove it. if (semaphore.remove () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) semaphore remove failed: %p\n", "remove"), -1); @@ -177,7 +177,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void) TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the Name Service.\n"), -1); this->naming_context_ = @@ -205,7 +205,7 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (void) this->host_, (long) this->pid_); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); // Create the name CosNaming::Name VDev_Name (1); @@ -222,7 +222,7 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (void) // Check if valid if (CORBA::is_nil (this->vdev_.in() )) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " could not resolve Stream_Endpoint_B in Naming service <%s>\n"), -1); } @@ -257,7 +257,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s { // use the baseclass activate if (this->activate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_AV_Endpoint_Process_Strategy: Error in activate ()\n"), -1); @@ -281,7 +281,7 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void) this->host_, (long) this->pid_); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); // Create the name CosNaming::Name Stream_Endpoint_A_Name (1); @@ -299,7 +299,7 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void) // Check for validity if (CORBA::is_nil (this->stream_endpoint_a_.in() )) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " could not resolve Stream_Endpoint_A in Naming service <%s>\n"), -1); } @@ -335,11 +335,11 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s try { if (this->activate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_AV_Endpoint_Process_Strategy: Error in activate ()\n"), -1); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()))); stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); @@ -366,7 +366,7 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void) this->host_, (long) this->pid_); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); // Create the name CosNaming::Name Stream_Endpoint_B_Name (1); @@ -384,7 +384,7 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void) // Check for validity if (CORBA::is_nil (this->stream_endpoint_b_.in() )) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " could not resolve Stream_Endpoint_B in Naming service <%s>\n"), -1); } diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 2a8d7b0783a..1589ebcb1ba 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -64,13 +64,13 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ try { this->activate_stream_endpoint (); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n")); this->activate_vdev (); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n")); this->activate_mediactrl (); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n")); } catch (const CORBA::Exception& ex) { @@ -114,7 +114,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ // Activate the object under the root poa. // CORBA::String_var vdev_ior = this->activate_with_poa (vdev, //); -// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n", +// if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n", // vdev_ior. in ())); // Save the object reference, so that create_A can return it @@ -233,7 +233,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea AVStreams::VDev_ptr &vdev) { if (this->activate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_AV_Endpoint_Reactive_Strategy_A: Error in activate ()\n"), -1); @@ -322,7 +322,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea AVStreams::VDev_ptr &vdev) { if (this->activate () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_AV_Endpoint_Reactive_Strategy_B: Error in activate ()\n"), -1); @@ -347,7 +347,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::TAO_AV_Child_Pro { this->pid_ = ACE_OS::getpid (); if (this->pid_ == 0) - ACE_ERROR ((LM_ERROR,"getpid () failed\n")); + ORBSVCS_ERROR ((LM_ERROR,"getpid () failed\n")); ACE_OS::hostname (this->host_, sizeof this->host_); } @@ -387,7 +387,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, // release the semaphore the parent is waiting on if (this->release_semaphore () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error releasing semaphores\n"), -1); @@ -433,20 +433,20 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects // activate the stream_endpoint CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n", stream_endpoint_ior.in ())); // activate the vdev CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n", vdev_ior.in ())); // activate the media controller CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ())); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ())); } catch (const CORBA::Exception& ex) { @@ -466,10 +466,10 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to resolve the Name Service.\n"), -1); - // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); + // if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in ()); } @@ -496,7 +496,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (vo this->host_, static_cast<long> (this->pid_)); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); // create the name this->vdev_name_.length (1); this->vdev_name_ [0].id = CORBA::string_dup (vdev_name); @@ -571,7 +571,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho this->host_, pid); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) semaphore is %s\n", sem_str)); @@ -581,7 +581,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho sem_str); if (semaphore.release () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error releasing semaphore %s: %p\n", sem_str, "semaphore.release ()"), @@ -648,7 +648,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_mediactrl (T_MediaCtrl *&media_ctrl) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t) TAO_AV_Child_Process::make_mediactrl ()\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t) TAO_AV_Child_Process::make_mediactrl ()\n")); ACE_NEW_RETURN (media_ctrl, T_MediaCtrl, -1); @@ -705,7 +705,7 @@ TAO_AV_Child_Process_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc this->host_, static_cast<long> (this->pid_)); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); this->stream_endpoint_name_.length (1); this->stream_endpoint_name_ [0].id = CORBA::string_dup (stream_endpoint_name); } @@ -731,7 +731,7 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc this->host_, static_cast<long> (this->pid_)); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); this->stream_endpoint_name_.length (1); this->stream_endpoint_name_ [0].id = CORBA::string_dup (stream_endpoint_name); } diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index feef03c032e..983cc3ad869 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -203,12 +203,12 @@ TAO_FlowSpec_Entry::set_protocol (void) if (this->address_ != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n")); ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_); ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ())); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ())); if (IN_CLASSD (inet_addr->get_ip_address ())) { this->is_multicast_ = 1; @@ -239,7 +239,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, TAO_AV_Core::Flow_Component flow_comp) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address [%s]\n", address)); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address [%s]\n", address)); if (address == 0) return 0; @@ -255,7 +255,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (protocol_tokenizer [1] != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Protocol tokenixer is not null\n")); if ((flow_comp == TAO_AV_Core::TAO_AV_DATA) || //(flow_comp == TAO_AV_Core::TAO_AV_BOTH) || @@ -266,7 +266,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, { TAO_Tokenizer addr_token (protocol_tokenizer [1], ';'); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Number of local sec addresses = %d\n", addr_token.num_tokens () - 1)); @@ -276,7 +276,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, ACE_NEW_RETURN (local_sec_addr_, char* [addr_token.num_tokens () - 1],-1); for (int j = 1; j <= addr_token.num_tokens () - 1; j++) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "adding addresses to sequence %s\n", addr_token [j])); @@ -318,7 +318,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (IN_CLASSD (inet_addr->get_ip_address ())) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address is multicast\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address is multicast\n")); this->is_multicast_ = 1; switch (this->protocol_) @@ -342,12 +342,12 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } break; default: - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"ATM support not added yet\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"ATM support not added yet\n")); } } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "AV BOTH %s\n", protocol_tokenizer[1])); @@ -360,7 +360,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Number of local sec addresses = %d\n", port_tokenizer.num_tokens () - 1)); @@ -369,7 +369,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, ACE_NEW_RETURN (local_sec_addr_, char* [port_tokenizer.num_tokens () - 1],-1); for (int j = 1; j <= port_tokenizer.num_tokens () - 1; j++) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "adding addresses to sequence %s\n", port_tokenizer [j])); @@ -425,7 +425,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (IN_CLASSD (inet_addr->get_ip_address ())) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address is multicast\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address is multicast\n")); this->is_multicast_ = 1; switch (this->protocol_) @@ -449,11 +449,11 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } break; default: - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"ATM support not added yet\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"ATM support not added yet\n")); } } } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Return from parse address\n")); return 0; } @@ -480,7 +480,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) return cstring.rep (); } default: - ACE_ERROR_RETURN ((LM_ERROR,"Address family not supported"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"Address family not supported"),0); } } @@ -541,7 +541,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) this->flowname_ = tokenizer [TAO_AV_FLOWNAME]; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Forward_FlowSpec_Entry::parse [%s]\n", flowSpec_entry)); @@ -564,7 +564,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) { TAO_Tokenizer addr_token (tokenizer [TAO_AV_PEER_ADDR], ';'); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Number of peer sec addresses = %d\n", addr_token.num_tokens () - 1)); @@ -577,7 +577,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) ACE_NEW_RETURN (peer_sec_addr_, char* [addr_token.num_tokens () - 1],-1); for (int j = 1; j <= addr_token.num_tokens () - 1; j++) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "adding addresses to sequence %s\n", addr_token [j])); @@ -597,7 +597,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) ACE_TCHAR buf [BUFSIZ]; addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Peer Address %s\n", buf)); @@ -811,11 +811,11 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) this->entry_ += "\\"; this->entry_ += peer_address_str; } - else ACE_DEBUG ((LM_DEBUG, + else ORBSVCS_DEBUG ((LM_DEBUG, "No peer address specified\n")); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"Forward entry_to_string: entry = %s\n",this->entry_.c_str())); + ORBSVCS_DEBUG ((LM_DEBUG,"Forward entry_to_string: entry = %s\n",this->entry_.c_str())); return this->entry_.c_str(); } @@ -894,7 +894,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry) this->flowname_ = tokenizer [TAO_AV_FLOWNAME]; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Reverse_FlowSpec_Entry::parse [%s]\n", flowSpec_entry)); @@ -1009,7 +1009,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) // this->entry_ += "\\"; // this->entry_ += format_; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Reverse entry_to_string: entry = %s\n",this->entry_.c_str() )); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"Reverse entry_to_string: entry = %s\n",this->entry_.c_str() )); return this->entry_.c_str(); } diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl index ed62cfdcca2..b31d7cb8436 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl @@ -293,7 +293,7 @@ TAO_FlowSpec_Entry::handler (TAO_AV_Flow_Handler *handler) // int result = event_handler->reactor ()->remove_handler (event_handler, // ACE_Event_Handler::READ_MASK); // if (result < 0) -// ACE_ERROR ((LM_ERROR,"TAO_FlowSpec_Entry::handler\n")); +// ORBSVCS_ERROR ((LM_ERROR,"TAO_FlowSpec_Entry::handler\n")); // break; // } // } diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index 9573932f203..3af38248259 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -199,7 +199,7 @@ TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep } int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_StreamEndPoint::destroy failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_StreamEndPoint::destroy failed\n")); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index f47c64117bd..61580021c7c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -46,7 +46,7 @@ TAO_AV_UDP_MCast_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, ACE_HANDLE TAO_AV_UDP_MCast_Flow_Handler::get_handle (void) const { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Flow_Handler::get_handle ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Flow_Handler::get_handle ")); return this->get_mcast_socket ()->get_handle () ; } @@ -161,10 +161,10 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf, size_t len, ACE_Time_Value *) { -// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Transport::send ")); +// if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Transport::send ")); // char addr [BUFSIZ]; // this->peer_addr_.addr_to_string (addr,BUFSIZ); -// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"to %s\n",addr)); +// if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr)); return this->handler_->get_mcast_socket ()->send (buf, len); diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index b622379edaf..c62ecf277ad 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -61,14 +61,14 @@ TAO_AV_Callback::open (TAO_AV_Protocol_Object *object, int TAO_AV_Callback::handle_start (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_start\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_start\n")); return -1; } int TAO_AV_Callback::handle_stop (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_stop\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_stop\n")); return -1; } @@ -77,7 +77,7 @@ TAO_AV_Callback::receive_frame (ACE_Message_Block * /*frame*/, TAO_AV_frame_info *, const ACE_Addr &) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::receive_frame\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::receive_frame\n")); return -1; } @@ -91,7 +91,7 @@ TAO_AV_Callback::receive_control_frame (ACE_Message_Block *, int TAO_AV_Callback::handle_destroy (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_end_stream\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_end_stream\n")); return -1; } @@ -99,14 +99,14 @@ void TAO_AV_Callback::get_timeout (ACE_Time_Value *& tv, void *& /*arg*/) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::get_timeout\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::get_timeout\n")); tv = 0; } int TAO_AV_Callback::handle_timeout (void * /*arg*/) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_timeout\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_timeout\n")); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 56832589873..94df4722405 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -125,7 +125,7 @@ TAO_AV_Protocol_Object::handle_control_input (ACE_Message_Block *, const ACE_Addr &) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n")); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index ef1f942c8fa..34acc9c7196 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -64,24 +64,24 @@ TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec, { if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, &ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to fill simplex sender qos (%N|%l)\n"), -1); else if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Filled up the Sender QoS parameters\n")); } else if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, &ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to fill simplex receiver qos (%N|%l)\n"), -1); else if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Filled up the Receiver QoS parameters\n")); } @@ -93,11 +93,11 @@ TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec, if (handler->qos_session ()->qos (handler->get_socket (), &qos_manager, *ace_qos) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to set QoS (%N|%l)\n"), -1); else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Setting QOS succeeds\n")); return 0; @@ -132,11 +132,11 @@ TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *ha // Protocol]. Initialize the QoS session. if (qos_session->open (dest_addr, IPPROTO_UDP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in opening the QoS session\n"), 0); else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "QoS session opened successfully\n")); if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) @@ -168,7 +168,7 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio // Initialize the Decorator. if (qos_decorator->init () != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "QoS Decorator init () failed (%N|%l)\n"), -1); @@ -177,7 +177,7 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio ACE_Event_Handler::QOS_MASK | ACE_Event_Handler::READ_MASK); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in registering the Decorator with the Reactor (%N|%l)\n"), -1); @@ -323,17 +323,17 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); if (this->qos_session_->update_qos () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in updating QoS\n"), -1); else { if(TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Updating QOS succeeds.\n")); } @@ -353,14 +353,14 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { if( TAO_debug_level > 0 ) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Resv Event Received\n")); } if (!CORBA::is_nil (this->negotiator_)) { if( TAO_debug_level > 0 ) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Negotiator Specified\n")); } @@ -404,7 +404,7 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos) { if( TAO_debug_level > 0 ) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n")); } @@ -416,7 +416,7 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos) if (new_qos.QoSParams.length () != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "New QoS Params are not Empty\n")); ACE_Flow_Spec *ace_flow_spec; @@ -435,13 +435,13 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos) { if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to fill simplex sender qos\n"), -1); else { if( TAO_debug_level > 0 ) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Filled up the Sender QoS parameters\n")); } } @@ -449,13 +449,13 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos) { if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to fill simplex receiver qos\n"), -1); else { if( TAO_debug_level > 0 ) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Filled up the Receiver QoS parameters\n")); } @@ -496,7 +496,7 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address); remote_addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n", buf)); } @@ -519,7 +519,7 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) *inet_addr); if (this->qos_session_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "QoS Session Open Failed (%N|%l)\n"), -1); @@ -536,7 +536,7 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (helper.activate_qos_handler (this->qos_session_, this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Activating QoS Handler Failed (%N|%l)\n"), -1); } @@ -548,7 +548,7 @@ ACE_HANDLE TAO_AV_UDP_QoS_Flow_Handler::get_handle (void) const { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n", this->qos_sock_dgram_.get_handle ())); @@ -646,12 +646,12 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, this->handler_->qos_session ()->dest_addr (), 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in dgram_mcast.send () (%N|%l)\n"), -1); else if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Using ACE_OS::sendto () : Bytes sent : %d", bytes_sent)); @@ -676,12 +676,12 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, this->handler_->qos_session ()->dest_addr (), 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in dgram_mcast.send ()\n"), -1); else if( TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d", bytes_sent)); @@ -700,13 +700,13 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf, ACE_Time_Value *) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Transport::send ")); ACE_TCHAR addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) to %s\n", addr)); @@ -731,13 +731,13 @@ TAO_AV_UDP_QoS_Transport::send (const iovec *iov, this->handler_->qos_session ()->dest_addr (), 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in dgram_mcast.send ()\n"), -1); else { if( TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d", bytes_sent)); } @@ -794,7 +794,7 @@ TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *hand int result = 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Acceptor Svc Handler QOS ENABLED\n")); TAO_AV_UDP_QoS_Session_Helper helper; @@ -802,7 +802,7 @@ TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *hand result = helper.activate_qos_handler (handler->qos_session (), handler); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in registering the Decorator with the Reactor\n"), -1); @@ -819,7 +819,7 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, ACE_UNUSED_ARG (flow_comp); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open ")); this->av_core_ = av_core; @@ -836,7 +836,7 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, inet_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s", buf)); @@ -873,7 +873,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, address->addr_to_string (buf, BUFSIZ);*/ - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) ADDRESS IS %s:%d\n", buf, qos_acceptor_addr_.get_port_number() )); @@ -937,13 +937,13 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) 1); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"), -1); result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error in getting Local Address (%N|%l)\n"), -1); @@ -960,7 +960,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Session Address is %s\n", dest_buf)); @@ -968,14 +968,14 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) dest_addr); if (this->qos_session_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "QoS Session Open Failed (%N|%l)\n"), -1); handler->qos_session (this->qos_session_); if (this->activate_svc_handler (handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Activate Svc Handler Failed (%N|%l)\n"), -1); @@ -997,7 +997,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (helper.set_qos (*ace_flow_spec, handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Set QoS Failed (%N|%l)\n"), -1); } @@ -1017,7 +1017,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) 1); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"), -1); } @@ -1041,7 +1041,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) } catch (const CORBA::Exception&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Negotiator Not Found\n")); } @@ -1050,7 +1050,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); local_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); @@ -1059,7 +1059,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Local Address is %s\n", buf)); } @@ -1095,7 +1095,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Connector::open ")); this->endpoint_ = endpoint; @@ -1212,7 +1212,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, 1); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Data socket open failed (%N|%l)\n"), -1); @@ -1240,7 +1240,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Session Address is %s\n", sess_buf)); @@ -1256,11 +1256,11 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, *session_addr); if (this->qos_session_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "QoS Session Open Failed (%N|%l)\n"), -1); else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "QoS session opened successfully\n")); if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) @@ -1298,13 +1298,13 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, if (helper.set_qos (*ace_flow_spec, handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to set QoS (%N|%l)\n"), -1); else { if( TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) Setting QOS succeeds.\n")); } } @@ -1327,7 +1327,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, } catch (const CORBA::Exception&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Negotiator not found for flow %s\n", this->entry_->flowname ())); } @@ -1339,7 +1339,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Get local addr failed (%N|%l)\n"), result); @@ -1352,7 +1352,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, local_addr->addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Local Address is %s\n", buf)); } @@ -1376,7 +1376,7 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han handler); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) Error in registering the Decorator with the Reactor\n"), -1); @@ -1396,7 +1396,7 @@ TAO_AV_UDP_QoS_Connector::close (void) TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n")); } @@ -1408,7 +1408,7 @@ int TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Factory::match_protocol\n")); if (ACE_OS::strcasecmp (protocol_string,"QoS_UDP") == 0) @@ -1420,7 +1420,7 @@ TAO_AV_Acceptor* TAO_AV_UDP_QoS_Factory::make_acceptor (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Factory::make_acceptor ")); TAO_AV_Acceptor *acceptor = 0; @@ -1434,7 +1434,7 @@ TAO_AV_Connector* TAO_AV_UDP_QoS_Factory::make_connector (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Factory::make_connector ")); TAO_AV_Connector *connector = 0; @@ -1458,7 +1458,7 @@ TAO_AV_UDP_QoS_Factory::init (int /* argc */, TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n")); } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 6166bce4d68..ea70dd766ec 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -71,7 +71,7 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, &more); if (!sr.is_valid(first_rtcp_packet)) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "warning invalid rtcp packet\n")); @@ -95,7 +95,7 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, &more); if (!rr.is_valid(first_rtcp_packet)) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "warning invalid rtcp packet\n")); @@ -120,7 +120,7 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, &more); if (!sdes.is_valid(first_rtcp_packet)) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "warning invalid rtcp packet\n")); @@ -134,7 +134,7 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, &more); if (!bye.is_valid(first_rtcp_packet)) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "warning invalid rtcp packet\n")); @@ -162,13 +162,13 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, } case RTCP_PT_APP: // If we receive one of these, ignore it. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "APP packet - ignore\n")); more -= (4 + (ACE_UINT16)buf_ptr[length - more + 2]); break; default: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "UNKNOWN packet type %u; ignore the rest\n", (int)buf_ptr[length - more + 1])); @@ -180,7 +180,7 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, } if (more != 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTCP_Callback::receive_control_frame - " "Error in overall packet length\n")); return 0; @@ -391,13 +391,13 @@ TAO_AV_RTCP_Object::handle_input (void) if (n == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_ERROR, "TAO_AV_RTCP::handle_input:connection closed\n")); + ORBSVCS_DEBUG ((LM_ERROR, "TAO_AV_RTCP::handle_input:connection closed\n")); return -1; } if (n < 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_ERROR,"TAO_AV_RTCP::handle_input:recv error\n")); + ORBSVCS_DEBUG ((LM_ERROR,"TAO_AV_RTCP::handle_input:recv error\n")); return -1; } data.wr_ptr (n); diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 7011dab5371..b32b95ce4f5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -198,7 +198,7 @@ RTCP_Channel_In::update_seq(ACE_UINT16 seq) this->init_seq (seq); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "RTCP_Channel_In: large jump in sequence number", "; init seq\n")); } @@ -222,7 +222,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb, const ACE_Addr *peer_address) { if (*peer_address != *this->peer_address_) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "RTCP_Channel_In::recv_rtp_packet - possible loop/collision detected")); RTP_Packet data_packet(mb->rd_ptr (), static_cast<int> (mb->length ())); @@ -231,7 +231,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb, if (data_packet.is_valid ()) this->updateStatistics(&data_packet); else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "RTCP_Channel_In::recvDataPacket - invalid RTP packet\n")); } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 9f5a03afd38..9479f69edbf 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -19,7 +19,7 @@ RTCP_Packet::RTCP_Packet(char* buffer) this->chd_.ver_ = (buffer[0] & 0xC0) >> 6; if (this->chd_.ver_ != RTP_VERSION) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "RTCP_Packet::RTCP_Packet version incorrect")); this->chd_.pad_ = (buffer[0] & 0x20) >> 5; @@ -249,13 +249,13 @@ RTCP_BYE_Packet::build_packet(void) void RTCP_BYE_Packet::dump (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nRTCP_BYE_Packet:: from ssrc(s) ")); for (int i=0; i< this->ssrc_list_length_; i++) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%u ", this->ssrc_list_[i])); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\n Reason '%s'\n", this->reason_)); } @@ -423,21 +423,21 @@ RTCP_RR_Packet::dump (void) RR_Block *b = this->rr_; int count = 1; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nRTCP_RR_Packet:: from %u - %d rr blocks follow.\n", this->ssrc_, this->chd_.count_)); while (b) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " Block %d: ssrc %u; frac %u; lost %u; last seq %u\n", count, b->ssrc_, b->fraction_, b->lost_, b->last_seq_)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " jitter %u; lsr %u; dlsr %u;\n", b->jitter_, b->lsr_, @@ -903,17 +903,17 @@ RTCP_SDES_Packet::dump (void) { sdesItem_t *ip; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nRTCP_SDES_Packet:: ")); if (this->num_chunks_ != 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Mixers not currently supported.\n")); return; } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "from ssrc %u\n", this->chunk_->ssrc_)); @@ -934,42 +934,42 @@ RTCP_SDES_Packet::dump (void) case RTCP_SDES_END: break; case RTCP_SDES_CNAME: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " CNAME '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_NAME: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " NAME '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_EMAIL: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " EMAIL '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_PHONE: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " PHONE '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_LOC: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " LOC '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_TOOL: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " TOOL '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_NOTE: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " NOTE '%s'\n", ip->info_.standard_.data_)); break; case RTCP_SDES_PRIV: - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " '%s' '%s'\n", ip->info_.priv_.name_, ip->info_.priv_.data_)); @@ -1175,30 +1175,30 @@ RTCP_SR_Packet::dump (void) RR_Block *b = this->rr_; int count = 1; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nRTCP_SR_Packet:: from %u - %d rr blocks follow.\n", this->ssrc_, this->chd_.count_)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " NTP(sec) %u.%u; RTP ts %u\n", this->ntp_ts_msw_, this->ntp_ts_lsw_, this->rtp_ts_)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " packets sent %u; octets sent %u\n", this->psent_, this->osent_)); while (b) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " Block %d: ssrc %u; frac %u; lost %u; last seq %u\n", count, b->ssrc_, b->fraction_, b->lost_, b->last_seq_)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " jitter %u; lsr %u; dlsr %u;\n", b->jitter_, b->lsr_, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index 2178f49ab2e..aab9f0713ad 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -114,7 +114,7 @@ RTP_Packet::RTP_Packet(unsigned char padding, if (data_size > RTP_MTU-12) { data_size = RTP_MTU-12; - ACE_DEBUG ((LM_DEBUG, "\n(%N,%l) RTP_Packet: Warning - packet truncated\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "\n(%N,%l) RTP_Packet: Warning - packet truncated\n")); } if (csrc_count > 15) @@ -320,7 +320,7 @@ TAO_AV_RTP_Object::handle_input (void) TAO_AV_frame_info frame_info; if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nTAO_AV_RTP_Object::handle_input\n")); // Handles the incoming RTP packet input. @@ -329,7 +329,7 @@ TAO_AV_RTP_Object::handle_input (void) int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); if (n == 0) - ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::handle_input:connection closed\n"),-1); + ORBSVCS_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::handle_input:connection closed\n"),-1); if (n < 0) { if ((errno == EADDRNOTAVAIL) || (errno == ECONNRESET)) @@ -338,7 +338,7 @@ TAO_AV_RTP_Object::handle_input (void) return -1; } else - ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::handle_input:recv error\n"),-1); + ORBSVCS_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::handle_input:recv error\n"),-1); } this->frame_.wr_ptr (this->frame_.rd_ptr () + n); @@ -385,7 +385,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, if (frame_info != 0) { if (frame_info->format != this->format_) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTP_Object::send_frame - error: format type mismatch")); if (frame_info->ssrc != 0) this->ssrc_ = frame_info->ssrc; @@ -476,7 +476,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, result = this->transport_->send (&mb); if (result < 0) - ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::send_frame failed\n"),result); + ORBSVCS_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::send_frame failed\n"),result); TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*> (this->control_object_); if (rtcp_prot_obj) @@ -506,7 +506,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, if (frame_info != 0) { if (frame_info->format != this->format_) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_RTP_Object::send_frame - error: format type mismatch")); this->sequence_num_ = static_cast<ACE_UINT16> (frame_info->sequence_num); if (frame_info->ssrc != 0) @@ -606,7 +606,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, delete rtp_packet; if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_RTP::send_frame failed\n"),result); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_RTP::send_frame failed\n"),result); return 0; } @@ -671,7 +671,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list) TAO_AV_Payload_Type_Policy *payload_policy = static_cast<TAO_AV_Payload_Type_Policy *> (policy); if (payload_policy == 0) - ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:Payload policy not defined\n"),-1); + ORBSVCS_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:Payload policy not defined\n"),-1); this->format_ = payload_policy->value (); } break; @@ -680,7 +680,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list) TAO_AV_SSRC_Policy *ssrc_policy = static_cast<TAO_AV_SSRC_Policy *> (policy); if (ssrc_policy == 0) - ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:SSRC policy not defined\n"),-1); + ORBSVCS_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:SSRC policy not defined\n"),-1); this->ssrc_ = ssrc_policy->value ();; } break; @@ -740,7 +740,7 @@ TAO_AV_RTP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_AV_Callback *callback = 0; if( endpoint->get_callback (entry->flowname (), callback) ) { - ACE_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); } TAO_AV_Protocol_Object *object = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index df916055a26..68d97fb7735 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -166,7 +166,7 @@ TAO_AV_SCTP_SEQ_Base_Acceptor::acceptor_open (TAO_AV_SCTP_SEQ_Acceptor *acceptor const ACE_INET_Addr &local_addr, TAO_FlowSpec_Entry *entry) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "In base acceptor open")); this->acceptor_ = acceptor; @@ -197,12 +197,12 @@ TAO_AV_SCTP_SEQ_Base_Acceptor::acceptor_open (TAO_AV_SCTP_SEQ_Acceptor *acceptor multi_addr.addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_SCTP_SEQ_Base_Acceptor::open: %s", buf)); if (this->open (multi_addr,reactor) < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Base_Acceptor::open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Base_Acceptor::open failed\n"),-1); return 0; } @@ -235,7 +235,7 @@ int TAO_AV_SCTP_SEQ_Acceptor::make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&sctp_handler) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_SCTP_SEQ_Acceptor::make_svc_handler\n")); if (this->endpoint_ != 0) @@ -284,7 +284,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, inet_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_SCTP_SEQ_Acceptor::open: %s", buf)); @@ -296,7 +296,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, *inet_addr, entry); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_SCTP_SEQ_Acceptor::open failed"), -1); @@ -332,7 +332,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_SCTP_SEQ_Acceptor::open failed"), -1); @@ -345,7 +345,7 @@ TAO_AV_SCTP_SEQ_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, address->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_SCTP_SEQ_Acceptor::open_default: %s\n", buf)); @@ -373,7 +373,7 @@ TAO_AV_SCTP_SEQ_Base_Connector::connector_open (TAO_AV_SCTP_SEQ_Connector *conne this->reactor_ = reactor; if (this->open (reactor) < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Base_Connector::open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Base_Connector::open failed\n"),-1); return 0; } @@ -399,7 +399,7 @@ TAO_AV_SCTP_SEQ_Base_Connector::connector_connect (TAO_AV_SCTP_SEQ_Flow_Handler local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Base_Connector::connect failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Base_Connector::connect failed\n"),-1); return 0; } @@ -418,7 +418,7 @@ int TAO_AV_SCTP_SEQ_Connector::make_svc_handler (TAO_AV_SCTP_SEQ_Flow_Handler *&sctp_handler) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Connector::make_svc_handler\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Connector::make_svc_handler\n")); // TAO_AV_Callback *callback = 0; if (this->endpoint_ != 0) @@ -453,7 +453,7 @@ TAO_AV_SCTP_SEQ_Connector::open (TAO_Base_StreamEndPoint *endpoint, this->endpoint_ = endpoint; this->flow_protocol_factory_ = factory; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Connector::open ")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Connector::open ")); int result = this->connector_.connector_open(this, av_core->reactor ()); return result; @@ -524,13 +524,13 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry, local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_connector::connect failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_connector::connect failed\n"),-1); entry->handler (handler); transport = handler->transport (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Local Addrs\n")); char buf [BUFSIZ]; size_t size = BUFSIZ; @@ -541,13 +541,13 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry, { peer_addrs [i].addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s %d\n", buf, size)); } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Remote Addrs\n")); size = BUFSIZ; @@ -556,7 +556,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry, { peer_addrs [i].addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s %d\n", buf, size)); @@ -599,7 +599,7 @@ TAO_AV_Acceptor* TAO_AV_SCTP_SEQ_Factory::make_acceptor (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_acceptor\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_acceptor\n")); TAO_AV_Acceptor *acceptor = 0; ACE_NEW_RETURN (acceptor, TAO_AV_SCTP_SEQ_Acceptor, @@ -611,7 +611,7 @@ TAO_AV_Connector* TAO_AV_SCTP_SEQ_Factory::make_connector (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_connector\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_SCTP_SEQ_Factory::make_connector\n")); TAO_AV_Connector *connector = 0; ACE_NEW_RETURN (connector, TAO_AV_SCTP_SEQ_Connector, @@ -637,9 +637,9 @@ TAO_AV_SCTP_SEQ_Object::handle_input (void) int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); if (n == -1) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Flow_Handler::handle_input recv failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Flow_Handler::handle_input recv failed\n"),-1); if (n == 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Flow_Handler::handle_input connection closed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SCTP_SEQ_Flow_Handler::handle_input connection closed\n"),-1); this->frame_.wr_ptr (this->frame_.rd_ptr () + n); return this->callback_->receive_frame (&this->frame_); @@ -717,7 +717,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) { if( TAO_debug_level > 0 ) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_SCTP_SEQ_Flow_Handler::change_qos\n")); } @@ -733,7 +733,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "DSCP %d\n", dscp)); dscp_flag=1; @@ -741,7 +741,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) if(!((dscp >= 0) && (dscp <= 63))) { dscp_flag = 0; - ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); return -1; } } @@ -753,7 +753,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) // IP Diffserv byte if(!((ecn >= 0) && (ecn <= 3))) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); ecn = 0; } @@ -774,7 +774,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) if(TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) set tos: ret: %d %d\n", tos, ret)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) set tos: ret: %d %d\n", tos, ret)); } } @@ -782,7 +782,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) { if(ret < 0 ) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) errno: %p\n")); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) errno: %p\n")); } } return ret; @@ -798,7 +798,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::open (void * /*arg*/) SCTP_NODELAY, (void *) &nodelay, sizeof (nodelay)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "NODELAY failed\n"), -1); #endif /* SCTP_NODELAY */ @@ -816,7 +816,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::open (void * /*arg*/) if (TAO_debug_level > 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) connection to server <%s> on %d\n", server, this->peer ().get_handle ())); @@ -827,7 +827,7 @@ TAO_AV_SCTP_SEQ_Flow_Handler::open (void * /*arg*/) && this->reactor ()->register_handler (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("unable to register client handler")), -1); @@ -882,7 +882,7 @@ TAO_AV_SCTP_SEQ_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, { TAO_AV_Callback *callback = 0; if( endpoint->get_callback (entry->flowname (), callback) ) { - ACE_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); } TAO_AV_SCTP_SEQ_Object *object = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 240f08690ad..604f65d781d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -179,7 +179,7 @@ TAO_AV_TCP_Factory::match_protocol (const char *protocol_string) TAO_AV_Acceptor* TAO_AV_TCP_Factory::make_acceptor (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_acceptor ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_acceptor ")); TAO_AV_Acceptor *acceptor = 0; ACE_NEW_RETURN (acceptor, TAO_AV_TCP_Acceptor, @@ -190,7 +190,7 @@ TAO_AV_TCP_Factory::make_acceptor (void) TAO_AV_Connector* TAO_AV_TCP_Factory::make_connector (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_connector ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_connector ")); TAO_AV_Connector *connector = 0; ACE_NEW_RETURN (connector, TAO_AV_TCP_Connector, @@ -208,9 +208,9 @@ TAO_AV_TCP_Object::handle_input (void) int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); if (n == -1) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Flow_Handler::handle_input recv failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Flow_Handler::handle_input recv failed\n"),-1); if (n == 0) - ACE_ERROR_RETURN ((LM_DEBUG,"TAO_AV_TCP_Flow_Handler::handle_input connection closed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_DEBUG,"TAO_AV_TCP_Flow_Handler::handle_input connection closed\n"),-1); this->frame_.wr_ptr (this->frame_.rd_ptr () + n); return this->callback_->receive_frame (&this->frame_); @@ -296,7 +296,7 @@ TAO_AV_TCP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_AV_Callback *callback = 0; if (endpoint->get_callback (entry->flowname (), callback)) { - ACE_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); } TAO_AV_TCP_Object *object = 0; @@ -327,7 +327,7 @@ TAO_AV_TCP_Base_Connector::connector_open (TAO_AV_TCP_Connector *connector, int result = ACE_Connector <TAO_AV_TCP_Flow_Handler,ACE_SOCK_CONNECTOR>::open (reactor); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Base_Connector::open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Base_Connector::open failed\n"),-1); return 0; } @@ -350,7 +350,7 @@ TAO_AV_TCP_Base_Connector::connector_connect (TAO_AV_TCP_Flow_Handler *&handler, ACE_Connector <TAO_AV_TCP_Flow_Handler,ACE_SOCK_CONNECTOR>::connect (handler, remote_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Base_Connector::connect failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Base_Connector::connect failed\n"),-1); return 0; } @@ -368,7 +368,7 @@ TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector (void) int TAO_AV_TCP_Connector::make_svc_handler (TAO_AV_TCP_Flow_Handler *&tcp_handler) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Connector::make_svc_handler\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Connector::make_svc_handler\n")); // TAO_AV_Callback *callback = 0; if (this->endpoint_ != 0) { @@ -402,7 +402,7 @@ TAO_AV_TCP_Connector::open (TAO_Base_StreamEndPoint *endpoint, { this->endpoint_ = endpoint; this->flow_protocol_factory_ = factory; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Connector::open ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Connector::open ")); int result = this->connector_.connector_open(this, av_core->reactor ()); return result; @@ -424,7 +424,7 @@ TAO_AV_TCP_Connector::connect (TAO_FlowSpec_Entry *entry, int result = this->connector_.connector_connect (handler, *inet_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_connector::connect failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_connector::connect failed\n"),-1); entry->handler (handler); transport = handler->transport (); return 0; @@ -453,7 +453,7 @@ TAO_AV_TCP_Base_Acceptor::acceptor_open (TAO_AV_TCP_Acceptor *acceptor, int const result = ACE_Acceptor <TAO_AV_TCP_Flow_Handler,ACE_SOCK_ACCEPTOR>::open (local_addr,reactor); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Base_Connector::open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Base_Connector::open failed\n"),-1); return 0; } @@ -485,7 +485,7 @@ int TAO_AV_TCP_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&tcp_handler) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::make_svc_handler\n" )); @@ -520,7 +520,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, this->flow_protocol_factory_ = factory; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::open ")); this->av_core_ = av_core; @@ -542,7 +542,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::open: %s", buf )); @@ -553,7 +553,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, entry); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_TCP_Acceptor::open failed"), -1); @@ -589,7 +589,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_AV_TCP_Acceptor::open failed"), -1); @@ -602,7 +602,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, address->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_TCP_Acceptor::open_default: %s\n", buf)); @@ -651,7 +651,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) TCP_NODELAY, (void *) &nodelay, sizeof (nodelay)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "NODELAY failed\n"), -1); #endif /* TCP_NODELAY */ @@ -677,7 +677,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) (void) addr.addr_to_string (server, sizeof (server)); if (TAO_debug_level > 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) connection to server <%s> on %d\n", server, this->peer ().get_handle ())); @@ -687,7 +687,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) && this->reactor ()->register_handler (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("unable to register client handler")), -1); diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index ff59fbe31d3..2a00b365cf0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -79,7 +79,7 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, // pluggable protocols are expected to have the ability to // create a default endpoint. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Protocol was specified without an endpoint\n"), -1); } @@ -115,7 +115,7 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, entry->transport (transport); } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to create an " "connector for <%s>\n", entry->flowname ()), @@ -151,7 +151,7 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, entry->protocol_object ()->control_object (entry->control_protocol_object ()); } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to create an " "connector for <%s>\n", entry->flowname ()), @@ -218,7 +218,7 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, int retv = 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Acceptor_Registry::open\n")); TAO_AV_FlowSpecSetItor last_flowspec @@ -236,7 +236,7 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, if (ACE_OS::strcmp (flow_protocol,"") == 0) flow_protocol = transport_protocol; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Acceptor_Registry::protocol for flow %s is %s\n", entry->flowname (), transport_protocol)); @@ -296,7 +296,7 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to create an " "acceptor for <%s>\n", entry->flowname ()), @@ -304,7 +304,7 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, } } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) Unable to create an " "acceptor for <%s>\n", entry->flowname ()), @@ -322,7 +322,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, TAO_FlowSpec_Entry *entry) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Acceptor_Registry::open_default ")); // No endpoints were specified, we let each protocol pick its own @@ -339,20 +339,20 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, // No matching flow protocol. if (flow_factory == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) (%N,%l) Unable to match protocol prefix " "for <%s>\n", flow_protocol), -1); if (TAO_debug_level > 0) - ACE_DEBUG((LM_DEBUG, "(%N,%l) Matched flow_protocol: %s, Looking for transport protocol: %s\n", flow_protocol, transport_protocol)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) Matched flow_protocol: %s, Looking for transport protocol: %s\n", flow_protocol, transport_protocol)); TAO_AV_Transport_Factory *transport_factory = av_core->get_transport_factory (transport_protocol); if (transport_factory == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) (%N,%l) Unable to match protocol prefix " "for <%s>\n", transport_protocol), @@ -363,7 +363,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, transport_factory->make_acceptor(); if (acceptor == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) unable to create " "an acceptor for <%d>\n", transport_protocol), @@ -374,7 +374,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, entry, flow_factory, TAO_AV_Core::TAO_AV_DATA) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) unable to open " "default acceptor for <%s>%p\n", flow_protocol), @@ -391,7 +391,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, av_core->get_flow_protocol_factory (control_flow_factory_name); if (control_flow_factory == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) Unable to match control flow " "for <%s>\n", control_flow_factory_name), @@ -400,7 +400,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Acceptor *control_acceptor = transport_factory->make_acceptor (); if (control_acceptor == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) unable to create " "an acceptor for <%d>\n", transport_protocol), @@ -411,7 +411,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, entry, control_flow_factory, TAO_AV_Core::TAO_AV_CONTROL) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) unable to open " "default acceptor for <%s>%p\n", transport_protocol), @@ -425,7 +425,7 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, if (this->acceptors_.size () == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P%t) cannot create any default acceptor\n")); return -1; } @@ -565,7 +565,7 @@ TAO_AV_Flow_Handler::stop (TAO_FlowSpec_Entry::Role role) { int result = this->event_handler ()->reactor ()->cancel_timer (this->timer_id_); if (result < 0) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Flow_Handler::stop:cancel_timer failed\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Flow_Handler::stop:cancel_timer failed\n")); } break; default: diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 4950e268695..e44475e86c5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -57,7 +57,7 @@ int TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Flow_Handler::set_remote_address\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Flow_Handler::set_remote_address\n")); ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (address); this->peer_addr_ = *inet_addr; @@ -71,7 +71,7 @@ ACE_HANDLE TAO_AV_UDP_Flow_Handler::get_handle (void) const { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_Flow_Handler::get_handle:%d\n", this->sock_dgram_.get_handle ())); @@ -83,7 +83,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) { if( TAO_debug_level > 0 ) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_Flow_Handler::change_qos\n")); } @@ -104,7 +104,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) if(!((dscp >= 0) && (dscp <= 63))) { dscp_flag = 0; - ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); return -1; } } @@ -116,7 +116,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) // IP Diffserv byte if(!((ecn >= 0) && (ecn <= 3))) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); ecn = 0; } @@ -137,7 +137,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) if(TAO_debug_level > 1) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) set tos: ret: %d\n", ret)); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) set tos: ret: %d\n", ret)); } } @@ -145,7 +145,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) { if(ret < 0 ) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) errno: %p\n")); + ORBSVCS_DEBUG((LM_DEBUG, "(%N,%l) errno: %p\n")); } } return ret; @@ -265,10 +265,10 @@ TAO_AV_UDP_Transport::send (const char *buf, size_t len, ACE_Time_Value *) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Transport::send ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Transport::send ")); ACE_TCHAR addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"to %s\n",addr)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr)); return this->handler_->get_socket ()->send (buf, len,this->peer_addr_); } @@ -353,7 +353,7 @@ TAO_AV_UDP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Flow_Protocol_Factory *factory, TAO_AV_Core::Flow_Component flow_comp) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Acceptor::open\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Acceptor::open\n")); this->av_core_ = av_core; this->endpoint_ = endpoint; this->entry_ = entry; @@ -377,7 +377,7 @@ TAO_AV_UDP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, inet_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_Acceptor::open: %s\n", buf)); } @@ -458,7 +458,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, if (result < 0) { - ACE_DEBUG((LM_DEBUG,"(%N,%l) Error during connection setup: %d\n", result)); + ORBSVCS_DEBUG((LM_DEBUG,"(%N,%l) Error during connection setup: %d\n", result)); } local_addr->set (local_addr->get_port_number (), @@ -546,7 +546,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_UDP_ACCEPTOR::open:%s\n", buf)); } @@ -586,7 +586,7 @@ TAO_AV_UDP_Connector::open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Flow_Protocol_Factory *factory) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Connector::open ")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Connector::open ")); this->endpoint_ = endpoint; this->av_core_ = av_core; this->flow_protocol_factory_ = factory; @@ -758,7 +758,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, local_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_CONNECTOR::connect:%s\n",buf)); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_CONNECTOR::connect:%s\n",buf)); } // call activate svc handler. @@ -808,7 +808,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, result = handler->get_mcast_socket ()->join (*inet_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_UDP_MCast_connector::open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_UDP_MCast_connector::open failed\n"),-1); // Now disable Multicast loopback. // @@Should we make this a policy? @@ -816,7 +816,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, if (handler->get_mcast_socket ()->set_option (IP_MULTICAST_LOOP, 0) < 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Acceptor::multicast loop disable failed\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Acceptor::multicast loop disable failed\n")); // @@ This should also be policies. #endif /*ACE_HAS_IP_MULTICAST*/ @@ -841,7 +841,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, { result = handler->get_mcast_socket ()->get_local_addr (*local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); local_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); @@ -867,7 +867,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, else result = handler->open (*local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"handler::open failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"handler::open failed\n"),-1); // set the socket buffer sizes to 64k. int sndbufsize = ACE_DEFAULT_MAX_SOCKET_BUFSIZ; @@ -898,7 +898,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, local_addr->addr_to_string (buf, BUFSIZ); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); } return 1; @@ -929,7 +929,7 @@ TAO_AV_UDP_Factory::match_protocol (const char *protocol_string) TAO_AV_Acceptor* TAO_AV_UDP_Factory::make_acceptor (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_acceptor\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_acceptor\n")); TAO_AV_Acceptor *acceptor = 0; ACE_NEW_RETURN (acceptor, TAO_AV_UDP_Acceptor, @@ -940,7 +940,7 @@ TAO_AV_UDP_Factory::make_acceptor (void) TAO_AV_Connector* TAO_AV_UDP_Factory::make_connector (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_connector\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_connector\n")); TAO_AV_Connector *connector = 0; ACE_NEW_RETURN (connector, TAO_AV_UDP_Connector, @@ -965,7 +965,7 @@ TAO_AV_UDP_Object::handle_input (void) int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); if (n == -1) - ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) TAO_AV_UDP_Flow_Handler::handle_input recv failed: errno: %m\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"(%N,%l) TAO_AV_UDP_Flow_Handler::handle_input recv failed: errno: %m\n"),-1); this->frame_.wr_ptr (this->frame_.rd_ptr () + n); @@ -977,7 +977,7 @@ TAO_AV_UDP_Object::send_frame (ACE_Message_Block *frame, TAO_AV_frame_info * /*frame_info*/) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Object::send_frame\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Object::send_frame\n")); int const result = this->transport_->send (frame); if (result < 0) return result; @@ -1061,7 +1061,7 @@ TAO_AV_UDP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, { TAO_AV_Callback *callback = 0; if( endpoint->get_callback (entry->flowname (), callback) ) { - ACE_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); } TAO_AV_UDP_Object *object = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 16f90aa997f..1880cda1354 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory %d\n")); } @@ -36,7 +36,7 @@ TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory (void) TAO_AV_CORE::instance ()->flow_protocol_factories ()->reset (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory\n")); } @@ -44,7 +44,7 @@ int TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Default_Resource_Factory::init\n")); int curarg = 0; @@ -63,7 +63,7 @@ TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) TAO_AV_Transport_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), -1); if (tset->insert (item) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to add transport factories for %s: %p\n"), argv[curarg])); @@ -81,7 +81,7 @@ TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) TAO_AV_Flow_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), -1); if (fpset->insert (item) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to add flow protocol factories for %s: %p\n"), argv[curarg])); diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 3d9704afbdc..686bc3a42b1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -62,7 +62,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) output_cdr.reset (); if (!(output_cdr << frame_header)) { - ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); return; } @@ -75,7 +75,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) output_cdr.reset (); if (!(output_cdr << fragment)) { - ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); return; } @@ -91,7 +91,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) output_cdr.reset (); if (!(output_cdr << start)) { - ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); return; } @@ -105,7 +105,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) output_cdr.reset (); if (!(output_cdr << start_reply)) { - ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); return; } @@ -120,7 +120,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) if (!(output_cdr << credit)) { - ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); + ORBSVCS_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); return; } credit_len = static_cast<u_int> (output_cdr.total_length ()); @@ -163,7 +163,7 @@ TAO_SFP_Base::handle_input (TAO_AV_Transport *transport, state.cdr); if (result < 0) return result; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Fragment received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"Fragment received\n")); result = TAO_SFP_Base::read_fragment (transport, state.fragment_, state, @@ -197,7 +197,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, int result = -1; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"Reading simple frame\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"Reading simple frame\n")); // Check to see what the length of the message is. int byte_order = frame_header.flags & 0x1; int message_len = frame_header.message_size; @@ -209,11 +209,11 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, state.static_frame_.wr_ptr (state.static_frame_.base ()); int n = transport->recv (state.static_frame_.rd_ptr (),message_len); if (n == -1) - ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0); else if (n==0) - ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0); else if (n != message_len) - ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame:message truncated\n"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame:message truncated\n"),0); message_block = &state.static_frame_; // print the buffer. // this->dump_buf (message,n); @@ -225,7 +225,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, if (frame_header.flags & 0x2) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"fragmented frame:0th fragment\n")); + ORBSVCS_DEBUG ((LM_DEBUG,"fragmented frame:0th fragment\n")); state.more_fragments_ = 1; ACE_Message_Block *data = 0; switch (frame_header.message_type) @@ -242,7 +242,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, TAO_InputCDR frame_info_cdr (&frame_info_mb,byte_order); frame_info_cdr >> state.frame_; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "frame.timestamp = %d, " "frame.synchsource = %d, " "frame.sequence_num = %d\n", @@ -266,7 +266,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, break; } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"Length of 0th fragment= %d\n",data->length ())); + ORBSVCS_DEBUG ((LM_DEBUG,"Length of 0th fragment= %d\n",data->length ())); TAO_SFP_Fragment_Table *fragment_table = 0; result = state.fragment_table_map_.find (ssrc,fragment_table); if (result != 0) @@ -276,7 +276,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, -1); result = state.fragment_table_map_.bind (ssrc,fragment_table); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_SFP_Base::read_frame: " "fragment_table_map:bind failed\n"),-1); } @@ -298,11 +298,11 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, // This case can happen where a nth (n > 0)fragment is // received before the 0th fragment. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "fragment table entry found for 0th fragment:\n")); result = fragment_entry->fragment_set_.insert (*new_node); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "insert for 0th fragment failed\n"),0); // enter the frame info. @@ -315,7 +315,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "fragment table entry not found for 0th fragment\n")); TAO_SFP_Fragment_Table_Entry *new_entry; ACE_NEW_RETURN (new_entry, @@ -323,12 +323,12 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, 0); result = new_entry->fragment_set_.insert (*new_node); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR,"insert for 0th fragment failed\n"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"insert for 0th fragment failed\n"),0); fragment_entry = new_entry; // not found. so bind a new entry. result = fragment_table->bind (state.frame_.sequence_num,new_entry); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR,"fragment table bind failed\n"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"fragment table bind failed\n"),0); if (frame_header.message_type & 4 ) fragment_entry->frame_info.boundary_marker = 1; switch (frame_header.message_type) @@ -374,7 +374,7 @@ TAO_SFP_Base::read_fragment (TAO_AV_Transport *transport, TAO_SFP_Fragment_Table_Entry *fragment_entry = 0; int result = -1; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"frag_number = %d, frag_size = %d,source_id = %d sequnce_num = %d\n", + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"frag_number = %d, frag_size = %d,source_id = %d sequnce_num = %d\n", fragment.frag_number,fragment.frag_sz,fragment.source_id,fragment.sequence_num)); ACE_Message_Block *data; @@ -385,12 +385,12 @@ TAO_SFP_Base::read_fragment (TAO_AV_Transport *transport, // Read the fragment. int n = transport->recv (data->wr_ptr (),fragment.frag_sz); if ((n == -1) || (n==0)) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_SFP::read_fragment:%p",""),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_SFP::read_fragment:%p",""),-1); // move past the fragment header. data->rd_ptr (fragment_len); data->wr_ptr (n); // TAO_SFP_Base::dump_buf (data->rd_ptr (),data->length ()); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"length of %dth fragment is: %d\n", + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"length of %dth fragment is: %d\n", fragment.frag_number, data->length ())); @@ -409,14 +409,14 @@ TAO_SFP_Base::read_fragment (TAO_AV_Transport *transport, -1); result = state.fragment_table_map_.bind (fragment.source_id,fragment_table); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_SFP_Base::read_fragment:fragment_table_map:bind failed\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_SFP_Base::read_fragment:fragment_table_map:bind failed\n"),-1); } if (fragment_table->find (fragment.sequence_num,fragment_entry) == 0) { // Already an entry exists. Traverse the list and insert it at the right place. result = fragment_entry->fragment_set_.insert (*new_node); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR,"insert for %dth node failed\n",fragment.frag_number),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"insert for %dth node failed\n",fragment.frag_number),-1); // check if all the fragments have been received. } else @@ -428,12 +428,12 @@ TAO_SFP_Base::read_fragment (TAO_AV_Transport *transport, // bind a new entry for this sequence number. result = fragment_table->bind (fragment.sequence_num,fragment_entry); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR,"bind for %dth fragment failed\n", + ORBSVCS_ERROR_RETURN ((LM_ERROR,"bind for %dth fragment failed\n", fragment.frag_number),-1); } if (!(fragment.flags & 0x2)) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Last fragment received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"Last fragment received\n")); // if bit 1 is not set then there are // no more fragments. fragment_entry->last_received_ = 1; @@ -457,11 +457,11 @@ TAO_SFP_Base::read_fragment (TAO_AV_Transport *transport, ACE_Message_Block* TAO_SFP_Base::check_all_fragments (TAO_SFP_Fragment_Table_Entry *fragment_entry) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"table size: %d, num_fragments: %d\n",fragment_entry->fragment_set_.size (),fragment_entry->num_fragments_)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"table size: %d, num_fragments: %d\n",fragment_entry->fragment_set_.size (),fragment_entry->num_fragments_)); // check to see if all the frames have been received. if (fragment_entry->fragment_set_.size () == fragment_entry->num_fragments_) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"all fragments have been received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"all fragments have been received\n")); // all the fragments have been received // we can now chain the ACE_Message_Blocks in the fragment_set_ and then return them // back. @@ -633,7 +633,7 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, ssize_t n = transport->send (stream.begin ()); if (n == -1) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO: (%P|%t) closing conn after fault %p\n", "GIOP::send_request ()")); return -1; @@ -642,7 +642,7 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, if (n == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO: (%P|%t) GIOP::send_request () " "EOF, closing conn:\n")); return -1; @@ -666,39 +666,39 @@ TAO_SFP_Base::peek_message_type (TAO_AV_Transport *transport, TAO_SFP_MAGIC_NUMBER_LEN); magic_number [TAO_SFP_MAGIC_NUMBER_LEN] = 0; if (n == -1) - ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),-1); else if (n==0) - ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),-1); if (ACE_OS::strcmp (magic_number,TAO_SFP_START_MAGIC_NUMBER) == 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)Start message received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)Start message received\n")); msg_type = flowProtocol::Start_Msg; } else if (ACE_OS::strcmp (magic_number,TAO_SFP_STARTREPLY_MAGIC_NUMBER) == 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)StartReply message received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t)StartReply message received\n")); msg_type = flowProtocol::StartReply_Msg; } else if (ACE_OS::strcmp (magic_number,TAO_SFP_MAGIC_NUMBER) == 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t) frameHeader received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t) frameHeader received\n")); // msg_type = flowProtocol::SimpleFrame; msg_type = (flowProtocol::MsgType)peek_buffer [TAO_SFP_MESSAGE_TYPE_OFFSET]; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Message Type = %d\n",msg_type)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"Message Type = %d\n",msg_type)); } else if (ACE_OS::strcmp (magic_number,TAO_SFP_FRAGMENT_MAGIC_NUMBER) == 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t) fragment Header received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t) fragment Header received\n")); msg_type = flowProtocol::Fragment_Msg; } else if (ACE_OS::strcmp (magic_number,TAO_SFP_CREDIT_MAGIC_NUMBER) == 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t) credit message received\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"(%P|%t) credit message received\n")); msg_type = flowProtocol::Credit_Msg; } else - ACE_ERROR_RETURN ((LM_ERROR,"TAO_SFP:Invalid magic number\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_SFP:Invalid magic number\n"),-1); return 0; } @@ -712,7 +712,7 @@ TAO_SFP_Base::read_start_message (TAO_AV_Transport *transport, int n = transport->recv (buf, start_len); if (n != static_cast<int> (start_len)) - ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start\n"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start\n"),0); else { if (!(input >> start)) @@ -732,7 +732,7 @@ TAO_SFP_Base::read_start_reply_message (TAO_AV_Transport *transport, int n = transport->recv (buf, start_reply_len); if (n != static_cast<int> (start_len)) - ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start_reply_message"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start_reply_message"),0); else { if (!(input >> start_reply)) @@ -751,7 +751,7 @@ TAO_SFP_Base::read_credit_message (TAO_AV_Transport *transport, int n = transport->recv (buf, credit_len); if (n != static_cast<int> (credit_len)) - ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_credit_message"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_credit_message"),0); else { if (!(input >> credit)) @@ -770,7 +770,7 @@ TAO_SFP_Base::read_endofstream_message (TAO_AV_Transport *transport, int n = transport->recv (buf, frame_header_len); if (n != static_cast<int> (frame_header_len)) - ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); else { if (!(input >> endofstream)) @@ -790,7 +790,7 @@ TAO_SFP_Base::peek_frame_header (TAO_AV_Transport *transport, frame_header_len, MSG_PEEK); if (n != static_cast<int> (frame_header_len)) - ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); else { if (!(input >> header)) @@ -810,7 +810,7 @@ TAO_SFP_Base::peek_fragment_header (TAO_AV_Transport *transport, fragment_len, MSG_PEEK); if (n != static_cast<int> (fragment_len)) - ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); else { if (!(input >> fragment)) @@ -823,10 +823,10 @@ void TAO_SFP_Base::dump_buf (char *buffer,int size) { char *buf = buffer; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"\n========================================\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"\n========================================\n")); for (int i=0;i<size;i++) - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"%d ",buf[i])); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"\n========================================\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"%d ",buf[i])); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"\n========================================\n")); } //------------------------------------------------------------ @@ -873,17 +873,17 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame, { TAO_OutputCDR out_stream; CORBA::Boolean result = 0; - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_SFP_Object::send_frame\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_SFP_Object::send_frame\n")); CORBA::Octet flags = TAO_ENCAP_BYTE_ORDER; if (this->transport_ == 0) - ACE_ERROR_RETURN ((LM_ERROR,"TAO_SFP_Object::send_frame: transport is null\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_SFP_Object::send_frame: transport is null\n"),-1); if (this->current_credit_ != 0) { // if we have enough credit then we send. size_t total_length = 0; for (ACE_Message_Block *temp = frame;temp != 0;temp = temp->cont ()) total_length += temp->length (); - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"total_length of frame=%d\n",total_length)); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"total_length of frame=%d\n",total_length)); if (total_length < (TAO_SFP_MAX_PACKET_SIZE -TAO_SFP_Base::frame_header_len)) { if (frame_info != 0) @@ -971,7 +971,7 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame, current_len); if (mb == 0) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"sending the last fragment\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"sending the last fragment\n")); // This is the last fragment so clear the fragments bit. flags = TAO_ENCAP_BYTE_ORDER; } @@ -1029,7 +1029,7 @@ TAO_SFP_Object::send_frame (const iovec * /*iov*/, int /*iovcnt*/, TAO_AV_frame_info * /*frame_info*/) { - ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SFP_Object::send_frame"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"TAO_AV_SFP_Object::send_frame"),-1); } int @@ -1128,14 +1128,14 @@ TAO_SFP_Consumer_Object::TAO_SFP_Consumer_Object (TAO_AV_Callback *callback, int TAO_SFP_Consumer_Object::handle_input (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_SFP_Consumer_Object::handle_input\n")); + if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_SFP_Consumer_Object::handle_input\n")); // This is the entry point for receiving data. TAO_AV_frame_info *frame_info = 0; int result = TAO_SFP_Base::handle_input (this->transport_, this->state_, frame_info); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR,"ERROR in TAO_SFP_Consumer_Object::handle_input"),result); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"ERROR in TAO_SFP_Consumer_Object::handle_input"),result); if (this->state_.frame_header_.message_type == flowProtocol::EndofStream_Msg) this->callback_->handle_destroy (); if (this->state_.is_complete ()) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 3d34f1fd4fb..606a8cbae3a 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -18,7 +18,7 @@ // ============================================================================ #include "orbsvcs/Concurrency/CC_Lock.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -41,7 +41,7 @@ CC_Lock::~CC_Lock (void) void CC_Lock::lock (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::lock\n")); lock_held_++; } @@ -49,18 +49,18 @@ CC_Lock::lock (void) CORBA::Boolean CC_Lock::try_lock (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::try_lock. ")); lock_held_++; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "lock_held_: %i, ", lock_held_)); int success = 0;//semaphore_.tryacquire (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "success: %i\n", success)); if (success == -1) @@ -73,7 +73,7 @@ CC_Lock::try_lock (void) else throw CORBA::INTERNAL (); } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "lock_held_: %i, ", lock_held_)); @@ -83,7 +83,7 @@ CC_Lock::try_lock (void) void CC_Lock::unlock (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); if (lock_held_ == 0) throw CosConcurrencyControl::LockNotHeld (); @@ -95,7 +95,7 @@ CC_Lock::unlock (void) lock_held_--; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "lock_held_: %i, ", lock_held_)); } @@ -103,7 +103,7 @@ CC_Lock::unlock (void) void CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::change_mode\n")); // @@TAO Hmmm, we cannot really do anything at present since there @@ -155,7 +155,7 @@ CC_Lock::DecLocksHeld (void) void CC_Lock::dump (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "mode_ %i, lock_held_: %i\n", mode_, lock_held_)); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index b04be1282ca..1f9b5be9f31 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -85,7 +85,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) void CC_LockSet::lock (CosConcurrencyControl::lock_mode mode) { - ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); CC_LockModeEnum lm = lmconvert (mode); @@ -106,7 +106,7 @@ CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode) { CC_LockModeEnum lm = lmconvert (mode); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_LockSet::try_lock\n")); if (this->try_lock_i (lm) == 0) @@ -143,7 +143,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode) void CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_LockSet::unlock\n")); CC_LockModeEnum lm = lmconvert (mode); @@ -185,7 +185,7 @@ void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, CosConcurrencyControl::lock_mode new_mode) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CC_LockSet::change_mode\n")); CC_LockModeEnum lm_held = lmconvert (held_mode); CC_LockModeEnum lm_new = lmconvert (new_mode); @@ -282,7 +282,7 @@ CC_LockSet::lock_held (CC_LockModeEnum lm) void CC_LockSet::dump (void) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "waiting_calls_: %i, IR: %i, R: %i, U: %i, IW: %i, W: %i\n", lock_queue_.size (), lock_[CC_IR], diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 94fc4610043..6a9a9d03ae6 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -59,7 +59,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb, CORBA::String_var str = orb->object_to_string (obj.in ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "listening as object <%s>\n", str.in ())); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index f4bd0609486..935c1f42665 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -88,7 +88,7 @@ TAO_CEC_Default_Factory::parse_collection_arg (ACE_TCHAR* opt) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unknown collection modifier <%s>\n", arg)); @@ -127,7 +127,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unsupported dispatching <%s>\n", opt)); @@ -198,7 +198,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unsupported consumer lock <%s>\n", opt)); @@ -228,7 +228,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unsupported supplier lock <%s>\n", opt)); @@ -279,7 +279,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unsupported consumer control <%s>\n", opt)); @@ -305,7 +305,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unsupported supplier control <%s>\n", opt)); @@ -407,7 +407,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strncmp (arg, ACE_TEXT("-CEC"), 3) == 0) { arg_shifter.consume_arg (); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "CEC_Default_Factory - " "unknown option <%s>\n", arg)); @@ -415,7 +415,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CEC_Default_Factory - " "ignoring option <%s>\n", arg)); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 819d431dd1b..8f201fe0a8b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) getq error in Dispatching Queue\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index cd72ac42037..ef0367f5707 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -40,7 +40,7 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request) { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Operation not found in IFR cache *****\n"))); } @@ -100,7 +100,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request) if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** TAO_CEC_DynamicImplementationServer::is_a called with value %s *****\n"), value)); } @@ -110,10 +110,10 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request) if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** is_a using Server's RepositoryId %s *****\n"), this->repository_id_)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** is_a using base interface %s *****\n"), object_id)); } @@ -131,7 +131,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request) { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** is_a using base interface %s *****\n"), this->typed_event_channel_->base_interfaces (base) )); } @@ -145,7 +145,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request) if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** is_a returning %d *****\n"), result)); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index f53f3cea315..23f196a7a3b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -147,7 +147,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, case '?': default: #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Usage: %s ") ACE_TEXT ("-n service_name ") ACE_TEXT ("-o ior_file_name ") @@ -160,7 +160,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TEXT ("\n"), argv[0])); #else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Usage: %s ") ACE_TEXT ("-n service_name ") ACE_TEXT ("-o ior_file_name ") @@ -277,7 +277,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // IFR initialization if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Initializing the IFR connection... *****\n"))); } @@ -290,7 +290,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** resolve_initial_references for IFR failed\n *****"))); } return CORBA::Object::_nil (); @@ -303,7 +303,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** CORBA::Repository::_narrow failed *****\n"))); } return CORBA::Object::_nil (); @@ -312,7 +312,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** ...IFR connection completed *****\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index ba31df77c25..86373f0df43 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -40,7 +40,7 @@ TAO_CEC_MT_Dispatching::activate (void) if (this->force_activate_ != 0) { if (this->task_.activate (THR_BOUND, this->nthreads_) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) cannot activate dispatching queue")); } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index f6dfbd8d374..f108678e0af 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -337,7 +337,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** connect_push_consumer, ") ACE_TEXT ("Event channel is typed *****\n"))); } @@ -400,7 +400,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** connect_push_consumer, ") ACE_TEXT ("Event channel is un-typed *****\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index e8be4970426..822626fc598 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -305,7 +305,7 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ProxyPushSupplier disconnected due to consumer_not_exist\n"))); } } @@ -346,7 +346,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception ( if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ProxyPushSupplier disconnected due to consumer_not_exist\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 6f978d9d564..07b1a46e06e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -224,7 +224,7 @@ TAO_CEC_TypedEventChannel::clear_ifr_cache (void) { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Destroying operation %s from ifr cache *****\n"), const_cast<char *> ((*i).ext_id_))); } @@ -264,7 +264,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** CORBA::InterfaceDef::_narrow failed for interface %s *****\n"), interface_)); } @@ -282,7 +282,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) { for (CORBA::ULong base=0; base<fid->base_interfaces.length(); base++) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Base interface %s found on interface %s *****\n"), static_cast<char const*>(fid->base_interfaces[base]), interface_ )); @@ -294,7 +294,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Operation %s found on interface %s, num params %d *****\n"), fid->operations[oper].name.in(), interface_, @@ -324,7 +324,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Parameter %s found on operation %s *****\n"), oper_params->parameters_[param].name_.in(), fid->operations[oper].name.in() )); @@ -333,7 +333,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Adding operation %s with %d parameters to the IFR cache *****\n"), fid->operations[oper].name.in(), oper_params->num_params_ )); @@ -344,7 +344,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Adding operation to IFR cache failed *****\n"))); } } @@ -395,7 +395,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** different uses_interface_ already registered *****\n"))); } return -1; @@ -415,7 +415,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** different supported_interface_ already registered *****\n"))); } return -1; @@ -457,7 +457,7 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** different supported_interface_ already registered *****\n"))); } return -1; @@ -477,7 +477,7 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su { if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** different uses_interface_ already registered *****\n"))); } return -1; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index c99dbc35ce9..ddae849a0b8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -37,7 +37,7 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer // DSI initialization if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Initializing the DSI for the new TypedProxyPushConsumer *****\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 6a6c0d61941..3e87acd0bcc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -263,20 +263,20 @@ TAO_ECG_CDR_Message_Receiver::handle_input ( if (errno == EWOULDBLOCK) return 0; - ACE_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m).\n"), + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m).\n"), -1); } if (n == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " "read 0 bytes from socket.\n"), 0); } if (n < TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE) { - ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " "# of bytes read < mcast header size.\n"), -1); } @@ -305,33 +305,33 @@ TAO_ECG_CDR_Message_Receiver::handle_input ( if ( this->check_crc_ && header.crc != crc) { static unsigned int err_count = 0; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "******************************\n")); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR DETECTED\n")); if (crc == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Sending process may not have computed CRC\n")); } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, " NETWORK CRC CHECKSUM FAILED\n")); } - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Message was received from [%s:%s:%d]\n", from.get_host_name (), from.get_host_addr (), from.get_port_number())); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Num errors = %d\n", ++err_count)); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "This is a bad thing. Attempting to ignore ..\n")); return 0; @@ -371,19 +371,19 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from, if (request == 0) { - ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence" + ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence" "below currently expected range.\n")); return 0; } if (*request == &Request_Completed_) { - ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " + ORBSVCS_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " "(Request already complete).\n")); return 0; } if (*request != 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for " "mcast request.\n"), -1); } @@ -410,13 +410,13 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( if (request == 0) { - ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence " + ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence " "below currently expected range.\n")); return 0; } if (*request == &Request_Completed_) { - ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " + ORBSVCS_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " "(Request already complete).\n")); return 0; } @@ -439,7 +439,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( header.fragment_id, header.fragment_count) == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Received invalid mcast fragment.\n"), -1); } @@ -447,7 +447,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( // Check whether this fragment was already received. if ((*request)->test_received (header.fragment_id) == 1) { - ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment.\n")); + ORBSVCS_DEBUG ((LM_INFO, "Received duplicate mcast fragment.\n")); return 0; } @@ -494,7 +494,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from) if (requests->init (this->max_requests_, this->min_purge_count_) == -1 || this->request_map_.bind (from, requests, entry) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to create hash map " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to create hash map " "entry for a new request.\n"), 0); } @@ -531,7 +531,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, this->byte_order = header[0]; if(this->byte_order != 0 && this->byte_order != 1) { - ACE_ERROR_RETURN ((LM_ERROR, "Reading mcast packet header: byte " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Reading mcast packet header: byte " "order is neither 0 nor 1, it is %d.\n", this->byte_order), -1); @@ -548,7 +548,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, || !header_cdr.read_octet (c) || a != 'A' || b != 'B' || c != 'C') { - ACE_ERROR_RETURN ((LM_ERROR, "Error reading magic bytes " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error reading magic bytes " "in mcast packet header.\n"), -1); } @@ -560,7 +560,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, || !header_cdr.read_ulong (this->fragment_id) || !header_cdr.read_ulong (this->fragment_count)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error decoding mcast packet header.\n"), -1); } @@ -591,7 +591,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, && (this->fragment_size != this->request_size || this->request_size != data_bytes_received))) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Invalid mcast fragment: " "inconsistent header fields.\n"), -1); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 7d725174738..d34fcb9e46a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -21,7 +21,7 @@ TAO_ECG_CDR_Message_Sender::init ( if (endpoint_rptr.get () == 0 || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): " "nil or unitialized endpoint argument.\n")); throw CORBA::INTERNAL (); } @@ -35,7 +35,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, { if (this->endpoint_rptr_.get () == 0) { - ACE_ERROR ((LM_ERROR, "Attempt to invoke send_message() " + ORBSVCS_ERROR ((LM_ERROR, "Attempt to invoke send_message() " "on non-initialized sender object.\n")); throw CORBA::INTERNAL (); } @@ -244,7 +244,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr, expected_n += iov[i].iov_len; if (n > 0 && size_t(n) != expected_n) { - ACE_ERROR ((LM_ERROR, ("Sent only %d out of %d bytes " + ORBSVCS_ERROR ((LM_ERROR, ("Sent only %d out of %d bytes " "for mcast fragment.\n"), n, expected_n)); @@ -254,18 +254,18 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr, { if (errno == EWOULDBLOCK) { - ACE_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n")); + ORBSVCS_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n")); // @@ TODO Use a Event Channel specific exception throw CORBA::COMM_FAILURE (); } else { - ACE_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m).\n")); + ORBSVCS_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m).\n")); } } else if (n == 0) { - ACE_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m).\n")); + ORBSVCS_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m).\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 322bbef29bd..03458561b12 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -37,7 +37,7 @@ TAO_ECG_Complex_Address_Server::init (const char *arg) location = ACE_OS::strchr (data, '@'); if (!location) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize address " "server: cannot find <@> separator " "in initialization string " @@ -83,7 +83,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, && *key == '*') { if (this->default_addr_.set (mcast_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " "mcast address specified: %s.\n", mcast_addr), -1); @@ -95,7 +95,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, CORBA::Long header_value = ACE_OS::strtol (key, &endptr, 0); if (*endptr != '\0') { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " "source/type specified: %s.\n", key), -1); @@ -104,7 +104,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, ACE_INET_Addr addr; if (addr.set (mcast_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " "mcast address specified: %s.\n", mcast_addr), -1); @@ -112,7 +112,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, if (this->mcast_mapping_.bind (header_value, addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: error adding " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: error adding " "new entry to the mapping.\n"), -1); } @@ -191,7 +191,7 @@ TAO_ECG_Complex_Address_Server::get_address ( void TAO_ECG_Complex_Address_Server::dump_content (void) { - ACE_DEBUG ((LM_DEBUG, "Default address: %s:%d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Default address: %s:%d\n", this->default_addr_.get_host_addr (), this->default_addr_.get_port_number ())); @@ -200,7 +200,7 @@ TAO_ECG_Complex_Address_Server::dump_content (void) iter++) { MAP::ENTRY & entry = *iter; - ACE_DEBUG ((LM_DEBUG, "%d --> %s:%d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "%d --> %s:%d\n", entry.ext_id_, this->default_addr_.get_host_addr (), this->default_addr_.get_port_number ())); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 498477b8bc0..e6455bd7a42 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -46,7 +46,7 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec) if (CORBA::is_nil (ec)) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_Mcast_EH::open(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_Mcast_EH::open(): " "nil ec argument")); throw CORBA::INTERNAL (); } @@ -246,19 +246,19 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (Address_Set& multicast_addresses) ACE_SOCK_Dgram_Mcast *socket = new_subscription.dgram; if (socket->open (new_subscription.mcast_addr, this->net_if_, 1) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to open multicast socket\n", ACE_ERRNO_GET)); } if ( socket->enable (ACE_NONBLOCK) != 0 ) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to enable nonblocking on mcast_eh\n", ACE_ERRNO_GET)); } if (socket->join (new_subscription.mcast_addr, 1, this->net_if_) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to join multicast group\n", ACE_ERRNO_GET)); } @@ -270,7 +270,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (Address_Set& multicast_addresses) sizeof (this->recvbuf_size_)) == -1) && errno != ENOTSUP ) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to set mcast_eh recvbuf_size:%d\n", ACE_ERRNO_GET, this->recvbuf_size_)); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 3dfa28aa6c9..284c792e3cc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -68,7 +68,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) this->service_type_ = ECG_MCAST_TWO_WAY; else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unsupported <-ECGService> option ") ACE_TEXT ("value: <%s>. Ignoring this option ") ACE_TEXT ("- using defaults instead.\n"), @@ -94,7 +94,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) this->address_server_type_ = ECG_ADDRESS_SERVER_TYPE; else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unsupported <-ECGAddressServer> ") ACE_TEXT ("option value: <%s>. Ignoring this ") ACE_TEXT ("option - using defaults instead.\n"), @@ -132,7 +132,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) this->handler_type_ = ECG_HANDLER_UDP; else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unsupported <-ECGHandler> ") ACE_TEXT ("option value: <%s>. Ignoring this ") ACE_TEXT ("option - using defaults instead.\n"), @@ -194,7 +194,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.ignore_arg (); - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, ACE_TEXT ("Ignoring <%s> option ") ACE_TEXT ("during initialization.\n"), arg)); @@ -244,7 +244,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) && this->service_type_ != ECG_MCAST_SENDER && this->address_server_type_ != ECG_ADDRESS_SERVER_BASIC) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "Configurations for mcast handler and " "address server do not match.\n")); return -1; @@ -255,7 +255,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) // implementation, which does not, we'll have to remove this check. if (this->address_server_arg_.length () == 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "Address server initializaton " "argument not specified.\n")); return -1; @@ -264,7 +264,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) if (this->ip_multicast_loop_ != 0 && this->ip_multicast_loop_ != 1) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "IP MULTICAST LOOP option must have a boolean value.\n")); return -1; } @@ -272,7 +272,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) if (this->non_blocking_ != 0 && this->non_blocking_ != 1) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "NON BLOCKING flag must have a boolean value.\n")); return -1; } @@ -303,7 +303,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) if (dgram.open (ACE_Addr::sap_any) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Cannot open dgram " "for sending mcast messages.\n")); return TAO_ECG_Refcounted_Endpoint (); @@ -322,7 +322,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) sizeof (this->ttl_value_)) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error setting TTL option on dgram " "for sending mcast messages.\n")); return TAO_ECG_Refcounted_Endpoint (); @@ -334,7 +334,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) &this->ip_multicast_loop_, sizeof (this->ip_multicast_loop_)) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error setting MULTICAST_LOOP option " "on dgram for sending mcast messages.\n")); return TAO_ECG_Refcounted_Endpoint (); @@ -343,7 +343,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) if (this->non_blocking_ && dgram.enable(ACE_NONBLOCK) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error setting NON BLOCKING option.\n")); return TAO_ECG_Refcounted_Endpoint (); } @@ -402,7 +402,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void) else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Cannot create address server: " "unknown address server type specified.\n")); return 0; @@ -460,7 +460,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, ACE_INET_Addr ipaddr; if (ipaddr.set (address_server_arg) != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR using address server argument " "in ACE_INET_Addr.set ().\n")); return TAO_ECG_Refcounted_Handler (); @@ -471,7 +471,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Cannot create handler: unknown " "handler type specified.\n")); return handler; @@ -561,14 +561,14 @@ TAO_ECG_Mcast_Gateway::verify_args (CORBA::ORB_ptr orb, { if (CORBA::is_nil (ec)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Nil event channel argument passed to " "TAO_ECG_Mcast_Gateway::run().\n")); throw CORBA::INTERNAL (); } if (CORBA::is_nil (orb)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Nil orb argument passed to " "TAO_ECG_Mcast_Gateway::run().\n")); throw CORBA::INTERNAL (); @@ -592,7 +592,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb, this->init_address_server (); if (!address_server_servant.in ()) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "Unable to create address server.\n")); throw CORBA::INTERNAL (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 49d935a6757..3cd27fef2e2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -170,7 +170,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist ( { try { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EC_Reactive_ConsumerControl(%P|%t) - " "channel %x does not exists\n")); gateway->cleanup_consumer_ec (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 8f5891204de..3f076ddbb58 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -210,7 +210,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::event_channel_not_exist ( { try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG_Reconnect_ConsumerControl(%P|%t) - " // "channel %x does not exists\n")); is_consumer_ec_connected_ = 0; @@ -244,7 +244,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::system_exception ( // return; // Anything else is serious, including timeouts... - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG_Reconnect_ConsumerControl(%P|%t) - " // "channel %x does not exists system except\n")); is_consumer_ec_connected_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index 1e101055c0f..202c2540f6b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -1,7 +1,7 @@ // $Id$ #include "orbsvcs/Event/ECG_Simple_Mcast_EH.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Reactor.h" #include "ace/os_include/os_fcntl.h" @@ -30,7 +30,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, ACE_INET_Addr mcast_group; if (mcast_group.set (mcast_addr) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open mcast handler: " "error using specified address %s " "in ACE_INET.set ().\n", @@ -38,7 +38,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, -1); if (this->dgram_.join (mcast_group, 1, net_if) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open mcast handler: error " "joining to %s\n", mcast_addr), @@ -52,7 +52,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, ACE_Event_Handler::READ_MASK)) { this->dgram_.close (); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot register handler with reactor.\n"), -1); } @@ -74,13 +74,13 @@ TAO_ECG_Simple_Mcast_EH::shutdown (void) ACE_Event_Handler::READ_MASK); } if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to deregister handler from reactor " "on shutdown.\n")); result = this->dgram_.close (); if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to close mcast receiving dgram " "on shutdown.\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index b47650a3a8b..dd5eb8ad16a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -31,7 +31,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr, return -1; if (this->dgram_.open (ipaddr, PF_INET, 0, reuse_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open udp handler: " "error opening receiving dgram.\n"), -1); @@ -42,7 +42,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr, ACE_Event_Handler::READ_MASK)) { this->dgram_.close (); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot register handler with reactor.\n"), -1); } @@ -64,13 +64,13 @@ TAO_ECG_UDP_EH::shutdown (void) ACE_Event_Handler::READ_MASK); } if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to deregister handler from reactor " "on shutdown.\n")); result = this->dgram_.close (); if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to close receiving dgram on shutdown.\n")); this->receiver_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index ef969994abd..79b68b0e033 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -29,7 +29,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, // is invoked, it throws an exception. if (CORBA::is_nil (lcl_ec)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::init(): " "<lcl_ec> argument is nil.\n")); throw CORBA::INTERNAL (); @@ -50,7 +50,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub) if (CORBA::is_nil (this->lcl_ec_.in ())) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Receiver: " "init() hasn't been called before connect().\n")); //FUZZ: enable check_for_lack_ACE_OS @@ -60,7 +60,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub) if (pub.publications.length () == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::connect(): " "0-length publications argument.\n")); throw CORBA::INTERNAL (); @@ -168,7 +168,7 @@ TAO_ECG_Event_CDR_Decoder::decode (TAO_InputCDR &cdr) { if (!(cdr >> this->events)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error decoding events cdr.\n"), -1); } @@ -184,7 +184,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) // any further. if (CORBA::is_nil (this->consumer_proxy_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::handle_input() " "called but the Receiver is not connected " "to an event channel. Shutting down the Receiver.\n")); @@ -204,7 +204,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) } if (result == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error receiving multicasted events.\n"), 0); } @@ -214,7 +214,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) catch (const CORBA::Exception& ex) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Caught and swallowed EXCEPTION in " "ECG_UDP_Receiver::handle_input: %C\n", ex._info ().c_str ())); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl index f344699998c..56eeea63b6f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl @@ -89,7 +89,7 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, { if (CORBA::is_nil (this->addr_server_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::get_addr() called but " "nil Address Server was supplied during " "initialization through init().\n")); @@ -106,7 +106,7 @@ TAO_ECG_UDP_Receiver::get_address (const RtecEventComm::EventHeader& header, { if (CORBA::is_nil (this->addr_server_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::get_addr() called but " "nil Address Server was supplied during " "initialization through init().\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 30078b9b547..29e3ea97f5a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -30,14 +30,14 @@ TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, { if (CORBA::is_nil (lcl_ec)) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " "<lcl_ec> argument is nil.")); throw CORBA::INTERNAL (); } if (CORBA::is_nil (addr_server)) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " "address server argument is nil.")); throw CORBA::INTERNAL (); } @@ -57,7 +57,7 @@ TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub) if (CORBA::is_nil (this->lcl_ec_.in ())) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Sender: " + ORBSVCS_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Sender: " "init() has not been called before connect().")); //FUZZ: enable check_for_lack_ACE_OS @@ -66,7 +66,7 @@ TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub) if (sub.dependencies.length () == 0) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::connect(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::connect(): " "0-length subscriptions argument.")); throw CORBA::INTERNAL (); } @@ -161,7 +161,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events) { if (events.length () == 0) { - // ACE_DEBUG ((EC_FORMAT (DEBUG, + // ORBSVCS_DEBUG ((EC_FORMAT (DEBUG, // "Nothing to multicast: " // "0-length EventSet."))); return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index bc6e10440b4..96c7f883207 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -59,7 +59,7 @@ void TAO_EC_Default_Factory::unsupported_option_value (const ACE_TCHAR * option_name, const ACE_TCHAR * option_value) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "Unsupported <%s> option value: <%s>. " "Ignoring this option - using defaults instead.\n", @@ -267,7 +267,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "Unknown consumer collection modifier <%s>.\n", arg)); } @@ -312,7 +312,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "Unknown supplier collection modifier <%s>.\n", arg)); } @@ -471,7 +471,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECPushSupplierSet")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "obsolete option <%s>, ignored\n", arg)); arg_shifter.consume_arg (); @@ -490,7 +490,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerAdminLock")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "obsolete option <%s>, ignored\n", arg)); arg_shifter.consume_arg (); @@ -498,7 +498,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierAdminLock")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "obsolete option <%s>, ignored\n", arg)); arg_shifter.consume_arg (); @@ -507,7 +507,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strncmp (arg, ACE_TEXT("-EC"), 3) == 0) { arg_shifter.consume_arg (); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "unknown option <%s>\n", arg)); @@ -515,7 +515,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EC_Default_Factory - " "ignoring option <%s>\n", arg)); @@ -541,7 +541,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, if (so != 0) return so; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) EC_Default_Factory::find_service_object " "unable to find queue full service object '%s'; " "using '%s' instead\n", @@ -552,7 +552,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, if (so != 0) return so; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) EC_Default_Factory::find_service_object " "unable find default queue full service object '%s'; " "aborting.\n", diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index aaef0d96cdf..dad5e5bc70c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -68,7 +68,7 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier ( this->qos_ = qos; #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Building filter for supplier <%x>.\n", this)); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index e408364f8b5..f7d07b20315 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -78,7 +78,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer ( CORBA::PolicyList_var unused; int status = push_consumer->_validate_connection (unused); #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status)); + ORBSVCS_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status)); #else ACE_UNUSED_ARG(status); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ @@ -90,7 +90,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer ( this->qos_ = qos; #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Building filters for consumer <%x>.\n", this)); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 18d5024f68c..37d0994d8d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -110,7 +110,7 @@ TAO_EC_Dispatching_Task::svc (void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) getq error in Dispatching Queue\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 7c645873577..cbd2f84250a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -84,7 +84,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec return 0; } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_EC_Gateway_IIOP - init_i " "Supplier and consumer event channel reference " "should be nil.\n"), -1); @@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void) void TAO_EC_Gateway_IIOP::close_i (void) { - // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); this->disconnect_consumer_proxies_i (); this->disconnect_supplier_proxy_i (); @@ -240,7 +240,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( || CORBA::is_nil (this->supplier_ec_.in ())) return; - // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i\n")); this->open_i (c_qos); } @@ -269,7 +269,7 @@ TAO_EC_Gateway_IIOP::open_i ( RtecEventComm::EventSourceID sid = h.source; - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) trying (%d,%d)\n", // sid, h.type)); @@ -285,14 +285,14 @@ TAO_EC_Gateway_IIOP::open_i ( if (this->consumer_proxy_map_.find (sid, proxy) == -1) { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) binding source %d\n", // sid)); proxy = supplier_admin->obtain_push_consumer (); this->consumer_proxy_map_.bind (sid, proxy); } } - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) consumer map computed (%d entries)\n", // this->consumer_proxy_map_.current_size ())); @@ -332,7 +332,7 @@ TAO_EC_Gateway_IIOP::open_i ( pub.publications[c].dependency_info.rt_info = this->consumer_info_; c++; } - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) supplier id %d has %d elements\n", // sid, c)); if (c == 0) @@ -340,7 +340,7 @@ TAO_EC_Gateway_IIOP::open_i ( pub.publications.length (c); - // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier ")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); (*j).int_id_->connect_push_supplier (supplier_ref.in (), pub); @@ -390,7 +390,7 @@ TAO_EC_Gateway_IIOP::open_i ( supplier_admin->obtain_push_consumer (); pub.publications.length (c); - // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier ")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub); @@ -406,7 +406,7 @@ TAO_EC_Gateway_IIOP::open_i ( RtecEventComm::PushConsumer_var consumer_ref = this->consumer_._this (); - // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); // ACE_ConsumerQOS_Factory::debug (sub); this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), @@ -423,7 +423,7 @@ TAO_EC_Gateway_IIOP::update_supplier ( void TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) { - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " // "disconnect from channel.\n")); } @@ -431,7 +431,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) void TAO_EC_Gateway_IIOP::disconnect_push_supplier (void) { - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " // "disconnect from channel.\n")); } @@ -439,11 +439,11 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (void) void TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) { - // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) -\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) -\n")); if (events.length () == 0) { - // ACE_DEBUG ((LM_DEBUG, "no events\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "no events\n")); return; } @@ -453,7 +453,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) this->busy_count_++; } - // ACE_DEBUG ((LM_DEBUG, "ECG: %d event(s)\n", events.length ())); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG: %d event(s)\n", events.length ())); // @@ TODO, there is an extra data copy here, we should do the event // modification without it and only compact the necessary events. @@ -485,7 +485,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) if (this->use_ttl_ == 1) out[0].header.ttl--; - // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); this->push_to_consumer(proxy, out); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index b1711600126..9342cb55b10 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.ignore_arg (); - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "Ignoring <%s> option " "during initialization.\n", arg)); @@ -156,7 +156,7 @@ void TAO_EC_Gateway_IIOP_Factory::unsupported_option_value (const ACE_TCHAR * option_name, const ACE_TCHAR * option_value) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Gateway_IIOP_Factory -" "Unsupported <%s> option value: <%s>. " "Ignoring this option - using defaults instead.\n", diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 205f4429e00..d5e04983a7b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -45,7 +45,7 @@ TAO_EC_Kokyu_Dispatching::activate (void) this->dispatcher_->activate (); - //ACE_DEBUG ((LM_DEBUG, "Kokyu dispatcher activated\n")); + //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher activated\n")); } void @@ -94,7 +94,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void) this->dispatcher_ = tmp; this->lanes_setup_ = 1; - //ACE_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n")); + //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n")); } void @@ -179,7 +179,7 @@ TAO_EC_Kokyu_Push_Command::execute () try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "(%t) Command object executed.\n")); this->proxy_->push_to_consumer (this->consumer_.in (), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 35d28320b76..4de3b4a5466 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -58,7 +58,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported dispatching <%s>\n"), opt)); @@ -127,7 +127,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported filtering <%s>\n"), opt)); @@ -155,7 +155,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) #endif /* 0 */ else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported timeout <%s>\n"), opt)); @@ -185,7 +185,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported scheduling <%s>\n"), opt)); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index 9c5b3c5bbb7..e297ac02047 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Event/EC_Kokyu_Filter.h" #include "orbsvcs/Event/EC_QOS_Info.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" @@ -169,12 +169,12 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n")); #endif this->init_rt_info (); #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "this->rt_info_ = %d, header.type = %d, qos_info.rt_info = %d\n", this->rt_info_, header.type, qos_info.rt_info)); #endif @@ -186,14 +186,14 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, if (matches != 0) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n")); #endif this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1, RtecBase::ONE_WAY_CALL); RtecScheduler::RT_Info_var info = this->scheduler_->get (qos_info.rt_info); - ACE_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n", this->name_.c_str (), this->rt_info_, info->entry_point.in (), @@ -202,12 +202,12 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, else { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches == 0\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches == 0\n")); #endif } #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "about to iterate thru children\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "about to iterate thru children\n")); #endif ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) @@ -215,7 +215,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, (*i)->add_dependencies (header, qos_info); } #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n")); #endif return 0; } @@ -260,7 +260,7 @@ TAO_EC_Kokyu_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->body_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); } @@ -274,7 +274,7 @@ TAO_EC_Kokyu_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->parent_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), info->entry_point.in ())); #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 4da636491ea..2c474004024 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -56,7 +56,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( #ifdef EC_KOKYU_LOGGING for (i=0; i<qos.dependencies.length (); ++i) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "consumerqos[%d] event.header.type = %s," "rt_info = %d\n", i, @@ -100,7 +100,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( RtecScheduler::handle_t h_final_consumer_rep_rt_info = 0; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "consumer rt_info found in consumerqos[%d]\n", npos)); + ORBSVCS_DEBUG ((LM_DEBUG, "consumer rt_info found in consumerqos[%d]\n", npos)); #endif if (npos >= 0 && establish_final_consumer_dependency == 1) @@ -109,7 +109,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( h_final_consumer_rt_info = qos.dependencies[npos].rt_info; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "about to get rt_info = %d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "about to get rt_info = %d\n", h_final_consumer_rep_rt_info)); #endif @@ -120,7 +120,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( final_consumer_rep_name += "#rep"; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "about to create consumer rep %s\n", + ORBSVCS_DEBUG ((LM_DEBUG, "about to create consumer rep %s\n", final_consumer_rep_name.c_str ())); #endif @@ -128,7 +128,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( h_final_consumer_rep_rt_info = scheduler->create (final_consumer_rep_name.c_str ()); #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "consumer rep created\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "consumer rep created\n")); #endif } @@ -144,7 +144,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( ); #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Verifying whether root filter" " dependency can be established\n")); #endif @@ -152,7 +152,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( if (npos >= 0 && establish_final_consumer_dependency == 1) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::root filter dependency " "can be established\n")); #endif @@ -183,13 +183,13 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( const RtecEventComm::Event& e = qos.dependencies[pos].event; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::In recursive build\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::In recursive build\n")); #endif if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::Conjuction designator\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Conjuction designator\n")); #endif CORBA::ULong npos = pos; ACE_CString name; @@ -231,7 +231,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( else if (e.header.type == ACE_ES_DISJUNCTION_DESIGNATOR) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::Disjunction designator\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Disjunction designator\n")); #endif CORBA::ULong npos = pos; ACE_CString name; @@ -274,7 +274,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( || e.header.type == ACE_ES_EVENT_DEADLINE_TIMEOUT) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::Timeout designator\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Timeout designator\n")); #endif // @@ We need a unique name for each timeout, assigned by the // application? @@ -337,7 +337,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( else { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu_Filter_Builder::No designator for this entry. " "Must be a body\n")); #endif diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 898172f5895..bd3f98b9d07 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -40,11 +40,11 @@ TAO_EC_MT_Dispatching::activate (void) { if (this->force_activate_ != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) activating dispatching queue at" " default priority\n")); if (this->task_.activate (THR_BOUND, this->nthreads_) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) cannot activate dispatching queue.\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index d9aaf04d5a9..63824d13eda 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -82,7 +82,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier) pub.publications[j].event; #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, "Connecting consumer <%x> to <%x>, " + ORBSVCS_DEBUG ((LM_DEBUG, "Connecting consumer <%x> to <%x>, " "trying event <%d:%d> ", supplier, this, event.header.source, event.header.type)); @@ -90,13 +90,13 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier) if (supplier->can_match (event.header)) { #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, " matched\n")); + ORBSVCS_DEBUG ((LM_DEBUG, " matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ this->collection_->connected (supplier); return; } #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, " not matched\n")); + ORBSVCS_DEBUG ((LM_DEBUG, " not matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ } } @@ -117,12 +117,12 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier) const RtecEventComm::Event& event = pub.publications[j].event; - // ACE_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n", + // ORBSVCS_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n", // event.header.source, event.header.type, // this)); if (supplier->can_match (event.header)) { - // ACE_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); + // ORBSVCS_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); this->collection_->connected (supplier); return; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index a7f902c9b55..c2c02873d8a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -77,7 +77,7 @@ TAO_EC_Priority_Dispatching::activate (void) priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER, ACE_SCOPE_THREAD); if (this->tasks_[i]->activate (flags, 1, 1, priority) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) cannot activate queue %d", i)); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 84c00ffa45f..ebe3786e1b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -23,7 +23,7 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer) { - ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", + ORBSVCS_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", supplier, consumer)); const RtecEventChannelAdmin::SupplierQOS& qos = consumer->publications (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 436d0ff5b62..d85bdee6d82 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -153,7 +153,7 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( { try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "EC_Reactive_ConsumerControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); proxy->disconnect_push_supplier (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index a8d388bdef5..369add84a12 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -146,7 +146,7 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist ( { try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "EC_Reactive_SupplierControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); proxy->disconnect_push_consumer (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 4732e146e71..4c387758ad1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -53,7 +53,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported dispatching <%s>\n"), opt)); @@ -87,7 +87,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported filtering <%s>\n"), opt)); @@ -115,7 +115,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) #endif /* 0 */ else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported timeout <%s>\n"), opt)); @@ -145,7 +145,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported scheduling <%s>\n"), opt)); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 1ae39568dea..7828330e5c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Event/EC_Sched_Filter.h" #include "orbsvcs/Event/EC_QOS_Info.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" @@ -152,7 +152,7 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, RtecScheduler::RT_Info_var info = this->scheduler_->get (qos_info.rt_info); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), info->entry_point.in ())); } @@ -207,7 +207,7 @@ TAO_EC_Sched_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (child.rt_info); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); @@ -224,7 +224,7 @@ TAO_EC_Sched_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->body_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); } @@ -238,7 +238,7 @@ TAO_EC_Sched_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->parent_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), info->entry_point.in ())); #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index facf8b9ae78..99453b0775c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -48,21 +48,21 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer) RtecEventComm::PushConsumer::_duplicate(consumer); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@)\n", pc.in())); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@)\n", pc.in())); TAO_EC_Dispatching_Task* dtask = new TAO_EC_TPC_Dispatching_Task (&this->thread_manager_, this->queue_full_service_object_); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@): new task %@\n", pc.in(), dtask)); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@): new task %@\n", pc.in(), dtask)); if ((dtask->activate (this->thread_creation_flags_, 1, // we only want one thread to dispatch to a consumer 1, // magic number?? this->thread_priority_)) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::add_consumer unable to activate" " dispatching task for consumer (%@)\n", consumer)); @@ -81,7 +81,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer) if (explanation != 0) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::add_consumer failed to bind consumer (%@)" " and dispatch task in map (%s): %p\n", consumer, explanation)); @@ -103,7 +103,7 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume if (this->consumer_task_map_.find (consumer, dtask) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::remove_consumer failed to" " find consumer (%@) in map\n", consumer)); return -1; @@ -112,7 +112,7 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume // Must have found it...first try to unbind if (this->consumer_task_map_.unbind (consumer) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::remove_consumer failed to" " unbind consumer (%@) and task in map\n", consumer)); return -1; @@ -181,14 +181,14 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, TAO_EC_QOS_Info&) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); TAO_EC_Dispatching_Task* dtask = 0; if (this->consumer_task_map_.find (consumer, dtask) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::push_nocopy failed to" " find consumer (%@) in map\n", consumer)); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 390c3832b2f..ec405725265 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -54,7 +54,7 @@ TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[]) // option isn't valid with this factory and that it's // being ignored. - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "EC_TPC_Factory - " "-ECDispatching not supported with TPC_Factory; ignoring the option and using thread-per-consumer dispatch strategy\n")); arg_shifter.consume_arg (); @@ -81,7 +81,7 @@ TAO_EC_Dispatching* TAO_EC_TPC_Factory::create_dispatching (TAO_EC_Event_Channel_Base *) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_dispatching\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_dispatching\n")); TAO_EC_Queue_Full_Service_Object* so = this->find_service_object (this->queue_full_service_object_name_.fast_rep(), @@ -99,7 +99,7 @@ TAO_EC_ProxyPushSupplier* TAO_EC_TPC_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel_Base *ec) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_supplier\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_supplier\n")); return new TAO_EC_TPC_ProxyPushSupplier (ec, this->consumer_validate_connection_); } @@ -108,7 +108,7 @@ TAO_EC_ProxyPushConsumer* TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_consumer\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_consumer\n")); return new TAO_EC_TPC_ProxyPushConsumer (ec); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 8ed6366b614..0e2ab33b5f8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -32,7 +32,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) // to fact that "remove" code out of just the // disconnect_push_consumer. if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "RTEC (%P|%t): inside ~TAO_EC_TPC_ProxyPushConsumer (%x)\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "RTEC (%P|%t): inside ~TAO_EC_TPC_ProxyPushConsumer (%x)\n", this)); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index d70bf720539..e026092784d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -24,7 +24,7 @@ void TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n", + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n", this, this->refcount_, this->consumer_.in())); @@ -36,7 +36,7 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) BASECLASS::disconnect_push_supplier (); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this)); } TAO_EC_TPC_Dispatching* @@ -55,7 +55,7 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer ( BASECLASS::connect_push_consumer (push_consumer, qos); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n", + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n", this, this->refcount_, this->consumer_.in())); TAO_EC_TPC_Dispatching* tpcdispatcher = this->tpc_dispatching (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl index 89900d54216..926931f936c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl @@ -11,7 +11,7 @@ TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel : TAO_EC_Default_ProxyPushSupplier (ec, validate_connection) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index d4107aababb..d08f0c146ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_Thread.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Sched_Params.h" @@ -111,7 +111,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) { // Ideally this would call some sort of on-error function... // but, it doesn't. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "RTEC (%P|%t) unable to parse %C as a thread flag - skipping\n", tok)); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 9af62d1d36a..27161888e63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -51,7 +51,7 @@ TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( ACE_Time_Value::zero); } - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "EC_Timeout_Filter - interval = %d:%d, ID = %d\n", // tv_interval.sec (), tv_interval.usec (), // this->id_)); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 19724045232..2b219948810 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -20,7 +20,7 @@ int TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, const void *vp) { - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "TAO_EC_Timeout_Adapter::handle_timeout -" // " expire at %d:%d\n", // tv.sec (), tv.usec ())); diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index f267d3c6546..5a2f1eeace2 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -1,7 +1,7 @@ // $Id$ #include "orbsvcs/Event_Utilities.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" @@ -134,7 +134,7 @@ void event_debug (const char* p, const RtecEventComm::Event& event) { size_t l = ACE_OS::strlen (p); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%*.*s - event.source: %d (0x%x)\n" "%*.*s event.type: %d (0x%x)\n", l, l, p, event.header.source, event.header.source, @@ -144,18 +144,18 @@ void event_debug (const char* p, void ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos) { - ACE_DEBUG ((LM_DEBUG, "ConsumerQOS {\n")); - ACE_DEBUG ((LM_DEBUG, " is_gateway: %d\n", qos.is_gateway)); + ORBSVCS_DEBUG ((LM_DEBUG, "ConsumerQOS {\n")); + ORBSVCS_DEBUG ((LM_DEBUG, " is_gateway: %d\n", qos.is_gateway)); for (u_int i = 0; i < qos.dependencies.length (); ++i) { char buf[128]; ACE_OS::sprintf (buf, " dep[%d]", i); event_debug (buf, qos.dependencies[i].event); - ACE_DEBUG ((LM_DEBUG, "%s rt_info: %d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "%s rt_info: %d\n", buf, qos.dependencies[i].rt_info)); } - ACE_DEBUG ((LM_DEBUG, "}\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "}\n")); } // ************************************************************ @@ -202,21 +202,21 @@ ACE_SupplierQOS_Factory::insert (RtecEventComm::EventSourceID sid, void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& qos) { - ACE_DEBUG ((LM_DEBUG, "SupplierQOS {\n")); - ACE_DEBUG ((LM_DEBUG, " is_gateway: %d\n", qos.is_gateway)); + ORBSVCS_DEBUG ((LM_DEBUG, "SupplierQOS {\n")); + ORBSVCS_DEBUG ((LM_DEBUG, " is_gateway: %d\n", qos.is_gateway)); for (u_int i = 0; i < qos.publications.length (); ++i) { char buf[128] = { 0 }; ACE_OS::sprintf (buf, " publications[%d]", i); event_debug (buf, qos.publications[i].event); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s dependency_info.rt_info: %d\n" "%s dependency_info.number_of_calls: %d\n", buf, qos.publications[i].dependency_info.rt_info, buf, qos.publications[i].dependency_info.number_of_calls)); } - ACE_DEBUG ((LM_DEBUG, "}\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "}\n")); } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index fc5f4c97198..c0b366020ae 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h" #include "tao/debug.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" #include "tao/AnyTypeCode/Any.h" @@ -80,7 +80,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%dms>\n"), time_value.msec ())); } @@ -165,7 +165,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%dms>\n"), time_value.msec ())); } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index ef4c9a87dc0..6d73c49ccbf 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -70,7 +70,7 @@ namespace TAO CORBA::String_var op = ri->operation (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT (%P|%t) - %s called for %s\n"), this->name_, op.in ())); @@ -138,7 +138,7 @@ namespace TAO if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_FT (%P|%t): FT_ClientRequest_Interceptor::receive_other - LOCATION_FORWARD received after request expiration.\n")); } @@ -372,7 +372,7 @@ namespace TAO { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT (%P|%t) - Using default value") ACE_TEXT ("of 1.5 seconds\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index fe42488a46f..35e4e395f52 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -240,7 +240,7 @@ TAO_FT_IOGR_Property::encode_properties ( if (this->ft_group_tagged_component_ == 0) { if (TAO_debug_level > 2) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO-FT (%P|%t) - The group tagged component ", "is null\n"), 0); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 3f46bad0a5d..6ae26e008ca 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -10,7 +10,7 @@ #include "tao/Base_Transport_Property.h" #include "tao/SystemException.h" #include "tao/debug.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -219,7 +219,7 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT (%P|%t) - Got a primary component\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index e34494173a1..ef5754b47b4 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -7,7 +7,7 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "tao/CDR.h" #include "orbsvcs/FT_CORBA_ORBC.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_string.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -119,7 +119,7 @@ namespace TAO if (fgvsc.object_group_ref_version > this->object_group_ref_version_) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_FT (%P|%t) - Wrong version information ") ACE_TEXT ("within the interceptor (%u > %u)\n"), fgvsc.object_group_ref_version, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index c4e102f6fcc..f21c6f11bcb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -4,7 +4,7 @@ #include "tao/MProfile.h" #include "tao/Stub.h" #include "tao/CDR.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -116,7 +116,7 @@ FTRT_ClientORB_Interceptor::receive_reply ( // update the target CORBA::Object_var target = ri->target(); target->_stubobj ()->base_profiles ( obj->_stubobj()->base_profiles() ); - ACE_DEBUG((LM_DEBUG, "target object updated\n")); + ORBSVCS_DEBUG((LM_DEBUG, "target object updated\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index 48efde46c4a..a26270cd646 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -18,11 +18,11 @@ int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor) if (reactor_->register_handler (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) can't register with reactor\n"), -1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) connected with %s\n", addr.get_host_name ())); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index a1edbc382df..12b181e0868 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -25,7 +25,7 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void) RtecEventChannelAdmin::ProxyPushSupplier_ptr TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void) { - ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); + ORBSVCS_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); return obtain_proxy(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 2bb5c55df40..4dcab640c17 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -50,7 +50,7 @@ void setup_object_group(TAO_FTEC_Event_Channel* es, resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context, FTRTEC::Identification_Service::instance()->name()); - ACE_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n")); + ORBSVCS_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n")); primary->join_group(member_list[0]); } @@ -67,7 +67,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership) detector_loader->init(0, 0); if (FTRTEC::Identification_Service::instance() == 0) - ACE_ERROR_RETURN((LM_ERROR, "No Identification\n"), 0); + ORBSVCS_ERROR_RETURN((LM_ERROR, "No Identification\n"), 0); // initialize naming_contex CosNaming::NamingContext_var naming_context @@ -164,7 +164,7 @@ TAO_FTEC_Event_Channel::for_suppliers (void) void TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) { - ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n")); + ORBSVCS_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n")); ec_impl_->set_state(s); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 35748435acc..2ccaf77d272 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -27,11 +27,11 @@ int find_by_location(const FTRT::ManagerInfoList& list, /* void print(const FTRT::Location& location) { - ACE_DEBUG((LM_DEBUG, "{")); + ORBSVCS_DEBUG((LM_DEBUG, "{")); for (size_t i = 0; i < location.length(); ++i) { - ACE_DEBUG((LM_DEBUG, "<%s,%s>", location[i].id.in(), location[i].kind.in())); + ORBSVCS_DEBUG((LM_DEBUG, "<%s,%s>", location[i].id.in(), location[i].kind.in())); } - ACE_DEBUG((LM_DEBUG, "}")); + ORBSVCS_DEBUG((LM_DEBUG, "}")); } */ @@ -86,7 +86,7 @@ void TAO_FTEC_Group_Manager::create_group ( if (impl_->my_position > 0) { Fault_Detector* detector = Fault_Detector::instance(); if ( detector->connect(impl_->info_list[impl_->my_position-1].the_location) == -1) { - ACE_DEBUG((LM_DEBUG, "Cannot connect to predecesor\n")); + ORBSVCS_DEBUG((LM_DEBUG, "Cannot connect to predecesor\n")); throw FTRT::PredecessorUnreachable(); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index 6eb812a3fc9..dd931ca66b7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -46,7 +46,7 @@ int Fault_Detector::init(int argc, ACE_TCHAR** argv) { if (!reactor_task_.thr_count() && reactor_task_.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0) - ACE_ERROR_RETURN ((LM_ERROR,"Cannot activate reactor thread\n"), + ORBSVCS_ERROR_RETURN ((LM_ERROR,"Cannot activate reactor thread\n"), -1); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 657d30f0c9d..ee56459d42f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -47,7 +47,7 @@ namespace FTRTEC { #if (TAO_HAS_SCIOP == 1) ACE_auto_ptr_reset(detector_, detector); #else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) SCTP not enabled. ", " Enable SCTP and rebuild ACE+TAO\n")); #endif /* TAO_HAS_SCIOP */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp index c7f814cc070..682706f00ca 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -22,12 +22,12 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::init_acceptor() { typename CONNECTOR::PEER_ADDR listen_addr; if (acceptor_.open(listen_addr, &reactor_task_.reactor_) != 0) - ACE_ERROR_RETURN((LM_ERROR, "Connot open acceptor\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "Connot open acceptor\n"), -1); if (acceptor_.acceptor().get_local_addr(listen_addr) !=0) - ACE_ERROR_RETURN((LM_ERROR, "Connot get local addr\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "Connot get local addr\n"), -1); - ACE_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(), + ORBSVCS_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(), listen_addr.get_port_number())); ACE_TCHAR tcharbuf [MAXHOSTNAMELEN]; listen_addr.addr_to_string(tcharbuf, MAXHOSTNAMELEN, 0); @@ -50,7 +50,7 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::connect(const FTRT::Lo ACE_NEW_RETURN(handler, DETECTION_HANDLER(listener_), 0) ; handler->reactor(&reactor_task_.reactor_); - ACE_DEBUG((LM_DEBUG, "connecting to %s\n", location[0].id.in())); + ORBSVCS_DEBUG((LM_DEBUG, "connecting to %s\n", location[0].id.in())); int result = connector_.connect(handler->peer(), prev_addr); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 06fe24e6903..2133578e6ea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -152,7 +152,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques maker->get_ref_version(), version); if (version < maker->get_ref_version()) { - ACE_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n")); + ORBSVCS_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n")); try{ CORBA::Object_var forward = get_forward(ri); @@ -187,7 +187,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques ri->add_reply_service_context (sc, 0); - ACE_DEBUG((LM_DEBUG, "reply_service_context added\n")); + ORBSVCS_DEBUG((LM_DEBUG, "reply_service_context added\n")); } catch (...){ } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 4793489d99f..b817cc5436d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -110,7 +110,7 @@ get_transaction_depth_context( } catch (const CORBA::BAD_PARAM&) { - ACE_DEBUG((LM_DEBUG, "Received request without transaction depth context\n")); + ORBSVCS_DEBUG((LM_DEBUG, "Received request without transaction depth context\n")); return -1; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 085b909aebc..c6909e1b2f2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -82,7 +82,7 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, result->iogr = ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()); - ACE_DEBUG((LM_DEBUG, "In setup_info\n")); + ORBSVCS_DEBUG((LM_DEBUG, "In setup_info\n")); //log_obj_endpoints(result->iogr.in()); /// check if sucessor changed diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index ff3188b6ba6..edcb6365af8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -207,7 +207,7 @@ IOGR_Maker::set_ref_version(CORBA::ULong version) CORBA::ULong IOGR_Maker::increment_ref_version() { - ACE_DEBUG((LM_DEBUG, "new object_group_ref_version = %d\n", ft_tag_component_. object_group_ref_version+1)); + ORBSVCS_DEBUG((LM_DEBUG, "new object_group_ref_version = %d\n", ft_tag_component_. object_group_ref_version+1)); return ++ft_tag_component_.object_group_ref_version; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 16e3a70b34b..bff2ecf8131 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -41,7 +41,7 @@ namespace FTRTEC { else if (argv[0][0] != '$') { TAO_FtRt::UUID uuid(argv[0]); if (!uuid.is_valid()) - ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1); + ORBSVCS_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1); object_id_.length(16); uuid.to_binary(&object_id_[0]); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 2ca0edfa40d..9d73e617337 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -94,7 +94,7 @@ TAO_Set_Update_Interceptor::send_request ( FTRT::SequenceNumber sequence_number = Request_Context_Repository().get_sequence_number(ri); - ACE_DEBUG((LM_DEBUG, "send_request : sequence_number = %d\n", sequence_number)); + ORBSVCS_DEBUG((LM_DEBUG, "send_request : sequence_number = %d\n", sequence_number)); if (sequence_number != 0) { if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))) throw CORBA::MARSHAL (); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 7f34610440f..3a40121b273 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -48,7 +48,7 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) ACE_OS::memcpy(&mgr, object_id->get_buffer(), sizeof(mgr)); ACE_OS::memcpy(&id, object_id->get_buffer()+sizeof(mgr), sizeof(id)); - ACE_DEBUG((LM_DEBUG, "%d\n", id)); + ORBSVCS_DEBUG((LM_DEBUG, "%d\n", id)); (mgr->*handler)(id); @@ -58,14 +58,14 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) void UpdateableHandler::set_update ( ) { - ACE_DEBUG((LM_DEBUG,"Received reply from ")); + ORBSVCS_DEBUG((LM_DEBUG,"Received reply from ")); dispatch(&Update_Manager::handle_reply); } void UpdateableHandler::set_update_excep ( ::Messaging::ExceptionHolder * excep_holder ) { - ACE_DEBUG((LM_DEBUG, "Received Exception from")); + ORBSVCS_DEBUG((LM_DEBUG, "Received Exception from")); try{ excep_holder->raise_exception(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 18e2bb69a54..1fb30914717 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -219,7 +219,7 @@ FTEC_Gateway::for_consumers (void) RtecEventChannelAdmin::SupplierAdmin_ptr FTEC_Gateway::for_suppliers (void) { - ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); + ORBSVCS_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index ac826856adc..ff5cac10553 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -21,7 +21,7 @@ unsigned int Log::log_level_; va_start(p, format); ACE_TCHAR str[1024]; ACE_OS::vsprintf(str, format, p); - ACE_DEBUG((LM_DEBUG, str)); + ORBSVCS_DEBUG((LM_DEBUG, str)); va_end(p); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl index f8ebf7863c9..688c3d5eeaf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -22,7 +22,7 @@ namespace TAO_FTRTEC { void Log::hexdump(unsigned int level, const char* buf, size_t len, const ACE_TCHAR* msg) { if (Log::log_level_ >= level) - ACE_HEX_DUMP((LM_DEBUG, buf, len, msg)); + ORBSVCS_HEX_DUMP((LM_DEBUG, buf, len, msg)); } #else // NDEBUG ACE_INLINE diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h index c5944651d37..d8fe9c403e6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h @@ -35,13 +35,13 @@ resolve_init (CORBA::ORB_ptr orb, catch (const CORBA::Exception&) { - ACE_ERROR(( + ORBSVCS_ERROR(( LM_ERROR, " (%P|%t) Unable to initialize %s.\n", id )); if (!CORBA::is_nil(obj.in())) - ACE_ERROR(( + ORBSVCS_ERROR(( LM_ERROR, " due to narrowing problem\n" )); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index b1e7680abe7..f9a670ca02e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -265,7 +265,7 @@ TAO::HTIOP::Acceptor::open (TAO_ORB_Core *orb_core, { // The hostname cache has already been set! // This is bad mojo, i.e. an internal TAO error. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("TAO::HTIOP::Acceptor::open - ") ACE_TEXT ("hostname already set\n\n")), @@ -277,7 +277,7 @@ TAO::HTIOP::Acceptor::open (TAO_ORB_Core *orb_core, int rp = this->ht_env_->get_proxy_port(proxy_port); if (rp == 0 && proxy_port != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("TAO::HTIOP::Acceptor::open - ") ACE_TEXT ("explicit endpoint inside proxy, port %d\n"), @@ -376,7 +376,7 @@ TAO::HTIOP::Acceptor::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Overriding address in IOR with %s\n"), this->hostname_in_ior_)); } @@ -418,7 +418,7 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core, { // The hostname cache has already been set! // This is bad mojo, i.e. an internal TAO error. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("TAO::HTIOP::Acceptor::open_default - ") ACE_TEXT ("hostname already set\n\n")), @@ -501,7 +501,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, this->concurrency_strategy_) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i ") ACE_TEXT ("- %p"), ACE_TEXT ("cannot open acceptor"))); @@ -516,7 +516,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, { // @@ Should this be a catastrophic error??? if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i ") ACE_TEXT ("- %p\n\n"), ACE_TEXT ("cannot get local addr"))); @@ -542,7 +542,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, { for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i - ") ACE_TEXT ("listening on: <%C:%u>\n"), this->hosts_[i], @@ -617,7 +617,7 @@ TAO::HTIOP::Acceptor::dotted_decimal_address (ACE_INET_Addr &addr, if (tmp == 0 || result != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("TAO::HTIOP::Acceptor::dotted_decimal_address ") ACE_TEXT ("- %p\n\n"), @@ -655,7 +655,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) Unable to probe network ") ACE_TEXT ("interfaces. Using default.\n"))); } @@ -713,7 +713,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Overriding address in IOR with %s\n"), this->hostname_in_ior_)); } @@ -770,7 +770,7 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::object_key") ACE_TEXT (" - v%d.%d\n"), major, @@ -788,7 +788,7 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO::HTIOP::Acceptor::object_key - ") ACE_TEXT ("error while decoding host/port"))); } @@ -848,7 +848,7 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) end = len; if (end == begin) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length HTIOP option.\n")), -1); else if (end != ACE_CString::npos) @@ -859,7 +859,7 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) HTIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), opt.c_str ()), @@ -869,7 +869,7 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) ACE_CString value = opt.substring (slot + 1); if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Zero length HTIOP ") ACE_TEXT ("option name.\n")), -1); @@ -878,7 +878,7 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) this->hostname_in_ior_ = value.rep (); } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid HTIOP option: <%s>\n"), name.c_str ()), -1); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index a5b8617fd49..3e4ef8c8222 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -82,7 +82,7 @@ TAO::HTIOP::Completion_Handler::handle_input (ACE_HANDLE h) -1); if (this->channel_->pre_recv() != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO::HTIOP::Completion_Handler: pre_recv not done, " "channel state = %d\n", this->channel_->state()), @@ -107,7 +107,7 @@ TAO::HTIOP::Completion_Handler::handle_input (ACE_HANDLE h) if (this->creation_strategy_->make_svc_handler (svc_handler) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO::HTIOP::Completion_Handler %p\n"), ACE_TEXT ("make_svc_handler"))); return -1; @@ -133,7 +133,7 @@ TAO::HTIOP::Completion_Handler::handle_input (ACE_HANDLE h) // on failure. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("activate_svc_handler"))); return -1; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 73e5913309b..79ed7dbe4f1 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -55,7 +55,7 @@ TAO::HTIOP::Connection_Handler::~Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - HTIOP_Connection_Handler::") ACE_TEXT("~HTIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); @@ -106,7 +106,7 @@ TAO::HTIOP::Connection_Handler::open (void*) (void) local_addr.addr_to_string (local_as_string, sizeof(local_as_string), 0); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("TAO(%P|%t) - TAO::HTIOP::Connection_Handler::open, ") ACE_TEXT("Holy Cow! The remote addr and ") ACE_TEXT("local addr are identical (%s == %s)\n"), @@ -123,7 +123,7 @@ TAO::HTIOP::Connection_Handler::open (void*) if (remote_addr.addr_to_string (client, sizeof (client), 0) == -1) return -1; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO_HTIOP connection to peer ") ACE_TEXT ("<%s> on %d\n"), client, this->peer ().get_handle ())); @@ -165,7 +165,7 @@ TAO::HTIOP::Connection_Handler::handle_input (ACE_HANDLE h) if (result != -1 && peer().session()) { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO::HTIOP::Connection_Handler::handle_input: ") ACE_TEXT("now binding to %d\n"), peer().get_handle())); @@ -257,7 +257,7 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%C],[%C]\n"), listen_point.port, listen_point.host.in (), diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index fe8850b1da4..4d098bb6ed8 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -97,7 +97,7 @@ TAO::HTIOP::Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO_HTIOP connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -168,7 +168,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, { char buffer[BUFSIZ]; htiop_endpoint->addr_to_string(buffer,BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO::HTIOP::Connector::make_connection, " "to <%s>\n", buffer)); @@ -202,7 +202,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, 0); ACE_NEW_RETURN (session, ACE::HTBP::Session (session_id,proxy, 1), 0); if (ACE::HTBP::Session::add_session (session) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "ACE::HTBP::Initial_Filter::recv_data_header %p", "add_session"), 0); @@ -235,7 +235,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - TAO::HTIOP::Connector::make_connection, ") ACE_TEXT("connection to <%s:%d> failed (%p)\n"), htiop_endpoint->host (), htiop_endpoint->port (), @@ -245,7 +245,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, } if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - TAO::HTIOP::Connector::make_connection, ") ACE_TEXT("new connection to <%s:%d> on Transport[%d]\n"), htiop_endpoint->host (), htiop_endpoint->port (), @@ -267,7 +267,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, svc_handler->close(); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - TAO::HTIOP::Connector::make_connection, ") ACE_TEXT("could not add the new") ACE_TEXT(" connection to cache\n"))); @@ -285,7 +285,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - TAO::HTIOP::Connector::make_connection, ") ACE_TEXT("could not register the new connection") ACE_TEXT(" in the reactor\n"))); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index 46bc7c75082..b7b4ccaf82e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -4,7 +4,7 @@ #include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/os_include/os_netdb.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "tao/IOPC.h" #include "tao/debug.h" @@ -91,7 +91,7 @@ TAO::HTIOP::Endpoint::set (const ACE::HTBP::Addr &addr, if (tmp == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("TAO::HTIOP::Endpoint::set ") ACE_TEXT ("- %p\n\n"), diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index cb65c9c3a69..49325bac550 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -93,7 +93,7 @@ TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr) || cdr.read_string (this->endpoint_.htid_.out()) == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO::HTIOP::Profile::decode - ") ACE_TEXT ("error while decoding host/port"))); return -1; @@ -182,7 +182,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior) // initialized. Just throw an exception. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("TAO::HTIOP::Profile::parse_string ") ACE_TEXT ("- %p\n\n"), @@ -347,7 +347,7 @@ TAO::HTIOP::Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) TAO - IIOP_Profile::create_profile_body " "no object key marshalled\n")); } @@ -430,7 +430,7 @@ TAO::HTIOP::Profile::decode_endpoints (void) // Extract the Byte Order. CORBA::Boolean byte_order; if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - ACE_ERROR_RETURN ((LM_ERROR,"boolean byte_order extraction failed\n"), + ORBSVCS_ERROR_RETURN ((LM_ERROR,"boolean byte_order extraction failed\n"), -1); in_cdr.reset_byte_order (static_cast<int> (byte_order)); @@ -438,7 +438,7 @@ TAO::HTIOP::Profile::decode_endpoints (void) HTIOPEndpointSequence endpoints; if ((in_cdr >> endpoints) == 0) - ACE_ERROR_RETURN ((LM_ERROR,"endpoint sequence extraction failed\n"), + ORBSVCS_ERROR_RETURN ((LM_ERROR,"endpoint sequence extraction failed\n"), -1); // Use information extracted from the tagged component to diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 6f5803136d1..3d1e53eaf7c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -77,7 +77,7 @@ TAO::HTIOP::Transport::recv (char *buf, errno != ETIME) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, ") ACE_TEXT ("read failure - %m"), this->id ())); @@ -110,7 +110,7 @@ TAO::HTIOP::Transport::register_handler (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::register_handler\n"), this->id ())); } @@ -187,7 +187,7 @@ TAO::HTIOP::Transport::send_message (TAO_OutputCDR &stream, // a core. %m would then be softer on this. if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::send_message, ") ACE_TEXT (" write failure - %m\n"), this->id ())); @@ -210,7 +210,7 @@ TAO::HTIOP::Transport::tear_listen_point_list (TAO_InputCDR &cdr) ::HTIOP::ListenPointList listen_list; if ((cdr >> listen_list) == 0) - ACE_ERROR_RETURN ((LM_ERROR,"tear_listen_point_list: no list\n"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR,"tear_listen_point_list: no list\n"),-1); //return -1; // As we have received a bidirectional information, set the flag to @@ -242,7 +242,7 @@ TAO::HTIOP::Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) if (this->get_listen_point (listen_point_list, *acceptor) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - TAO::HTIOP::Transport::set_bidir_info, "), ACE_TEXT("error getting listen_point\n"))); @@ -294,7 +294,7 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Could not resolve local ") ACE_TEXT ("host address in ") ACE_TEXT ("get_listen_point()\n")), @@ -315,7 +315,7 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, local_addr, local_interface.out ()) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Could not resolve local host") ACE_TEXT (" name\n")), -1); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index dc22ca7e0dc..80ede30519c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -41,7 +41,7 @@ TAO_IFR_Server::~TAO_IFR_Server (void) ACE_Event_Handler::READ_MASK) == -1) { - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("Interface Repository: cannot remove handler\n") )); @@ -66,7 +66,7 @@ TAO_IFR_Server::init_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) IFR_Service::init_with_orb ") ACE_TEXT ("Unable to initialize the POA.\n")), -1); @@ -246,7 +246,7 @@ TAO_IFR_Server::open_config (void) delete heap; heap = 0; - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Error:: Opening persistent heap file '%s'\n"), filename @@ -335,7 +335,7 @@ TAO_IFR_Server::create_repository (void) if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1); } else { @@ -355,7 +355,7 @@ TAO_IFR_Server::create_repository (void) if (output_file_ == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_IFR_Server::create_repository - ") ACE_TEXT ("can't open IOR output ") ACE_TEXT ("file for writing\n")), @@ -419,7 +419,7 @@ TAO_IFR_Server::init_multicast_server (void) TAO_SERVICEID_INTERFACEREPOSERVICE) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Interface Repository: cannot initialize ") ACE_TEXT ("multicast event handler\n") @@ -436,7 +436,7 @@ TAO_IFR_Server::init_multicast_server (void) TAO_SERVICEID_INTERFACEREPOSERVICE) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Interface Repository: cannot initialize ") ACE_TEXT ("multicast event handler\n") @@ -451,7 +451,7 @@ TAO_IFR_Server::init_multicast_server (void) ACE_Event_Handler::READ_MASK) == -1) { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Interface Repository: cannot register ") ACE_TEXT ("multicast event handler\n") @@ -1122,7 +1122,7 @@ TAO_IFR_Service_Utils::reference_to_path (CORBA::IRObject_ptr obj) { if (CORBA::is_nil (obj)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "reference_to_path - null object; check the include " "order of IDL\n")); @@ -1136,7 +1136,7 @@ TAO_IFR_Service_Utils::reference_to_path (CORBA::IRObject_ptr obj) object_id); if (status != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "reference_to_path - parse_ir_object_key failed\n")); return 0; } @@ -1156,7 +1156,7 @@ TAO_IFR_Service_Utils::path_to_def_kind (ACE_TString &path, if (status != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "path_to_def_kind - bad path: '%s'\n", path.c_str ())); return CORBA::dk_none; @@ -1187,7 +1187,7 @@ TAO_IFR_Service_Utils::path_to_idltype (ACE_TString &path, if (retval == 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "path_to_idltype - not an IDLType: '%s'\n", path.c_str ())); return 0; @@ -1207,7 +1207,7 @@ TAO_IFR_Service_Utils::path_to_contained (ACE_TString &path, if (retval == 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "path_to_contained - not a contained type: '%s'\n", path.c_str ())); return 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 71420458e5e..06a69176e2d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -47,7 +47,7 @@ TAO_IRObject_i::update_key (void) object_id); if (status != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "update_key - parse_ir_object_key failed\n")); return; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 9048059af33..5db1c995573 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -226,7 +226,7 @@ TAO_OperationDef_i::params_i (void) // We have an undefined interface if (impl == 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Encountered undefined parameter type " "for variable: %s\n"), name.c_str ())); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index d00960cb07c..2a3d6dd42f1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/IFRService/Options.h" #include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" @@ -56,7 +56,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) this->using_registry_ = 1; break; #else /* ACE_WIN32 */ - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("parse_args: not a win32 platform\n") ), @@ -68,7 +68,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) break; case '?': // display help for use of the server. default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Usage: %s" " [-o] <ior_output_file>" " [-r]" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 7c21b9d2b84..438442a9b49 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -489,7 +489,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref, CORBA::TypeCodeFactory::_narrow (object.in ()); if (CORBA::is_nil (this->tc_factory_.in ())) - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Repository: TypeCodeFactory narrow failed\n") ), @@ -498,7 +498,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref, } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Repository: TypeCodeFactory resolve failed\n") ), @@ -516,7 +516,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref, PortableServer::Current::_narrow (object.in ()); if (CORBA::is_nil (this->poa_current_.in ())) - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Repository: POACurrent narrow failed\n") ), @@ -525,7 +525,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref, } else { - ACE_ERROR_RETURN (( + ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Repository: POACurrent resolve failed\n") ), diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 55c3adf82d4..35691e93493 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -5,7 +5,7 @@ #include "tao/debug.h" #include "ace/SOCK_Connector.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,7 +29,7 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior, port, mcast_addr, service_id) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("TAO_IOR_Multicast"))); } @@ -38,7 +38,7 @@ TAO_IOR_Multicast::~TAO_IOR_Multicast (void) { if (ior_.length() > 0 && this->mcast_dgram_.leave (this->mcast_addr_) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "~TAO_IOR_Multicast()")); + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "~TAO_IOR_Multicast()")); } } @@ -49,7 +49,7 @@ TAO_IOR_Multicast::init (const char *ior, TAO_Service_ID service_id) { if (this->mcast_addr_.set (port, mcast_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::init() %p\n", "set"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::init() %p\n", "set"), -1); return common_init (ior, service_id); } @@ -88,7 +88,7 @@ TAO_IOR_Multicast::init (const char *ior, } if (this->mcast_addr_.set (actual_mcast_addr.in ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%p\n", "set"), -1); @@ -104,13 +104,13 @@ TAO_IOR_Multicast::common_init (const char *ior, this->ior_ = ior; if (this->response_addr_.set ((u_short) 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "set"), -1); else if (this->response_.open (this->response_addr_) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%p\n", "set"), -1); @@ -122,12 +122,12 @@ TAO_IOR_Multicast::common_init (const char *ior, if (this->mcast_dgram_.join (this->mcast_addr_, 1, ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "join"),-1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "join"),-1); } else { if (this->mcast_dgram_.join (this->mcast_addr_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "subscribe"), -1); @@ -146,7 +146,7 @@ int TAO_IOR_Multicast::handle_input (ACE_HANDLE) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Entered TAO_IOR_Multicast::handle_input\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Entered TAO_IOR_Multicast::handle_input\n")); // The length of the service name string that follows. CORBA::Short header; @@ -164,12 +164,12 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) remote_addr, MSG_PEEK); if (n <= 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::handle_input - peek %d\n", n), 0); else if (ACE_NTOHS (header) <= 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::handle_input() Header value < 1\n"), 0); @@ -189,7 +189,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) iovcnt, remote_addr); if (n <= 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::handle_input recv = %d\n", n), 0); @@ -198,7 +198,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) { ACE_TCHAR addr[64]; remote_addr.addr_to_string (addr, sizeof(addr)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Received multicast from %s.\n" "Service Name received : %s\n" "Port received : %u\n", @@ -218,7 +218,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) && ACE_OS::strcmp (service_name, "MCASTServer") != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "IOR_Multicast::connect() Unknown service requested.\n"),0); } @@ -267,14 +267,14 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) { ACE_TCHAR addr[64]; peer_addr.addr_to_string (addr, sizeof(addr)); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Replying to peer %s.\n", addr)); } // Connect. if (connector.connect (stream, peer_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "IOR_Multicast::connect failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "IOR_Multicast::connect failed\n"), 0); // Send the IOR back to the client. (Send iovec, which contains ior // length as the first element, and ior itself as the second.) @@ -300,10 +300,10 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) // Check for error. if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "IOR_Multicast::send failed\n"), 0); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "IOR_Multicast::send failed\n"), 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_IOR_Multicast::handle_input() ior_: <%s>\n" "sent to %s:%u.\n" "result from send = %d\n", diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index e575f720b12..54aa627e7b0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -148,7 +148,7 @@ TAO_LB_CPU_Utilization_Monitor::loads (void) load_list[0].id = CosLoadBalancing::LoadAverage; load_list[0].value = load; - ACE_DEBUG ((LM_DEBUG, "%2f\n", load_list[0].value)); + ORBSVCS_DEBUG ((LM_DEBUG, "%2f\n", load_list[0].value)); return load_list._retn (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 0ba928de2fe..dbcada6992b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -126,7 +126,7 @@ TAO_LB_LeastLoaded::push_loads ( if (this->load_map_->bind (the_location, eff_load) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR: TAO_LB_LeastLoaded - " "Unable to push loads\n")); @@ -186,7 +186,7 @@ TAO_LB_LeastLoaded::next_member ( if (found_location) { -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "RETURNING REFERENCE FOR LOCATION \"%s\"\n", // location[0].id.in ())); @@ -246,7 +246,7 @@ TAO_LB_LeastLoaded::analyze_loads ( current_loads.in (), load); /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EFFECTIVE_LOAD == %f\n" "CRITICAL == %f\n" "REJECT == %f\n" @@ -263,7 +263,7 @@ TAO_LB_LeastLoaded::analyze_loads ( if (load.value > this->critical_threshold_) { /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%P --- ALERTING LOCATION %u\n", i)); */ @@ -332,7 +332,7 @@ TAO_LB_LeastLoaded::get_location ( current_loads.in (), load); /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "LOC = %u" "\tC = %d" "\treject = %f" @@ -349,7 +349,7 @@ TAO_LB_LeastLoaded::get_location ( || load.value < this->reject_threshold_) && load.value < min_load) { -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "**** LOAD == %f\n", // load.value)); @@ -405,15 +405,15 @@ TAO_LB_LeastLoaded::get_location ( location_index = i; found_location = 1; -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "** NEW MIN_LOAD == %f\n", // min_load)); } // if (n == 0) -// ACE_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); +// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); // else -// ACE_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); +// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); } else @@ -422,7 +422,7 @@ TAO_LB_LeastLoaded::get_location ( location_index = i; found_location = 1; -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "***** NEW MIN_LOAD == %f\n", // min_load)); } @@ -433,13 +433,13 @@ TAO_LB_LeastLoaded::get_location ( location_index = i; found_location = 1; -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "NEW MIN_LOAD == %f\n", // min_load)); } } - // ACE_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load)); + // ORBSVCS_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load)); } catch (const CosLoadBalancing::LocationNotFound&) { @@ -448,7 +448,7 @@ TAO_LB_LeastLoaded::get_location ( } } -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "FOUND_LOAD == %u\n" // "FOUND_LOCATION == %u\n", // found_load, @@ -461,13 +461,13 @@ TAO_LB_LeastLoaded::get_location ( { if (found_location) { - //ACE_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index)); + //ORBSVCS_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index)); location = locations[location_index]; } else if (!ACE::is_equal (this->reject_threshold_, 0.0f)) throw CORBA::TRANSIENT (); -// ACE_DEBUG ((LM_DEBUG, "LOCATION ID == %s\n", location[0].id.in ())); +// ORBSVCS_DEBUG ((LM_DEBUG, "LOCATION ID == %s\n", location[0].id.in ())); } return found_location; @@ -548,7 +548,7 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props) this->dampening_ = dampening; this->per_balance_load_ = per_balance_load; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "--------------------------------\n" "critical_threshold = %f\n" "reject_threshold = %f\n" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index f111dda9eb8..aa8318f65fd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -19,7 +19,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep ( ::Messaging::ExceptionHolder *) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Exception caught when invoking ") ACE_TEXT ("LoadAlert::enable_alert()\n"))); } @@ -33,7 +33,7 @@ void TAO_LB_LoadAlert_Handler::disable_alert_excep (::Messaging::ExceptionHolder *) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Exception caught when invoking ") ACE_TEXT ("LoadAlert::disable_alert()\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 463f4c3da83..7e978b34584 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -124,7 +124,7 @@ TAO_LB_LoadAverage::push_loads ( if (this->load_map_->bind (the_location, eff_load) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR: TAO_LB_LoadAverage - " "Unable to push loads\n")); @@ -229,7 +229,7 @@ TAO_LB_LoadAverage::analyze_loads ( tmp[i] = load; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TOTAL == %f\n", total_load.value)); */ @@ -243,7 +243,7 @@ TAO_LB_LoadAverage::analyze_loads ( avg_load.value = total_load.value / len; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "AVERAGE LOAD == %f\n", avg_load.value)); */ @@ -257,7 +257,7 @@ TAO_LB_LoadAverage::analyze_loads ( const PortableGroup::Location & loc = locations[j]; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EFFECTIVE_LOAD == %f\n" "AVERAGE == %f\n", tmp[i].value, @@ -278,7 +278,7 @@ TAO_LB_LoadAverage::analyze_loads ( percent_diff = 0; } /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "ALERT LOC == %u" "\tAVG LOAD == %f\n" "\tLOAD == %f\n" @@ -300,7 +300,7 @@ TAO_LB_LoadAverage::analyze_loads ( && (percent_diff < 1)) { /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%P --- ALERTING LOCATION %u\n", i)); */ @@ -374,7 +374,7 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props) this->per_balance_load_ = per_balance_load; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "--------------------------------\n" "tolerance = %f\n" "dampening = %f\n" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index ce233f9935f..80109f82794 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -372,7 +372,7 @@ TAO_LB_LoadManager::register_load_monitor ( if (this->timer_id_ == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_LB_LoadManager::register_load_monitor: " "Unable to schedule timer.\n")); @@ -388,7 +388,7 @@ TAO_LB_LoadManager::register_load_monitor ( else if (result != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_LB_LoadManager::register_load_monitor: " "Unable to register load monitor.\n")); @@ -434,7 +434,7 @@ TAO_LB_LoadManager::remove_load_monitor ( if (this->reactor_->cancel_timer (this->timer_id_) == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_LB_LoadManager::remove_load_monitor: " "Unable to cancel timer.\n")); @@ -863,7 +863,7 @@ TAO_LB_LoadManager::initialize (ACE_Reactor * reactor, if (this->ping_interval_ > ACE_Time_Value::zero && this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT ("(%P|%t)TAO_LB_LoadManager::initialize failed to activate ") ACE_TEXT ("thread to validate connection.\n"))); throw CORBA::INTERNAL (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 6f2e8a65abf..f86e5184334 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -125,7 +125,7 @@ TAO_LB_LoadMinimum::push_loads ( if (this->load_map_->bind (the_location, eff_load) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR: TAO_LB_LoadMinimum - " "Unable to push loads\n")); @@ -186,7 +186,7 @@ TAO_LB_LoadMinimum::next_member ( if (found_location) { /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "RETURNING REFERENCE FOR LOCATION \"%s\"\n", location[0].id.in ())); */ @@ -206,7 +206,7 @@ TAO_LB_LoadMinimum::next_member ( // @note The Random load balancing strategy is used since it is // very lightweight and stateless. /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "CALLING RANDOM REFERENCE FOR LOCATION\n")); */ @@ -268,7 +268,7 @@ TAO_LB_LoadMinimum::analyze_loads ( } /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TOTAL == %f\n", total_load.value)); */ @@ -283,7 +283,7 @@ TAO_LB_LoadMinimum::analyze_loads ( avg_load.value = total_load.value / len; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "AVERAGE LOAD == %f" "\tMIN LOAD == %f\n", avg_load.value, @@ -299,7 +299,7 @@ TAO_LB_LoadMinimum::analyze_loads ( const PortableGroup::Location & loc = locations[j]; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EFFECTIVE_LOAD == %f\n" "AVERAGE == %f\n", tmp[i].value, @@ -321,7 +321,7 @@ TAO_LB_LoadMinimum::analyze_loads ( percent_diff = 0; } /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "ALERT LOC == %u" "\tMIN LOAD == %f\n" "\tLOAD == %f\n" @@ -340,7 +340,7 @@ TAO_LB_LoadMinimum::analyze_loads ( && (percent_diff < 1)) { /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%P --- ALERTING LOCATION %u\n", i)); */ @@ -398,7 +398,7 @@ TAO_LB_LoadMinimum::get_location ( current_loads.in (), load); /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "LOC == %u" "\tMIN LOAD == %f\n" "\tLOAD == %f\n", @@ -460,15 +460,15 @@ TAO_LB_LoadMinimum::get_location ( location_index = i; found_location = 1; -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "** NEW MIN_LOAD == %f\n", // min_load)); } // if (n == 0) -// ACE_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); +// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); // else -// ACE_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); +// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); } else @@ -477,7 +477,7 @@ TAO_LB_LoadMinimum::get_location ( location_index = i; found_location = 1; -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "***** NEW MIN_LOAD == %f\n", // min_load)); } @@ -488,13 +488,13 @@ TAO_LB_LoadMinimum::get_location ( location_index = i; found_location = 1; -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "NEW MIN_LOAD == %f\n", // min_load)); } } - // ACE_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load)); + // ORBSVCS_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load)); } catch (const CosLoadBalancing::LocationNotFound&) { @@ -503,7 +503,7 @@ TAO_LB_LoadMinimum::get_location ( } } -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "FOUND_LOAD == %u\n" // "FOUND_LOCATION == %u\n", // found_load, @@ -517,11 +517,11 @@ TAO_LB_LoadMinimum::get_location ( if (found_location) { location = locations[location_index]; - //ACE_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index)); + //ORBSVCS_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index)); } } - //ACE_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index)); + //ORBSVCS_DEBUG ((LM_DEBUG, "LOCATED = %u\n", location_index)); return found_location; } @@ -574,7 +574,7 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props) this->per_balance_load_ = per_balance_load; /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "--------------------------------\n" "tolerance = %f\n" "dampening = %f\n" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp index 74d0e2e4e1d..38f75a53234 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp @@ -26,8 +26,8 @@ TAO_LB_MemberLocator::preinvoke ( CORBA::Object_var member = this->load_manager_->next_member (oid); -// ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, "%N:%l\n")); +// ORBSVCS_DEBUG ((LM_DEBUG, // "FORWARDED\n")); ACE_ASSERT (!CORBA::is_nil (member.in ())); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 4a2b4d8c673..313d2f24d91 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -197,7 +197,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group ( if (this->table_.bind (repository_id, group) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_LB_ObjectReferenceFactory::" "find_object_group - " "Couldn't bind object group reference.\n")); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index 1e57e25e8bf..81f7f36ae84 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -54,7 +54,7 @@ TAO_LB_Pull_Handler::handle_timeout ( this->load_manager_->push_loads (location, load_list.in ()); -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "LOCATION = %s\tLOAD = %f\n", // location[0].id.in (), // load_list[0].value)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 1f34bee74a9..77e351614a3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -126,7 +126,7 @@ TAO_LB_Random::_tao_next_member ( ACE_ASSERT (i < len); -// ACE_DEBUG ((LM_DEBUG, +// ORBSVCS_DEBUG ((LM_DEBUG, // "** Len = %u\t" // "Location # %u\t" // "Loc Name = \"%s\"\n", diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index 340279af649..cd7604486a4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -127,7 +127,7 @@ TAO_LB_ServerRequestInterceptor::send_exception ( // A CORBA::TRANSIENT is thrown when the LoadManager informs the // LoadAlert object that its member is overloaded, for example. - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("TAO_LB_ServerRequestInterceptor -- ") ACE_TEXT ("Exception thrown.\n"))); } @@ -146,7 +146,7 @@ TAO_LB_ServerRequestInterceptor::send_other ( ri->reply_status (); if (status == PortableInterceptor::LOCATION_FORWARD) - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("TAO_LB_ServerRequestInterceptor -- ") ACE_TEXT ("LOCATION FORWARDED\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 6b3b97fca88..0bd06a2e339 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -136,7 +136,7 @@ TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec) // First, bind the id to the LogRecord in the hash_map if (this->rec_map_.bind (rec.id, rec) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "LogRecordStore (%P|%t):Failed to bind %Q in the hash map\n", rec.id), -1); @@ -377,7 +377,7 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG,"Matched constraint! d = %Q, Time = %Q\n", + ORBSVCS_DEBUG ((LM_DEBUG,"Matched constraint! d = %Q, Time = %Q\n", iter->item ().id, iter->item ().time)); } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 8f43c54d406..d2bb2e4c1eb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1120,7 +1120,7 @@ TAO_Log_i::check_capacity_alarm_threshold (void) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "threshold of %d breached\n", this->thresholds_[this->current_threshold_])); } diff --git a/TAO/orbsvcs/orbsvcs/Log_Macros.cpp b/TAO/orbsvcs/orbsvcs/Log_Macros.cpp new file mode 100644 index 00000000000..ffbffee019d --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Log_Macros.cpp @@ -0,0 +1,9 @@ +// $Id$ + +#include "Log_Macros.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Svc_Utils_Export ACE_Log_Category ORBSVCS_log_category ("ORBSVCS"); + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log_Macros.h b/TAO/orbsvcs/orbsvcs/Log_Macros.h new file mode 100644 index 00000000000..e62667ef4d2 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Log_Macros.h @@ -0,0 +1,78 @@ +// $Id$ + +#ifndef TAO_ORBSVCS_LOG_MACROS_H +#define TAO_ORBSVCS_LOG_MACROS_H +#include "ace/pre.h" + +#include "ace/Log_Category.h" +#include "ace/Log_Msg.h" + +#include "tao/Versioned_Namespace.h" + +#include "svc_utils_export.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +extern TAO_Svc_Utils_Export ACE_Log_Category ORBSVCS_log_category; + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_NLOGGING) +#if !defined (ORBSVCS_HEX_DUMP) +# define ORBSVCS_HEX_DUMP(X) do {} while (0) +#endif +#if !defined (ORBSVCS_ERROR_RETURN) +# define ORBSVCS_ERROR_RETURN(X, Y) return (Y) +#endif +#if !defined (ORBSVCS_ERROR) +# define ORBSVCS_ERROR(X) do {} while (0) +#endif +#if !defined (ORBSVCS_DEBUG) +# define ORBSVCS_DEBUG(X) do {} while (0) +#endif +#else +#if !defined (ORBSVCS_HEX_DUMP) +#define ORBSVCS_HEX_DUMP(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::ORBSVCS_log_category.per_thr_obj(); \ + if (ace___ == 0) break;\ + ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ + ace___->log_hexdump X; \ + } while (0) +#endif +#if !defined (ORBSVCS_ERROR_RETURN) +#define ORBSVCS_ERROR_RETURN(X, Y) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::ORBSVCS_log_category.per_thr_obj(); \ + if (ace___ == 0) return Y;\ + ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \ + ace___->log X; \ + return Y; \ + } while (0) +#endif +#if !defined (ORBSVCS_ERROR) +#define ORBSVCS_ERROR(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::ORBSVCS_log_category.per_thr_obj(); \ + if (ace___ == 0) break;\ + ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \ + ace___->log X; \ + } while (0) +#endif +#if !defined (ORBSVCS_DEBUG) +#define ORBSVCS_DEBUG(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::ORBSVCS_log_category.per_thr_obj(); \ + if (ace___ == 0) break;\ + ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ + ace___->log X; \ + } while (0) +#endif +#endif /* ACE_NLOGGING */ + +#include "ace/post.h" +#endif diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index f3cbf477afe..d34faf2beb2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -31,7 +31,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %s\n", #name \ )); \ } @@ -50,7 +50,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %s\n", #name \ )); \ } \ @@ -192,7 +192,7 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st { (*group_names)[i] = CORBA::string_dup ("<group without LB property>"); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::groups: no LB ") ACE_TEXT ("property set on group.\n") )); @@ -218,7 +218,7 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st { { // Group has no name (*group_names)[i] = CORBA::string_dup ("<unnamed group>"); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::groups: no name ") ACE_TEXT ("property set on group.\n") )); @@ -256,7 +256,7 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group, { if (CORBA::is_nil (group)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::group_name: ") ACE_TEXT ("cannot get name for a null object.\n") )); @@ -274,7 +274,7 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group, } else { // The group has no name - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_FT_Naming_Manager::group_name - ") ACE_TEXT ("object group does not have a name")), false); @@ -389,7 +389,7 @@ TAO_FT_Naming_Manager::create_member ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::create_member: ") ACE_TEXT ("unknown group\n") )); @@ -411,7 +411,7 @@ TAO_FT_Naming_Manager::add_member ( { if (TAO_debug_level > 3) { - ACE_ERROR ( + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member") ACE_TEXT ("Null object group provided.\n") @@ -433,7 +433,7 @@ TAO_FT_Naming_Manager::add_member ( } catch (...) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::add_member - ") ACE_TEXT ("Issue with IOR of group or member.\n"))); throw PortableGroup::ObjectNotAdded (); @@ -446,7 +446,7 @@ TAO_FT_Naming_Manager::add_member ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::add_member ") ACE_TEXT ("to unknown group\n") )); @@ -466,7 +466,7 @@ TAO_FT_Naming_Manager::remove_member ( { if (TAO_debug_level > 3) { - ACE_ERROR ( + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member") ACE_TEXT ("Null object group provided.\n") @@ -504,7 +504,7 @@ TAO_FT_Naming_Manager::locations_of_members ( { if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::locations_of_members ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -522,7 +522,7 @@ TAO_FT_Naming_Manager::locations_of_members ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("locations_of_members: unknown group\n") )); @@ -546,7 +546,7 @@ TAO_FT_Naming_Manager::get_object_group_id ( if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::get_object_group_id ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -563,7 +563,7 @@ TAO_FT_Naming_Manager::get_object_group_id ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_object_group_id: unknown group\n") )); @@ -579,7 +579,7 @@ TAO_FT_Naming_Manager::get_object_group_ref ( { if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::get_object_group_ref ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -597,7 +597,7 @@ TAO_FT_Naming_Manager::get_object_group_ref ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_object_group_ref: unknown group\n") )); @@ -622,7 +622,7 @@ PortableGroup::ObjectGroup_ptr TAO_FT_Naming_Manager::get_object_group_ref_from_ { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_object_group_ref_from_id: unknown group\n") )); @@ -640,7 +640,7 @@ TAO_FT_Naming_Manager::get_member_ref ( if (CORBA::is_nil (object_group)) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_FT_Naming_Manager::get_member_ref ") ACE_TEXT ("- null object group passed.\n"))); throw PortableGroup::ObjectGroupNotFound (); @@ -658,7 +658,7 @@ TAO_FT_Naming_Manager::get_member_ref ( { if (TAO_debug_level > 0) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_Naming_Manager::") ACE_TEXT ("get_member_ref: unknown group\n") )); @@ -756,7 +756,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group) { if (TAO_debug_level > 3) { - ACE_ERROR ( + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::add_member") ACE_TEXT ("Null object group provided.\n") @@ -783,7 +783,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group) // return failure if (!found) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::next_member: ") ACE_TEXT ("object group has no TAO_FT_LOAD_BALANCING_STRATEGY ") ACE_TEXT ("property.\n") @@ -806,7 +806,7 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group) result = this->round_robin_.next_location (object_group, this, next_location); break; default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_FT_Naming_Manager::next_location: ") ACE_TEXT ("unsupported load balancing strategy requested.\n") )); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index e4b837dd831..97fc61cf9ae 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -85,7 +85,7 @@ TAO_FT_Naming_Replication_Manager::notify_updated_object_group ( int result = this->naming_svr_->update_object_group (group_info); if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unable to update object group.\n"))); } @@ -100,7 +100,7 @@ TAO_FT_Naming_Replication_Manager::notify_updated_context ( if (result != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Error while updating naming context.\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index 1dd1ec4cc3d..02e0f87b601 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -90,7 +90,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc, // Make sure the object group directory is accessible if (ACE_OS::access (this->object_group_dir_.c_str (), W_OK|X_OK)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Invalid object ") ACE_TEXT ("group persistence directory\n")), -1); @@ -135,7 +135,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc, // references to files. No need to write out the IOR if we if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("Writing combined IOR.\n"))); @@ -145,7 +145,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc, { // Primary was started in the past, but it is not currently // accessible for pairing. Primary will initiate pairing when // it is restarted. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Unable to pair with primary\n"))); result = 0; // This is a normal situation on backup restart. } @@ -185,7 +185,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT(" (%P|%t) ERROR: Unable to initialize the POA.\n")), -1); } @@ -263,7 +263,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, this->naming_manager_ior_.in (), ACE_TEXT_ALWAYS_CHAR (this->naming_manager_ior_file_name_)) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to open %s ") ACE_TEXT ("for writing:(%u) %p\n"), this->naming_manager_ior_file_name_, @@ -294,7 +294,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: TAO_FT_Naming_Server::") ACE_TEXT ("init_naming_manager_with_orb - Nil IORTable\n"))); } @@ -337,7 +337,7 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT(" (%P|%t) ERROR: Unable to initialize the POA.\n")), -1); } @@ -443,7 +443,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) if (this->server_role_ == PRIMARY) { // We are the primary if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("is a primary\n"))); @@ -457,7 +457,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) // may be up and running so we should register with it. CORBA::Object_var backup_ior; if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server reading ") ACE_TEXT ("backup ior file\n"))); @@ -471,11 +471,11 @@ TAO_FT_Naming_Server::init_replication_pairing (void) FT_Naming::ReplicationManager::_narrow (backup_ior.in ()); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("narrowing IOR\n"))); if (CORBA::is_nil (peer_ref.in ())) - ACE_ERROR_RETURN ( + ORBSVCS_ERROR_RETURN ( (LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not ") ACE_TEXT ("a FT_Naming::ReplicationManager\n"), @@ -484,7 +484,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) try { if (TAO_debug_level > 3) - ACE_DEBUG ( + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server registering ") ACE_TEXT ("with backup.\n"))); @@ -502,14 +502,14 @@ TAO_FT_Naming_Server::init_replication_pairing (void) if (registration_result == 0) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("registered with backup.\n"))); } else { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:Backup peer ") ACE_TEXT ("replica not started yet.\n"))); } @@ -528,7 +528,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) // Could not get the backup replica from the IOR file, which is OK. // The backup will register with us in the future. if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server no Replica ") ACE_TEXT ("IOR file. Waiting for registration.\n"))); } @@ -536,11 +536,11 @@ TAO_FT_Naming_Server::init_replication_pairing (void) else if (this->server_role_ == TAO_FT_Naming_Server::BACKUP) { // We are the backup if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:Is a Backup\n"))); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server writing ") ACE_TEXT ("replica ior\n"))); // Write out the backup ior for use by the primary if it must be restarted. @@ -551,7 +551,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) CORBA::Object_var primary_ref = CORBA::Object::_nil (); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("reading primary ior file\n"))); // Check for the primary IOR. We must have it to bootstrap the redundant @@ -561,7 +561,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) primary_ref.out ()) == 0)) { // There is a primary IOR file, so we must be restarting. if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("storing the primary reference ior\n"))); // Store the primary reference as our peer @@ -569,14 +569,14 @@ TAO_FT_Naming_Server::init_replication_pairing (void) FT_Naming::ReplicationManager::_narrow (primary_ref.in ()); if (CORBA::is_nil (peer_ref.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: IOR in file %s ") ACE_TEXT ("is not a FT_Naming::ReplicationManager\n"), primary_file_name.c_str ()), -1); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server ") ACE_TEXT ("backup registering with primary.\n"))); // Register with the primary @@ -587,14 +587,14 @@ TAO_FT_Naming_Server::init_replication_pairing (void) root.in (), nm.in ()); if (registration_result == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Backup unable to ") ACE_TEXT ("register with the primary at this time.\n")), 1); } else { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: No primary IOR ") ACE_TEXT ("available. Have you started the ") ACE_TEXT ("primary? Exiting.\n")), @@ -604,7 +604,7 @@ TAO_FT_Naming_Server::init_replication_pairing (void) else {// We are neither a primary or replica, but running in standalone mode if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:Is Standalone\n"))); } @@ -685,7 +685,7 @@ TAO_FT_Naming_Server::parse_args (int argc, #endif /* ACE_SIZEOF_VOID_P */ &address); if (result == 0 || result == EOF) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to ") ACE_TEXT ("process <-b> option")), -1); @@ -740,7 +740,7 @@ TAO_FT_Naming_Server::parse_args (int argc, break; case '?': default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s\n") ACE_TEXT ("--primary (not used with --backup)\n") ACE_TEXT ("--backup (not used with --primary)\n") @@ -769,7 +769,7 @@ TAO_FT_Naming_Server::parse_args (int argc, if (f_opt_used + u_opt_used + r_opt_used > 1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Only one persistence option ") ACE_TEXT ("can be provided.\n\n")), -1); @@ -788,7 +788,7 @@ TAO_FT_Naming_Server::parse_args (int argc, // User has not provided a role, so we will not use redundancy option if (this->use_redundancy_ == 1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("INFO: Cannot run standalone with ") ACE_TEXT ("-r option. Using -u instead.\n") ACE_TEXT ("Must start a '--primary' and a '--backup' ") @@ -803,7 +803,7 @@ TAO_FT_Naming_Server::parse_args (int argc, // Only the backup should be requested to write the multi-profile IOR if ((this->server_role_ != TAO_FT_Naming_Server::BACKUP) && (this->combined_naming_service_ior_file_name_ != 0)) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Must export the multi-profile ") ACE_TEXT ("IOR (using '-c' option) from the backup") ACE_TEXT (" server.\n\n")), @@ -812,7 +812,7 @@ TAO_FT_Naming_Server::parse_args (int argc, // Only the backup should be requested to write the multi-profile IOR if ((this->server_role_ == TAO_FT_Naming_Server::BACKUP) && (this->combined_naming_service_ior_file_name_ == 0)) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Must export the multi-profile ") ACE_TEXT ("IOR (using '-c' option) from the backup") ACE_TEXT (" server.\n\n")), @@ -843,7 +843,7 @@ TAO_FT_Naming_Server::fini (void) IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Nil IORTable\n"))); } else @@ -914,7 +914,7 @@ TAO_FT_Naming_Server::read_reference_from_file (const char* replica_file_name, if (CORBA::is_nil (object.in ())) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) - invalid ior in file <%s>\n"), replica_file_name)); @@ -959,7 +959,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) // Make sure the user provided an ior_file_name for the comb if (this->combined_naming_service_ior_file_name_ != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to write combined") ACE_TEXT (" NameService IOR file. ") ACE_TEXT ("Only supported by the backup naming service.\n") @@ -974,7 +974,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) // Make sure the user provided an ior_file_name for the multi-profile ior file if (this->combined_naming_service_ior_file_name_ == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to write combined") ACE_TEXT (" NameService IOR file. ") ACE_TEXT ("No file name provided.\n")), @@ -985,7 +985,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) CORBA::Object_var peer_root_cxt = this->peer_root_context (); if (CORBA::is_nil (peer_root_cxt.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to get the primary") ACE_TEXT (" NameService object ref")), -1); @@ -994,7 +994,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) CORBA::Object_var my_root_cxt = this->my_root_context (); if (CORBA::is_nil (my_root_cxt.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to get this") ACE_TEXT (" services NameService object ref")), -1); @@ -1013,7 +1013,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) if (CORBA::is_nil (combined_obj_ref.in ())) { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: could not combine") ACE_TEXT(" primary and backup IORs for") ACE_TEXT(" fault tolerant Naming Service.\n"))); @@ -1032,7 +1032,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) if (this->combined_naming_manager_ior_file_name_ == 0) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - FT_Naming_Server:No NamingManager") ACE_TEXT (" IOR file name provided") ACE_TEXT (" with -g option. Not writing IOR.\n"))); @@ -1053,7 +1053,7 @@ TAO_FT_Naming_Server::export_ft_naming_references (void) if (CORBA::is_nil (combined_obj_ref.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) ERROR: could not combine") ACE_TEXT(" primary and backup IORs for") ACE_TEXT(" fault tolerant Naming Manager.\n")), @@ -1106,7 +1106,7 @@ TAO_FT_Naming_Server::update_object_group ( { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - ") ACE_TEXT ("An update of object group with ID %lld ") ACE_TEXT ("has been made by the peer\n"), @@ -1117,7 +1117,7 @@ TAO_FT_Naming_Server::update_object_group ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Attempting to update object group ") ACE_TEXT ("as stale with obect group persistence not ") ACE_TEXT ("enabled.\n"))); @@ -1160,7 +1160,7 @@ TAO_FT_Naming_Server::update_naming_context ( if (changed_context_servant == 0) { // Another type of class was used as the servant. Should not happen. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Invalid servant type registered") ACE_TEXT (" with oid: %s"), context_info.context_name.in ())); @@ -1169,7 +1169,7 @@ TAO_FT_Naming_Server::update_naming_context ( if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - ") ACE_TEXT ("An update of naming context with name %s ") ACE_TEXT ("has been made by the peer"), diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp index 5890db3344d..5781ab6ee52 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp @@ -42,7 +42,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale ( ACE_CString change_type_str ("created"); if (group_info.change_type == FT_Naming::DELETED) change_type_str = "deleted"; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory: ") ACE_TEXT ("Setting list store as stale "), ACE_TEXT ("because of group with ID %lld "), @@ -63,7 +63,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale ( if (!og) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - FT_PG_Group_Factory ") ACE_TEXT ("In setting object group stale could not cast ") ACE_TEXT ("to FT_PG_Object_Group_Storable\n"))); @@ -72,7 +72,7 @@ TAO::FT_PG_Group_Factory::set_object_group_stale ( if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Setting object group with ID %lld as stale\n"), group_id diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp index 546e1a7e54d..351b47279ed 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp @@ -86,7 +86,7 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification // Notify the naming_manager of the updated context if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - propagate_update_notification ") ACE_TEXT ("Notifying peer that object group with ID %lld ") ACE_TEXT ("has been updated\n"), object_group_info.id @@ -145,7 +145,7 @@ TAO::FT_PG_Object_Group_Storable::add_member_to_iogr (CORBA::Object_ptr member) if (CORBA::is_nil (member)) {// A null object reference is not an acceptable member of the group. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to add null member ") ACE_TEXT ("to object group with id: %s\n"), this->tagged_component_.object_group_id)); @@ -166,7 +166,7 @@ TAO::FT_PG_Object_Group_Storable::add_member_to_iogr (CORBA::Object_ptr member) } catch (const CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Unable to add member ") ACE_TEXT ("to object group with id: %s for object ") ACE_TEXT ("of type: %s\n"), diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index ab1a1ae2737..4540ba37299 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -72,7 +72,7 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n) // If there is no naming manager, we will fail and report an error. if ( this->naming_manager_impl_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ") ACE_TEXT ("- No NamingManager defined.\n"))); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 653b4ef90c0..e03f2279adf 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -74,7 +74,7 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n) // If there is no naming manager, we will fail and report an error. if ( this->naming_manager_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_FT_Storable_Naming_Context::resolve ") ACE_TEXT ("- No NamingManager defined.\n"))); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index bfbc7cfc7e1..4274aa1006e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -41,7 +41,7 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb) this->orb_ = CORBA::ORB::_duplicate (orb); if (CORBA::is_nil (this->orb_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the ") ACE_TEXT ("ORB.\n")), -1); @@ -55,7 +55,7 @@ NS_group_svc::set_naming_manager( FT_Naming::NamingManager_ptr nm) this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm); if (CORBA::is_nil (this->naming_manager_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Invalid Naming Manager.\n")), -1); return 0; @@ -68,7 +68,7 @@ NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc) this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc); if (CORBA::is_nil (this->name_service_.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Invalid Name Context.\n")), -1); return 0; @@ -81,7 +81,7 @@ NS_group_svc::group_exist ( { if (group_name == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_exist args not provided\n")), false); } @@ -115,7 +115,7 @@ NS_group_svc::group_create ( if (group_name == 0 || policy == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_create args not provided\n")), -2); } @@ -124,7 +124,7 @@ NS_group_svc::group_create ( FT_Naming::LoadBalancingStrategyValue strategy; if (false == determine_policy_string (policy, strategy)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%s is not a valid policy.\n"), policy), -2); @@ -136,7 +136,7 @@ NS_group_svc::group_create ( /// Group names must be unique if ( true == group_exist (group_name)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Group %s already exists\n"), group_name), -1); @@ -162,7 +162,7 @@ NS_group_svc::group_create ( if (CORBA::is_nil (obj.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to create group %s.\n"), group_name), -1); @@ -171,7 +171,7 @@ NS_group_svc::group_create ( } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to create group %s\n"), group_name), -1); @@ -195,7 +195,7 @@ NS_group_svc::group_bind ( if (group_name == 0 || path == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_bind args not provided\n")), -2); } @@ -208,7 +208,7 @@ NS_group_svc::group_bind ( ACE_TEXT_ALWAYS_CHAR(group_name)); if (CORBA::is_nil (group_var.in())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get reference.\n")), -1); @@ -221,19 +221,19 @@ NS_group_svc::group_bind ( catch (const CosNaming::NamingContextExt::InvalidName& ex){ ex._tao_print_exception ("InvalidName Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n%s is invalid\n"), path), -1); } catch (const CosNaming::NamingContext::CannotProceed&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nCannot proceed with %s\n"), path), -1); } catch (const CosNaming::NamingContext::NotFound&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find %s\n"), path), -1); @@ -242,7 +242,7 @@ NS_group_svc::group_bind ( ex._tao_print_exception ("SystemException Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to bind %s\n"), path), -1); @@ -251,7 +251,7 @@ NS_group_svc::group_bind ( ex._tao_print_exception ("Exception in group_bind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to bind %s\n"), path), -1); @@ -263,7 +263,7 @@ int NS_group_svc::group_unbind (const ACE_TCHAR* path){ if ( path == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_unbind args not provided\n")), -2); } @@ -277,19 +277,19 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ } catch (const CosNaming::NamingContext::NotFound&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find %s\n"), path), -1); } catch (const CosNaming::NamingContext::CannotProceed&){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nCannot proceed with %s\n"), path), -1); } catch (const CosNaming::NamingContext::InvalidName&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n%s is invalid\n"), path), -1); @@ -298,7 +298,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ ex._tao_print_exception ("Exception in group_unbind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to unbind %s\n"), path), -1); @@ -307,7 +307,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path){ ex._tao_print_exception ("Exception in group_unbind"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to unbind %s\n"), path), -1); @@ -345,7 +345,7 @@ NS_group_svc::display_load_policy_group( const ACE_TCHAR *display_label) { if( display_label == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("display_load_policy_group args ") ACE_TEXT ("not provided\n")), -2); @@ -356,7 +356,7 @@ NS_group_svc::display_load_policy_group( FT_Naming::GroupNames_var list = this->naming_manager_->groups (strategy); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n%s Load Balancing Groups\n"), display_label)); @@ -365,13 +365,13 @@ NS_group_svc::display_load_policy_group( for (unsigned int i = 0; i < list->length (); ++i) { CORBA::String_var s = CORBA::string_dup (list[i]); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT (" %C\n"), s.in ())); } } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("No %s Load Balancing Groups Registered\n"), display_label)); } @@ -381,7 +381,7 @@ NS_group_svc::display_load_policy_group( { ex._tao_print_exception ("Exception in group_list"); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get %s group list\n"), display_label), -1); @@ -403,7 +403,7 @@ NS_group_svc::group_modify ( { if (group_name == 0 || policy == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_modify args not provided\n")), -2); } @@ -412,7 +412,7 @@ NS_group_svc::group_modify ( FT_Naming::LoadBalancingStrategyValue strategy; if (false == determine_policy_string (policy, strategy)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%s is not a valid policy.\n"), policy), -2); @@ -426,14 +426,14 @@ NS_group_svc::group_modify ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to modify group %s\n"), group_name), -1); @@ -452,7 +452,7 @@ NS_group_svc::group_remove (const ACE_TCHAR* group_name) { if (group_name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("group_remove args not provided\n")), -2); } @@ -464,14 +464,14 @@ NS_group_svc::group_remove (const ACE_TCHAR* group_name) } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to remove group %s\n"), group_name), -1); @@ -494,7 +494,7 @@ NS_group_svc::member_add ( { if (group_name == 0 || location == 0 || ior == 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_add args not provided\n")), -2); } @@ -514,7 +514,7 @@ NS_group_svc::member_add ( if (CORBA::is_nil (ior_var.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nInvalid member IOR provided.\n")), -1); } @@ -526,21 +526,21 @@ NS_group_svc::member_add ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::ObjectNotAdded&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to add location %s to group %s\n"), location, group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to add location %s to group %s\n"), location, group_name), -1); @@ -559,7 +559,7 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) { if (group_name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_list args not provided\n")), -2); } @@ -577,7 +577,7 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) { const PortableGroup::Location & loc = locations[i]; if (loc.length() > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C\n"), loc[0].id.in())); } @@ -586,14 +586,14 @@ NS_group_svc::member_list (const ACE_TCHAR* group_name) } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to list members for group %s\n"), group_name), -1); @@ -614,7 +614,7 @@ NS_group_svc::member_remove ( { if (group_name == 0 || location == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_remove args not provided\n")), -2); } @@ -642,21 +642,21 @@ NS_group_svc::member_remove ( } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::MemberNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find member %s\n"), location), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to remove member %s\n"), location), -1); @@ -678,7 +678,7 @@ NS_group_svc::member_show ( { if (group_name == 0 || location == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("member_show args not provided\n")), -2); } @@ -700,28 +700,28 @@ NS_group_svc::member_show ( CORBA::String_var ior_string = this->orb_->object_to_string (ior_var.in()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%C\n"), ior_string.in())); } catch (const PortableGroup::ObjectGroupNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find group %s\n"), group_name), -1); } catch (const PortableGroup::MemberNotFound&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to find member location %s\n"), location), -1); } catch (const CORBA::Exception&) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nUnable to show member location %s\n"), location), -1); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index 08bcaee49f2..a3087e3483f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/CosNamingC.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -28,7 +28,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) orb->resolve_initial_references ("NameService", timeout); if (CORBA::is_nil (naming_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the NameService.\n"), -1); this->naming_context_ = diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 2c04507eee2..39727340e27 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -83,7 +83,7 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, if (this->naming_server_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_Naming_Loader::create_object - naming_server_ ") ACE_TEXT ("never set.\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index a393b597a5f..bb04e9371e0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -102,7 +102,7 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb, use_storable_context, round_trip_timeout, use_round_trip_timeout) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) %p\n", "TAO_Naming_Server::init")); } @@ -135,7 +135,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, // Success in finding a Naming Service. // if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nNameService found!\n")); this->naming_context_ = @@ -154,7 +154,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nWe'll become a NameService\n")); // Become a Naming Service. @@ -229,7 +229,7 @@ TAO_Naming_Server::parse_args (int argc, #endif /* ACE_SIZEOF_VOID_P */ &address); if (result == 0 || result == EOF) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to process <-b> option"), -1); this->base_address_ = (void *) address; @@ -270,7 +270,7 @@ TAO_Naming_Server::parse_args (int argc, ACE_TEXT (""); #endif /* TAO_HAS_MINIMUM_POA && !CORBA_E_MICRO */ #endif /* !ACE_NLOGGING */ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s ") ACE_TEXT ("-d ") ACE_TEXT ("-o <ior_output_file> ") @@ -287,7 +287,7 @@ TAO_Naming_Server::parse_args (int argc, } if (f_opt_used + u_opt_used + r_opt_used > 1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Only one persistence option can be passed") ACE_TEXT ("\n")), -1); @@ -313,7 +313,7 @@ TAO_Naming_Server::init_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT(" (%P|%t) Unable to initialize the POA.\n")), -1); } @@ -436,7 +436,7 @@ TAO_Naming_Server::init_with_orb (int argc, ns_ior.in (), ACE_TEXT_ALWAYS_CHAR (this->ior_file_name_)) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Unable to open %C for writing:(%u) %p\n"), this->ior_file_name_, ACE_ERRNO_GET, @@ -510,7 +510,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Now make sure this directory exists if (ACE_OS::access (persistence_location, W_OK|X_OK)) { - ACE_ERROR_RETURN ((LM_ERROR, "Invalid persistence directory\n"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Invalid persistence directory\n"), -1); } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) @@ -590,7 +590,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, || this->context_index_->init (context_size) == -1) { if (TAO_debug_level >0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Naming_Server: context_index initialization failed\n")); return -1; } @@ -631,7 +631,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + ORBSVCS_ERROR ((LM_ERROR, "Nil IORTable\n")); } else { @@ -707,13 +707,13 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_Event_Handler::READ_MASK) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Naming_Server: cannot register Event handler\n")); return -1; } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_Naming_Server: The multicast server setup is done.\n")); } #else @@ -768,7 +768,7 @@ TAO_Naming_Server::write_ior_to_file (const char* ior_string, FILE *iorf = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (iorf == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Unable to open %s for writing:(%u) %p\n"), file_name, ACE_ERRNO_GET, @@ -781,7 +781,7 @@ TAO_Naming_Server::write_ior_to_file (const char* ior_string, } else { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Invalid file name or IOR string provided") ACE_TEXT ("to TAO_Naming_Server::write_ior_to_file\n")), -1); @@ -837,7 +837,7 @@ TAO_Naming_Server::fini (void) IORTable::Table::_narrow (table_object.in ()); if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + ORBSVCS_ERROR ((LM_ERROR, "Nil IORTable\n")); } else { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index e003601379c..4f4975843ca 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -99,10 +99,10 @@ ACE_Unbounded_List<T>::dump (void) const { ACE_TRACE ("ACE_Unbounded_List<T>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -112,9 +112,9 @@ ACE_Unbounded_List<T>::dump (void) const for (ACE_Unbounded_List_Iterator<T> iter (*(ACE_Unbounded_List<T> *) this); iter.next (item) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class T> void diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 5da2864d20e..224f449eaae 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -178,7 +178,7 @@ TAO_Persistent_Context_Index::recreate_all (void) IND_DEF::ENTRY *entry = 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file...\n")); // For each entry in <index_>, create a Naming Context servant. do @@ -262,7 +262,7 @@ TAO_Persistent_Context_Index::create_index (void) #if !defined (ACE_LACKS_ACCESS) // Now check if the backing store has been created successfully. if (ACE_OS::access (this->index_file_, F_OK) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "create_index\n"), -1); #endif /* ACE_LACKS_ACCESS */ @@ -287,7 +287,7 @@ TAO_Persistent_Context_Index::create_index (void) context_index) == -1) { // Attempt to clean up. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "create_index\n")); this->allocator_->remove (); return -1; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 65c5dbd7fef..97c8ce6de86 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -331,7 +331,7 @@ File_Open_Lock_and_Check::load_from_stream () { if (context_ == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) File_Open_Lock_and_Check::load_from_stream -") ACE_TEXT ("null context_ encountered."))); throw CORBA::INTERNAL (); @@ -410,7 +410,7 @@ TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) if (fl.get()) { if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) NameService: removing file %s\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) NameService: removing file %s\n", file_name.fast_rep())); fl->remove (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 171fae5d70a..55cbf08504d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -188,7 +188,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, if (type == "subscriptions") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload subscription %d\n"), static_cast<int> (id) )); @@ -200,7 +200,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, else if (type == "filter_admin") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n"), static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index e7b1b61ea8a..4f39ccb53e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -47,7 +47,7 @@ public: _CrtMemState diff; _CrtMemDifference (&diff, &before_, &after); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %s: New heap blocks: %d; bytes: %d\n"), name_.c_str (), static_cast<int> (diff.lCounts[_NORMAL_BLOCK]), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 14ce46c8381..c06c987993e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -39,7 +39,7 @@ CORBA::Boolean TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_AnyEvent::do_match ()\n")); return filter->match(*this->event_); @@ -49,7 +49,7 @@ void TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_AnyEvent::push\n")); consumer->push (*this->event_); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 8f2b142f342..3b5e52b0767 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -80,7 +80,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 9603d8a9636..1c0a7519cc5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -57,7 +57,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 92362902145..ab1e896d791 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -83,7 +83,7 @@ TAO_Notify_ProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index aae6d178396..8bd7e942456 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -65,7 +65,7 @@ TAO_Notify_ProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index 45b6ffbdc18..6372d121caa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -71,7 +71,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer) //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Any push init dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Any push init dispatching ORB id is %s.\n", obj->_stubobj()->orb_core()->orbid())); } //--cj end @@ -80,7 +80,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer) catch (const CORBA::TRANSIENT& ex) { ex._tao_print_exception ("Got a TRANSIENT in NS_PushConsumer::init"); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this)); } catch (const CORBA::Exception&) { @@ -100,7 +100,7 @@ TAO_Notify_PushConsumer::push (const CORBA::Any& payload) { //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Any push dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Any push dispatching ORB id is %s.\n", this->push_consumer_->_stubobj()->orb_core()->orbid())); } //--cj end diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index fcba741ef1f..bfbc94e9eb6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -193,7 +193,7 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* met { if (this->queue (method_request) == -1) { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, "Notify (%P|%t) - Panic! failed to enqueue event\n")); return -1; } @@ -204,7 +204,7 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* met } else { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, "Notify (%P|%t) - Panic! did not attempt to enqueue event\n")); return -1; } @@ -286,26 +286,26 @@ TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable* metho order == CosNotification::FifoOrder) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n")); return this->msg_queue_.enqueue_tail (method_request); } if (order == CosNotification::PriorityOrder) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n")); return this->msg_queue_.enqueue_prio (method_request); } if (order == CosNotification::DeadlineOrder) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n")); return this->msg_queue_.enqueue_deadline (method_request); } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid order policy\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid order policy\n")); return this->msg_queue_.enqueue_tail (method_request); } @@ -348,7 +348,7 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* met else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n")); result = this->msg_queue_.dequeue_head (mb); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 3f794fd2c7f..8925eb49e22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -102,7 +102,7 @@ TAO_Notify_Consumer::enqueue_request ( TAO_Notify_Method_Request_Event_Queueable (*request, event), CORBA::NO_MEMORY ()); - if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG, + if (DEBUG_LEVEL > 3) ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d: enqueue_request (%d) @%@.\n"), static_cast<int> (this->proxy ()->id ()), request->sequence (), @@ -119,7 +119,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req if (! this->pending_events().is_empty ()) { if (DEBUG_LEVEL > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -138,7 +138,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req if (this->is_suspended_ == 1) { if (DEBUG_LEVEL > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -178,7 +178,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request) case DISPATCH_RETRY: { if (DEBUG_LEVEL > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d enqueing event %d due ") ACE_TEXT ("to failed dispatch.\n"), static_cast<int> (this->proxy ()->id ()), @@ -190,7 +190,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request) case DISPATCH_DISCARD: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Error during ") ACE_TEXT ("direct dispatch. Discarding event:%d.\n"), static_cast<int> (this->proxy ()->id ()), @@ -205,7 +205,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request) case DISPATCH_FAIL: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Failed during ") ACE_TEXT ("direct dispatch :%d. Discarding event.\n"), static_cast<int> (this->proxy ()->id ()), @@ -234,7 +234,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { request->event ()->push (this); if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d dispatched single event %d.\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -244,7 +244,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -256,7 +256,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request catch (const CORBA::TRANSIENT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) Transient (minor=%d) %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -296,7 +296,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request catch (const CORBA::TIMEOUT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push ") ACE_TEXT ("(request) %s\n"), this->proxy ()->id (), @@ -307,7 +307,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request catch (const CORBA::COMM_FAILURE& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push ") ACE_TEXT ("(request) %s\n"), this->proxy ()->id (), @@ -319,7 +319,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) SystemException %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -330,7 +330,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request } catch (const CORBA::Exception&) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) Caught unexpected exception ") ACE_TEXT ("pushing event to consumer.\n"), @@ -372,7 +372,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::OBJECT_NOT_EXIST& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -383,7 +383,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::TRANSIENT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() Transient (minor=%d) %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -423,7 +423,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::TIMEOUT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%u::dispatch_batch() %s\n"), this->proxy ()->id (), @@ -434,7 +434,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::COMM_FAILURE& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%u::dispatch_batch() %s\n"), this->proxy ()->id (), @@ -446,7 +446,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() SystemException %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -457,7 +457,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) } catch (const CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() Caught unexpected ") ACE_TEXT ("exception pushing batch to consumer.\n"), @@ -472,7 +472,7 @@ void TAO_Notify_Consumer::dispatch_pending (void) { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d dispatching pending events. Queue size: %d\n"), static_cast<int> (this->proxy ()->id ()), this->pending_events().size () @@ -524,7 +524,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( case DISPATCH_RETRY: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -537,7 +537,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( case DISPATCH_DISCARD: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Error during ") ACE_TEXT ("dispatch. Discarding event:%d.\n"), static_cast<int> (this->proxy ()->id ()), @@ -551,7 +551,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( case DISPATCH_FAIL: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Failed. ") ACE_TEXT ("Discarding event %d.\n"), static_cast<int> (this->proxy ()->id ()), @@ -621,7 +621,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) if (DEBUG_LEVEL > 5) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"), static_cast<int> (this->proxy ()->id ()), tv.msec ())); } @@ -630,7 +630,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) this->timer_->schedule_timer (this, tv, ACE_Time_Value::zero); if (this->timer_id_ == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () ") ACE_TEXT ("Error scheduling timer.\n"), static_cast<int> (this->proxy ()->id ()) @@ -648,7 +648,7 @@ TAO_Notify_Consumer::cancel_timer (void) if (this->timer_.isSet() && this->timer_id_ != -1) { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d canceling dispatch timer.\n"), static_cast<int> (this->proxy ()->id ()) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index de8fc25335f..8463c807abc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -95,7 +95,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, TAO_Notify::Topology_Object* result = this; if (type == "proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -103,7 +103,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, } else if (type == "structured_proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -111,7 +111,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, } else if (type == "sequence_proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -120,7 +120,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, #if 0 else if (type == "ec_proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 0362bcd53af..bf8fdda5e9f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -43,7 +43,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTDispatching")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) @@ -54,7 +54,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTSourceEval")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) @@ -65,27 +65,27 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTLookup")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) { supplier_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads\n"))); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTListenerEval")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) { // Since this option is always added to consumer_threads, we'll // deprecate it in favor of that option. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -ListenerThreads option has been deprecated, use -DispatchingThreads\n"))); consumer_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); @@ -117,12 +117,12 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { properties->separate_dispatching_orb ( static_cast<bool> (ACE_OS::atoi(current_arg))); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Using separate Dispatching ORB\n"))); } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-UseSeparateDispatchingORB usage.\n"), @@ -147,7 +147,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) op = CosNotifyChannelAdmin::OR_OP; else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-DefaultConsumerAdminFilterOp usage.\n"), @@ -167,7 +167,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) op = CosNotifyChannelAdmin::OR_OP; else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-DefaultSupplierAdminFilterOp usage.\n"), @@ -180,7 +180,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { arg_shifter.consume_arg (); TAO_Notify_PROPERTIES::instance()->validate_client (true); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using reactive client control.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Using reactive client control.\n"))); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ValidateClientDelay")) == 0) { @@ -192,7 +192,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-ValidateClientDelay usage.\n"), @@ -211,7 +211,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-ValidateClientDelay usage.\n"), @@ -222,7 +222,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Ignoring unknown option for Notify Factory: %s\n"), arg_shifter.get_current() )); @@ -242,7 +242,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per ConsumerAdmin QoS { if (consumer_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each ConsumerAdmin.\n", consumer_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each ConsumerAdmin.\n", consumer_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, consumer_threads); properties->default_consumer_admin_qos_properties (qos); @@ -251,7 +251,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per SupplierAdmin QoS { if (supplier_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each SupplierAdmin.\n", supplier_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each SupplierAdmin.\n", supplier_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, supplier_threads); properties->default_supplier_admin_qos_properties (qos); @@ -262,7 +262,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per ProxyConsumer QoS { if (supplier_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each Supplier.\n", supplier_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each Supplier.\n", supplier_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, supplier_threads); // lookup thread per proxy doesn't make sense. properties->default_proxy_consumer_qos_properties (qos); @@ -271,7 +271,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per ProxySupplier QoS { if (consumer_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each Consumer.\n", consumer_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each Consumer.\n", consumer_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, consumer_threads); properties->default_proxy_supplier_qos_properties (qos); @@ -313,14 +313,14 @@ TAO_CosNotify_Service::fini (void) void TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb) { - ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n")); if (TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb()) { // got here by way of svc.conf. no second orb supplied so create one if (CORBA::is_nil (TAO_Notify_PROPERTIES::instance()->dispatching_orb())) { - ACE_DEBUG ((LM_DEBUG, "No dispatching orb supplied. Creating default one.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "No dispatching orb supplied. Creating default one.\n")); int argc = 0; ACE_TCHAR *argv0 = 0; @@ -397,7 +397,7 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb) orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ()); @@ -426,7 +426,7 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) - ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); + ORBSVCS_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index 08d1dd913b9..306e963b614 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -30,14 +30,14 @@ Delivery_Request::Delivery_Request (const Routing_Slip_Ptr & routing_slip, size_ , request_id_ (request_id) , delivery_type_ (0) { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Delivery_Request:: constructor\n") )); } Delivery_Request::~Delivery_Request () { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Delivery_Request:: destructor\n") )); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 66c9ed15961..1f06393b04e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -71,7 +71,7 @@ TAO_Notify_Constraint_Expr::load_child ( CORBA::ULong len = this->constr_expr.event_types.length (); if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload EventType %d \n"), len + 1)); @@ -115,13 +115,13 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter () catch (const CORBA::Exception&) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Error in Filter dtor\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Error in Filter dtor\n"))); // @@ eat exception. } if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Filter Destroyed\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Filter Destroyed\n"))); } char* @@ -151,7 +151,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Added an empty constraint to filter\n"))); if (this->constraint_expr_list_.bind (cnstr_id, notify_constr_expr) == -1) @@ -185,7 +185,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i if (cnstr_id == 0) { if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Added constraint %C to filter %d\n"), expr.constraint_expr.in (), this->id_)); @@ -194,7 +194,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i else { if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Loaded constraint %C to filter %d\n"), expr.constraint_expr.in (), this->id_)); } @@ -216,7 +216,7 @@ TAO_Notify_ETCL_Filter::add_constraints ( CORBA::ULong const constraint_length = constraint_list.length (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("constraint_length = %d\n"), constraint_length)); @@ -237,7 +237,7 @@ TAO_Notify_ETCL_Filter::add_constraints ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Adding constraint %d, %C\n"), pop_index, constraint_list [pop_index].constraint_expr.in ())); @@ -586,7 +586,7 @@ TAO_Notify_ETCL_Filter::load_child (const ACE_CString &type, constraint_expr_ids_ = id; if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload filter %d constraint %d\n"), static_cast<int> (this->id_), static_cast<int> (id))); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 55972f57961..9532a05b845 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -223,7 +223,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type, { TAO_Notify_Object::ID const id = ACE_OS::atoi (value); if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload filter %d\n"), static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 003b4e6cd5c..b5b8a15c509 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -24,13 +24,13 @@ TAO_Notify_Event::TAO_Notify_Event (void) , time_ (ACE_OS::gettimeofday ()) { // if (TAO_debug_level > 0) - // ACE_DEBUG ((LM_DEBUG,"event:%x created\n", this )); + // ORBSVCS_DEBUG ((LM_DEBUG,"event:%x created\n", this )); } TAO_Notify_Event::~TAO_Notify_Event () { // if (TAO_debug_level > 1) - // ACE_DEBUG ((LM_DEBUG,"event:%x destroyed\n", this )); + // ORBSVCS_DEBUG ((LM_DEBUG,"event:%x destroyed\n", this )); } void TAO_Notify_Event::release (void) @@ -69,7 +69,7 @@ TAO_Notify_Event::unmarshal (TAO_InputCDR & cdr) result = TAO_Notify_StructuredEvent::unmarshal (cdr); break; default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Event::unmarshal: unknown event code %d\n"), code)); break; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 922b871eeaa..8947a8d539b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -512,7 +512,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, else if (type == "consumer_admin") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload consumer_admin %d\n") , static_cast<int> (id) )); @@ -535,7 +535,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, else if (type == "supplier_admin") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload supplier_admin %d\n") , static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 9f13cd4ec58..33536380395 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -214,7 +214,7 @@ TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::Channe void TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factory* f) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) Debug Topology_Factory installed in EventChannelFactory.\n") )); // If the above meessage appears when you don't expect it @@ -239,7 +239,7 @@ TAO_Notify_EventChannelFactory::load_topology (void) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Topology persistence disabled.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Topology persistence disabled.\n"))); } this->loading_topology_ = false; } @@ -319,7 +319,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) { //@@todo: tell the rspm it's an orphan, but we can't during reload // we need collect these and come back later to remove them - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reload persistent event failed.\n") )); } @@ -328,7 +328,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notify Service: Configuration error. Event Persistence requires Topology Persistence.\n") )); throw CORBA::PERSIST_STORE(); @@ -377,7 +377,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type, TAO_Notify::Topology_Object * result = this; if (type == "channel") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannelFactory reload channel %d\n") , static_cast<int> (id) )); @@ -510,7 +510,7 @@ TAO_Notify_EventChannelFactory::activate_self (void) { if (DEBUG_LEVEL > 9) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self\n") )); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self\n") )); } this->reconnect (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index 66dcf492e9d..eb5c4166582 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -3,7 +3,7 @@ #include "orbsvcs/Notify/EventType.h" #include "ace/ACE.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_string.h" #if ! defined (__ACE_INLINE__) @@ -123,7 +123,7 @@ TAO_Notify_EventType::is_special (void) const void TAO_Notify_EventType::dump (void) const { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%s,%s)", this->event_type_.domain_name.in (), this->event_type_.type_name.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 5828fd92d0f..35a178c269c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -253,7 +253,7 @@ TAO_Notify_EventTypeSeq::dump (void) const for (iter.first (); iter.next (event_type); iter.advance ()) { event_type->dump (); - ACE_DEBUG ((LM_DEBUG, ", ")); + ORBSVCS_DEBUG ((LM_DEBUG, ", ")); } } @@ -295,7 +295,7 @@ TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id, if ((type == "subscription") && et.init(attrs)) { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Event_Type reload subscription\n") )); inherited::insert(et); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index bb33172973f..39c036ac616 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -66,7 +66,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, "destroying consumer/supplier map count = %d/%d,\n", + ORBSVCS_DEBUG ((LM_DEBUG, "destroying consumer/supplier map count = %d/%d,\n", this->consumer_map().proxy_count (), this->supplier_map().proxy_count ())); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 4c3e8b47459..bf501298e68 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -71,7 +71,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void) parent.filter_operator ()); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Notify (%P|%t) Proxysupplier %x filter ") ACE_TEXT ("eval result = %d\n"), &this->proxy_supplier_ , val)); @@ -138,7 +138,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( if (proxy_supplier != 0) { if (DEBUG_LEVEL > 6) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT (" reload event for %C\n"), textpath.c_str())); @@ -150,14 +150,14 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0); //@@todo if (proxy_consumer == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT ("::unmarshal: unknown proxy id %C\n"), textpath.c_str())); } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT ("::unmarshal: wrong type of proxy id %C\n"), textpath.c_str())); @@ -166,7 +166,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT ("::unmarshal: Cant read proxy id path\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 6a0120758fd..78e5a5b6a3e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -67,7 +67,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void) parent.filter_operator ()); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Notify (%P|%t) Proxyconsumer %x filter ") + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Notify (%P|%t) Proxyconsumer %x filter ") ACE_TEXT("eval result = %d\n"), &this->proxy_consumer_ , val)); @@ -143,14 +143,14 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Lookup_No_Copy::unmarshal: unknown proxy id\n") )); } } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Lookup_No_Copy::unmarshal: Cant read proxy id path\n") )); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index 1a29bd03d23..35c75ebfc0f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -50,7 +50,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) this->task_.ior_output_ = opts.opt_arg (); if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_MonitorManager: Setting IOR output file to: %s"), this->task_.ior_output_.c_str ())); } @@ -61,7 +61,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) ACE_TCHAR * orbArgs = opts.opt_arg (); if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_MonitorManager: Setting Orb arguments to: %s"), orbArgs)); } @@ -71,14 +71,14 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_MonitorManager: Not using naming service"))); } this->task_.use_name_svc_ = false; } break; case ':': - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_MonitorManager: %s requires an argument\n"), opts.last_option ()), -1); @@ -184,7 +184,7 @@ TAO_MonitorManager::ORBTask::svc (void) { if (CORBA::is_nil (this->orb_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_MonitorManager: Unable to " "initialize the ORB\n"), 1); @@ -202,7 +202,7 @@ TAO_MonitorManager::ORBTask::svc (void) if (CORBA::is_nil (poa.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_MonitorManager: Unable to " "resolve the RootPOA\n"), 1); @@ -228,7 +228,7 @@ TAO_MonitorManager::ORBTask::svc (void) if (CORBA::is_nil (iortable.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_MonitorManager: Unable to " "resolve the IORTable\n"), 1); @@ -252,7 +252,7 @@ TAO_MonitorManager::ORBTask::svc (void) if (fp == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_MonitorManager: " ACE_TEXT ("Unable to write to %s\n")), this->ior_output_.c_str ()), @@ -318,7 +318,7 @@ TAO_MonitorManager::ORBTask::svc (void) this->orb_ = CORBA::ORB::_nil (); } - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unexpected exception type caught " "in TAO_MonitorManager::ORBTask::svc")); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp index 2b3648468df..22204d38bd9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -262,7 +262,7 @@ NotificationServiceMonitor_i::get_invalid_names ( { if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_NotificationServiceMonitor: Client requested invalid statistic name: %s"), names[i].in ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp index 8ea167e6983..740d55f66fd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp @@ -38,7 +38,7 @@ TAO_MC_Notify_Service::init_i (CORBA::ORB_ptr orb) if (monitor == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "%s must be loaded via " + ORBSVCS_DEBUG ((LM_DEBUG, "%s must be loaded via " "the Service Configurator\n", TAO_NOTIFY_MONITOR_CONTROL_MANAGER)); } @@ -60,7 +60,7 @@ TAO_MC_Notify_Service::init_i2 (CORBA::ORB_ptr orb, if (monitor == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "%s must be loaded via " + ORBSVCS_DEBUG ((LM_DEBUG, "%s must be loaded via " "the Service Configurator\n", TAO_NOTIFY_MONITOR_CONTROL_MANAGER)); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index b9e254acd89..bd01af15cb0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -116,7 +116,7 @@ TAO_MonitorConsumerAdmin::register_stats_controls ( if (!cinstance->add (control)) { delete control; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", this->control_name_.c_str ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index 6af8a90efe3..1ea7bc7b369 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -401,7 +401,7 @@ TAO_MonitorEventChannel::map_supplier_proxy ( else { delete rcsc; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", full.c_str ())); } @@ -450,7 +450,7 @@ TAO_MonitorEventChannel::map_consumer_proxy ( else { delete rcsc; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", full.c_str ())); } @@ -545,7 +545,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, timestamp)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -565,7 +565,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, consumers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -585,7 +585,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, consumers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -605,7 +605,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, tconsumers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -626,7 +626,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, suppliers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -647,7 +647,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, suppliers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -667,7 +667,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, conadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -687,7 +687,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, conadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -708,7 +708,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, supadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -729,7 +729,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, supadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -748,7 +748,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, events)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -778,7 +778,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, oldest)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -797,7 +797,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, slowest)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -814,7 +814,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, overflows)) { delete overflows; - ACE_ERROR ((LM_ERROR, "Unable to add statistic: %s\n", + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic: %s\n", stat_name.c_str ())); } @@ -835,7 +835,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) else { delete sd; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", this->name_.c_str ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp index 4c6c6e6dbac..06d08194399 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp @@ -106,7 +106,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::configure( } else { - ACE_DEBUG ((LM_DEBUG, "Warning MC cannot enable statistics for buffering strategy.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Warning MC cannot enable statistics for buffering strategy.\n")); } this->base_stat_name_ = admin_->stat_name (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp index bc07e2eb328..820c9877d3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp @@ -74,7 +74,7 @@ TAO_MonitorSupplierAdmin::register_stats_controls ( if (!cinstance->add (control)) { delete control; - ACE_ERROR ((LM_ERROR, "Unable to add control: %s\n", + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", this->control_name_.c_str ())); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index d731d5e7bb9..3d172aa22a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -102,7 +102,7 @@ TAO_Notify_Constraint_Interpreter::build_tree ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Constraint: %C\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Constraint: %C\n"), exp_str.c_str ())); } this->build_tree (exp_str.c_str ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 1b00338642c..6e1a1e8b2b8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -19,7 +19,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, if (notify_service == 0) { - ACE_DEBUG ((LM_DEBUG, "Service not found! check conf. file\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Service not found! check conf. file\n")); return notify_factory._retn (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index 8bedd6b771f..2e892f29b8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -27,13 +27,13 @@ TAO_Notify_Object::TAO_Notify_Object (void) , shutdown_ (false) { if (TAO_debug_level > 2 ) - ACE_DEBUG ((LM_DEBUG,"object:%x created\n", this )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x created\n", this )); } TAO_Notify_Object::~TAO_Notify_Object () { if (TAO_debug_level > 2 ) - ACE_DEBUG ((LM_DEBUG,"object:%x destroyed\n", this )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x destroyed\n", this )); this->destroy_proxy_poa (); this->destroy_object_poa (); @@ -95,7 +95,7 @@ TAO_Notify_Object::deactivate (void) if (TAO_debug_level > 2) { ex._tao_print_exception ("(%P|%t)\n"); - ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_)); + ORBSVCS_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_)); } } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 12c6dfaa571..b113c6505bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -107,7 +107,7 @@ TAO_Notify_POA_Helper::create_i ( if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, "Created POA : %C\n", the_name.in ())); + ORBSVCS_DEBUG ((LM_DEBUG, "Created POA : %C\n", the_name.in ())); } /* @@ -158,7 +158,7 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Activating object with ") ACE_TEXT ("id = %d in POA : %C\n"), id, the_name.in () @@ -179,7 +179,7 @@ TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA: if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Activating object with ") ACE_TEXT ("existing id = %d in POA : %C\n"), id, the_name.in () @@ -204,7 +204,7 @@ TAO_Notify_POA_Helper::deactivate (CORBA::Long id) const if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Deactivating object with") ACE_TEXT ("id = %d in POA : %C\n"), id, the_name.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 251350631ca..635df7c0ac9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -168,7 +168,7 @@ Persistent_File_Allocator::allocate() // why not. What if the disk is full? Oh, I see we // allocate non-existent blocks. FIX this } - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate: %B\n"), block_number )); @@ -181,7 +181,7 @@ Persistent_File_Allocator::allocate_at(size_t block_number) { Persistent_Storage_Block* result = 0; this->used(block_number); - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate at : %B\n"), block_number )); @@ -208,7 +208,7 @@ void Persistent_File_Allocator::used(size_t block_number) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_); - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %B\n"), block_number )); @@ -219,7 +219,7 @@ Persistent_File_Allocator::used(size_t block_number) void Persistent_File_Allocator::free(size_t block_number) { - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::free: %B\n"), block_number )); @@ -277,7 +277,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb) Persistent_Storage_Block* ourpsb = psb; if (!psb->get_allocator_owns()) { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Copy PSB %B\n") , psb->block_number () )); @@ -285,7 +285,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb) ourpsb->set_allocator_owns(true); } ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false); - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Queueing PSB to write block %B\n") , psb->block_number () )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 94efb2e50af..f943b69b598 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -32,7 +32,7 @@ TAO_Notify_Properties::TAO_Notify_Properties (void) this->ec_qos_[0].value <<= tp_params; if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, "in TAO_Properties ctos %x\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "in TAO_Properties ctos %x\n", this)); } TAO_Notify_Properties::~TAO_Notify_Properties () diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 5b3b6da7382..ae5e3ce7b71 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -119,7 +119,7 @@ TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event) TAO_Notify::Routing_Slip_Ptr routing_slip = TAO_Notify::Routing_Slip::create (pevent); if (DEBUG_LEVEL > 0) - ACE_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n"))); + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n"))); routing_slip->route (this, true); routing_slip->wait_persist (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index 604d36d8a89..5bae0f25499 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -20,7 +20,7 @@ TAO_RT_Notify_Service::~TAO_RT_Notify_Service () void TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb) { - ACE_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n")); this->init_i (orb); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 0a82670bc4f..6c6cd4d5e20 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -36,7 +36,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* RTCORBA::CLIENT_PROPAGATED : RTCORBA::SERVER_DECLARED; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Priority Model = %d, Server prio = %d\n" + ORBSVCS_DEBUG ((LM_DEBUG, "Priority Model = %d, Server prio = %d\n" , tp_params.priority_model, tp_params.server_priority)); policy_list.length (3); @@ -45,7 +45,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* tp_params.server_priority); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n" + ORBSVCS_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n" , tp_params.static_threads, tp_params.default_priority)); // Create the thread-pool. @@ -100,7 +100,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, "Creating threadpool lane %d: priority = %d, static threads = %d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Creating threadpool lane %d: priority = %d, static threads = %d\n", index, tpl_params.lanes[index].lane_priority, tpl_params.lanes[index].static_threads)); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index e8790ae3e34..b18a023dc85 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Notify/Random_File.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_fcntl.h" #include "tao/debug.h" #include "ace/OS_NS_unistd.h" @@ -59,7 +59,7 @@ Random_File::open(const ACE_TCHAR* filename, size_t block_size) if (result) { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Opening file %s\n") , filename )); @@ -91,7 +91,7 @@ bool Random_File::write(const size_t block_number, void* buf, bool atomic) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Write block %B %c\n"), block_number, (atomic ? '*' : ' ') @@ -126,7 +126,7 @@ bool Random_File::read(const size_t block_number, void* buf) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Read block %B\n"), block_number )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index b6b936da109..f04195c869d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -51,7 +51,7 @@ namespace TAO_Notify if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: registering %d\n"), static_cast<int> (next_id) )); @@ -75,7 +75,7 @@ namespace TAO_Notify { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: unregistering %d\n"), static_cast<int> (id) )); @@ -115,7 +115,7 @@ namespace TAO_Notify NVPList cattrs; if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: saving %d\n"), static_cast<int> (entry->ext_id_) )); @@ -153,7 +153,7 @@ namespace TAO_Notify if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: reloading %d\n"), static_cast<int> (id) )); @@ -166,7 +166,7 @@ namespace TAO_Notify } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Reconnect registry: missing attribute\n") )); } @@ -190,7 +190,7 @@ namespace TAO_Notify { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Sending reconnection to client %d\n"), static_cast<int> (entry->ext_id_) )); @@ -205,7 +205,7 @@ namespace TAO_Notify } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Can't resolve reconnection client's IOR %d\n"), static_cast<int> (entry->ext_id_) )); @@ -216,7 +216,7 @@ namespace TAO_Notify } catch (const CORBA::Exception&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Exception sending reconnection to client -- discarding registry entry\n") )); //throw this entry away but you've got an iterator so be careful diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index c80e3402a6f..9abb4399a7d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Notify/Refcountable.h" #include "tao/debug.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Guard_T.h" #if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) @@ -74,12 +74,12 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable () TAO_Notify_Tracker::Entry e = TAO_Notify_Tracker::get_instance().find( this ); if ( e.obj != 0 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n", e.obj, e.class_name, e.obj->ref_id_, e.obj->refcount_.value() )); if ( e.obj != this || e.obj->ref_id_ != this->ref_id_ ) { - ACE_DEBUG ((LM_DEBUG, " with an ID mismatch %x->%d != %x->%d!\n", + ORBSVCS_DEBUG ((LM_DEBUG, " with an ID mismatch %x->%d != %x->%d!\n", this, ref_id_, e.obj, e.obj->ref_id_)); } TAO_Notify_Tracker::get_instance().remove( this ); @@ -97,7 +97,7 @@ TAO_Notify_Refcountable::_incr_refcnt (void) CORBA::Long refcount = ++this->refcount_; if (TAO_debug_level > 1 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount )); } #if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) // Stack-instantiated-non-servants should never have _incr_refcnt called. @@ -118,7 +118,7 @@ TAO_Notify_Refcountable::_decr_refcnt (void) if (TAO_debug_level > 1 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount )); } ACE_ASSERT(refcount >= 0); @@ -155,19 +155,19 @@ TAO_Notify_Tracker::dump( const char* title ) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - ACE_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump"))); + ORBSVCS_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump"))); EntityMap::const_iterator iter( map_.begin() ); while ( iter != map_.end() ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d.\n", iter->second.obj, iter->second.class_name, iter->first, iter->second.obj->refcount_.value() )); iter++; } EntityMap::size_type current_count = map_.size(); int diff = ( current_count - last_dump_count_ ); - ACE_DEBUG ((LM_DEBUG,"Count: %u\nDifference: %+d\n", current_count, diff )); + ORBSVCS_DEBUG ((LM_DEBUG,"Count: %u\nDifference: %+d\n", current_count, diff )); last_dump_count_ = current_count; } @@ -197,7 +197,7 @@ TAO_Notify_Tracker::add( TAO_Notify_Refcountable* p ) EntityMap::iterator& it = result.first; if ( result.second == false ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) added twice.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) added twice.\n", it->second.obj, it->second.class_name.c_str(), it->first )); } else @@ -218,7 +218,7 @@ TAO_Notify_Tracker::remove( const TAO_Notify_Refcountable* p ) if ( iter == map_.end() ) { const char* class_name = typeid(*iter->second.obj).name(); - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) not found.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) not found.\n", p, class_name, ref_id )); } else diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 991f591e056..366cc02da24 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -64,7 +64,7 @@ Routing_Slip::create (const TAO_Notify_Event::Ptr& event) // note we don't care about ultra-precise stats, so no guard for these if (DEBUG_LEVEL > 8 && ((result->sequence_ % 100) == 0)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip_Statistics\n") ACE_TEXT (" enter_transient \t%B\n") ACE_TEXT (" continue_transient \t%B\n") @@ -128,7 +128,7 @@ Routing_Slip::create ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip::create: Unmarshalling failed for routing slip.\n") )); result.reset (); @@ -136,7 +136,7 @@ Routing_Slip::create ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip::create: Unmarshalling failed for event.\n") )); } @@ -144,7 +144,7 @@ Routing_Slip::create ( } catch (const CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip::create: Exception reloading event.\n") )); } @@ -176,7 +176,7 @@ Routing_Slip::Routing_Slip( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, sequence_lock_); this->sequence_ = ++routing_slip_sequence_; - if (DEBUG_LEVEL > 1) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 1) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: constructor\n"), this->sequence_ )); @@ -184,7 +184,7 @@ Routing_Slip::Routing_Slip( Routing_Slip::~Routing_Slip () { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: destructor\n"), this->sequence_ )); @@ -236,7 +236,7 @@ Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel) size_t const request_id = delivery_requests_.size (); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%B: lookup, completed %B of %B\n"), this->sequence_, request_id, @@ -293,7 +293,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) guard.acquire(); size_t request_id = delivery_requests_.size (); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: Forward %s; completed %d of %d\n"), this->sequence_, static_cast<int> (request_id), @@ -310,7 +310,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) TAO_Notify_Method_Request_Dispatch_No_Copy method (request, ps, filter); guard.release (); if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %d to " "proxy supplier %d\n", this->sequence_, @@ -321,7 +321,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) else { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %d to " "proxy supplier %d; already shut down\n", this->sequence_, @@ -344,7 +344,7 @@ Routing_Slip::dispatch ( size_t request_id = delivery_requests_.size (); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%B: Dispatch %s; completed %B of %B\n"), this->sequence_, request_id, @@ -359,7 +359,7 @@ Routing_Slip::dispatch ( TAO_Notify_Method_Request_Dispatch_No_Copy method (request, ps, filter); guard.release (); if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %B to " "proxy supplier %d\n", this->sequence_, @@ -370,7 +370,7 @@ Routing_Slip::dispatch ( else { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %B to " "proxy supplier %d; already shut down\n", this->sequence_, @@ -391,7 +391,7 @@ Routing_Slip::delivery_request_complete (size_t request_id) this->delivery_requests_[request_id].reset (); this->complete_requests_ += 1; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: delivery_request_complete #%B: completed %B of %B\n"), this->sequence_, request_id, @@ -437,7 +437,7 @@ Routing_Slip::delivery_request_complete (size_t request_id) } default: { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notification Service Routing Slip: Unexpected delivery_request_complete in state %d\n"), static_cast<int> (this->state_) )); @@ -455,7 +455,7 @@ Routing_Slip::at_front_of_persist_queue () { case rssNEW: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: NEW Reached front of queue\n"), this->sequence_ )); @@ -464,7 +464,7 @@ Routing_Slip::at_front_of_persist_queue () } case rssCOMPLETE_WHILE_NEW: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: COMPLETE_WHILE_NEW Reached front of queue\n"), this->sequence_ )); @@ -475,7 +475,7 @@ Routing_Slip::at_front_of_persist_queue () } case rssCHANGED: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: CHANGED Reached front of queue\n"), this->sequence_ )); @@ -484,7 +484,7 @@ Routing_Slip::at_front_of_persist_queue () } case rssCOMPLETE: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: COMPLETE Reached front of queue\n"), this->sequence_ )); @@ -493,7 +493,7 @@ Routing_Slip::at_front_of_persist_queue () } default: { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing Slip %d: Unexpected at_front_of_persist_queue in state %d\n"), this->sequence_, static_cast<int> (this->state_) @@ -522,7 +522,7 @@ Routing_Slip::persist_complete () { case rssSAVING: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: SAVING persist complete\n"), this->sequence_ )); @@ -536,7 +536,7 @@ Routing_Slip::persist_complete () } case rssUPDATING: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: UPDATING persist complete\n"), this->sequence_ )); @@ -545,7 +545,7 @@ Routing_Slip::persist_complete () } case rssDELETING: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: DELETING persist complete\n"), this->sequence_ )); @@ -554,7 +554,7 @@ Routing_Slip::persist_complete () } default: { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notification Service Routing Slip: Unexpected transition in state %d\n"), static_cast<int> (this->state_) )); @@ -588,7 +588,7 @@ void Routing_Slip::enter_state_new (Routing_Slip_Guard & guard) { ++count_enter_new_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state NEW\n"), this->sequence_ )); @@ -611,7 +611,7 @@ Routing_Slip::enter_state_complete_while_new (Routing_Slip_Guard & guard) { ++count_enter_complete_while_new_; ACE_UNUSED_ARG (guard); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state COMPLETE_WHILE_NEW\n"), this->sequence_ )); @@ -628,7 +628,7 @@ void Routing_Slip::enter_state_reloaded (Routing_Slip_Guard & guard) { ++count_enter_reloaded_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #&d: enter state RELOADED\n"), this->sequence_ )); @@ -640,7 +640,7 @@ void Routing_Slip::enter_state_transient (Routing_Slip_Guard & guard) { ++count_enter_transient_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state TRANSIENT\n"), this->sequence_ )); @@ -687,7 +687,7 @@ Routing_Slip::enter_state_saving (Routing_Slip_Guard & guard) } else { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state SAVING\n"), this->sequence_ )); @@ -710,7 +710,7 @@ void Routing_Slip::enter_state_saved (Routing_Slip_Guard & guard) { ++count_enter_saved_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state SAVED\n"), this->sequence_ )); @@ -722,7 +722,7 @@ void Routing_Slip::enter_state_updating (Routing_Slip_Guard & guard) { ++count_enter_updating_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state UPDATING\n"), this->sequence_ )); @@ -742,7 +742,7 @@ void Routing_Slip::enter_state_changed_while_saving (Routing_Slip_Guard & guard) { ++count_enter_changed_while_saving_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state CHANGED_WHILE_SAVING\n"), this->sequence_ )); @@ -761,7 +761,7 @@ void Routing_Slip::enter_state_changed (Routing_Slip_Guard & guard) { ++count_enter_changed_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state CHANGED\n"), this->sequence_ )); @@ -793,7 +793,7 @@ void Routing_Slip::enter_state_complete (Routing_Slip_Guard & guard) { ++count_enter_complete_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state COMPLETE\n"), this->sequence_ )); @@ -805,7 +805,7 @@ void Routing_Slip::enter_state_deleting (Routing_Slip_Guard & guard) { ++count_enter_deleting_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state DELETING\n"), this->sequence_ )); @@ -819,7 +819,7 @@ Routing_Slip::enter_state_terminal (Routing_Slip_Guard & guard) { ++count_enter_terminal_; ACE_ASSERT( this->is_safe_); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state TERMINAL\n"), this->sequence_ )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index baba1386099..e0b60d2fac6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -155,7 +155,7 @@ Routing_Slip_Persistence_Manager::load( } else { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT( "(%P|%t) Reloaded Persistent Event is missing event.\n") )); @@ -451,7 +451,7 @@ Routing_Slip_Persistence_Manager::store_i(const ACE_Message_Block& event, } else { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT( "(%P|%t) No Event is being stored with this routing slip.\n") )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 953bbbef2ff..6c8e2e83ba2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -89,7 +89,7 @@ TAO_Notify_SequenceProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index 20eea7db03d..3c17564d31b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -66,7 +66,7 @@ TAO_Notify_SequenceProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 040c6248479..9a67e7764a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -67,7 +67,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push init dispatching ORB id is %s.\n", obj->_stubobj()->orb_core()->orbid())); } @@ -77,7 +77,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p { ex._tao_print_exception ( "Got a TRANSIENT in NS_SequencePushConsumer::init"); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this)); } catch (const CORBA::Exception&) { @@ -101,7 +101,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A bool result = true; if (DEBUG_LEVEL > 0) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) SequencePushConsumer dispatch queued requests. queue size:%u\n"), requests.size ())); } @@ -130,7 +130,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"), request)); } @@ -174,7 +174,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A if (request->should_retry ()) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast <int> (this->proxy ()->id ()), request->sequence ())); requests.enqueue_head (request); @@ -183,7 +183,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A else { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); request->complete (); @@ -195,7 +195,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A if (request->should_retry ()) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); requests.enqueue_head (request); @@ -204,7 +204,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A else { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); request->complete (); @@ -233,7 +233,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A if (request->should_retry ()) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); requests.enqueue_head (request); @@ -242,7 +242,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A else { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); request->complete (); @@ -266,7 +266,7 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary ( TAO_Notify_Method_Request_Event * request) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n")); + ORBSVCS_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n")); this->enqueue_request (request); size_t mbs = static_cast<size_t>(this->max_batch_size_.value()); @@ -301,7 +301,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_ { //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push dispatching ORB id is %s.\n", this->push_consumer_->_stubobj()->orb_core()->orbid())); } //--cj end diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 57fa3a8211c..1206c57073d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -64,7 +64,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) if (ACE_OS::strcasecmp (av, ACE_TEXT ("-v")) == 0) { verbose = true; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n") )); } @@ -73,7 +73,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) this->filename_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: Setting -file_path: %s\n"), this->filename_.c_str () )); @@ -85,7 +85,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) this->block_size_ = ACE_OS::atoi(argv[narg + 1]); if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: Setting -block_size: %d\n"), this->block_size_ )); @@ -94,7 +94,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unknown parameter to Standard Event Persistence: %s\n"), argv[narg] )); @@ -144,7 +144,7 @@ Standard_Event_Persistence_Factory::~Standard_Event_Persistence_Factory() { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence_Factory::~Standard_Event_Persistence_Factory\n") )); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index 01f2d086736..e317a22a265 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -67,7 +67,7 @@ CORBA::Boolean TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_match ()\n")); return filter->match_structured (*this->notification_); @@ -83,7 +83,7 @@ void TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_push (" "CosNotifyComm::StructuredPushConsumer_ptr)\n")); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index f4ef5cee6fb..375b734990f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -85,7 +85,7 @@ TAO_Notify_StructuredProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushConsumer::validate(%d)") ACE_TEXT("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 47c93c2d2a4..5fa70f7278d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -69,7 +69,7 @@ TAO_Notify_StructuredProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 4078536d4ab..c4378e029ae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -53,7 +53,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Structured push init dispatching ORB id is %s.\n", obj->_stubobj()->orb_core()->orbid())); } @@ -63,7 +63,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p { ex._tao_print_exception ( "Got a TRANSIENT in NS_StructuredPushConsumer::init"); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this)); } catch (const CORBA::Exception&) { @@ -98,7 +98,7 @@ TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event) // Expected exception when a bad connection is found if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); } } connection_valid = 1; @@ -114,7 +114,7 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& { //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Structured push dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Structured push dispatching ORB id is %s.\n", this->push_consumer_->_stubobj()->orb_core()->orbid())); } //--cj end @@ -131,7 +131,7 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& // Expected exception when a bad connection is found if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); } } connection_valid = 1; diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 81fee5f301f..890bdf0ef5f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -88,7 +88,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, TAO_Notify::Topology_Object* result = this; if (type == "proxy_push_consumer") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -96,7 +96,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, } else if (type == "structured_proxy_push_consumer") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -104,7 +104,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, } else if (type == "sequence_proxy_push_consumer") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index b973af826c4..daa64d327a0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -85,10 +85,10 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, } if (ACE_OS::last_error () == EPERM) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Insufficient privilege.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Insufficient privilege.\n"))); else if (ACE_OS::last_error () == EAGAIN) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) task activation at priority %d failed %p\n"), tp_params.default_priority, "activate")); throw CORBA::NO_RESOURCES (); @@ -110,7 +110,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request) ACE_Message_Block::release (request_copy); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "NS_ThreadPool_Task (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "NS_ThreadPool_Task (%P|%t) - " "failed to enqueue\n")); } } @@ -150,7 +150,7 @@ TAO_Notify_ThreadPool_Task::svc (void) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t)ThreadPool_Task dequeue failed\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t)ThreadPool_Task dequeue failed\n")); } } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp index 0f5338aaf05..156dac2386a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp @@ -20,7 +20,7 @@ TAO_Notify_validate_client_Task:: { if (this->activate (THR_NEW_LWP | THR_JOINABLE, 1) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t)TAO_Notify_validate_client_Task: %p\n"),"activate")); } } @@ -49,12 +49,12 @@ TAO_Notify_validate_client_Task::svc (void) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate start\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate start\n"))); } this->ecf_->validate (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate end\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate end\n"))); } } catch (...) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp index b1090cd9b3f..d72f07bb5f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp @@ -5,7 +5,7 @@ #include "Validate_Worker_T.h" #include "tao/debug.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -28,7 +28,7 @@ namespace TAO_Notify { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t)Validate_Worker<TOPOOBJ>::work: obj is nil\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index adb507e2400..4cf620384c7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -100,14 +100,14 @@ namespace TAO_Notify catch (const ACEXML_Exception& ex) { // The only way to find out what it is, it to let it print itself, so... - ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n Will try backup file.\n", this->file_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Unable to load \"%s\".\n Will try backup file.\n", this->file_name_.c_str ())); ex.print (); result = false; } } else { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n Will try backup file.\n"), file_name_.c_str())); + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n Will try backup file.\n"), file_name_.c_str())); result = false; } } @@ -154,14 +154,14 @@ namespace TAO_Notify catch (const ACEXML_Exception& ex) { // The only way to find out what it is, it to let it print itself, so... - ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ())); ex.print (); throw CORBA::INTERNAL(); } } else { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n"), file_name_.c_str())); + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n"), file_name_.c_str())); throw CORBA::INTERNAL(); } } @@ -185,7 +185,7 @@ namespace TAO_Notify NVPList attrs; CORBA::Long id = makeNVPList (attrs, xml_attrs); - if (DEBUG_LEVEL > 5) ACE_DEBUG ((LM_INFO, + if (DEBUG_LEVEL > 5) ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("(%P|%t) XML_Loader: Element %s\n"), name )); @@ -214,7 +214,7 @@ namespace TAO_Notify ACE_ASSERT (object_stack_.size () > 0); if (DEBUG_LEVEL > 5) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("(%P|%t) XML_Loader: End Element %s\n"), name)); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index 2e3f883571f..f35ff41e3b5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -26,7 +26,7 @@ namespace TAO_Notify { if (this->output_ != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) XML_Saver warning close not called or failed\n") )); } @@ -102,7 +102,7 @@ namespace TAO_Notify if (this->output_) { this->close_out_ = true; } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) XML_Saver unable to open %s\n"), base_name.c_str())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index f3bead86487..28ba529569d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -71,7 +71,7 @@ namespace TAO_Notify if (ACE_OS::strcasecmp (av, ACE_TEXT("-v")) == 0) { verbose = true; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n") )); } @@ -81,7 +81,7 @@ namespace TAO_Notify this->load_base_path_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -base_path: %s\n"), this->save_base_path_.c_str () )); @@ -93,7 +93,7 @@ namespace TAO_Notify this->save_base_path_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -save_base_path: %s\n"), this->save_base_path_.c_str () )); @@ -105,7 +105,7 @@ namespace TAO_Notify this->load_base_path_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -load_base_path: %s\n"), this->load_base_path_.c_str () )); @@ -117,7 +117,7 @@ namespace TAO_Notify this->backup_count_ = ACE_OS::atoi(argv[narg + 1]); if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -file_count: %d\n"), this->backup_count_ )); @@ -129,14 +129,14 @@ namespace TAO_Notify this->timestamp_ = false; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -no_timestamp\n") )); } } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unknown parameter to XML Topology Factory: %s\n"), argv[narg] )); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 6616cfd978f..8c5e9392833 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -100,7 +100,7 @@ namespace TAO_PG (*cur_iter).item ()->started () == ACE_Time_Value::zero ? ACE_TEXT ("broken ") : ACE_TEXT (""); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TBFCS::cleanup, ") ACE_TEXT ("cleaning %s%d bytes (hash %d)\n"), b, (*cur_iter).item ()->data_length (), @@ -151,7 +151,7 @@ namespace TAO_PG sorted_set[i]->item ()->started () == ACE_Time_Value::zero ? ACE_TEXT ("broken ") : ACE_TEXT (""); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - NBFCS::cleanup, ") ACE_TEXT ("cleaning %s%d bytes (hash %d)\n"), b, sorted_set[i]->item ()->data_length (), @@ -182,7 +182,7 @@ namespace TAO_PG if ((*cur_iter).item ()->started () == ACE_Time_Value::zero) { if (TAO_debug_level >= 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - MBFCS::cleanup, ") ACE_TEXT ("cleaning broken %d bytes (hash %d)\n"), (*cur_iter).item ()->data_length (), @@ -222,7 +222,7 @@ namespace TAO_PG break; if (TAO_debug_level >= 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - MBFCS::cleanup, ") ACE_TEXT ("cleaning %d bytes (hash %d)\n"), sorted_set[i]->item ()->data_length (), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 29352fc2b30..762c6316f2b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // to aid in debugging. #define METHOD_ENTRY(name) \ if (TAO_debug_level <= 6){} else \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %C\n", #name \ )) @@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Moral: Always use braces. #define METHOD_RETURN(name) \ if (TAO_debug_level <= 6){} else \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %C\n", #name \ )); \ return /* value goes here */ @@ -92,7 +92,7 @@ int TAO::PG_FactoryRegistry::parse_args (int argc, ACE_TCHAR * argv[]) case '?': // fall thru default: - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "usage: %s" " -o <registry ior file>" " -n <name to use to register with name service>" @@ -184,7 +184,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA); if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the POA.\n")), -1); @@ -195,7 +195,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) if (CORBA::is_nil (this->poa_.in())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")), -1); } @@ -233,7 +233,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil(naming_obj.in ())){ - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "%T %n (%P|%t) Unable to find the Naming Service\n"), 1); } @@ -288,7 +288,7 @@ void TAO::PG_FactoryRegistry::register_factory ( auto_ptr<RoleInfo> safe_entry; if (this->registry_.find(role, role_info) != 0) { - ACE_DEBUG(( LM_DEBUG, + ORBSVCS_DEBUG(( LM_DEBUG, "%s: adding new role: %s:%s\n", this->identity_.c_str(), role, type_id)); @@ -317,7 +317,7 @@ void TAO::PG_FactoryRegistry::register_factory ( PortableGroup::FactoryInfo & info = infos[nInfo]; if (info.the_location == factory_info.the_location) { - ACE_ERROR(( LM_ERROR, + ORBSVCS_ERROR(( LM_ERROR, "%s: Attempt to register duplicate location %s for role: %s\n" , this->identity_.c_str(), static_cast<const char *> (info.the_location[0].id), @@ -334,7 +334,7 @@ void TAO::PG_FactoryRegistry::register_factory ( this->registry_.bind(role, safe_entry.release()); } - ACE_DEBUG(( LM_DEBUG, + ORBSVCS_DEBUG(( LM_DEBUG, "%s: Added factory: [%d] %s@%s\n", this->identity_.c_str(), static_cast<int> (length + 1), @@ -364,7 +364,7 @@ void TAO::PG_FactoryRegistry::unregister_factory ( { found = 1; - ACE_ERROR(( LM_INFO, + ORBSVCS_ERROR(( LM_INFO, "%s: Unregistering factory %s@%s\n", this->identity_.c_str(), role, @@ -386,7 +386,7 @@ void TAO::PG_FactoryRegistry::unregister_factory ( ACE_ASSERT ( length == 1 ); if (this->registry_.unbind (role) == 0) { - ACE_DEBUG(( LM_INFO, + ORBSVCS_DEBUG(( LM_INFO, "%s: No more factories registered for %s\n", this->identity_.c_str(), role @@ -395,7 +395,7 @@ void TAO::PG_FactoryRegistry::unregister_factory ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%s: LOGIC ERROR AT " __FILE__ " (%d): Entry to be deleted disappeared\n", this->identity_.c_str(), __LINE__)); @@ -406,7 +406,7 @@ void TAO::PG_FactoryRegistry::unregister_factory ( } else { - ACE_ERROR(( LM_ERROR, + ORBSVCS_ERROR(( LM_ERROR, "%s, Attempt to unregister factory for unknown role %s\n", this->identity_.c_str(), role @@ -419,7 +419,7 @@ void TAO::PG_FactoryRegistry::unregister_factory ( // check quit-on-idle if (registry_.current_size() == 0 && quit_state_ == LIVE) { - ACE_ERROR(( LM_INFO, + ORBSVCS_ERROR(( LM_INFO, "%s is idle\n", identity() )); @@ -442,7 +442,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role ( RoleInfo * role_info = 0; if (this->registry_.unbind(role, role_info) == 0) { - ACE_DEBUG(( LM_DEBUG, + ORBSVCS_DEBUG(( LM_DEBUG, "%s: Unregistering all factories for role %s\n", this->identity_.c_str(), role @@ -452,7 +452,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role ( } else { - ACE_ERROR(( LM_INFO, + ORBSVCS_ERROR(( LM_INFO, "%s: Unregister_factory_by_role: unknown role: %s\n", this->identity_.c_str(), role @@ -464,7 +464,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role ( // check quit options if (registry_.current_size() == 0 && quit_state_ == LIVE) { - ACE_ERROR(( LM_INFO, + ORBSVCS_ERROR(( LM_INFO, "%s is idle\n", identity() )); @@ -497,7 +497,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( RoleInfo * role_info = entry.int_id_; PortableGroup::FactoryInfos & infos = role_info->infos_; - // ACE_ERROR((LM_INFO, "unregister_factory_by_location: Checking role %s\n", role.c_str() )); + // ORBSVCS_ERROR((LM_INFO, "unregister_factory_by_location: Checking role %s\n", role.c_str() )); int found = 0; CORBA::ULong length = infos.length(); @@ -507,7 +507,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( if (info.the_location == location) { - ACE_ERROR((LM_INFO, + ORBSVCS_ERROR((LM_INFO, "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n", this->identity_.c_str(), static_cast<int> (nInfo), @@ -519,7 +519,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( { while (nInfo + 1 < length) { - ACE_ERROR((LM_INFO, + ORBSVCS_ERROR((LM_INFO, "%s: Unregister_factory_by_location: Move: [%d] %s to [%d]\n", this->identity_.c_str(), (int)nInfo + 1, role.c_str(), (int)nInfo @@ -527,7 +527,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( infos[nInfo] = infos[nInfo + 1]; nInfo += 1; } - ACE_ERROR((LM_INFO, + ORBSVCS_ERROR((LM_INFO, "%s: unregister_factory_by_location: New length [%d] %s\n", this->identity_.c_str(), (int)nInfo, role.c_str() @@ -536,7 +536,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( } else { - ACE_ERROR((LM_INFO, + ORBSVCS_ERROR((LM_INFO, "%s: Removed all entries for %s\n", this->identity_.c_str(), role.c_str() @@ -553,7 +553,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( for (size_t nRole = 0; nRole < emptyRoles.size(); ++nRole) { - ACE_ERROR((LM_INFO, + ORBSVCS_ERROR((LM_INFO, "%s: Remove role %s\n", this->identity_.c_str(), emptyRoles[nRole].c_str() @@ -565,7 +565,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%s: LOGIC ERROR AT " __FILE__ " (%d): Role to be deleted disappeared\n", this->identity_.c_str(), __LINE__)); @@ -575,7 +575,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( // If all types are gone... if (registry_.current_size() == 0 && quit_state_ == LIVE) { - ACE_ERROR(( LM_INFO, + ORBSVCS_ERROR(( LM_INFO, "%s is idle\n", identity() )); @@ -610,7 +610,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( else { type_id = CORBA::string_dup(""); - ACE_ERROR(( LM_INFO, + ORBSVCS_ERROR(( LM_INFO, "%s: list_factories_by_role: unknown role %s\n", this->identity_.c_str(), role @@ -677,7 +677,7 @@ int TAO::PG_FactoryRegistry::write_ior_file(const ACE_TCHAR * outputFile, const } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Open failed for %s\n", outputFile )); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 50c7f85edcc..1799e5c4ada 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -266,7 +266,7 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroupId group_id) dynamic_cast<PG_Object_Group_Storable *> (group); if (!og) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - PG_Group_Factory ") ACE_TEXT ("In destroying group could not cast ") ACE_TEXT ("to PG_Object_Group_Storable\n"))); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 5df2decdcb1..5b8ba5a6441 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -783,7 +783,7 @@ TAO_PG_ObjectGroupManager::remove_group_from_location_map ( int to_be_removed = this->get_object_group_position (*groups, group_entry); if (TAO_debug_level > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_PG_ObjectGroupManager::") ACE_TEXT ("remove_group_from_location_map -") ACE_TEXT ("Found group at location: %s, position %i, size = %i\n"), @@ -794,7 +794,7 @@ TAO_PG_ObjectGroupManager::remove_group_from_location_map ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: (%P|%t) TAO_PG_ObjectGroupManager::remove_group_from_location_map -") ACE_TEXT ("Group not at expected location: \n"), loc[0].id.in ())); @@ -810,7 +810,7 @@ TAO_PG_ObjectGroupManager::remove_entry_from_groups (int to_be_removed, TAO_PG_ObjectGroup_Array * groups) { if (TAO_debug_level > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_PG_ObjectGroupManager::remove_entry_from_groups -") ACE_TEXT ("Found group at position %i, size = %i\n"), to_be_removed, groups->size ())); @@ -951,7 +951,7 @@ TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb, const TimeBase::TimeT& timeout) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)TAO_PG_ObjectGroupManager::validate_members start\n"))); /// Get list of active member info. @@ -997,7 +997,7 @@ TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb, } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)TAO_PG_ObjectGroupManager::validate_members end\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 22e1f86fcc8..85240fa0c46 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -107,7 +107,7 @@ TAO::PG_Object_Group::PG_Object_Group ( TAO::PG_Object_Group::~PG_Object_Group (void) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - Destroying object group: %s"), this->group_name_)); @@ -218,7 +218,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location, { if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - TAO::PG_Object_Group::add_member") ACE_TEXT ("Can't add a null member to object group\n") )); @@ -248,7 +248,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location, { if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - ") ACE_TEXT ("Can't add member because first profile ") ACE_TEXT ("is IIOP version 1.0, which does not ") @@ -313,7 +313,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location, if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("PG (%P|%t) Issue incrementing the ") ACE_TEXT ("version in Object_Group add_member\n"))); } @@ -325,7 +325,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location, if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("PG (%P|%t) exit Object_Group add_member\n"))); } } @@ -362,7 +362,7 @@ TAO::PG_Object_Group::set_primary_member ( { if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("%T %n (%P|%t) - ") ACE_TEXT ("Can't set primary in IOGR .\n") )); @@ -379,7 +379,7 @@ TAO::PG_Object_Group::set_primary_member ( { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO-PG (%P|%t) - set_primary_location ") ACE_TEXT("throwing PrimaryNotSet because increment") ACE_TEXT("version failed.\n") @@ -393,7 +393,7 @@ TAO::PG_Object_Group::set_primary_member ( { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO-PG (%P|%t) - set_primary_location ") ACE_TEXT ("throwing MemberNotFound.\n"))); } @@ -440,7 +440,7 @@ TAO::PG_Object_Group::remove_member ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO-PG (%P|%t) - ") ACE_TEXT ("remove_member throwing MemberNotFound.\n") )); @@ -502,7 +502,7 @@ TAO::PG_Object_Group::increment_version (void) this->tagged_component_.object_group_ref_version += 1; if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - Setting IOGR version to %u\n"), static_cast<unsigned> (this->tagged_component_.object_group_ref_version) )); @@ -552,7 +552,7 @@ TAO::PG_Object_Group::distribute_iogr (void) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "PG (%P|%t) - Object_Group pushing " "IOGR to %s member: %s@%s.\n", (info->is_primary_ ? "Primary" : "Backup"), @@ -575,7 +575,7 @@ TAO::PG_Object_Group::distribute_iogr (void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO::PG_Object_Group::distribute iogr can't " "narrow member reference to " "PortableGroup::TAO_UpdateObjectGroup.\n" @@ -836,7 +836,7 @@ TAO::PG_Object_Group::create_members (size_t count) // log, but otherwise ignore the errorf if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("PG (%P|%t) Replica Factory ") ACE_TEXT ("@ %s refused create_object ") ACE_TEXT ("request for type %s\n"), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index e8ccd41d89b..55df4a49566 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -146,14 +146,14 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member) TAO_FT_IOGR_Property prop (ft_tag_component); if (this->iorm_->is_primary_set (&prop, member)) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - %s: PRIMARY member.\n"), label )); } else { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - %s: backup member.\n"), label )); @@ -162,7 +162,7 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member) PortableGroup::TagGroupTaggedComponent tag_component; if (TAO::PG_Utils::get_tagged_component (member, tag_component)) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - %s: Group: .") ACE_TEXT (" version: %u\n"), @@ -172,7 +172,7 @@ void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member) } else { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - %s: No group information found.\n"), label )); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 5acf71e1773..a24d91725d6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -87,7 +87,7 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set) { if (TAO_debug_level > 3) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: Property_set: rebind failed.\n" )); } @@ -155,7 +155,7 @@ void TAO::PG_Property_Set::set_property ( { // Value was not rebound. if (TAO_debug_level > 3) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: Property_set: rebind failed.\n" )); } @@ -273,7 +273,7 @@ int TAO_PG::test_encode_decode () { if (longResult != testLong) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: %s = %d expecting %d\n", testLongKey, (int)longResult, @@ -284,7 +284,7 @@ int TAO_PG::test_encode_decode () } else { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: Can't find value for %s\n", testLongKey )); result = 0; @@ -295,7 +295,7 @@ int TAO_PG::test_encode_decode () { if (0 != ACE_OS::strcmp (testString, stringResult)) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: %s = \"%s\" expecting \"%s\"\n", testStringKey, (int)stringResult, @@ -306,7 +306,7 @@ int TAO_PG::test_encode_decode () } else { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: Can't find value for %s\n", testStringKey )); result = 0; @@ -318,7 +318,7 @@ int TAO_PG::test_encode_decode () { if (doubleResult != testDouble) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: %s = \"%f\" expecting \"%f\"\n", testDoubleKey, doubleResult, @@ -329,7 +329,7 @@ int TAO_PG::test_encode_decode () } else { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, "%n\n%T: Can't find value for %s\n", testDoubleKey )); result = 0; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index 612d7574bc2..60137cea9c9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -105,7 +105,7 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile, delete acceptor; if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("unable to open acceptor ") ACE_TEXT ("for <%s>%p\n"), @@ -130,7 +130,7 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile, delete acceptor; if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("unable to add acceptor to registry") ACE_TEXT ("for <%s>%p\n"), @@ -147,7 +147,7 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile, else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("unable to create acceptor ") )); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index fb2b02000fe..33376a0c97b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -25,7 +25,7 @@ TAO_PortableGroup_ORBInitializer::pre_init ( if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) PortableGroup_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index 480fd3dafb9..ad455164497 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -89,7 +89,7 @@ TAO_UIPMC_Acceptor::open ( { // The hostname cache has already been set! // This is bad mojo, i.e. an internal TAO error. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Acceptor::open, ") ACE_TEXT ("hostname already set\n")), -1); @@ -127,7 +127,7 @@ TAO_UIPMC_Acceptor::open ( if (cp_pos == 0) { // No valid IPv6 address specified. - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Acceptor::open, ") ACE_TEXT ("Invalid IPv6 decimal address specified\n")), -1); @@ -156,7 +156,7 @@ TAO_UIPMC_Acceptor::open ( // Both host and port have to be specified. if (port_separator_loc == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Acceptor::open, ") ACE_TEXT ("port is not specified\n")), -1); @@ -173,7 +173,7 @@ TAO_UIPMC_Acceptor::open ( (addr.get_type () != AF_INET6 || addr.is_ipv4_mapped_ipv6 ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Acceptor::open, ") ACE_TEXT ("non-IPv6 endpoints not allowed when ") ACE_TEXT ("connect_ipv6_only is set\n")), @@ -236,7 +236,7 @@ TAO_UIPMC_Acceptor::open_i ( connection_handler->listen_on_all (this->listen_on_all_); if (connection_handler->open (0)) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - TAO_UIPMC_Acceptor::open_i, ") ACE_TEXT("failed to open connection handler.\n") )); @@ -267,7 +267,7 @@ TAO_UIPMC_Acceptor::open_i ( this->addrs_[j].set_port_number (port, 1); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Acceptor::open_i, ") ACE_TEXT ("listening on: <%C:%u>\n"), this->hosts_[j], @@ -298,7 +298,7 @@ TAO_UIPMC_Acceptor::dotted_decimal_address ( if (!addr.get_host_addr (tmp, sizeof tmp)) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Acceptor::") ACE_TEXT ("dotted_decimal_address, cannot determine ") ACE_TEXT ("hostname (Errno: '%m')\n"))); @@ -370,7 +370,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str) ++j; // In this way we fight MS VS warning about unreachable code. if (end == begin) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length UIPMC option.\n")), -1); else if (end != ACE_CString::npos) @@ -381,7 +381,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) UIPMC option <%s> is ") ACE_TEXT ("missing a value.\n"), opt.c_str ()), @@ -393,21 +393,21 @@ TAO_UIPMC_Acceptor::parse_options (const char *str) begin = end + 1; if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length UIPMC ") ACE_TEXT ("option name.\n")), -1); if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid UIPMC endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n"), value.c_str ()), -1); } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid UIPMC option: <%s>\n"), name.c_str ()), -1); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 0af78fdb3e4..055a3171da2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -55,7 +55,7 @@ TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::") ACE_TEXT ("~UIPMC_Connection_Handler, ") ACE_TEXT ("release_os_resources() failed (Errno: '%m')\n"))); @@ -186,7 +186,7 @@ TAO_UIPMC_Connection_Handler::open (void*) { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - UIPMC_Connection_Handler::open, ") ACE_TEXT("couldn't set hop limit (Errno: '%m')\n"))); } @@ -238,7 +238,7 @@ TAO_UIPMC_Connection_Handler::open (void*) { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::open, ") ACE_TEXT ("couldn't %s multicast packets looping (Errno: '%m')\n"), protocol_properties.enable_multicast_loop_ ? @@ -255,7 +255,7 @@ TAO_UIPMC_Connection_Handler::open (void*) // Assume a small buffer this->send_hi_water_mark_ = 1024u; if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::") ACE_TEXT ("open, -ORBSendHighWaterMark not specified ") ACE_TEXT ("using %u bytes\n"), @@ -274,7 +274,7 @@ TAO_UIPMC_Connection_Handler::open (void*) // value is what is returned by the get_option, so it is best to halve. this->send_hi_water_mark_ >>= 1; if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::") ACE_TEXT ("open, -ORBSendHighWaterMark not specified, ") ACE_TEXT ("using -ORBSndSock value of %u bytes\n"), @@ -285,7 +285,7 @@ TAO_UIPMC_Connection_Handler::open (void*) // Assume a small buffer this->send_hi_water_mark_ = 1024u; if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::") ACE_TEXT ("open, -ORBSendHighWaterMark not specified ") ACE_TEXT ("and getsockopt failed (Errno: '%m'), using %u bytes\n"), @@ -428,7 +428,7 @@ TAO_UIPMC_Connection_Handler::set_tos (int tos) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::") ACE_TEXT ("set_dscp_codepoint -> IPV6_TCLASS not ") ACE_TEXT ("supported yet\n"))); @@ -450,7 +450,7 @@ TAO_UIPMC_Connection_Handler::set_tos (int tos) if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connection_Handler::") ACE_TEXT ("set_dscp_codepoint -> dscp: %x; ") ACE_TEXT ("result: %d; %s\n"), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 6f487bf45a6..f2edc63d043 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -71,7 +71,7 @@ TAO_UIPMC_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) UIPMC connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -111,7 +111,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, (void) remote_address.addr_to_string (remote_as_string, sizeof remote_as_string); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connector::open, ") ACE_TEXT ("invalid connection to IPv4 mapped IPv6 ") ACE_TEXT ("interface <%s>!\n"), @@ -164,7 +164,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (svc_handler->peer ().set_nic(prefer_if, AF_INET6)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - UIPMC_Connector::make_connection, " "connection to <%C:%u> - failed to set requested local network interface <%s>\n", uipmc_endpoint->host (), @@ -179,7 +179,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, else { if (TAO_debug_level > 3) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - UIPMC_Connector::make_connection, " "connection to <%C:%u> from interface <%s> failed (%p)\n", uipmc_endpoint->host (), @@ -197,7 +197,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - UIPMC_Connector::make_connection, " "failed to open the connection to <%C:%u>\n", remote_address.get_host_addr (), @@ -218,7 +218,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, char remote_hostaddr[INET6_ADDRSTRLEN]; remote_address.get_host_addr (remote_hostaddr, sizeof remote_hostaddr); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connector::make_connection, ") ACE_TEXT ("new connection from <%C:%u> to <%C:%u> on ") ACE_TEXT ("HANDLE %d\n"), @@ -238,7 +238,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, // Give users a clue to the problem. if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connector:") ACE_TEXT (":make_connection, connection to ") ACE_TEXT ("<%C:%u> failed (%p)\n"), @@ -261,7 +261,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Connector::") ACE_TEXT ("make_connection, could not add the ") ACE_TEXT ("new connection to cache\n"))); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index b8dbe540640..a4160120127 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -186,7 +186,7 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) latest->preferred_if_ = CORBA::string_dup (preferred[i].c_str() + 3); latest->preferred_path_.host = (const char *) 0; if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_UIPMC_Endpoint::preferred_interfaces, setting network interface name <%s>" " as preferred path for [%s] \n", latest->preferred_if_.in(), this->host_.in ())); @@ -198,7 +198,7 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) CORBA::string_dup (preferred[i].c_str()); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_UIPMC_Endpoint::preferred_interfaces, adding path [%s]" " as preferred local address for [%s] \n", latest->preferred_path_.host.in(), this->host_.in ())); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index 911c269fc35..8e9cc43cf7b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -72,7 +72,7 @@ TAO_UIPMC_Protocol_Factory::init (int argc, } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_UIPMC_Protocol_Factory::init - ") ACE_TEXT ("ignoring unknown option <%s>\n"), argv[curarg])); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp index 76d1cba6007..b1b3e04f9f0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -55,7 +55,7 @@ TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Connection_Handler::") ACE_TEXT ("~UIPMC_Mcast_Connection_Handler, ") ACE_TEXT ("release_os_resources() failed '%m'\n"))); @@ -116,7 +116,7 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void*) { char tmp[INET6_ADDRSTRLEN]; this->local_addr_.get_host_addr (tmp, sizeof tmp); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - UIPMC_Mcast_Connection_Handler::open, ") ACE_TEXT("subscribed to multicast group at %C:%u\n"), tmp, @@ -129,7 +129,7 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void*) { char tmp[INET6_ADDRSTRLEN]; this->local_addr_.get_host_addr (tmp, sizeof tmp); - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - UIPMC_Mcast_Connection_Handler::open, ") ACE_TEXT("failed to subscribe to multicast group at %C:%u '%m'\n"), tmp, @@ -151,7 +151,7 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void*) if (this->peer ().enable (ACE_NONBLOCK) == -1) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Connection_Handler::") ACE_TEXT ("open, failed to set to non-blocking mode ") ACE_TEXT ("'%m'\n"))); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp index 96c9e0bcfff..3f70aaffe5a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp @@ -75,7 +75,7 @@ TAO_UIPMC_Mcast_Transport::cleanup_packets (bool expired_only) if (TAO_debug_level >= 8) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("cleanup_packets, cleaning %d bytes\n"), this->id (), @@ -171,7 +171,7 @@ TAO_UIPMC_Mcast_Transport::recv_packet ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_packet, packet of size %d is ") ACE_TEXT ("too small\n"), @@ -196,7 +196,7 @@ TAO_UIPMC_Mcast_Transport::recv_packet ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_packet, packet didn't contain ") ACE_TEXT ("magic bytes\n"), @@ -214,7 +214,7 @@ TAO_UIPMC_Mcast_Transport::recv_packet ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_packet, packet has wrong version ") ACE_TEXT ("%d.%d\n"), @@ -254,7 +254,7 @@ TAO_UIPMC_Mcast_Transport::recv_packet ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_packet, malformed packet\n"), this->id ())); @@ -269,7 +269,7 @@ TAO_UIPMC_Mcast_Transport::recv_packet ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_packet, packet not large enough ") ACE_TEXT ("for padding\n"), @@ -285,7 +285,7 @@ TAO_UIPMC_Mcast_Transport::recv_packet ( // Normally we don't need to log this but if someone will want. Here we are. if (TAO_debug_level >= 10) { - ACE_HEX_DUMP ((LM_DEBUG, + ORBSVCS_HEX_DUMP ((LM_DEBUG, (char const *) buf, miop_header_size, ACE_TEXT ("MIOP header"))); @@ -340,7 +340,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) { if (errno != EWOULDBLOCK && errno != EAGAIN) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_all, unexpected failure of recv_packet (Errno: '%m')\n"), this->id ())); @@ -352,7 +352,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) { char tmp[INET6_ADDRSTRLEN]; from_addr.get_host_addr (tmp, sizeof tmp); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv, received %d bytes from <%C:%u> ") ACE_TEXT ("(hash %d)\n"), @@ -378,7 +378,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) { // Cleanup the packet. delete packet; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_all, could not queue fragment\n"), this->id ())); @@ -400,7 +400,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) { if (TAO_debug_level >= 9) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_all, completed MIOP message %@\n"), this->id (), static_cast<void *> (packet))); @@ -419,7 +419,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) // it after all. if (TAO_debug_level >= 9) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_all, completed MIOP message %@\n"), this->id (), static_cast<void *> (packet))); @@ -430,7 +430,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) if (TAO_debug_level >= 9) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_all, completed MIOP message %@ (QUEUED)\n"), this->id (), static_cast<void *> (packet))); @@ -458,7 +458,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) TAO_PG::UIPMC_Recv_Packet *packet = 0; if (this->complete_.dequeue_head (packet) == -1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_UIPMC_Mcast_Transport[%d]::recv_all, ") ACE_TEXT ("unable to dequeue completed message\n"), this->id ())); @@ -467,7 +467,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) if (TAO_debug_level >= 9) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("recv_all, completed MIOP message %@ (DEQUEUED)\n"), this->id (), static_cast<void *> (packet))); @@ -488,7 +488,7 @@ TAO_UIPMC_Mcast_Transport::recv_all (TAO_Resume_Handle &rh) } else if (retval < 0 && TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_UIPMC_Mcast_Transport[%d]::recv_all, ") ACE_TEXT ("notify to the reactor failed.\n"), this->id ())); @@ -508,7 +508,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( if (TAO_debug_level >= 8) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("handle_input, started\n"), this->id ())); @@ -520,7 +520,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( { if (TAO_debug_level >= 9) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("handle_input, processing MIOP message %@ (%d bytes)\n"), this->id (), static_cast<void *> (complete), complete->data_length ())); @@ -568,7 +568,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("handle_input, failed to parse input\n"), this->id ())); @@ -579,7 +579,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( // Parse/marshal error happened. if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("handle_input, got missing data\n"), this->id ())); @@ -590,7 +590,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( // We read too much data. if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Mcast_Transport[%d]::") ACE_TEXT ("handle_input, read %d but expected %d\n"), this->id (), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 10a7057b444..056957847f3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -105,7 +105,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::decode, ") ACE_TEXT ("can't read version\n"))); } @@ -118,7 +118,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::decode, ") ACE_TEXT ("unsupported version %d.%d\n"), major, @@ -144,7 +144,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) { // If there is extra data in the profile we are supposed to // ignore it, but print a warning just in case... - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::decode, %d bytes ") ACE_TEXT ("out of %u left after profile data\n"), cdr.length (), @@ -172,7 +172,7 @@ TAO_UIPMC_Profile::decode_profile (TAO_InputCDR& cdr) !cdr.read_ushort (port) ) { if (TAO_debug_level) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::decode, ") ACE_TEXT ("Couldn't unmarshal address and port!\n"))); return -1; @@ -376,7 +376,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string) // since it wasn't found. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile: ") ACE_TEXT ("Invalid ref: can't find multicast address in %s\n"), string @@ -407,7 +407,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string) // No valid IPv6 address specified. if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("\nTAO (%P|%t) - UIPMC_Profile::") ACE_TEXT ("parse_string_i, Invalid IPv6 ") ACE_TEXT ("decimal address specified.\n"))); @@ -717,7 +717,7 @@ TAO_UIPMC_Profile::update_cached_group_component (void) if ((out_cdr << group) == 0) { if (TAO_debug_level) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::") ACE_TEXT ("update_cached_group_component, Error ") ACE_TEXT ("marshaling group component!"))); @@ -833,7 +833,7 @@ TAO_UIPMC_Profile::extract_group_component ( !cdr.read_octet (minor) ) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::") ACE_TEXT ("extract_group_component, couldn't unmarshal version\n"))); return -1; @@ -847,7 +847,7 @@ TAO_UIPMC_Profile::extract_group_component ( !cdr.read_ushort (port) ) { if (TAO_debug_level) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Profile::") ACE_TEXT ("extract_group_component, Couldn't ") ACE_TEXT ("unmarshal address and port!\n"))); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index e09c374446f..87d045ed28e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -108,7 +108,7 @@ TAO_UIPMC_Transport::throttle_send_rate ( if (this->total_bytes_outstanding_ <= octets_processed) { if (2 <= TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::") ACE_TEXT ("throttle_send_rate, Previous data ") ACE_TEXT ("(%u bytes) has cleared ") @@ -123,7 +123,7 @@ TAO_UIPMC_Transport::throttle_send_rate ( else { if (2 <= TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::") ACE_TEXT ("throttle_send_rate, Previous data ") ACE_TEXT ("(%u bytes) has reduced by %Q bytes ") @@ -171,7 +171,7 @@ TAO_UIPMC_Transport::throttle_send_rate ( static_cast <suseconds_t> (delay_in_micro_seconds % ACE_ONE_SECOND_IN_USECS)); if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::") ACE_TEXT ("throttle_send_rate, SendHighWaterMark ") ACE_TEXT ("(%u) exceeded by %u bytes, delaying ") @@ -223,7 +223,7 @@ TAO_UIPMC_Transport::send ( if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::send, ") ACE_TEXT ("Did not send MIOP message of size %u ") ACE_TEXT ("(it was too large, needing %u fragments).\n") @@ -237,11 +237,11 @@ TAO_UIPMC_Transport::send ( factory->max_fragments ())); if (max_fragment_size < MIOP_MAX_DGRAM_SIZE) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT (" or -ORBMaxFragmentSize %u\n"), max_fragment_size)); else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } return bytes_transferred; @@ -274,7 +274,7 @@ TAO_UIPMC_Transport::send ( miop_hdr.write_ulong (number_of_packets_required); if (!this->write_unique_id (miop_hdr)) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::send, ") ACE_TEXT ("error creating fragment MIOP header.\n"), this->id ())); @@ -310,7 +310,7 @@ TAO_UIPMC_Transport::send ( // Just a safety check for building iovec. if (this_fragment_iovcnt >= ACE_IOV_MAX) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::send, ") ACE_TEXT ("Too many iovec to create fragment.\n"), this->id ())); @@ -364,7 +364,7 @@ TAO_UIPMC_Transport::send ( addr); if (already_sent < 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::send, ") ACE_TEXT ("error sending data (Errno: '%m')\n"), this->id ())); @@ -373,7 +373,7 @@ TAO_UIPMC_Transport::send ( else if (TAO_debug_level && static_cast<u_long> (already_sent) != this_fragment_size) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::send, ") ACE_TEXT ("Partial fragment (%B/%u bytes), ") ACE_TEXT ("reattempting remainder.\n"), @@ -394,7 +394,7 @@ TAO_UIPMC_Transport::send ( { char tmp[INET6_ADDRSTRLEN]; addr.get_host_addr (tmp, sizeof tmp); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIPMC_Transport[%d]::send, ") ACE_TEXT ("Sent %u bytes payload (fragment %u/%u) to <%C:%u>\n"), this->id (), @@ -484,7 +484,7 @@ TAO_UIPMC_Transport::send_message ( if (n == -1) { if (TAO_debug_level) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) - UIPMC_Transport[%d]::") ACE_TEXT ("send_message, closing transport %d after ") ACE_TEXT ("fault (Errno: '%m')\n"), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp index c9547808179..088507ecbff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -59,7 +59,7 @@ namespace TAO_PG this->data_length_ += len; if (TAO_debug_level >= 10) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_PG::UIPMC_Recv_Packet::") ACE_TEXT ("add_fragment, adding fragment %d with %d out ") ACE_TEXT ("of %d bytes\n"), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp index 83d84972a82..2030b39574f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp @@ -63,13 +63,13 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) TAO_MIOP_CLEANUP_MEMORY_BOUND; } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBFragmentsCleanupStrategy %s is unknown.\n"), name)); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBFragmentsCleanupStrategy missing type.\n"))); } @@ -79,7 +79,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (++curarg < argc) this->fragments_cleanup_bound_ = ACE_OS::atoi (argv[curarg]); else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBFragmentsCleanupBound missing value.\n"))); } @@ -91,7 +91,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) int const max= ACE_OS::atoi (argv[curarg]); if (max < 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBMaxFragments %d ") ACE_TEXT ("is invalid (using %u).\n"), @@ -103,7 +103,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->max_fragments_ = static_cast<u_long> (max); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBMaxFragments missing limit.\n"))); } @@ -116,7 +116,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (size < static_cast<int> (MIOP_MAX_HEADER_SIZE) || size > static_cast<int> (MIOP_MAX_DGRAM_SIZE) ) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBMaxFragmentSize %d is not within ") ACE_TEXT ("range %u to %u (using %u).\n"), @@ -130,7 +130,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->max_fragment_size_ = static_cast<u_long> (size); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBMaxFragmentSize missing limit.\n"))); } @@ -142,7 +142,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) int const tx_time= ACE_OS::atoi (argv[curarg]); if (tx_time <= 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBMaxFragmentRate %d is invalid ") ACE_TEXT ("(using -ORBMaxFragmentSize in micro seconds).\n"), @@ -153,7 +153,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->max_fragment_rate_= static_cast<u_long> (tx_time); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBMaxFragmentRate missing micro-seconds.\n"))); } @@ -175,7 +175,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) int const hwm= ACE_OS::atoi (argv[curarg]); if (hwm <= 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("%s %d is invalid ") ACE_TEXT ("(using actual -ORBSndSock size).\n"), @@ -188,7 +188,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->send_hi_water_mark_ = static_cast<u_long> (hwm); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("%s missing limit.\n"), argv[curarg-1])); @@ -201,7 +201,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) int const bytes= ACE_OS::atoi (argv[curarg]); if (bytes <= 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBSndSock %d is invalid.\n"), bytes)); @@ -211,7 +211,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->send_buffer_size_= static_cast<u_long> (bytes); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBSndSock missing size in bytes.\n"))); } @@ -223,7 +223,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) int const bytes= ACE_OS::atoi (argv[curarg]); if (bytes <= 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBRcvSock %d is invalid.\n"), bytes)); @@ -233,7 +233,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->receive_buffer_size_= static_cast<u_long> (bytes); } else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("-ORBRcvSock missing size in bytes.\n"))); } @@ -245,7 +245,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (++curarg < argc) this->enable_throttling_= static_cast<bool> (ACE_OS::atoi (argv[curarg])); else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("%s missing 0 or 1 parameter.\n"), argv[curarg-1])); @@ -258,7 +258,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (++curarg < argc) this->enable_eager_dequeue_= static_cast<bool> (ACE_OS::atoi (argv[curarg])); else - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory ") ACE_TEXT ("%s missing 0 or 1 parameter.\n"), argv[curarg-1])); @@ -267,14 +267,14 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { // Can we assume there is an argument after the option? // ++curarg; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory - ") ACE_TEXT ("unknown option <%s>.\n"), argv[curarg])); } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - MIOP_Resource_Factory - ") ACE_TEXT ("ignoring option <%s>.\n"), argv[curarg])); diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 4e594216cfe..825a6fa4771 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -473,7 +473,7 @@ TAO_PropertySet::define_property (const char *property_name, if (this->hash_table_.rebind (hash_key, hash_value) != 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO_PropertySet::Define Property failed\n")); throw CORBA::UNKNOWN (); } @@ -692,7 +692,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, if (iterator.next (entry_ptr) != 0) if (property_set->hash_table_.bind (entry_ptr->ext_id_, entry_ptr->int_id_) < 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Error:TAO_PropertySet::get_all_property_names\n")); // Make the NamesIterator out of this TAO_PropertySet. @@ -864,7 +864,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, if (iterator.next (entry_ptr) != 0 && prop_set->hash_table_.bind (entry_ptr->ext_id_, entry_ptr->int_id_) < 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Error:TAO_PropertySet::get_all_properties\n")); } diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 9494678b5a0..53a9720234d 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -102,7 +102,7 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle, // any differences. if (handle <= 0 || handle > entry_count_) { - ACE_DEBUG ((LM_DEBUG, "Unknown task: no entry for handle %d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Unknown task: no entry for handle %d\n", handle)); throw RtecScheduler::UNKNOWN_TASK(); // NOTREACHED @@ -116,7 +116,7 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle, || rt_info_[handle - 1].quantum != quantum || rt_info_[handle - 1].info_type != info_type || rt_info_[handle - 1].threads != static_cast<CORBA::Long> (threads)) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "invalid data for RT_Info: %s\n", (const char*)rt_info_[handle - 1].entry_point)); // TODO: throw something here. @@ -253,7 +253,7 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle, return; } } - ACE_ERROR ((LM_ERROR, "unmatched dependency on %s\n", + ORBSVCS_ERROR ((LM_ERROR, "unmatched dependency on %s\n", (const char*)rt_info_[handle - 1]->entry_point)); #endif } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index f4a8504a424..b3f35f27ed3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -91,7 +91,7 @@ TAO::IIOP_SSL_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_SSL connection failed.\n") ACE_TEXT ("TAO (%P|%t) - This is most likely ") ACE_TEXT ("due to a hostname lookup failure.\n"))); @@ -119,7 +119,7 @@ TAO::IIOP_SSL_Connector::make_connection ( iiop_endpoint->object_addr (); if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) IIOP_SSL_Connector::connect ") ACE_TEXT ("making a new connection\n"))); @@ -164,7 +164,7 @@ TAO::IIOP_SSL_Connector::make_connection ( max_wait_time)) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector::" + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector::" "make_connection, " "wait for completion failed\n")); } @@ -182,7 +182,7 @@ TAO::IIOP_SSL_Connector::make_connection ( // Give users a clue to the problem. if (TAO_debug_level) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, " "connection to <%s:%d> failed (%p)\n", iiop_endpoint->host (), iiop_endpoint->port (), @@ -200,7 +200,7 @@ TAO::IIOP_SSL_Connector::make_connection ( // At this point, the connection has be successfully connected. // #REFCOUNT# is one. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", iiop_endpoint->host (), iiop_endpoint->port (), @@ -220,7 +220,7 @@ TAO::IIOP_SSL_Connector::make_connection ( if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector::make_connection, " "could not add the new connection to cache\n")); } @@ -241,7 +241,7 @@ TAO::IIOP_SSL_Connector::make_connection ( (void) transport->close_connection (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_SSL_Connector [%d]::make_connection, " "could not register the transport " "in the reactor.\n", diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 3cb850dc6f3..cdce4595651 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -474,7 +474,7 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core, this->reuse_addr_) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SSLIOP_Acceptor::open_i - %p\n\n"), ACE_TEXT ("cannot open acceptor"))); @@ -495,7 +495,7 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core, for (ACE_UINT32 p = requested_port; p <= last_port; p++) { if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor::open_i() ") ACE_TEXT ("trying to listen on port %d\n"), p)); @@ -518,7 +518,7 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core, if (! found_a_port) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SSLIOP_Acceptor::open_i - %p\n\n"), ACE_TEXT ("cannot open acceptor"))); @@ -534,7 +534,7 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core, { // @@ Should this be a catastrophic error??? if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SSLIOP_Acceptor::open_i - %p\n\n"), ACE_TEXT ("cannot get local addr"))); @@ -555,7 +555,7 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core, { for (size_t i = 0; i < this->endpoint_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("SSLIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), @@ -595,7 +595,7 @@ TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv) if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SSLIOP endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n"), value.c_str ()), @@ -608,7 +608,7 @@ TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv) if (ssl_port >= 0 && ssl_port < 65536) this->ssl_component_.port = ssl_port; else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid ") ACE_TEXT ("IIOP/SSL endpoint ") ACE_TEXT ("port: <%s>\n"), @@ -668,7 +668,7 @@ TAO::SSLIOP::Acceptor::verify_secure_configuration (TAO_ORB_Core *orb_core, ::Security::NoProtection)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Cannot support secure ") ACE_TEXT ("IIOP over SSL connection if\n") ACE_TEXT ("(%P|%t) standard profile ") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index eb298513d6e..f0b625b71dd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -61,7 +61,7 @@ TAO::SSLIOP::Connection_Handler::~Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - SSLIOP_Connection_Handler::") ACE_TEXT("~SSLIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); @@ -192,7 +192,7 @@ TAO::SSLIOP::Connection_Handler::open (void *) sizeof (remote_as_string) / sizeof (ACE_TCHAR)); (void) local_addr.addr_to_string (local_as_string, sizeof (local_as_string) / sizeof (ACE_TCHAR)); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("TAO(%P|%t) - TAO::SSLIOP::Connection_Handler::open, ") ACE_TEXT("Holy Cow! The remote addr and ") ACE_TEXT("local addr are identical (%s == %s)\n"), @@ -213,7 +213,7 @@ TAO::SSLIOP::Connection_Handler::open (void *) ACE_OS::strcpy (client, ACE_TEXT("*unable to obtain*")); } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SSLIOP connection from ") ACE_TEXT ("client <%s> on [%d]\n"), client, @@ -226,7 +226,7 @@ TAO::SSLIOP::Connection_Handler::open (void *) ACE_OS::strcpy (client, ACE_TEXT("*unable to obtain*")); } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SSLIOP connection accepted from ") ACE_TEXT ("server <%s> on [%d]\n"), client, @@ -382,7 +382,7 @@ TAO::SSLIOP::Connection_Handler::process_listen_point_list ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Listening port [%d] on [%C]\n", listen_point.port, listen_point.host.in ())); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 4752e20c531..2378f49b6e3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -85,7 +85,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver, ACE_Time_Value *timeout) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_SSLIOP (%P|%t) - Connector::connect, ") ACE_TEXT ("looking for SSLIOP connection.\n"))); @@ -137,7 +137,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_SSLIOP (%P|%t) ERROR: ") ACE_TEXT ("Cannot establish trust since ") ACE_TEXT ("no SSLIOP tagged component was ") @@ -171,7 +171,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_SSLIOP (%P|%t) ERROR: ") ACE_TEXT ("Cannot make secure invocation since ") ACE_TEXT ("no SSLIOP tagged component was ") @@ -279,7 +279,7 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) SSLIOP_Connector::corbaloc_scan warning: ") ACE_TEXT("supplied string contains no comma or slash: %s\n"), endpoint)); @@ -433,7 +433,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SSLIOP connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -456,7 +456,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( if (!ssl_endpoint->credentials_set ()) { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Initializing SSLIOP_Endpoint\n") )); @@ -464,7 +464,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( svc_handler) != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ") ACE_TEXT ("service handler.\n"))); @@ -497,7 +497,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( safe_handler (svc_handler); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") ACE_TEXT ("got existing transport[%d]\n"), transport->id ())); @@ -510,7 +510,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( transport, max_wait_time)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect,") ACE_TEXT ("wait for completion failed\n"))); @@ -529,7 +529,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") ACE_TEXT ("making a new connection\n"))); @@ -547,7 +547,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( svc_handler) != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ") ACE_TEXT ("service handler.\n"))); @@ -592,7 +592,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( "eNULL") == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to set eNULL ") ACE_TEXT ("SSL cipher.\n"))); @@ -639,7 +639,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( max_wait_time)) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector::" + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector::" "ssliop_connect, " "wait for completion failed\n")); } @@ -660,7 +660,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( char buffer [MAXHOSTNAMELEN + 6 + 1]; ssl_endpoint->addr_to_string (buffer, sizeof (buffer) - 1); - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SSL connection to ") ACE_TEXT ("<%s:%d> failed (%p)\n"), buffer, @@ -686,7 +686,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( // At this point, the connection has be successfully connected. // #REFCOUNT# is one. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, " "new SSL connection to port %d on transport[%d]\n", remote_address.get_port_number (), @@ -706,7 +706,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - SLIIOP_Connector::ssliop_connect, " "could not add the new connection to cache\n")); } @@ -735,7 +735,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( (void) transport->close_connection (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector [%d]::ssliop_connect, " "could not register the transport " "in the reactor.\n", diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 46e33cd0d63..af4cf50fbcc 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -148,7 +148,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list) if (::X509_check_private_key (x509.in (), evp.in ()) != 1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Private key is not ") ACE_TEXT ("consistent with X.509 certificate"))); @@ -232,7 +232,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_X509 (const ::SSLIOP::File &certificate) if (fp == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) SSLIOP::CredentialsAcquirer::make_X509 - %p\n"), ACE_TEXT ("fopen"))); @@ -252,7 +252,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_X509 (const ::SSLIOP::File &certificate) if (fp == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) SSLIOP::CredentialsAcquirer::make_X509 - %p\n"), ACE_TEXT ("fopen"))); @@ -308,7 +308,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key) if (fp == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) SSLIOP::CredentialsAcquirer::make_EVP_PKEY ") ACE_TEXT ("- %p\n"), ACE_TEXT ("fopen"))); @@ -329,7 +329,7 @@ TAO::SSLIOP::CredentialsAcquirer::make_EVP_PKEY (const ::SSLIOP::File &key) if (fp == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) SSLIOP::CredentialsAcquirer::make_EVP_PKEY ") ACE_TEXT ("- %p\n"), ACE_TEXT ("fopen"))); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 0373200cec8..ed02368b472 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -117,14 +117,14 @@ dump_endpoint (const char* msg, const TAO_Endpoint *other_endpoint) if (endpoint == 0) { - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) endpoint - %s: Unable to cast an endpoint to SSLIOP_Endpoint\n", msg)); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) endpoint - %s: Unable to cast an endpoint to SSLIOP_Endpoint\n", msg)); return; } char hostaddr[MAXHOSTNAMELEN + 16]; int gothost = endpoint->addr_to_string (hostaddr, sizeof hostaddr); - ACE_DEBUG ((LM_INFO, "TAO (%P|%t) SSLIOPEndpoint %s - %@ {%s, ssl=%d, iiop=%d," + ORBSVCS_DEBUG ((LM_INFO, "TAO (%P|%t) SSLIOPEndpoint %s - %@ {%s, ssl=%d, iiop=%d," " qop=%d, trst=(%d,%d), c=%@, crdh=0x%x}, h=0x%x\n", msg, endpoint, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 09cd06c9081..1de1ff61c11 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -161,7 +161,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) session_id_len)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to set the session id ") ACE_TEXT ("context to \'%C\'\n"), session_id_context_)); @@ -191,7 +191,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) if (::SSL_CTX_set_cipher_list (ssl_ctx->context (), "ALL:eNULL") == 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to set eNULL ") ACE_TEXT ("SSL cipher in SSLIOP ") ACE_TEXT ("factory.\n"))); @@ -280,7 +280,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) if (sscanf (ACE_TEXT_ALWAYS_CHAR(argv[curarg]), "%f", &timeout) != 1 || timeout < 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "ERROR: Invalid -SSLAcceptTimeout " "value: %s.\n", argv[curarg]), @@ -347,7 +347,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) if (::SSL_CTX_set_cipher_list (ssl_ctx->context (), ACE_TEXT_ALWAYS_CHAR(argv[curarg])) == 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to set cipher ") ACE_TEXT ("list in SSLIOP ") ACE_TEXT ("factory.\n"))); @@ -374,14 +374,14 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) if( -1 == ssl_ctx->seed_file (ACE_TEXT_ALWAYS_CHAR(path), -1)) { ++errors; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Failed to load ") ACE_TEXT ("more entropy from <%s>: %m\n"), path)); } else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Loaded ") ACE_TEXT ("more entropy from <%s>\n"), path)); } @@ -399,7 +399,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) { if (ssl_ctx->load_trusted_ca (ca_file, ca_dir.in ()) != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to load ") ACE_TEXT ("CA certs from %C%C%C\n"), ((ca_file != 0) ? ca_file : "a file pointed to by " @@ -416,7 +416,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) SSLIOP loaded ") ACE_TEXT ("Trusted Certificates from %C%C%C\n"), ((ca_file != 0) ? ca_file : "a file pointed to by " @@ -453,7 +453,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) // We only want to fail catastrophically if the user specified // a dh parameter file and we were unable to actually find it // and load from it. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) SSLIOP_Factory: ") ACE_TEXT ("unable to set ") ACE_TEXT ("DH parameters <%C>\n"), @@ -463,7 +463,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) SSLIOP_Factory: ") ACE_TEXT ("No DH parameters found in ") ACE_TEXT ("certificate <%C>; either none ") @@ -475,7 +475,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) SSLIOP loaded ") ACE_TEXT ("Diffie-Hellman params ") ACE_TEXT ("from %C\n"), @@ -492,7 +492,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) if (ssl_ctx->certificate (certificate_path, certificate_type) != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to set ") ACE_TEXT ("SSL certificate <%C> ") ACE_TEXT ("in SSLIOP factory.\n"), @@ -503,7 +503,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) SSLIOP loaded ") ACE_TEXT ("SSL certificate ") ACE_TEXT ("from %C\n"), @@ -516,7 +516,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) if (ssl_ctx->private_key (private_key_path, private_key_type) != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to set ") ACE_TEXT ("SSL private key ") ACE_TEXT ("<%C> in SSLIOP factory.\n"), @@ -527,7 +527,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) SSLIOP loaded ") ACE_TEXT ("Private Key ") ACE_TEXT ("from <%C>\n"), diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index fce8f35cd85..ce54bcc271b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -42,7 +42,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor if (tao_current != 0) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) SSLIOP_Invocation_Interceptor::CTOR--setting up SSLIOP Current with slot %d\n", tss_slot)); + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) SSLIOP_Invocation_Interceptor::CTOR--setting up SSLIOP Current with slot %d\n", tss_slot)); tao_current->tss_slot (tss_slot); } else @@ -102,7 +102,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request ( this->ssliop_current_->no_context (); if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl))); + ORBSVCS_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl))); // if // (1) no SSL session state is available (which means that the @@ -158,7 +158,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request ( operation_name.in()); if (TAO_debug_level >= 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) SL2::access_allowed_ex returned %s\n", it_should_happen ? "true" : "false")); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index d36fcaddd00..8b322fbe617 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -171,7 +171,7 @@ TAO::SSLIOP::ORBInitializer::get_tss_slot_id ( if (security_current == 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Unable to obtain TSS slot ID from " "\"SecurityCurrent\" object.\n")); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index c6df3ae8d8c..b371687e1cd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -87,7 +87,7 @@ TAO::SSLIOP::Transport::recv (char *buf, // Now the message has been read if (n == -1 && TAO_debug_level > 4 && errno != ETIME) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Transport[%d]::recv, ") ACE_TEXT ("read failure - %m errno %d\n"), this->id (), @@ -156,7 +156,7 @@ TAO::SSLIOP::Transport::send_message (TAO_OutputCDR &stream, if (n == -1) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Transport::send_message, ") ACE_TEXT ("closing transport %d after fault %p\n"), this->id (), @@ -212,7 +212,7 @@ TAO::SSLIOP::Transport::set_bidir_context_info ( { if (this->get_listen_point (listen_point_list, *acceptor) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Transport::set_bidir_info, ", "error getting listen_point\n")); return; @@ -262,7 +262,7 @@ TAO::SSLIOP::Transport::get_listen_point ( { if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Could not resolve local host") ACE_TEXT (" address in get_listen_point()\n")), -1); @@ -280,7 +280,7 @@ TAO::SSLIOP::Transport::get_listen_point ( local_addr, local_interface.out ()) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Could not resolve local host") ACE_TEXT (" name\n")), -1); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index a0449dfe4d6..e059b265322 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -70,7 +70,7 @@ ACE_Config_Scheduler::create (const char * entry_point) default: delete rt_info[0]; delete[] rt_info; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::create - register_task failed\n")); // @@ TODO: throw something. break; @@ -90,7 +90,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point) case BaseSchedImplType::FAILED: case BaseSchedImplType::ST_UNKNOWN_TASK: default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::lookup - get_rt_info failed\n")); // @@ TODO: throw something. break; @@ -115,7 +115,7 @@ ACE_Config_Scheduler::get (RtecScheduler::handle_t handle) case BaseSchedImplType::FAILED: case BaseSchedImplType::ST_UNKNOWN_TASK: default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::get - lookup_rt_info failed\n")); // @@ TODO: throw something. break; @@ -151,7 +151,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, case BaseSchedImplType::FAILED: case BaseSchedImplType::ST_UNKNOWN_TASK: default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::set - lookup_rt_info failed\n")); // @@ TODO: throw something. break; @@ -166,7 +166,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::priority - priority failed\n")); // TODO: throw something. } @@ -208,7 +208,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, case BaseSchedImplType::FAILED: case BaseSchedImplType::ST_UNKNOWN_TASK: default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "cannot find %d to add dependency", handle)); // TODO: throw something. break; @@ -301,7 +301,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, } // Output the anomaly message - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "%s: %s\n", anomaly_severity_msg, (*anomaly)->description.in ())); @@ -318,7 +318,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, // On a fatal anomaly abort without generating a schedule. case RtecScheduler::ANOMALY_FATAL: // TODO: throw something. - ACE_ERROR ((LM_ERROR, "Schedule failed due to FATAL anomaly.\n")); + ORBSVCS_ERROR ((LM_ERROR, "Schedule failed due to FATAL anomaly.\n")); return; // Otherwise, make sure we didn't get a fatal return type. @@ -327,25 +327,25 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, { case BaseSchedImplType::ST_BAD_INTERNAL_POINTER : // TODO: throw something. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Schedule failed due to bad internal pointer.\n")); return; case BaseSchedImplType::ST_VIRTUAL_MEMORY_EXHAUSTED : // TODO: throw something. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Schedule failed due to insufficient memory.\n")); return; case BaseSchedImplType::THREAD_COUNT_MISMATCH : // TODO: throw something. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Schedule failed due to thread count mismatch.\n")); return; case BaseSchedImplType::TASK_COUNT_MISMATCH : // TODO: throw something. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Schedule failed due to task count mismatch.\n")); return; @@ -376,7 +376,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, case BaseSchedImplType::FAILED: case BaseSchedImplType::ST_UNKNOWN_TASK: default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::schedule - lookup_rt_info failed\n")); // TODO: throw something. break; @@ -405,7 +405,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, case BaseSchedImplType::FAILED: case BaseSchedImplType::ST_UNKNOWN_TASK: default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::schedule - " "lookup_config_info failed\n")); // TODO: throw something. @@ -413,13 +413,13 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, } } - ACE_DEBUG ((LM_DEBUG, "Schedule prepared.\n")); - ACE_DEBUG ((LM_DEBUG, "Dumping to stdout.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Schedule prepared.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Dumping to stdout.\n")); ACE_Scheduler_Factory::dump_schedule (*(infos.ptr()), *(dependencies.ptr()), *(configs.ptr()), *(anomalies.ptr()), 0); - ACE_DEBUG ((LM_DEBUG, "Dump done.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Dump done.\n")); } @@ -430,7 +430,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::dispatch_configuration -" " dispatch_configuration failed\n")); // TODO: throw something. @@ -447,7 +447,7 @@ ACE_Config_Scheduler::last_scheduled_priority (void) if (priority < 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Config_Scheduler::last_scheduled_priority - priorities failed\n")); // TODO: throw something. } diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 9ca891642e7..36b496851ff 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -433,7 +433,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, // swap the handles and point to the caller instead of the called operation if (lookup_rt_info (d.rt_info, temp_info) != SUCCEEDED) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("cannot find %d to add dependency\n"), d.rt_info)); return -1; } @@ -443,13 +443,13 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("unrecognized dependency type %d for %C\n"), d.dependency_type, rt_info->entry_point.in ())); return -1; } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Sched (%t) adding %s dependency to caller: %C\n"), (const ACE_TCHAR *) ((d.dependency_type == RtecBase::TWO_WAY_CALL) ? ACE_TEXT("TWO_WAY") : ACE_TEXT("ONE_WAY")), @@ -510,7 +510,7 @@ ACE_DynScheduler::dispatch_configuration (const Preemption_Priority & p_priority Config_Info *config_info; if (lookup_config_info (p_priority, config_info) != SUCCEEDED) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Config info for priority %lu could not be found\n"), p_priority), -1); @@ -1546,7 +1546,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, task_entries_ [i].has_unresolved_remote_dependencies (1); - ACE_DEBUG ( + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT("Warning: an operation identified by ") ACE_TEXT("\"%C\" has unresolved remote dependencies.\n"), @@ -1562,7 +1562,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, else { // Local node that no one calls and has neither rate nor threads is suspect - ACE_DEBUG ( + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT("Error: operation \"%C\" does not specify a period or\n") ACE_TEXT("visible threads, and is not called by any other operation.\n") @@ -1650,7 +1650,7 @@ ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry) if ((*calling_entry_link)->caller ().dfs_status () == Task_Entry::NOT_VISITED) { // indicate the two tasks are in (the same) dependency cycle - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("Tasks \"%C\" and \"%C\" are part of a call cycle.\n"), (*calling_entry_link)->caller ().rt_info ()->entry_point.in (), entry.rt_info ()->entry_point.in ())); @@ -1758,7 +1758,7 @@ ACE_DynScheduler::store_assigned_info (void) if ((! ordered_dispatch_entries_) || (! (ordered_dispatch_entries_[i])) || (! (ordered_dispatch_entries_[i]->task_entry ().rt_info ()))) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::store_assigned_info () could not store ") ACE_TEXT("priority information (error in internal representation)")), ST_BAD_INTERNAL_POINTER); @@ -1934,7 +1934,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") ACE_TEXT("Could not open schedule file (\"%C\")"), filename)); @@ -1988,7 +1988,7 @@ ACE_DynScheduler::output_dispatch_priorities (FILE *file) int(minimum_critical_priority ())) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") ACE_TEXT("Could not write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2004,7 +2004,7 @@ ACE_DynScheduler::output_dispatch_priorities (FILE *file) ordered_dispatch_entries_[i]->dynamic_subpriority (), ordered_dispatch_entries_[i]->static_subpriority ()) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") ACE_TEXT("Could not write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2029,7 +2029,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") ACE_TEXT("Could not open schedule file (\"%s\")"), filename)); @@ -2048,7 +2048,7 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) "operation ID (nsec) (nsec) (nsec) (nsec) time (nsec) (nsec) (nsec)\n" "--------- ----------- ------- -------- ----- ------ ----------- ------- ------\n") < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") ACE_TEXT("Could not write to schedule file")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2064,7 +2064,7 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) TimeLine_Entry_Link *link; if ((iter.next (link) == 0) || (! link)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") ACE_TEXT("Bad internal pointer\n")), ST_BAD_INTERNAL_POINTER); @@ -2104,7 +2104,7 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) last_entry->stop ())) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") ACE_TEXT("Unable to write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2129,7 +2129,7 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) last_entry->stop ())) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") ACE_TEXT("Unable to write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2156,7 +2156,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Cannot open timeline file (\"%C\")\n"), filename)); @@ -2174,7 +2174,7 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) "operation ID (nsec) (nsec)\n" "--------- ----------- ------ ------\n") < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Cannot write to timeline file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2187,7 +2187,7 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) { if ((iter.next (link) == 0) || (! link)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Bad internal pointer\n")), ST_BAD_INTERNAL_POINTER); @@ -2204,7 +2204,7 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) ACE_U64_TO_U32 (link->entry ().start ()), ACE_U64_TO_U32 (link->entry ().stop ())) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Cannot write to timeline file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2220,7 +2220,7 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) ACE_U64_TO_U32 (link->entry ().start ()), ACE_U64_TO_U32 (link->entry ().stop ())) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Cannot write to timeline file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); @@ -2361,7 +2361,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) if ((! up_to_date_) || (! timeline_)) { status = NOT_SCHEDULED; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_timeline: ") ACE_TEXT("Schedule not generated"))); } @@ -2373,7 +2373,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) if (! file) { status = UNABLE_TO_OPEN_SCHEDULE_FILE; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_timeline: ") ACE_TEXT("Could not open schedule file"))); } @@ -2384,7 +2384,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) if (ACE_OS::fprintf (file, "%s\n\n", heading) < 0) { status = UNABLE_TO_WRITE_SCHEDULE_FILE; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_timeline: ") ACE_TEXT("Could not write to schedule file"))); } diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index eced05efa7b..5e0b5d1e431 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -134,14 +134,14 @@ TAO_RT_Info_Ex::reset (u_long reset_flags) ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, volatile_token); - //ACE_DEBUG((LM_DEBUG, "Removing Entries for RT_Info: %d, entry_ptr: %x\n", handle, entry_ptr)); + //ORBSVCS_DEBUG((LM_DEBUG, "Removing Entries for RT_Info: %d, entry_ptr: %x\n", handle, entry_ptr)); if (entry_ptr) { entry_ptr->remove_tuples (reset_flags); } else { - ACE_ERROR ((LM_ERROR, "Pointer to associated entry is zero.")); + ORBSVCS_ERROR ((LM_ERROR, "Pointer to associated entry is zero.")); } } @@ -158,7 +158,7 @@ TAO_RT_Info_Ex::enabled_state (RtecScheduler::RT_Info_Enabled_Type_t enabled_in) } else { - ACE_ERROR ((LM_ERROR, "Pointer to associated entry is zero.")); + ORBSVCS_ERROR ((LM_ERROR, "Pointer to associated entry is zero.")); } } @@ -273,7 +273,7 @@ remove_tuples (u_long tuple_flags) if (orig_tuple_iter.next (tuple_ptr_ptr) == 0 || tuple_ptr_ptr == 0 || *tuple_ptr_ptr == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Failed to access tuple under iterator")); return; } @@ -323,7 +323,7 @@ insert_tuple (TAO_RT_Info_Tuple &tuple, if (tuple_iter.next (tuple_ptr_ptr) == 0 || tuple_ptr_ptr == 0 || *tuple_ptr_ptr == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Failed to access tuple under iterator"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to access tuple under iterator"), -1); } // Update existing tuples @@ -388,7 +388,7 @@ update_tuple (TAO_RT_Info_Ex &info, if (tuple_iter.next (tuple_ptr_ptr) == 0 || tuple_ptr_ptr == 0 || *tuple_ptr_ptr == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Failed to access tuple under iterator"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to access tuple under iterator"), -1); } else if ((*tuple_ptr_ptr)->period < info.period) { @@ -429,7 +429,7 @@ register_tuples (TAO_RT_Info_Tuple ** tuple_ptr_array, if (tuple_iter.next (tuple_ptr_ptr) == 0 || tuple_ptr_ptr == 0 || *tuple_ptr_ptr == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Failed to access tuple under iterator"), -1); + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to access tuple under iterator"), -1); } else { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 467b0e13f8a..2bd46205fea 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -52,7 +52,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) // modifications that are applied to each node unconditionally. if (this->unconditional_action (rse) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::" "visit: error from unconditional action.\n"), -1); } @@ -64,7 +64,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) result = this->precondition (rse); if (result < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::" "visit: error from precondition evaluation.\n"), -1); } @@ -75,7 +75,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) // modifications on the node prior to visiting its successors. if (this->prefix_action (rse) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::" "visit: error from prefix action.\n"), -1); } @@ -101,7 +101,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) if (rt_info_map_.find ((*dependency_set) [i].rt_info, next_rt_info) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, "RT_Info (%i) not found.\n", + ORBSVCS_ERROR_RETURN ((LM_ERROR, "RT_Info (%i) not found.\n", (*dependency_set) [i].rt_info), -1); } @@ -109,7 +109,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) if (next_rt_info == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "RT_Info in map was null.\n"), + ORBSVCS_ERROR_RETURN ((LM_ERROR, "RT_Info in map was null.\n"), -1); } @@ -121,7 +121,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) next_rt_info->volatile_token); if (next_rse == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Entry pointer in RT_Info was null.\n"), -1); } @@ -133,7 +133,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) (*dependency_set) [i]); if (result < 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::visit: " "error from pre-recursion action.\n"), -1); @@ -152,7 +152,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) // modifications on the node after visiting all its successors. if (this->postfix_action (rse) < 0) { - ACE_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::" + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_RSE_Dependency_Visitor::" "visit: error from postfix action.\n"), -1); } } @@ -441,7 +441,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, ++this->number_of_cycles_; } - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "RT_Infos \"%s\" and \"%s\" are part of dependency cycle %d.\n", entry.actual_rt_info ()->entry_point.in (), successor.actual_rt_info ()->entry_point.in (), @@ -503,7 +503,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, // Do not allow conjunction nodes for now. if (entry.actual_rt_info ()->info_type == RtecScheduler::CONJUNCTION) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Conjunction Nodes are not supported currently.")), -1); } @@ -636,7 +636,7 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) { ++this->unresolved_remotes_; - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "RT_Info \"%s\" has unresolved " "remote dependencies.\n", rse.actual_rt_info ()->entry_point.in ())); @@ -645,7 +645,7 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) { ++this->unresolved_locals_; - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "RT_Info \"%s\" has unresolved " "local dependencies.\n", rse.actual_rt_info ()->entry_point.in ())); @@ -656,7 +656,7 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) // Specification error: any RT_Info that specifies threads // must also specify a period. ++this->thread_specification_errors_; - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "RT_Info \"%s\" specifies %1d " "threads, but no period.\n", rse.actual_rt_info ()->entry_point.in (), @@ -692,7 +692,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, if (orig_tuple_iter.next (tuple_ptr_ptr) == 0 || tuple_ptr_ptr == 0 || *tuple_ptr_ptr == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Failed to access tuple under iterator")); return -1; } @@ -701,7 +701,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, // function on existing rate tuples. #ifdef SCHEDULER_LOGGING - ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", + ORBSVCS_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", successor.actual_rt_info ()->handle, &successor, (*tuple_ptr_ptr))); @@ -725,7 +725,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, if (prop_tuple_iter.next (tuple_ptr_ptr) == 0 || tuple_ptr_ptr == 0 || *tuple_ptr_ptr == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Failed to access tuple under iterator")); return -1; } @@ -734,7 +734,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, // function on existing rate tuples. #ifdef SCHEDULER_LOGGING - ACE_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", + ORBSVCS_DEBUG((LM_DEBUG, "Inserting new propagated tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", successor.actual_rt_info ()->handle, &successor, (*tuple_ptr_ptr))); @@ -789,7 +789,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig { int result = 0; #ifdef SCHEDULER_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Priority_Visitor visiting %s[%d],crit=%d,period=%d\n", rse.actual_rt_info ()->entry_point.in(), rse.actual_rt_info ()->handle, @@ -810,7 +810,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig else { #ifdef SCHEDULER_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Previous entry %s[%d],crit=%d,period=%d\n", previous_entry_->actual_rt_info ()->entry_point.in(), previous_entry_->actual_rt_info ()->handle, @@ -847,7 +847,7 @@ TAO_RSE_Priority_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::visit (TAO_Reconfig ++priority_; #ifdef SCHEDULER_LOGGING - ACE_DEBUG ((LM_DEBUG, "New priority %d formed\n", priority_)); + ORBSVCS_DEBUG ((LM_DEBUG, "New priority %d formed\n", priority_)); #endif os_priority_ = ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO, os_priority_, @@ -1041,7 +1041,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, const RtecScheduler::Dependency_Info & /* di */) { #ifdef SCHEDULER_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n", entry.actual_rt_info ()->entry_point.in(), entry.actual_rt_info ()->handle, @@ -1063,7 +1063,7 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, successor.actual_rt_info ()->criticality = max_crit; #ifdef SCHEDULER_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Successor's new criticality is %d\n", successor.actual_rt_info ()->criticality)); #endif diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index 67633c43ecb..3144125bd1e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -62,7 +62,7 @@ TAO_Reconfig_Scheduler (int enforce_schedule_stability, critical_utilization_threshold_ (critical_utilization_threshold) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler default ctor.\n")); #endif /* SCHEDULER_LOGGING */ } @@ -96,7 +96,7 @@ TAO_Reconfig_Scheduler (int config_count, critical_utilization_threshold_ (critical_utilization_threshold) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler alternative ctor.\n")); #endif /* SCHEDULER_LOGGING */ @@ -115,7 +115,7 @@ TAO_Reconfig_Scheduler (int config_count, } catch (const CORBA::SystemException& ) { - ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, " + ORBSVCS_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, " "ACE_LOCK>::TAO_Reconfig_Scheduler " "system exception: cannot init scheduler.\n")); } @@ -129,7 +129,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: ~TAO_Reconfig_Scheduler () { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler dtor.\n")); #endif /* SCHEDULER_LOGGING */ @@ -139,7 +139,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: } catch (const CORBA::SystemException& ) { - ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, " + ORBSVCS_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, " "ACE_LOCK>::~TAO_Reconfig_Scheduler " "exception: cannot close scheduler.\n")); } @@ -163,7 +163,7 @@ init (int config_count, u_long stability_flags) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::init.\n")); #endif /* SCHEDULER_LOGGING */ @@ -311,7 +311,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::close.\n")); #endif /* SCHEDULER_LOGGING */ @@ -426,7 +426,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create (const char *entry_point) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::create.\n")); #endif /* SCHEDULER_LOGGING */ @@ -453,7 +453,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: lookup (const char * entry_point) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::lookup.\n")); #endif /* SCHEDULER_LOGGING */ @@ -475,7 +475,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get (RtecScheduler::handle_t handle) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::get.\n")); #endif /* SCHEDULER_LOGGING */ @@ -518,7 +518,7 @@ set (::RtecScheduler::handle_t handle, ::RtecScheduler::Info_Type_t info_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set.\n")); #endif /* SCHEDULER_LOGGING */ @@ -574,7 +574,7 @@ reset (RtecScheduler::handle_t handle, RtecScheduler::Info_Type_t info_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::reset.\n")); #endif /* SCHEDULER_LOGGING */ @@ -633,7 +633,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_seq (const RtecScheduler::RT_Info_Set& infos) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_seq.\n")); #endif /* SCHEDULER_LOGGING */ @@ -689,7 +689,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: reset_seq (const RtecScheduler::RT_Info_Set& infos) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::reset_seq.\n")); #endif /* SCHEDULER_LOGGING */ @@ -767,7 +767,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: replace_seq (const RtecScheduler::RT_Info_Set& infos) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::replace_seq.\n")); #endif /* SCHEDULER_LOGGING */ @@ -905,7 +905,7 @@ entry_point_priority (const char * entry_point, RtecScheduler::Preemption_Priority_t& p_priority) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::entry_point_priority.\n")); #endif /* SCHEDULER_LOGGING */ @@ -933,7 +933,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc RtecScheduler::Dependency_Type_t dependency_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::add_dependency.\n")); #endif /* SCHEDULER_LOGGING */ @@ -962,7 +962,7 @@ remove_dependency (RtecScheduler::handle_t handle, RtecScheduler::Dependency_Type_t dependency_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::remove_dependency.\n")); #endif /* SCHEDULER_LOGGING */ @@ -991,7 +991,7 @@ set_dependency_enable_state (RtecScheduler::handle_t handle, RtecScheduler::Dependency_Enabled_Type_t enabled) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_dependency_enable_state.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1012,7 +1012,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_dependency_enable_state_seq.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1040,7 +1040,7 @@ set_rt_info_enable_state (RtecScheduler::handle_t handle, RtecScheduler::RT_Info_Enabled_Type_t enabled) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_rt_info_enable_state.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1072,7 +1072,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_rt_info_enable_state_seq.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1125,11 +1125,11 @@ compute_scheduling (CORBA::Long minimum_priority, this->get_config_info_set (configs); #if defined (SCHEDULER_DUMP) - ACE_DEBUG ((LM_TRACE, "Schedule prepared.\n")); - ACE_DEBUG ((LM_TRACE, "Dumping to stdout.\n")); + ORBSVCS_DEBUG ((LM_TRACE, "Schedule prepared.\n")); + ORBSVCS_DEBUG ((LM_TRACE, "Dumping to stdout.\n")); ACE_Scheduler_Factory::dump_schedule (*(infos.ptr()), *(dependencies.ptr()), *(configs.ptr()), *(anomalies.ptr()), 0); - ACE_DEBUG ((LM_TRACE, "Dump done.\n")); + ORBSVCS_DEBUG ((LM_TRACE, "Dump done.\n")); #endif // SCHEDULER_DUMP return; @@ -1145,7 +1145,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::compute_scheduling.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1268,7 +1268,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, CORBA::NO_MEMORY ()); } - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "cutil = %f, ncutil = %f\n", this->critical_utilization_, this->noncritical_utilization_)); @@ -1404,7 +1404,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::Dispatching_Type_t & d_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::dispatch_configuration.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1440,7 +1440,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: last_scheduled_priority (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::last_scheduled_priority.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1507,7 +1507,7 @@ create_i (const char *entry_point, int ignore_duplicates) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::create_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1634,14 +1634,14 @@ set_i (TAO_RT_Info_Ex *rt_info, RtecScheduler::Info_Type_t info_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_i.\n")); #endif /* SCHEDULER_LOGGING */ // Do not allow conjunction nodes for now. if (info_type == RtecScheduler::CONJUNCTION) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("Conjunction Nodes are not supported currently."))); throw RtecScheduler::INTERNAL (); } @@ -1664,7 +1664,7 @@ set_i (TAO_RT_Info_Ex *rt_info, TAO_Reconfig_Scheduler_Entry * rse_ptr = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, rt_info->volatile_token); -// ACE_DEBUG((LM_DEBUG, "Updating or inserting tuple for RT_Info: %d, entry_ptr: %x\n", rt_info->handle, rse_ptr)); +// ORBSVCS_DEBUG((LM_DEBUG, "Updating or inserting tuple for RT_Info: %d, entry_ptr: %x\n", rt_info->handle, rse_ptr)); if (rse_ptr == 0) { throw RtecScheduler::INTERNAL (); @@ -1687,7 +1687,7 @@ set_i (TAO_RT_Info_Ex *rt_info, // Make sure the new tuple is cleaned up if we exit abruptly. auto_ptr<TAO_RT_Info_Tuple> tuple_auto_ptr (tuple_ptr); -// ACE_DEBUG((LM_DEBUG, "Tuple not found. Inserting new tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", +// ORBSVCS_DEBUG((LM_DEBUG, "Tuple not found. Inserting new tuple for RT_Info: %d, entry_ptr: 0x%x, tuple_ptr: 0x%x\n", // rt_info->handle, // rse_ptr, // tuple_ptr)); @@ -1725,7 +1725,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: lookup_i (const char * entry_point) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::lookup_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1779,7 +1779,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende RtecScheduler::Dependency_Enabled_Type_t enabled) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::add_dependency_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1873,7 +1873,7 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe RtecScheduler::Dependency_Type_t dependency_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::remove_dependency_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -1944,7 +1944,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle, RtecScheduler::Dependency_Enabled_Type_t enabled) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::set_dependency_enable_state_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2018,7 +2018,7 @@ map_dependency_i (RtecScheduler::handle_t key, RtecScheduler::Dependency_Enabled_Type_t enabled) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::map_dependency_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2062,7 +2062,7 @@ unmap_dependency_i (RtecScheduler::handle_t key, RtecScheduler::Dependency_Type_t dependency_type) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::unmap_dependency_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2128,7 +2128,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key, RtecScheduler::Dependency_Enabled_Type_t enabled) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::map_dependency_enable_state_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2181,7 +2181,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: dfs_traverse_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::dfs_traverse_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2219,7 +2219,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: detect_cycles_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::detect_cycles_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2263,7 +2263,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: perform_admission_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::perform_admission_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2323,7 +2323,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: crit_dfs_traverse_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::crit_dfs_traverse_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2357,7 +2357,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: propagate_criticalities_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::propagate_criticalities_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2399,7 +2399,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: propagate_characteristics_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::propagate_characteristics_i.\n")); #endif /* SCHEDULER_LOGGING */ @@ -2439,15 +2439,15 @@ assign_priorities_i (void) { int i; #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::assign_priorities_i.\n")); - ACE_DEBUG ((LM_DEBUG, "Scheduler::entry ptr array before sorting is\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Scheduler::entry ptr array before sorting is\n")); for (i = 0; i < this->rt_info_count_; ++i) { RtecScheduler::RT_Info* rt_info_ptr = this->entry_ptr_array_[i]->actual_rt_info (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n", rt_info_ptr->entry_point.in (), rt_info_ptr->handle, @@ -2467,12 +2467,12 @@ assign_priorities_i (void) reinterpret_cast<COMP_FUNC> (RECONFIG_SCHED_STRATEGY::total_priority_comp)); #ifdef SCHEDULER_LOGGING - ACE_DEBUG ((LM_DEBUG, "Scheduler::qsorted array is\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Scheduler::qsorted array is\n")); for (i = 0; i < this->rt_info_count_; ++i) { RtecScheduler::RT_Info* rt_info_ptr = this->entry_ptr_array_[i]->actual_rt_info (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n", rt_info_ptr->entry_point.in (), rt_info_ptr->handle, @@ -2582,7 +2582,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: refresh_tuple_ptr_array_i (void) { #if defined (SCHEDULER_LOGGING) - ACE_DEBUG ((LM_TRACE, + ORBSVCS_DEBUG ((LM_TRACE, " TAO_Reconfig_Scheduler::refresh_tuple_ptr_array_i.\n")); #endif /* SCHEDULER_LOGGING */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index b94d0709197..5c04bf5a6f8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -200,7 +200,7 @@ Task_Entry::disjunctive_merge (Dependency_Type dt, // Propagate the unresolved remote dependency flag, and // issue a debug scheduler warning. this->has_unresolved_remote_dependencies (1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Warning: an operation identified by " "\"%s\" has unresolved remote dependencies.\n", (const char*) this->rt_info ()->entry_point)); @@ -224,7 +224,7 @@ Task_Entry::disjunctive_merge (Dependency_Type dt, // Propagate the unresolved local dependency flag, and // issue a debug scheduler warning. this->has_unresolved_local_dependencies (1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Warning: an operation identified by " "\"%s\" has unresolved local dependencies.\n", (const char*) this->rt_info ()->entry_point)); @@ -298,7 +298,7 @@ Task_Entry::conjunctive_merge (Dependency_Type dt, // Propagate the unresolved remote dependency flag, and // issue a debug scheduler warning. this->has_unresolved_remote_dependencies (1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Warning: an operation identified by " "\"%s\" has unresolved remote dependencies.\n", (const char*) this->rt_info ()->entry_point)); @@ -321,7 +321,7 @@ Task_Entry::conjunctive_merge (Dependency_Type dt, // Propagate the unresolved local dependency flag, and // issue a debug scheduler warning. this->has_unresolved_local_dependencies (1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Warning: an operation identified by " "\"%s\" has unresolved local dependencies.\n", (const char*) this->rt_info ()->entry_point)); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 4c8812fff85..5cd3d34e84b 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -188,7 +188,7 @@ int ACE_Scheduler::number_of_dependencies(RT_Info& rt_info) int ACE_Scheduler::add_dependency(RT_Info* rt_info, const Dependency_Info& d) { - // ACE_DEBUG ((LM_DEBUG, "Sched (%t) adding dependency to: %s\n", + // ORBSVCS_DEBUG ((LM_DEBUG, "Sched (%t) adding dependency to: %s\n", // (const char*)rt_info->entry_point)); RtecScheduler::Dependency_Set& set = rt_info->dependencies; int l = set.length(); @@ -249,7 +249,7 @@ ACE_Scheduler::dispatch_configuration (const Preemption_Priority & p_priority, Config_Info *config_info; if (lookup_config_info (p_priority, config_info) != SUCCEEDED) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Config info for priority %lu could not be found\n", p_priority), -1); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 50b4d4a843e..902d657bc8c 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -169,7 +169,7 @@ ACE_Strategy_Scheduler::assign_priorities ( default: // Should never reach here: something *bad* has happened. - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, "Priority assignment failure: tasks" " \"%s\" and \"%s\" are out of order.\n", @@ -309,7 +309,7 @@ ACE_Strategy_Scheduler::assign_subpriorities ( default: // We should never reach here: something *bad* has happened. - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, "Static subpriority assignment failure: tasks" " \"%s\" and \"%s\" are out of order.\n", @@ -335,7 +335,7 @@ ACE_Strategy_Scheduler::assign_subpriorities ( default: // We should never reach here: something *bad* has happened. - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, "Dynamic subpriority assignment failure: tasks" " \"%s\" and \"%s\" are out of order.\n", @@ -364,7 +364,7 @@ ACE_Strategy_Scheduler::assign_subpriorities ( default: // We should never reach here: something *bad* has happened. - ACE_ERROR (( + ORBSVCS_ERROR (( LM_ERROR, "Priority assignment failure: tasks" " \"%s\" and \"%s\" are out of order.\n", diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 99b2825be99..c1c3d0a25e0 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -127,7 +127,7 @@ int ACE_Scheduler_Factory::use_runtime (int cc, POD_RT_Info rti[]) { if (server_ != 0 || TAO_SF_entry_count != -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_Scheduler_Factory::use_runtime - ") ACE_TEXT("server already configured\n")), -1); @@ -159,7 +159,7 @@ static_server (void) { server_ = ace_scheduler_factory_data->scheduler_._this (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("ACE_Scheduler_Factory - configured static server\n"))); } catch (const CORBA::Exception& ex) @@ -228,7 +228,7 @@ ACE_Scheduler_Factory::server (void) server_ = static_server (); if (server_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_Scheduler_Factor::server - ") ACE_TEXT("no scheduling service configured\n")), 0); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 390fe24f253..df469e7ab0b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -132,7 +132,7 @@ TAO::Security::AccessDecision::~AccessDecision () TAO::Security::AccessDecision::OBJECT_KEY TAO::Security::AccessDecision::map_key_from_objref (CORBA::Object_ptr /*obj */) { - ACE_ERROR ((LM_ERROR, "map_key_from_objref is currently not implemented\n")); + ORBSVCS_ERROR ((LM_ERROR, "map_key_from_objref is currently not implemented\n")); throw CORBA::NO_IMPLEMENT(); @@ -160,7 +160,7 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // Couldn't find the IOR in the map, so we use the default access_decision = this->default_allowance_decision_; if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) SL2_AccessDecision::access_decision(%x,%s)" " NOT FOUND using default %d\n", hash.operator()(key), @@ -168,7 +168,7 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, } else if (TAO_debug_level >= 3) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t) SL2_AccessDecision::access_decision(%x,%s)" " found with decision %d\n", hash.operator()(key), @@ -241,7 +241,7 @@ TAO::Security::AccessDecision::add_object { // rebind shouldn't fail under normal circumstances if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t): SL2_AccessDecision::add_object(%x,%d) " "unexpectedly failed (errno=%d)\n", hash.operator()(key), @@ -255,7 +255,7 @@ TAO::Security::AccessDecision::add_object else { if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t): SL2_AccessDecision::add_object(%x,%d) okay\n", hash.operator()(key), allow_insecure_access)); @@ -287,7 +287,7 @@ TAO::Security::AccessDecision::remove_object { // ignore b/c we don't care...maybe log a debug message for info if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t): SL2_AccessDecision::remove_object(%x) " "object not found in access map\n", hash.operator()(key))); @@ -295,7 +295,7 @@ TAO::Security::AccessDecision::remove_object else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TAO (%P|%t): SL2_AccessDecision::remove_object(%x) " " unexpected error during unbind from map (errno=%d\n)", hash.operator()(key), diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 52a1c563892..c33b252957c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -29,7 +29,7 @@ TAO::Security::ORBInitializer::pre_init ( if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) Security_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp index f4e8c0e1f43..a85bd530c09 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp @@ -1,7 +1,7 @@ // $Id$ #include "orbsvcs/Shutdown_Utilities.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -49,7 +49,7 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals) if (i != 10) #endif { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "WARNING: Failed to register signal handler " "for signal %d: %p\n", i, ACE_TEXT ("register_handler"))); @@ -66,7 +66,7 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals) } if (! did_register) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "WARNING: Service_Shutdown did not register any signals.\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index a0dc2ef0702..78a46f3eac7 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -20,6 +20,7 @@ project(Svc_Utils) : orbsvcslib, orbsvcs_output, install, portableserver, tao_ve Time_Utilities.cpp IOR_Multicast.cpp Daemon_Utilities.cpp + Log_Macros.cpp } Header_Files { diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index dca1d520b5e..917bad7f334 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -25,7 +25,7 @@ TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value, 0, ACE_Time_Value::zero, ACE_Time_Value(timer_value,timer_value_usecs)) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "%p\n", "schedule_timer ()")); } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index a6c436edf00..92f7dbc82a6 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -40,7 +40,7 @@ TAO_Time_Service_Server::universal_time (void) PortableServer::ServantBase_var xfer = uto; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Returning a UTO\n")); return uto->_this (); diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 88fcbe7dd24..9aba4f4ec4c 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -49,7 +49,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, (*value)->universal_time (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n" "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n", UTO_server->time (), @@ -78,7 +78,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "\nUpdated time from %d servers in the network", no_of_servers)); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 00267cfddd7..db14a4b42ba 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -47,7 +47,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void) { const char *tmp = localhost.get_host_addr (); if (tmp == 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO Trading Service (%P|%t) ") ACE_TEXT ("TAO_Trading_Loader ") ACE_TEXT ("- %p\n\n"), @@ -66,7 +66,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void) *dot = '_') continue; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Trading Service %C initializing.\n", trader_name)); @@ -126,7 +126,7 @@ TAO_Trading_Loader::fini (void) CosTrading::LinkNameSeq_var link_name_seq = our_link->list_links (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Unlinking from federated traders.\n")); for (CORBA::ULong j = 0; @@ -136,12 +136,12 @@ TAO_Trading_Loader::fini (void) CORBA::ULong i = link_name_seq->length () - j - 1; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Describing the next link.\n")); CosTrading::Link::LinkInfo_var link_info = our_link->describe_link (link_name_seq[i]); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Removing link to %C.\n", static_cast<const char *> (link_name_seq[i]))); our_link->remove_link (link_name_seq[i]); @@ -150,12 +150,12 @@ TAO_Trading_Loader::fini (void) remote_lookup = link_info->target.in (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = remote_lookup->link_if (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Removing its link to us.\n")); if (this->bootstrapper_) @@ -239,7 +239,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, if (CORBA::is_nil (adapter.in ())) { - ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); + ORBSVCS_ERROR ((LM_ERROR, "Nil IORTable\n")); } else { @@ -273,23 +273,23 @@ TAO_Trading_Loader::bootstrap_to_federation (void) CORBA::ORB_var orb = this->orb_manager_.orb (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Bootstrapping to another Trading Service.\n")); CORBA::Object_var trading_obj = orb->resolve_initial_references ("TradingService"); if (CORBA::is_nil (trading_obj.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "We're all alone. " "Unable to link to other traders.\n"), -1); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = CosTrading::Lookup::_narrow (trading_obj.in ()); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Obtaining the link interface.\n")); CosTrading::Link_var link_if = lookup_if->link_if (); @@ -301,26 +301,26 @@ TAO_Trading_Loader::bootstrap_to_federation (void) CosTrading::Link_ptr our_link = trd_comp.link_if (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Linking found trader to self.\n")); link_if->add_link (this->name_.in (), our_lookup, CosTrading::always, CosTrading::always); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Linking self to found trader.\n")); our_link->add_link ("Bootstrap", lookup_if.in (), CosTrading::always, CosTrading::always); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Retrieving list of known linked traders.\n")); CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Linking self to all linked traders.\n")); for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; @@ -330,7 +330,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void) if (ACE_OS::strcmp (static_cast<const char *> (link_name_seq[i]), this->name_.in ()) != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Getting info for link %s.\n", static_cast<const char *> (link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = @@ -339,19 +339,19 @@ TAO_Trading_Loader::bootstrap_to_federation (void) CosTrading::Lookup_ptr remote_lookup; remote_lookup = link_info->target.in (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = remote_lookup->link_if (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Creating a link to me from it.\n")); remote_link->add_link (this->name_.in (), our_lookup, CosTrading::always, CosTrading::always); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "*** Creating a link to it from me.\n")); our_link->add_link (link_name_seq[i], remote_lookup, @@ -404,7 +404,7 @@ TAO_Trading_Loader::init_multicast_server (void) port, ACE_DEFAULT_MULTICAST_ADDR, TAO_SERVICEID_TRADINGSERVICE) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Failed to init IOR multicast.\n"), -1); } @@ -412,10 +412,10 @@ TAO_Trading_Loader::init_multicast_server (void) // Register event handler for the ior multicast. if (reactor->register_handler (&this->ior_multicast_, ACE_Event_Handler::READ_MASK) == -1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "cannot register Event handler\n")); else - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "The multicast server setup is done.\n")); // Other trader instances will bootstrap to us. @@ -453,7 +453,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) ACE_OS::fopen (file_name, ACE_TEXT("w")); if (this->ior_output_file_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", file_name), -1); arg_shifter.consume_arg (); |