diff options
author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 18:54:38 +0000 |
---|---|---|
committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 18:54:38 +0000 |
commit | fbb34b996992b0fbd0a57f01d857e4eacaaef4e0 (patch) | |
tree | e1f3e0c4523a47f69d333c664390996570c9ab68 | |
parent | 74bc1a6ae95311079d67ae9b3764a08191468490 (diff) | |
download | ATCD-fbb34b996992b0fbd0a57f01d857e4eacaaef4e0.tar.gz |
Merge from trunk
625 files changed, 8328 insertions, 4098 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3c10f5b5edc..c157d57a4ff 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,1690 @@ +Thu May 2 09:00:38 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp: + + Clean up issues related to restarting the locator with persisted info. + +Wed May 1 21:06:50 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + Repopulate the pinger with all known servers on a restart with + a persistent store. This helps the list -a command return + accurate results. Also list -a considers all final states that + are not LS_DEAD to be be equivalent to alive. + + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Ensure that when a server is in a final state of LS_LAST_TRANSIENT + a new listener will be notified of that state. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/README: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Add new test variants for listing and locator restarts. + +Wed May 1 14:16:54 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Clear the result returned by the tao_imr when it is expected to + return a non-zero value. + +Wed May 1 13:32:09 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: + + The test does not require persistence, removing it allows the test + to work as intended on MacOS. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/README: + + Document the new test variations. + +Tue Apr 30 20:31:14 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_other_tests.lst: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Fix the new hidden server test so it is portable and added to the + nightly builds. + +Tue Apr 30 17:13:13 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_3384_Regression/Server_i.cpp: + Fixed OpenVMS compile error + +Tue Apr 30 16:29:22 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Added a new -hide_server variant to test failure notification from + the activator. + +Tue Apr 30 15:18:30 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + Add handling of child death notification during the server + start up process. This is necessary on unix style platforms + where the activator will "succeed" with a fork and later + fail the exec. This puts the locator in a state of expecting + a server_is_running that will never come. For this to work, + the Activator must be run with the -l option to notify the + locator of child death. + +Mon Apr 29 16:35:35 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_other_tests.lst: + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + Clean up and add more debugging output. Fix the scenario where a + registered server takes longer than 16.610 seconds to get from + creating a POA to activating that POA. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp: + + Add a test variant for using the IMR command line utility to + start a delayed server to validate that use case. + +Sun Apr 28 14:37:50 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Fix for some 64-bit windows builds + +Fri Apr 26 16:35:54 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Reworked the ping timinging to avoid potential deadlocks + and add more permanent debugging. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Enhance the debug log management. + +Thu Apr 25 21:04:51 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + add -debuglog variant to have each process write output to a separate + log file with timestamps. + +Thu Apr 25 18:42:02 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + * tao/IORTable/Async_Table_Adapter.cpp: + * tao/IORTable/Locate_ResponseHandler.cpp: + + Scoreboard cleanup. + +Wed Apr 24 14:45:54 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/tao_imr_i.h: + + Include the correct version of ImplRepoC.h for the tao_imr tool. + +Wed Apr 24 08:21:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> + + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp: + + Thread unsafe singleton TAO::Unknown_IDL_Type::lock_i () + initialization, used with any demarshaling, moved into dynamic + library loading initalization. This now happens prior to main + which is single threaded. Priviously, and only very rarely, multiple + threads attempt to demarshal the "first" Unknown_IDL_Type + and they all race to initialise the lock resulting in non-multual + exculsion and multiple partial locks being created, followed by + pure virtual functions being called and finaly aborts. + Failure occured appoximatly once every 300000 startups making this + impossialble to test and hard to detect. + +Tue Apr 23 17:13:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + Scoreboard cleanup for QNX and corba_e builds. + +Tue Apr 23 16:12:25 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp: + * orbsvcs/tests/ImplRepo/scale_clients/server.cpp: + * orbsvcs/tests/ImplRepo/servers_list/server.cpp: + + More static-linked fixes. + +Tue Apr 23 15:41:07 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc: + + Support for static-linked builds + +Tue Apr 23 14:45:23 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/IORTable/Async_IORTable.mpc: + * tao/IORTable/IORTable.mpc: + + Be explicit with the resource and package file assignments. + +Mon Apr 22 19:56:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/IORTable/Async_IORTable.h: + * tao/IORTable/Async_IORTable.cpp: + * tao/IORTable/Async_IORTable.mpc: + * tao/IORTable/Async_IORTable.pidl: + * tao/IORTable/Async_IOR_Table_Impl.h: + * tao/IORTable/Async_IOR_Table_Impl.cpp: + * tao/IORTable/Async_Table_Adapter.h: + * tao/IORTable/Async_Table_Adapter.cpp: + * tao/IORTable/IORTable.mpc: + * tao/IORTable/Locate_ResponseHandler.h: + * tao/IORTable/Locate_ResponseHandler.inl: + * tao/IORTable/Locate_ResponseHandler.cpp: + * tao/IORTable/TAO_Async_IORTable.pc.in: + * tao/IORTable/TAO_Async_IORTable.rc: + + Move the Async_IORTable sources back into the IORTable directory + even though it still builds as a separate library. This eases a + maintenance burden with some dependant projects that build the + ImR service. + + * tests/IORTable_Locator/async_server.cpp: + * orbsvcs/ImplRepo_Service/INS_Locator.h: + + These explicitly reference Async_IORTable headers. + + + * tao/Async_IORTable: + * tao/Async_IORTable/Async_IORTable.h: + * tao/Async_IORTable/Async_IORTable.cpp: + * tao/Async_IORTable/Async_IORTable.mpc: + * tao/Async_IORTable/Async_IORTable.pidl: + * tao/Async_IORTable/Async_IOR_Table_Impl.h: + * tao/Async_IORTable/Async_IOR_Table_Impl.cpp: + * tao/Async_IORTable/Async_Table_Adapter.h: + * tao/Async_IORTable/Async_Table_Adapter.cpp: + * tao/Async_IORTable/Locate_ResponseHandler.h: + * tao/Async_IORTable/Locate_ResponseHandler.inl: + * tao/Async_IORTable/Locate_ResponseHandler.cpp: + * tao/Async_IORTable/TAO_Async_IORTable.pc.in: + * tao/Async_IORTable/TAO_Async_IORTable.rc: + + Removed these files. + +Mon Apr 22 19:13:01 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Fix a memory leak related to liveness callback handlers. + +Mon Apr 22 17:53:36 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + The ImR locator binary can't link to the ImR_Client library + since it should be using the async stubs instead. + +Mon Apr 22 15:05:31 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/ORB_Core.cpp: + + Fix an uninitialized pointer + +Mon Apr 22 14:54:18 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * tao/ImR_Client/ImplRepo.idl: + * tao/ImR_Client/ServerObject.idl: + + Fixed fuzz errors. + +Fri Apr 19 19:17:11 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + + Fixed fuzz error in use of the new ACE log category macros. + +Fri Apr 19 16:08:52 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + * tao/Async_IORTable/Async_Table_Adapter.cpp: + + Clean up covarity related issues. + + * tao/Async_IORTable/Async_IOR_Table_Impl.cpp: + + fix to ensure that if the Async IORTable is intialized with a + non-async capable locator, it still works. + + * bin/tao_orb_tests.lst: + + * tests/IORTable_Locator/Test.mpc: + * tests/IORTable_Locator/async_server.cpp: + * tests/IORTable_Locator/run_test.pl: + + Added a new test variant to run the async IORTable locator as well + as the sync version. + +Fri Apr 19 03:28:07 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/async_imr_client_export.h: + + New async stubs lib can't have a dependency on imr_client. + Fixed generation of stubs and skeletons with correct export macro. + + * tao/ImR_Client/ImR_Client.mpc: + + Make sure not to run tao_idl in the non-idl project. + +Thu Apr 18 22:32:11 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * MPC/config/imr_client.mpb: + + Revert addition of messaging dependency. + + * orbsvcs/ImplRepo_Service/ImR_Activator.idl: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/Iterator.h: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/Server_Info.h: + * orbsvcs/ImplRepo_Service/tao_imr_i.h: + * orbsvcs/ImplRepo_Service/utils.h: + + In order to shield client applications from the AMI/AMH imposed + dependencies, the project now makes a local compilation of the + ImR_Client based stubs and skeletons with the async modifiers. + + * tao/ImR_Client/ImR_Client.mpc: + * tao/ImR_Client/ImplRepo.idl: + * tao/ImR_Client/ServerObject.idl: + + As a companion to the above change, this restores the more narrow + dependency so that clients of the ImR do not need to load the messaging + library. + + * tao/ImR_Client/ImplRepo.pidl: + * tao/ImR_Client/ServerObject.pidl: + + Removed these files. It was necessary to rename from .pidl to .idl so + the stub/skeleton includes would be generated correctly. There is nothing + pseudo about these idls anyway so no need to use .pidl. + +Thu Apr 18 19:37:19 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * utils/logWalker/HostProcess.cpp: + + Fixed compiler warnings. + +Thu Apr 18 13:18:10 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + Scoreboard cleanup. + +Thu Apr 18 07:26:52 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * bin/tao_orb_tests.lst: + * tests/IORTable_Locator/Test.mpc: + * tests/IORTable_Locator/client.cpp: + * tests/IORTable_Locator/run_test.pl: + * tests/IORTable_Locator/server.cpp: + * tests/IORTable_Locator/simple_test.idl: + * tests/IORTable_Locator/simple_test_i.h: + * tests/IORTable_Locator/simple_test_i.cpp: + Added simple test to test corbaloc resolving through + IORTable::Locator (*not* collocated like in + Bug_3790_Regression test). + +Wed Apr 17 19:00:17 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_other_tests.lst: + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.h: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + Servers may be started externally to the ImR but register with + it so that clients may still be forwarded to it. Traditionally, + such servers are not pinged by the ImR in the spirit that since + its own means were used to activate the service, the ImR should + let the client deal with the server no matter the consequences. + However, the ImR is in a position to give more information to the + client or lists of active servers, so enabling the ping_external_ + option will override the assumption of liveness and actively ping, + based on the existing rules, all registered servers. + + * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: + + Added a new test variant to run the new feature. + +Wed Apr 17 14:19:35 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + * tao/ORB.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.inl: + * tao/ORB_Core.cpp: + * tao/objectid.h: + + Make explicit the distinction between the traditional IORTable and the + Asynchronous version used with the ImplRepo service. + +Wed Apr 17 12:54:37 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/orbsvcs/Log_Macros.h: + + Added empty comments for fuzz script. + +Wed Apr 17 07:06:17 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * tao/Transport.h: + * tao/Transport.cpp: + Change return type of method. Fixes VC8 warnings. + +Tue Apr 16 19:46:38 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Repository.h: + * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + + Fix for the regression failure with the ReconnectServer test. + +Tue Apr 16 14:51:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Messaging/AMH_Response_Handler.cpp: + + Fix to the previous fix. I was too cavalier in copying the CORBA + subset macro tests from the ForwardRequest.pidl file. + +Tue Apr 16 14:25:30 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/IORTable/IOR_Table_Impl.h: + + Add the export macro on the class definition as well as the + forward declaration. + + * tao/Messaging/AMH_Response_Handler.cpp: + + Ensure the library can be built even on CORBA subset builds. + +Mon Apr 15 19:49:48 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Fix the timing on the test so the condition being tested is actually + allowed to occur. The total ping retry schedule is about 15 seconds, + so a 20 second timeout means the threshold is exceeded. When the + full ping retry schedule is exhausted, the IMR gives up and returns + the IOR, letting the client deal with the server directly. In this + case, doing so meant the client got a transient exception and thus + failed. + +Tue Apr 16 03:10:56 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * MPC/config/async_iortable.mpb: + + * tao/Async_IORTable/Async_IORTable.cpp: + * tao/Async_IORTable/Async_Table_Adapter.cpp: + + * tao/IORTable/IOR_Table_Impl.h: + + clean up some scoreboard issues for visibility builds. + +Mon Apr 15 17:03:16 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Async_IORTable/Async_IORTable.mpc: + + Fixed the project name for uniqueness. + +Mon Apr 15 16:48:16 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * MPC/config/async_iortable.mpb: + * MPC/config/imr_client.mpb: + * MPC/config/iortable.mpb: + + * orbsvcs/ImplRepo_Service/INS_Locator.h: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + * tao/Async_IORTable: + + * tao/Async_IORTable/Async_IORTable.h: + * tao/Async_IORTable/Async_IORTable.cpp: + * tao/Async_IORTable/Async_IORTable.mpc: + * tao/Async_IORTable/Async_IORTable.pidl: + * tao/Async_IORTable/Async_IOR_Table_Impl.h: + * tao/Async_IORTable/Async_IOR_Table_Impl.cpp: + * tao/Async_IORTable/Async_Table_Adapter.h: + * tao/Async_IORTable/Async_Table_Adapter.cpp: + * tao/Async_IORTable/Locate_ResponseHandler.h: + * tao/Async_IORTable/Locate_ResponseHandler.inl: + * tao/Async_IORTable/Locate_ResponseHandler.cpp: + * tao/Async_IORTable/TAO_Async_IORTable.pc.in: + * tao/Async_IORTable/TAO_Async_IORTable.rc: + + * tao/IORTable/IORTable.h: + * tao/IORTable/IORTable.mpc: + * tao/IORTable/IORTable.pidl: + * tao/IORTable/IOR_Table_Impl.h: + * tao/IORTable/IOR_Table_Impl.cpp: + * tao/IORTable/Table_Adapter.h: + * tao/IORTable/Table_Adapter.cpp: + + * tao/ORB_Core.cpp: + + * tao/IORTable/Locate_ResponseHandler.h: + * tao/IORTable/Locate_ResponseHandler.inl: + * tao/IORTable/Locate_ResponseHandler.cpp: + + Refactored the IORTable to restore the minimal dependency of + the base library so that small footprint builds can continue + using the IORTable as needed. The new features added to support + asynchronous use of the IMR are now in a new library. While the + new Async_IORTable is registered as a distinct object in the + service object registry, the ORB Core will load it if present + when an application uses resolve_initial_references ("IORTable"). + Right now the only use case for the async ior table is with the + IMR, which has its own implementation of the locator objeect. + +Mon Apr 15 14:26:39 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * MPC/config/ftclientorb.mpb: + * MPC/config/ftserverorb.mpb: + * MPC/config/notify_monitor_control.mpb: + * MPC/config/portablegroup.mpb: + * orbsvcs/IFR_Service/IFR_Service.mpc: + * orbsvcs/tests/FT_App/FT_App.mpc: + + Added svc_utils for static link. + +Mon Apr 15 14:12:56 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * MPC/config/naming.mpb: + * orbsvcs/orbsvcs/SSLIOP.mpc: + + Added svc_utils base project. + +Fri Apr 12 22:41:43 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/orbsvcs/Svc_Utils.mpc: + * orbsvcs/orbsvcs/Log_Macros.h: + * orbsvcs/orbsvcs/Log_Macros.cpp: + + Added a distinct ACE Log Category for orbsvcs. + + * orbsvcs/Concurrency_Service/Concurrency_Service.cpp: + * orbsvcs/Dump_Schedule/Dump_Schedule.cpp: + * orbsvcs/Event_Service/Event_Service.cpp: + * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp: + * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp: + * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp: + * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc: + * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp: + * orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp: + * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp: + * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp: + * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc: + * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp: + * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp: + * orbsvcs/Fault_Detector/Fault_Detector.mpc: + * orbsvcs/Fault_Detector/Fault_Detector_i.cpp: + * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp: + * orbsvcs/IFR_Service/IFR_Server.cpp: + * orbsvcs/IFR_Service/IFR_Service.mpc: + * orbsvcs/IFR_Service/be_global.cpp: + * orbsvcs/IFR_Service/be_init.cpp: + * orbsvcs/IFR_Service/be_produce.cpp: + * orbsvcs/IFR_Service/be_util.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp: + * orbsvcs/IFR_Service/ifr_removing_visitor.cpp: + * orbsvcs/ImplRepo_Service/Activator_Loader.cpp: + * orbsvcs/ImplRepo_Service/Activator_Options.cpp: + * orbsvcs/ImplRepo_Service/Adapter_Activator.cpp: + * orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/ImR_Activator.cpp: + * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/Locator_Loader.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + * orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp: + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + * orbsvcs/LifeCycle_Service/Factory_Trader.cpp: + * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp: + * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp: + * orbsvcs/LoadBalancer/LoadBalancer.mpc: + * orbsvcs/LoadBalancer/LoadManager.cpp: + * orbsvcs/LoadBalancer/LoadMonitor.cpp: + * orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp: + * orbsvcs/LoadBalancer/Push_Handler.cpp: + * orbsvcs/LoadBalancer/Signal_Handler.cpp: + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp: + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp: + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp: + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp: + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp: + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp: + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp: + * orbsvcs/Naming_Service/NT_Naming_Server.cpp: + * orbsvcs/Naming_Service/NT_Naming_Service.cpp: + * orbsvcs/Naming_Service/Naming_Server.cpp: + * orbsvcs/Notify_Service/NT_Notify_Server.cpp: + * orbsvcs/Notify_Service/Notify_Server.cpp: + * orbsvcs/Notify_Service/Notify_Service.cpp: + * orbsvcs/Scheduling_Service/Scheduling_Service.cpp: + * orbsvcs/TAO_Service/TAO_Service.cpp: + * orbsvcs/TAO_Service/TAO_Service.mpc: + * orbsvcs/Time_Service/Clerk_i.cpp: + * orbsvcs/Time_Service/Server_i.cpp: + * orbsvcs/Time_Service/Time_Service_Clerk.cpp: + * orbsvcs/Time_Service/Time_Service_Server.cpp: + * orbsvcs/Trading_Service/Trading_Server.cpp: + * orbsvcs/Trading_Service/Trading_Service.cpp: + * orbsvcs/orbsvcs/AV.mpc: + * orbsvcs/orbsvcs/AV/AVStreams_i.inl: + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * orbsvcs/orbsvcs/AV/AV_Core.cpp: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: + * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: + * orbsvcs/orbsvcs/AV/Flows_T.cpp: + * orbsvcs/orbsvcs/AV/MCast.cpp: + * orbsvcs/orbsvcs/AV/Policy.cpp: + * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp: + * orbsvcs/orbsvcs/AV/QoS_UDP.cpp: + * orbsvcs/orbsvcs/AV/RTCP.cpp: + * orbsvcs/orbsvcs/AV/RTCP_Channel.cpp: + * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp: + * orbsvcs/orbsvcs/AV/RTP.cpp: + * orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp: + * orbsvcs/orbsvcs/AV/TCP.cpp: + * orbsvcs/orbsvcs/AV/Transport.cpp: + * orbsvcs/orbsvcs/AV/UDP.cpp: + * orbsvcs/orbsvcs/AV/default_resource.cpp: + * orbsvcs/orbsvcs/AV/sfp.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp: + * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosLoadBalancing.mpc: + * orbsvcs/orbsvcs/CosNaming.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp: + * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp: + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp: + * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp: + * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp: + * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl: + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp: + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp: + * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl: + * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp: + * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp: + * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp: + * orbsvcs/orbsvcs/Event_Utilities.cpp: + * orbsvcs/orbsvcs/FTORB.mpc: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent.mpc: + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl: + * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp: + * orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h: + * orbsvcs/orbsvcs/HTIOP.mpc: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp: + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: + * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp: + * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/Options.cpp: + * orbsvcs/orbsvcs/IFRService/Repository_i.cpp: + * orbsvcs/orbsvcs/IOR_Multicast.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp: + * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp: + * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp: + * orbsvcs/orbsvcs/Log/Log_i.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Client.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Server.cpp: + * orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: + * orbsvcs/orbsvcs/Notify/Admin.cpp: + * orbsvcs/orbsvcs/Notify/AllocTracker.h: + * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/Consumer.cpp: + * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp: + * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp: + * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp: + * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp: + * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp: + * orbsvcs/orbsvcs/Notify/Event.cpp: + * orbsvcs/orbsvcs/Notify/EventChannel.cpp: + * orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp: + * orbsvcs/orbsvcs/Notify/EventType.cpp: + * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp: + * orbsvcs/orbsvcs/Notify/Event_Manager.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp: + * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp: + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp: + * orbsvcs/orbsvcs/Notify/Object.cpp: + * orbsvcs/orbsvcs/Notify/POA_Helper.cpp: + * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp: + * orbsvcs/orbsvcs/Notify/Properties.cpp: + * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp: + * orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp: + * orbsvcs/orbsvcs/Notify/Random_File.cpp: + * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp: + * orbsvcs/orbsvcs/Notify/Refcountable.cpp: + * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp: + * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp: + * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp: + * orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp: + * orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp: + * orbsvcs/orbsvcs/Notify/XML_Loader.cpp: + * orbsvcs/orbsvcs/Notify/XML_Saver.cpp: + * orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp: + * orbsvcs/orbsvcs/PortableGroup.mpc: + * orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp: + * orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp: + * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: + * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp: + * orbsvcs/orbsvcs/Sched/DynSched.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp: + * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: + * orbsvcs/orbsvcs/Sched/SchedEntry.cpp: + * orbsvcs/orbsvcs/Sched/Scheduler.cpp: + * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp: + * orbsvcs/orbsvcs/Scheduler_Factory.cpp: + * orbsvcs/orbsvcs/Security.mpc: + * orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp: + * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp: + * orbsvcs/orbsvcs/Shutdown_Utilities.cpp: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp: + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp: + * orbsvcs/orbsvcs/Time/Timer_Helper.cpp: + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: + + Use new logging macros for orbsvcs. + +Fri Apr 12 20:58:38 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * MPC/config/iortable.mpb: + + Add new base projects to satisfy static builds. + +Fri Apr 12 18:16:42 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + Added required base projects for valuetype and messaging. + +Fri Apr 12 17:58:35 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * tao/LF_Strategy_Complete.cpp: + * tao/TAO_Singleton.cpp: + + Fix undeclared TAOLIB_DEBUG problem. + +Fri Apr 12 17:27:29 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Adapter_Activator.h: + * orbsvcs/ImplRepo_Service/Forwarder.h: + + Fix for versioned namespace builds. + + * utils/logWalker/Invocation.cpp: + + clean up some scoreboard warnings. + +Fri Apr 12 12:11:11 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3384_Regression/Client_i.h: + * tests/Bug_3384_Regression/Client_i.cpp: + * tests/Bug_3384_Regression/Server_i.h: + * tests/Bug_3384_Regression/Server_i.cpp: + More fixes for fuzzy fuzzer. + +Fri Apr 12 09:47:06 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3384_Regression/Client_i.h: + * tests/Bug_3384_Regression/Client_i.cpp: + * tests/Bug_3384_Regression/README.txt: + * tests/Bug_3384_Regression/Server_i.h: + * tests/Bug_3384_Regression/Server_i.cpp: + Fuzz fixes. + +Thu Apr 11 19:52:53 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * NEWS: + + Documented new ImR. + +Thu Apr 11 19:47:49 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * tao/debug.h: + Fixed TAOLIB_ERROR_RETURN() control reaches end of non-void function warning. + +Thu Apr 11 18:03:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * tao/Acceptor_Impl.cpp: + * tao/Acceptor_Registry.cpp: + + * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp: + * tao/AnyTypeCode/NVList.cpp: + * tao/AnyTypeCode/append.cpp: + * tao/AnyTypeCode/skip.cpp: + + * tao/Any_Insert_Policy_T.h: + * tao/Asynch_Queued_Message.cpp: + + * tao/BiDir_GIOP/BiDir_ORBInitializer.cpp: + + * tao/CORBALOC_Parser.cpp: + * tao/CORBANAME_Parser.cpp: + + * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp: + * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp: + * tao/CSD_Framework/CSD_ORBInitializer.cpp: + * tao/CSD_Framework/CSD_Strategy_Base.inl: + * tao/CSD_Framework/CSD_Strategy_Base.cpp: + * tao/CSD_Framework/CSD_Strategy_Proxy.cpp: + * tao/CSD_Framework/CSD_Strategy_Repository.cpp: + + * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp: + * tao/CSD_ThreadPool/CSD_TP_Task.cpp: + + * tao/Cache_Entries_T.cpp: + + * tao/Codeset/Codeset_Descriptor.cpp: + * tao/Codeset/Codeset_Manager_i.cpp: + * tao/Codeset/Codeset_Translator_Factory_T.cpp: + * tao/Codeset/UTF16_BOM_Factory.cpp: + * tao/Codeset/UTF16_BOM_Translator.cpp: + * tao/Codeset/UTF8_Latin1_Factory.cpp: + + * tao/Compression/zlib/ZlibCompressor_Factory.cpp: + + * tao/Condition.cpp: + * tao/Connection_Handler.cpp: + * tao/Connector_Registry.cpp: + + * tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp: + + * tao/DynamicAny/DynValue_i.cpp: + + * tao/DynamicInterface/DII_Invocation.cpp: + * tao/DynamicInterface/DII_Reply_Dispatcher.cpp: + * tao/DynamicInterface/DII_Reply_Handler.cpp: + * tao/DynamicInterface/Request.cpp: + + * tao/Dynamic_TP/DTP_Config.cpp: + * tao/Dynamic_TP/DTP_ORBInitializer.cpp: + * tao/Dynamic_TP/DTP_ORB_Loader.cpp: + * tao/Dynamic_TP/DTP_POA_Loader.cpp: + * tao/Dynamic_TP/DTP_POA_Strategy.cpp: + * tao/Dynamic_TP/DTP_Task.cpp: + * tao/Dynamic_TP/DTP_Thread_Pool.cpp: + + * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp: + + * tao/Environment.cpp: + * tao/Exception.cpp: + * tao/Exclusive_TMS.cpp: + + * tao/FlResource/FlResource_Factory.cpp: + + * tao/FoxResource/FoxResource_Factory.cpp: + + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Generator_Parser.cpp: + * tao/GIOP_Message_Generator_Parser_10.cpp: + * tao/GIOP_Message_Generator_Parser_12.cpp: + * tao/GIOP_Message_State.cpp: + * tao/HTTP_Client.cpp: + * tao/HTTP_Handler.cpp: + * tao/HTTP_Parser.cpp: + * tao/IIOP_Acceptor.cpp: + * tao/IIOP_Connection_Handler.cpp: + * tao/IIOP_Connector.cpp: + * tao/IIOP_Endpoint.cpp: + * tao/IIOP_Profile.cpp: + * tao/IIOP_Transport.cpp: + + * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp: + + * tao/ImR_Client/ImR_Client.cpp: + + * tao/Invocation_Adapter.cpp: + * tao/LF_CH_Event.cpp: + * tao/LF_Strategy_Complete.cpp: + * tao/Leader_Follower.cpp: + * tao/Load_Protocol_Factory_T.h: + * tao/LocalObject.cpp: + * tao/MCAST_Parser.cpp: + * tao/MProfile.cpp: + + * tao/Messaging/AMH_Response_Handler.cpp: + * tao/Messaging/Asynch_Invocation_Adapter.cpp: + * tao/Messaging/Asynch_Reply_Dispatcher.cpp: + * tao/Messaging/Asynch_Timeout_Handler.cpp: + * tao/Messaging/Connection_Timeout_Policy_i.cpp: + * tao/Messaging/Messaging_ORBInitializer.cpp: + * tao/Messaging/Messaging_Policy_i.cpp: + * tao/Messaging/Messaging_Queueing_Strategies.cpp: + + * tao/Muxed_TMS.cpp: + * tao/ORB.cpp: + * tao/ORBInitializer_Registry.cpp: + * tao/ORB_Core.cpp: + * tao/Object.cpp: + * tao/Object_Ref_Table.cpp: + * tao/On_Demand_Fragmentation_Strategy.cpp: + + * tao/PI/ClientRequestInfo.cpp: + * tao/PI/DLL_Resident_ORB_Initializer.cpp: + * tao/PI/Interceptor_List_T.cpp: + * tao/PI/ORBInitializer_Registry_Impl.cpp: + * tao/PI/PICurrent_Impl.cpp: + + * tao/Parser_Registry.cpp: + * tao/Policy_Validator.cpp: + + * tao/PortableServer/Active_Object_Map.cpp: + * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp: + * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp: + * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp: + * tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyPersistent.cpp: + * tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp: + * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/Operation_Table_Binary_Search.cpp: + * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp: + * tao/PortableServer/Operation_Table_Linear_Search.cpp: + * tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * tao/PortableServer/POA_Policy_Set.cpp: + * tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp: + * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp: + * tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp: + * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp: + * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp: + * tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp: + * tao/PortableServer/ServantRetentionStrategyRetain.cpp: + * tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategyFactoryImpl.cpp: + * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp: + + * tao/Profile.cpp: + + * tao/QtResource/QtResource_Factory.cpp: + + * tao/Queued_Data.cpp: + + * tao/RTCORBA/Linear_Network_Priority_Mapping.cpp: + * tao/RTCORBA/Linear_Priority_Mapping.cpp: + * tao/RTCORBA/Multi_Priority_Mapping.cpp: + * tao/RTCORBA/RT_Current.cpp: + * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp: + * tao/RTCORBA/RT_ORBInitializer.cpp: + * tao/RTCORBA/RT_ORB_Loader.cpp: + * tao/RTCORBA/RT_Protocols_Hooks.cpp: + * tao/RTCORBA/RT_Service_Context_Handler.cpp: + * tao/RTCORBA/Thread_Pool.cpp: + + * tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + + * tao/RTScheduling/Current.cpp: + * tao/RTScheduling/RTScheduler_Initializer.cpp: + * tao/RTScheduling/RTScheduler_Loader.cpp: + * tao/RTScheduling/Request_Interceptor.cpp: + + * tao/Reactive_Connect_Strategy.cpp: + * tao/Remote_Invocation.cpp: + * tao/Resume_Handle.cpp: + * tao/Storable_File_Guard.cpp: + * tao/Storable_FlatFileStream.cpp: + + * tao/Strategies/COIOP_Acceptor.cpp: + * tao/Strategies/COIOP_Connection_Handler.cpp: + * tao/Strategies/COIOP_Profile.cpp: + * tao/Strategies/DIOP_Acceptor.cpp: + * tao/Strategies/DIOP_Connection_Handler.cpp: + * tao/Strategies/DIOP_Connector.cpp: + * tao/Strategies/DIOP_Endpoint.cpp: + * tao/Strategies/DIOP_Profile.cpp: + * tao/Strategies/DIOP_Transport.cpp: + * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp: + * tao/Strategies/SCIOP_Acceptor.cpp: + * tao/Strategies/SCIOP_Connection_Handler.cpp: + * tao/Strategies/SCIOP_Connector.cpp: + * tao/Strategies/SCIOP_Endpoint.cpp: + * tao/Strategies/SCIOP_Profile.cpp: + * tao/Strategies/SCIOP_Transport.cpp: + * tao/Strategies/SHMIOP_Acceptor.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Connector.cpp: + * tao/Strategies/SHMIOP_Endpoint.cpp: + * tao/Strategies/SHMIOP_Profile.cpp: + * tao/Strategies/SHMIOP_Transport.cpp: + * tao/Strategies/Strategies_ORBInitializer.cpp: + * tao/Strategies/UIOP_Acceptor.cpp: + * tao/Strategies/UIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Connector.cpp: + * tao/Strategies/UIOP_Profile.cpp: + * tao/Strategies/UIOP_Transport.cpp: + * tao/Strategies/advanced_resource.cpp: + + * tao/Stub.inl: + * tao/Stub.cpp: + * tao/Synch_Invocation.cpp: + * tao/Synch_Reply_Dispatcher.cpp: + * tao/SystemException.cpp: + * tao/TAO_Internal.cpp: + * tao/TAO_Server_Request.cpp: + * tao/TAO_Singleton.cpp: + * tao/Tagged_Profile.cpp: + * tao/Time_Policy_Manager.cpp: + + * tao/TkResource/TkResource_Factory.cpp: + + * tao/Transport.cpp: + + * tao/TransportCurrent/Current_ORBInitializer_Base.cpp: + + * tao/Transport_Acceptor.cpp: + * tao/Transport_Cache_Manager_T.inl: + * tao/Transport_Cache_Manager_T.cpp: + * tao/Transport_Connector.cpp: + + * tao/Utils/ORB_Manager.cpp: + * tao/Utils/Server_Main.cpp: + + * tao/Valuetype/AbstractBase.cpp: + * tao/Valuetype/ValueBase.cpp: + + * tao/Wait_On_LF_No_Upcall.cpp: + * tao/Wait_On_Read.cpp: + * tao/WrongTransactionC.cpp: + + * tao/XtResource/XtResource_Factory.cpp: + + * tao/ZIOP/ZIOP.cpp: + * tao/ZIOP/ZIOP_ORBInitializer.cpp: + * tao/ZIOP/ZIOP_Stub.cpp: + + * tao/debug.h: + * tao/debug.cpp: + * tao/default_client.cpp: + * tao/default_resource.cpp: + * tao/default_server.cpp: + Change ACE_DEBUG/ACE_ERROR macros in tao to TAOLIB_DEBUG/TAOLIB_ERROR. + +Thu Apr 11 17:18:36 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tao/Transport.cpp (TAO_Transport::send_asynchronous_message_i): + Applied a patch from Russ Noseworthy <J.Russell.Noseworthy at + TENA-SDA dot org> that fixes a problem when sending a large (> + 64k) number of bytes in a (oneway) RMI on OS X. What happened + was that, for large payloads, the send in Transport.cpp returns + a value of n, not equal to the number of bytes to send. What's + supposed to happen is that the rest of the bytes get sent with + the next send. Instead, if the current value of errno happens + to be ETIME (for any reason), the send never completes, and + instead declares that it's timed out. This fixes bugid 4103. + +Thu Apr 11 16:51:31 UTC 2013 Martin Corino <mcorino@remedy.nl> + + Implemented an improvement (fix) for oneways with SYNC_NONE sync scope + policy which makes the transport honour buffering constraints on the + first oneway request queued before the connection is established. + This fixes Bugzilla 3384. + + * tao/Profile_Transport_Resolver.cpp: + Removed the call to TAO_Transport::set_flush_in_post_open() since this + requirement is now checked in Transport::format_queue_message(). + + * tao/Transport.h: + * tao/Transport.inl: + Removed public method TAO_Transport::set_flush_in_post_open() since this + is not needed anymore. + + * tao/Transport.cpp: + Added check on buffering constraints in TAO_Transport::format_queue_message() + after queuing the message setting flush_in_post_open_ as needed. + Added check in TAO_Transport::check_buffering_constraints_i() on connection + state since this method can now be called in both a connected as well as + unconnected state. + + * bin/tao_orb_tests.lst: + * tests/Bug_3384_Regression/Client_i.h: + * tests/Bug_3384_Regression/Client_i.cpp: + * tests/Bug_3384_Regression/README.txt: + * tests/Bug_3384_Regression/Server_i.h: + * tests/Bug_3384_Regression/Server_i.cpp: + * tests/Bug_3384_Regression/Test.idl: + * tests/Bug_3384_Regression/client.cpp: + * tests/Bug_3384_Regression/run_test.pl: + * tests/Bug_3384_Regression/server.cpp: + * tests/Bug_3384_Regression/test.mpc: + Added new regression test. + +Thu Apr 11 16:16:21 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + branch merge from branches/OCI_Asynch_ImR. This is a re-implementation + of the tao_imr_locator to improve performance using asynchronous method + handling and invocation (AMH/AMI) to allow many concurrent client requests + to be satisfied as quickly as possible, avoiding nested upcalls and + potentally fatal stack sizes. The only user visible change is that IMR + clients must now include the messaging library to satsify the linker due + to the AMI/AMH stubs and skeletons. MPC makes this happen automatically for + projects using it for build management. + + Wed Apr 10 00:58:56 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Fix for the reconnect test. Use the fact that a dead server is + not scheduled for a ping to throw an immediate exception. + + Tue Apr 9 15:44:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Cleaned up explicit debug output, added a catch for errors during + connection establishment with the async ping. The AMI callback + exception handler is only invoked after a successful send of the + invocation. A connection failure is still an exception in the + caller's context. + + * orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp: + * orbsvcs/tests/ImplRepo/servers_list/run_test.pl: + + Reverted earlier change. + + Tue Apr 9 14:42:10 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Improve the list performance by forcing a poll if an active + test is required. + + * orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp: + * orbsvcs/tests/ImplRepo/servers_list/run_test.pl: + + enhance the debugging output. + + Mon Apr 8 19:02:29 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Clean up earlier debug messages, fix the list operation. + + Mon Apr 8 17:13:01 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + More work on PER_CLIENT activations. + + Mon Apr 8 03:29:47 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + Coveratge for PER_CLIENT activations. + + Sun Apr 7 13:55:15 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Fix for memory leak and scoreboard failures. + + Sat Apr 6 12:36:48 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/INS_Locator.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + More cleanup of development-level debug messages. + + * tao/IORTable/Locate_ResponseHandler.cpp: + + Fix for improper memory management. + + Fri Apr 5 21:21:15 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/INS_Locator.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + * tao/IORTable/Locate_ResponseHandler.h: + * tao/IORTable/Locate_ResponseHandler.cpp: + + * tao/Messaging/AMH_Response_Handler.h: + * tao/Messaging/AMH_Response_Handler.cpp: + + Clean up some development-level logging. Fixed the memory problems. Continue + testing and validating. + + Thu Apr 4 23:15:58 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.h: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/INS_Locator.h: + * orbsvcs/ImplRepo_Service/INS_Locator.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Repository.h: + * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + + * tao/Adapter.h: + + * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: + + * tao/IORTable/IORTable.h: + * tao/IORTable/IORTable.mpc: + * tao/IORTable/IORTable.pidl: + * tao/IORTable/IOR_Table_Impl.h: + * tao/IORTable/IOR_Table_Impl.cpp: + * tao/IORTable/Locate_ResponseHandler.h: + * tao/IORTable/Locate_ResponseHandler.inl: + * tao/IORTable/Locate_ResponseHandler.cpp: + * tao/IORTable/Table_Adapter.h: + * tao/IORTable/Table_Adapter.cpp: + + * tao/Messaging/AMH_Response_Handler.h: + * tao/Messaging/AMH_Response_Handler.cpp: + + Adding support for an asynchronous IORTable locator. This commit + also contains a lot of intermediate debugging artifacts. It still + crashes. Committing for easy distribution to other test hosts. + + Wed Apr 3 14:20:28 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + Fix how exceptions are handled when using the sync reponse handler. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + + Improve the quality of output when run in debug mode. + + Tue Apr 2 23:13:50 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/INS_Locator.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Clean up debugging output and improve ping retry logic. + + * utils/logWalker/HostProcess.h: + * utils/logWalker/HostProcess.cpp: + * utils/logWalker/Log.cpp: + * utils/logWalker/PeerProcess.h: + * utils/logWalker/PeerProcess.cpp: + * utils/logWalker/Session.h: + * utils/logWalker/Session.cpp: + + Fix up the endpoint association so multiple log files can correlate. + +Tue Apr 2 13:17:44 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + + Nightly build cleanup. + + Tue Apr 2 01:37:35 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + More debugging added for scoreboard processing. + + Mon Apr 1 23:52:37 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + More memory management and state machine improvments + + Mon Apr 1 21:28:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Improve memory management. + + * utils/logWalker/Log.cpp: + + Improve handling of nested client/server connection + completions. + + Mon Apr 1 15:51:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + allow collocation calls to support the AMI callbacks. + + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp: + + Fix a scoreboard build error. + + Fri Mar 29 22:52:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Improve the ping retry state machine, add more diagonstics. + + * utils/logWalker/Log.cpp: + + Fix a memory managment error. + + Fri Mar 29 00:23:44 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + Added messaging library dependency to tao_imr. + + Fri Mar 29 00:14:00 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.h: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h: + * orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + Completed the initial task of transitioning to an AMH Locator servant. + Still need to work on the INS_Locator which uses synch calls. Also need to + run through regression suite and debug. + + * orbsvcs/ImplRepo_Service/AsyncStartupWaiter.idl: + * orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h: + * orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp: + + Removed these files. + + Thu Mar 28 17:05:52 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Repository.h: + + Further improvments to the implementation. At the point where the basic ImplRepo + test passes. + + Tue Mar 26 23:58:50 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Adapter_Activator.h: + * orbsvcs/ImplRepo_Service/Adapter_Activator.cpp: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.h: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.h: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + completed asynch ping tracking and event delivery. Removed sync/asynch + behavior option, it didn't work and it was temporary anyway. Stripped the + old code that was optional. + + Tue Mar 26 16:35:26 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + + Clean up error in validating the forward-to IOR. + + * orbsvcs/ImplRepo_Service/ImR_Locator.cpp: + + Clean up the shutdown handler for single-thread use. + + * tao/Messaging/AMH_Response_Handler.cpp: + + Add the explicit handling of ForwardRequest exceptions. + + Tue Mar 26 15:52:50 UTC 2013 Byron Harris <harrisb@ociweb.com> + + * bin/tao_other_tests.lst: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/README: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp: + * orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc: + + Added test for ImR pinging of ill-behaved, interacting servers. + + Mon Mar 25 20:52:13 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + + Restore the export macro in the ImR_Locator impl class. + + Mon Mar 25 20:41:16 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Adapter_Activator.cpp: + + Fix policy inconsitency. + + Mon Mar 25 17:35:24 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncAccessManager.h: + * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: + * orbsvcs/ImplRepo_Service/Forwarder.h: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + * orbsvcs/ImplRepo_Service/INS_Locator.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + Continue with implementation. Added some temporary debug output, hooked up the + sync version of the reactive ping-wait. Started in on the next stage, which is + making the rest of the server access Asynchronous. Changed the mode select flag + for start up from defaulting to the traditional sync-style of calls to the new + asynch style. The temporary command line flag is now --old, to use the old + style for comparison. + + Fri Mar 22 18:16:00 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Fix for a core-on-exit problem. + + Tue Mar 19 13:31:43 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/LiveCheck.h: + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Adding new mechanism for pinging servers asynchronously. When the IMR is + interested in the status of a server, it now registers a callback object and + a ping is scheduled. At the appropriate time, the ping request is sent using + AMI. The reply or exception is then handled asynchronously. + + For testing in an otherwise synchronous locator, a blocking ping reply waiter + is used. + + Thu Mar 14 21:36:30 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + + Some syntactic clean up and apply a fix for a memory leak Kevin applied to + the trunk. + + * utils/logWalker/HostProcess.cpp: + * utils/logWalker/Invocation.h: + * utils/logWalker/Invocation.cpp: + * utils/logWalker/Thread.h: + * utils/logWalker/Thread.cpp: + + Add a new type of by-thread output that highlights nested upcalls and the + processing impact of delaying action on replies. + + Mon Mar 11 16:31:08 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.h: + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/Locator_Options.h: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + Actually select the DSI/AMH implementation when the asynch + option is supplied. Avoid confusion with the option by calling + it --asynch rather than the earlier --use_dsi + + * orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: + + Modify the test to verify that both synchronous and asynch + implementations work. + + Mon Mar 11 01:50:33 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Adapter_Activator.h: + * orbsvcs/ImplRepo_Service/Adapter_Activator.cpp: + + In order to support asynchronous interfaces, the adapter has to use the + default servant rather than the servant locator. The servant locator does + not give an opportunity for asynch processing. + + * orbsvcs/ImplRepo_Service/Forwarder.h: + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + + The initial cut at implementing AMH. + + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + * orbsvcs/ImplRepo_Service/Locator_Options.h: + * orbsvcs/ImplRepo_Service/Locator_Options.cpp: + + The feature is optional for now at least. + + * tao/ImR_Client/ImR_Client.mpc: + + Add support for generating asyncronous stubs and skeletons for working + with the ImR. + Thu Apr 4 13:35:46 UTC 2013 Byron Harris <harrisb@ociweb.com> * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: diff --git a/TAO/ChangeLog_Asynch_ImR b/TAO/ChangeLog_Asynch_ImR index a27934dc892..db69db65ccc 100644 --- a/TAO/ChangeLog_Asynch_ImR +++ b/TAO/ChangeLog_Asynch_ImR @@ -1,204 +1,6 @@ -Wed Apr 10 21:09:01 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> +Wed May 8 14:15:01 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> - * ChangeLog: - - * MPC/config/tao_versioning_idl_defaults.mpb: - - * NEWS: - * PROBLEM-REPORT-FORM: - * TAO_IDL: - - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be/be_util.cpp: - - * TAO_IDL/be_include/be_global.h: - - * TAO_IDL/util/utl_err.cpp: - - * VERSION: - - * bin/tao_other_tests.lst: - - * docs/Options.html: - - * orbsvcs/IFR_Service: - - * orbsvcs/ImplRepo_Service/Locator_Options.cpp: - * orbsvcs/ImplRepo_Service/Locator_Repository.h: - * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: - * orbsvcs/ImplRepo_Service/README: - * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: - - * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: - * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: - - * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp: - - * orbsvcs/tests/Bug_3673_Regression: - - * orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc: - * orbsvcs/tests/Bug_3673_Regression/Hello.h: - * orbsvcs/tests/Bug_3673_Regression/Hello.cpp: - * orbsvcs/tests/Bug_3673_Regression/NamingTask.h: - * orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp: - * orbsvcs/tests/Bug_3673_Regression/NsShutdown.h: - * orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp: - * orbsvcs/tests/Bug_3673_Regression/Test.idl: - * orbsvcs/tests/Bug_3673_Regression/client.cpp: - * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp: - * orbsvcs/tests/Bug_3673_Regression/run_test.pl: - * orbsvcs/tests/Bug_3673_Regression/server.cpp: - - * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: - * orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl: - * orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl: - * orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp: - - * orbsvcs/tests/FT_Naming/Replication/run_test.pl: - - * orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp: - * orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc: - * orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: - - * orbsvcs/tests/ImplRepo/run_test.pl: - - * orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc: - - * orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc: - - * orbsvcs/tests/Notify/Bug_3646a_Regression: - - * orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc: - * orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp: - * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: - - * orbsvcs/tests/Notify/Bug_3646b_Regression: - - * orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc: - * orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h: - * orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp: - * orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h: - * orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp: - - * orbsvcs/tests/Notify/Bug_3646c_Regression: - - * orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc: - * orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp: - * orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h: - * orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp: - * orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h: - * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp: - - * orbsvcs/tests/Notify/Bug_3646d_Regression: - - * orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc: - * orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h: - * orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp: - * orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h: - * orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp: - - * orbsvcs/tests/Notify/Bug_3663_Regression: - - * orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc: - * orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h: - * orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp: - * orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h: - * orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp: - - * orbsvcs/tests/Notify/Bug_3688b_Regression: - - * orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc: - * orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h: - * orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp: - * orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h: - * orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp: - * orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h: - * orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp: - * orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h: - * orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp: - - * performance-tests/POA/Object_Creation_And_Registration/registration.cpp: - - * tao/ImR_Client/ImR_Client.cpp: - - * tao/PortableServer/Key_Adapters.cpp: - - * tao/TransportCurrent/IIOP_Current_Impl.cpp: - - * tao/Version.h: - - * tests/Bug_3630_Regression: - - * tests/Bug_3630_Regression/Bug_3630_Regression.mpc: - * tests/Bug_3630_Regression/TAO Conf File.conf: - * tests/Bug_3630_Regression/TAO_Conf_File.conf: - * tests/Bug_3630_Regression/run_test.pl: - * tests/Bug_3630_Regression/server.cpp: - - * tests/Bug_3647_Regression/Backend_Impl.h: - * tests/Bug_3647_Regression/Middle_Impl.h: - - * tests/Bug_3672_Regression: - - * tests/Bug_3672_Regression/Bug_3672_Regression.mpc: - * tests/Bug_3672_Regression/ami_test.idl: - * tests/Bug_3672_Regression/ami_test_i.h: - * tests/Bug_3672_Regression/ami_test_i.cpp: - * tests/Bug_3672_Regression/client.cpp: - * tests/Bug_3672_Regression/run_test.pl: - * tests/Bug_3672_Regression/server.cpp: - - * tests/Bug_3683_Regression: - - * tests/Bug_3683_Regression/Bug_3683_Regression.mpc: - * tests/Bug_3683_Regression/Echo.idl: - * tests/Bug_3683_Regression/Echo_Client_i.h: - * tests/Bug_3683_Regression/Echo_Client_i.cpp: - * tests/Bug_3683_Regression/Echo_i.h: - * tests/Bug_3683_Regression/Echo_i.cpp: - * tests/Bug_3683_Regression/Simple_util.h: - * tests/Bug_3683_Regression/Simple_util.cpp: - * tests/Bug_3683_Regression/client.cpp: - * tests/Bug_3683_Regression/run_test.pl: - * tests/Bug_3683_Regression/server.cpp: - * tests/Bug_3683_Regression/svc.conf: - - * tests/Bug_3701_Regression: - - * tests/Bug_3701_Regression/Bug_3701_Regression.mpc: - * tests/Bug_3701_Regression/client.cpp: - * tests/Bug_3701_Regression/run_test.pl: - - * tests/Bug_4097_Regression/Bug_4097_Regression.cpp: - - * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp: - - * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp: - - * tests/File_IO/File_i.cpp: - - * tests/NestedUpcall/MT_Client_Test/client.cpp: - - * tests/POA/Default_Servant2/File_i.cpp: - - * tests/RTCORBA/Bug_3643_Regression: - - * tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc: - * tests/RTCORBA/Bug_3643_Regression/client.cpp: - * tests/RTCORBA/Bug_3643_Regression/run_test.pl: - * tests/RTCORBA/Bug_3643_Regression/server.cpp: - * tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic: - * tests/RTCORBA/Bug_3643_Regression/test.idl: - * tests/RTCORBA/Bug_3643_Regression/test_i.h: - * tests/RTCORBA/Bug_3643_Regression/test_i.cpp: - - Merge in from trunk. + * : Merge from trunk Wed Apr 10 00:58:56 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> diff --git a/TAO/MPC/config/async_iortable.mpb b/TAO/MPC/config/async_iortable.mpb new file mode 100644 index 00000000000..cbee2c16936 --- /dev/null +++ b/TAO/MPC/config/async_iortable.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, iortable, messaging, dynamicinterface { + after += Async_IORTable + libs += TAO_Async_IORTable +} diff --git a/TAO/MPC/config/ftclientorb.mpb b/TAO/MPC/config/ftclientorb.mpb index 25ee7e903cd..a8c4ae20ada 100644 --- a/TAO/MPC/config/ftclientorb.mpb +++ b/TAO/MPC/config/ftclientorb.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ftorbutils, pi, interceptors, threads { +project : ftorbutils, pi, interceptors, threads, svc_utils { avoids += ace_for_tao // Requires ace/UUID after += FT_ClientORB libs += TAO_FT_ClientORB diff --git a/TAO/MPC/config/ftserverorb.mpb b/TAO/MPC/config/ftserverorb.mpb index 5d1b388707f..fd934a18ecb 100644 --- a/TAO/MPC/config/ftserverorb.mpb +++ b/TAO/MPC/config/ftserverorb.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : ftorbutils, portablegroup, pi_server, interceptors { +project : ftorbutils, portablegroup, pi_server, interceptors, svc_utils { after += FT_ServerORB libs += TAO_FT_ServerORB tagchecks += FT_ServerORB diff --git a/TAO/MPC/config/naming.mpb b/TAO/MPC/config/naming.mpb index a1f4d3b6014..de38c8162f6 100644 --- a/TAO/MPC/config/naming.mpb +++ b/TAO/MPC/config/naming.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib { +project : orbsvcslib, svc_utils { after += CosNaming libs += TAO_CosNaming tagchecks += Naming diff --git a/TAO/MPC/config/notify_monitor_control.mpb b/TAO/MPC/config/notify_monitor_control.mpb index e1a6c00f7c5..5058c237db7 100644 --- a/TAO/MPC/config/notify_monitor_control.mpb +++ b/TAO/MPC/config/notify_monitor_control.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -feature(notify_monitor_control) { +feature(notify_monitor_control): svc_utils { avoids += wince after += TAO_Monitor CosNotification_MC CosNotification_MC_Ext libs += TAO_CosNotification_MC_Ext TAO_CosNotification_MC TAO_Monitor diff --git a/TAO/MPC/config/portablegroup.mpb b/TAO/MPC/config/portablegroup.mpb index 168a0af6eaf..21ff9b4c55f 100644 --- a/TAO/MPC/config/portablegroup.mpb +++ b/TAO/MPC/config/portablegroup.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : naming, messaging, iormanip, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project : naming, messaging, iormanip, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, svc_utils { libs += TAO_PortableGroup after += PortableGroup tagchecks += PortableGroup @@ -1,6 +1,11 @@ -USER VISIBLE CHANGES BETWEEN TAO-2.1.8 and TAO-2.2.0 +USER VISIBLE CHANGES BETWEEN TAO-2.1.8 and TAO-2.1.9 ==================================================== +. High performance implementation Repository [#4104] - The Implementation + Repository Locator has been reimplemented using AMI/AMH to avoid the + problem of nested upcalls under heavy load. + + USER VISIBLE CHANGES BETWEEN TAO-2.1.7 and TAO-2.1.8 ==================================================== diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index cfeea21dd7d..274dd67b9d5 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -289,7 +289,9 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) << "\"AnyTypeCode_Adapter\");" << be_uidt_nl << "if (adapter == 0)" << be_idt_nl << "{" << be_idt_nl - << "ACE_ERROR_RETURN ((LM_ERROR," << be_idt_nl + // FUZZ: disable check_for_ace_log_categories + << "TAOLIB_ERROR_RETURN ((LM_ERROR," << be_idt_nl + // FUZZ: enable check_for_ace_log_categories << "ACE_TEXT (\"TAO \")," << be_nl << "ACE_TEXT (\"Unable to find the \")" << be_nl << "ACE_TEXT (\"AnyTypeCode Adapter instance\")), 0);" << be_uidt << be_uidt_nl diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index 043d4543af5..332406d5d00 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -145,6 +145,7 @@ TAO/tests/Bug_3299_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI TAO/tests/Bug_3315_Regression/run_test.pl: !ST TAO/tests/Bug_3321_Regression/run_test.pl: !ST TAO/tests/Bug_3333_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Bug_3384_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO TAO/tests/Bug_3430_Regression/run_test.pl: TAO/tests/Bug_3470_Regression/run_test.pl: TAO/tests/Bug_3471_Regression/run_test.pl: @@ -329,6 +330,10 @@ TAO/tests/POA/RootPOA/run_test.pl: TAO/tests/DiffServ/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/IORManipulation/run_test.pl: TAO/tests/IORManipulation/filter/run_test.pl: +TAO/tests/IORTable_Locator/run_test.pl: +TAO/tests/IORTable_Locator/run_test.pl -async_1: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/IORTable_Locator/run_test.pl -async_2: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/IORTable_Locator/run_test.pl -async_3: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index 27c461a294d..0796abdac63 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -135,8 +135,11 @@ TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_CO TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -pingexternal: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 141f5e2f51b..162321657e6 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -13,6 +13,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "Concurrency_Service.h" #include "orbsvcs/Daemon_Utilities.h" @@ -30,7 +31,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 +40,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 +48,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 +70,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 +88,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 +101,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 +121,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 +152,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 +185,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 +200,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 +209,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..ae380b50111 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" @@ -26,7 +27,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..fd392a917fd 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Event_Service.h" #include "ace/Get_Opt.h" @@ -79,7 +80,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 +108,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 +148,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 +225,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 +250,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 +272,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 +284,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 +373,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 +383,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..348061a30c7 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -11,6 +11,7 @@ #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h" #include "orbsvcs/FtRtEvent/Utils/Log.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_main.h" #include "ace/OS_NS_strings.h" @@ -48,7 +49,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 +64,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 +155,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 +165,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 +177,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 +194,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 +243,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..794587b039a 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "EventChannelFactory_i.h" #include "ace/Process.h" #include "ace/Read_Buffer.h" @@ -23,7 +24,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 +124,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 +136,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 +146,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..fd86aeed1c4 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "EventChannelFactory_i.h" #include "ace/Task.h" #include "ace/SString.h" @@ -37,7 +38,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 +92,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 +108,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/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc index 3e1946b0d50..22990c1de45 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies, install { +project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies, install, svc_utils { after += FaultTolerance exename = ftrtec_factory_service } 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..befc6b319ac 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "FT_Naming_Service.h" #include "ace/OS_main.h" @@ -27,7 +28,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 +46,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..a7e69a96037 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -11,6 +11,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_DefaultFaultAnalyzer.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/FT_NotifierC.h" @@ -64,7 +65,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 +104,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 +118,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 +132,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 +153,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..daed0b89a70 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -16,6 +16,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_FaultConsumer.h" #include "orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h" @@ -58,7 +59,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 +101,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 +121,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 +135,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 +146,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 +166,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 +176,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 +213,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 +228,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 +241,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 +258,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 +267,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..1951861bd2d 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp @@ -15,6 +15,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_FaultEventDescriptor.h" #include "ace/SString.h" @@ -46,7 +47,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 +56,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 +66,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 +78,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..05a4c7effef 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -12,6 +12,7 @@ * @author Curt Hibbs <hibbs_c@ociweb.com> */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_ReplicationManager.h" #include "FT_Property_Validator.h" @@ -36,7 +37,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %s\n", #name \ )); \ } @@ -55,7 +56,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %s\n", #name \ )); \ } \ @@ -112,7 +113,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 +141,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 +192,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 +214,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 +247,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 +264,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 +361,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 +394,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 +419,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 +633,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 +668,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 +722,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 +755,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 +781,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 +807,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 +834,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 +924,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_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index c55549bbc2b..4fc203b9cdd 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install { +project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils { sharedname = TAO_ReplicationManagerLib dynamicflags += TAO_REPLICATIONMANAGERLIB_BUILD_DLL @@ -19,7 +19,7 @@ project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notificati } } -project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, install { +project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb, install, svc_utils { exename = tao_ft_replicationmanager libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index aa3e2e8e9c8..11c514c644b 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -11,6 +11,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_ReplicationManagerFaultAnalyzer.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/FT_NotifierC.h" @@ -63,7 +64,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 +155,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 +173,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 +188,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 +219,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 +249,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 +279,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 +309,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 +339,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 +354,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 +403,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 +415,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 +432,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 +441,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 +476,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 +504,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 +516,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 +530,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 +542,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 +560,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 +572,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 +590,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 +602,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 +620,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 +631,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 +652,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 +686,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 +714,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 +785,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..e9807971d59 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -10,6 +10,7 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_FaultDetectorFactory_i.h" #include "Fault_Detector_i.h" #include "ace/Get_Opt.h" @@ -21,7 +22,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 +38,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 +116,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 +165,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 +196,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 +217,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 +228,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 +278,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 +286,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 +309,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 +330,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 +405,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 +420,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 +454,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 +500,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 +512,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 +532,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 +545,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 +563,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 +574,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 +598,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 +609,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.mpc b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc index 2fdd0a25426..a530e7f7890 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc @@ -1,5 +1,5 @@ // $Id$ -project : taoserver, orbsvcsexe, install, fault_tolerance { +project : taoserver, orbsvcsexe, install, fault_tolerance, svc_utils { exename = tao_fault_detector Source_Files { Fault_Detector_i.cpp diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index 6d8174af809..2cca6602c79 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -11,6 +11,7 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "Fault_Detector_i.h" #include "FT_FaultDetectorFactory_i.h" #include "tao/debug.h" @@ -55,7 +56,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 +98,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 +108,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 +160,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 +168,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 +180,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..980b56c7cf4 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -11,6 +11,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "FT_Notifier_i.h" #include "ace/Get_Opt.h" @@ -23,7 +24,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %C\n", #name \ )); \ } @@ -42,7 +43,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %C\n", #name \ )); \ } \ @@ -100,13 +101,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 +136,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 +174,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 +205,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 +229,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 +257,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 +268,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 +321,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 +343,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 +360,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 +382,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 +407,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 +436,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 +445,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 +543,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 +604,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 +654,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 +673,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..c8ab2234b8f 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "IFR_Service.h" #include "tao/Environment.h" #include "orbsvcs/Shutdown_Utilities.h" @@ -24,7 +25,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/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index bbb97bf8f9f..d04d4fe4613 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -3,7 +3,7 @@ // The ifrservice base project inherits from minimum_corba, so it's no longer // necessary to add minimum_corba to 'avoids' here. -project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client { +project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, svc_utils { exename = tao_ifr_service IDL_Files { @@ -15,7 +15,7 @@ project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client } } -project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe { +project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils { after += IFR_Service sharedname = TAO_IFR_BE dynamicflags += TAO_IFR_BE_BUILD_DLL @@ -40,7 +40,7 @@ project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_c } -project(TAO_IFR_EXE) : aceexe, install, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe { +project(TAO_IFR_EXE) : aceexe, install, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils { after += TAO_IFR_BE exename = tao_ifr libs += TAO_IFR_BE TAO diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index f010d756b33..dc8a924a7ee 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -13,6 +13,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "be_global.h" #include "ast_generator.h" #include "global_extern.h" @@ -169,7 +170,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 +183,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..72d33de3371 100644 --- a/TAO/orbsvcs/IFR_Service/be_init.cpp +++ b/TAO/orbsvcs/IFR_Service/be_init.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "global_extern.h" #include "be_extern.h" #include "../../tao/Version.h" @@ -89,7 +90,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..572a73246c8 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -67,6 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // BE_produce.cc - Produce the work of the BE - does nothing in the // dummy BE +#include "orbsvcs/Log_Macros.h" #include "global_extern.h" #include "TAO_IFR_BE_Export.h" #include "be_extern.h" @@ -87,7 +88,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 +105,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 +118,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 +130,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 +157,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 +174,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 +191,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..056515c1b18 100644 --- a/TAO/orbsvcs/IFR_Service/be_util.cpp +++ b/TAO/orbsvcs/IFR_Service/be_util.cpp @@ -12,12 +12,13 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "be_util.h" #include "be_extern.h" #include "ast_generator.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" // Prepare an argument for a BE. void @@ -33,12 +34,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..6c6adccf89b 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -1,6 +1,7 @@ /* -*- c++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ast_argument.h" #include "ast_array.h" #include "ast_attribute.h" @@ -85,7 +86,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 +105,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 +174,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 +205,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 +216,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 +231,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 +351,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 +372,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 +385,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 +409,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 +497,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 +549,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 +697,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 +710,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 +734,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 +821,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 +948,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 +969,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 +985,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 +1077,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 +1366,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 +1379,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 +1403,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 +1495,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 +1719,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 +1819,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 +1882,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 +1894,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 +1979,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 +2096,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 +2220,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 +2367,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 +2388,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 +2403,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 +2414,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 +2428,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 +2469,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 +2698,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 +2714,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 +2748,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 +2768,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 +2787,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 +2810,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 +2830,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 +2849,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 +2908,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 +2921,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 +2946,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 +2958,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 +3016,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 +3029,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 +3054,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 +3066,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 +3108,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 +3130,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 +3146,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 +3158,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 +3214,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 +3227,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 +3260,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 +3272,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 +3333,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 +3346,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 +3371,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 +3383,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 +3414,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 +3444,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 +3457,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 +3502,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 +3835,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..328b638b06f 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -1,6 +1,7 @@ /* -*- c++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ast_enum.h" #include "ast_exception.h" #include "ast_expression.h" @@ -51,7 +52,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 +72,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 +184,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 +202,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 +215,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 +229,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 +245,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 +258,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 +272,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 +431,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..b5703032394 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp @@ -1,6 +1,7 @@ /* -*- c++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ast_argument.h" #include "ast_exception.h" #include "ast_expression.h" @@ -51,7 +52,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 +180,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..0c53a5bc7e2 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -1,6 +1,7 @@ /* -*- c++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ast_enum.h" #include "ast_expression.h" #include "ast_field.h" @@ -42,7 +43,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 +67,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 +82,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 +140,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 +159,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 +172,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 +188,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 +208,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 +220,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 +236,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 +396,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..a03bf8a5845 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -1,6 +1,7 @@ /* -*- c++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ast_enum.h" #include "ast_expression.h" #include "ast_union.h" @@ -52,7 +53,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 +80,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 +95,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 +318,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 +340,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 +360,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 +373,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 +388,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 +409,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 +421,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 +437,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 +472,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..c671f048e98 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -1,6 +1,7 @@ /* -*- c++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ifr_removing_visitor.h" #include "utl_scope.h" #include "ast_root.h" @@ -34,7 +35,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 +88,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 +99,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 +112,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..17114c0d580 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Activator_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Task.h" @@ -91,7 +92,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..75ee0e4700e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp @@ -11,7 +11,8 @@ #include "Adapter_Activator.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" +#include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/Servant_Base.h" ImR_Adapter::ImR_Adapter (void) @@ -22,7 +23,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 +76,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/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h index 8a56836c0f1..72aa6060f15 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h @@ -23,7 +23,9 @@ #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServantBase; +TAO_END_VERSIONED_NAMESPACE_DECL /** diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp index 75094848da1..95668c6f4ac 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Config_Backing_Store.h" #include "Server_Info.h" #include "Activator_Info.h" @@ -140,7 +141,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 +157,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 +177,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 +209,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 +217,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 +233,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 +253,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 +299,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 9b143038eb0..ded0b6cbcde 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -4,13 +4,13 @@ * * $Id$ * -* @brief Definition of ImR_Forwarder +* @brief Definition of ImR_DSI_Forwarder * -* @author Darrell Brunsch <brunsch@cs.wustl.edu> -* @author Priyanka Gontla <pgontla@doc.ece.uci.edu> +* @author Phil Mesnier <mesnier_p@ociweb.com> */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "Forwarder.h" #include "ImR_Locator_i.h" @@ -22,11 +22,11 @@ #include "tao/PortableServer/POA_Current_Impl.h" #include "tao/PortableServer/POA_Current.h" -#include <tao/TAO_Server_Request.h> -#include <tao/DynamicInterface/Request.h> -#include <tao/DynamicInterface/Server_Request.h> -#include <tao/DynamicInterface/AMH_DSI_Response_Handler.h> -#include <tao/Messaging/AMH_Response_Handler.h> +#include "tao/TAO_Server_Request.h" +#include "tao/DynamicInterface/Request.h" +#include "tao/DynamicInterface/Server_Request.h" +#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h" +#include "tao/Messaging/AMH_Response_Handler.h" ImR_DSI_Forwarder::ImR_DSI_Forwarder (ImR_Locator_i& imr_impl) : locator_ (imr_impl) @@ -88,8 +88,9 @@ ImR_DSI_Forwarder::_dispatch (TAO_ServerRequest &request, CORBA::ServerRequest (request)); try { - TAO_AMH_DSI_Response_Handler_var rh; - ACE_NEW (rh, TAO_AMH_DSI_Response_Handler(request)); + TAO_AMH_DSI_Response_Handler_ptr rhp; + ACE_NEW (rhp, TAO_AMH_DSI_Response_Handler(request)); + TAO_AMH_DSI_Response_Handler_var rh(rhp); rh->init (request, 0); // Delegate to user. @@ -206,14 +207,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/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index cc5b91aa674..927fec2103e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -42,9 +42,11 @@ class ImR_Locator_i; */ // forward declare the types used to manage AMH/DSI coupling +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_AMH_DSI_Response_Handler; typedef TAO_AMH_DSI_Response_Handler * TAO_AMH_DSI_Response_Handler_ptr; class TAO_AMH_DSI_Response_Handler_var; +TAO_END_VERSIONED_NAMESPACE_DECL class ImR_DSI_ResponseHandler : public ImR_ResponseHandler { diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h index 3aee6001873..78ba670428c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h @@ -15,7 +15,7 @@ #define IMR_INS_LOCATOR_H #include /**/ "ace/pre.h" -#include "tao/IORTable/IORTable.h" +#include "tao/IORTable/Async_IORTable.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index 4e9843969ea..c7f62fe55f4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Activator_Options.h" #include "ImR_Activator_i.h" #include "Activator_NT_Service.h" @@ -92,7 +93,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 +125,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 +153,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 +166,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 +180,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.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl index 03b6a55385a..3dce9f3009d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl @@ -2,7 +2,7 @@ // $Id$ -#include "tao/ImR_Client/ImplRepo.pidl" +#include "ImplRepo.idl" module ImplementationRepository { diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index ad7f91357c7..d75b0b0b367 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ImR_Activator_i.h" #include "Activator_Options.h" @@ -63,7 +64,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 +80,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 +88,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 +103,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 +145,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 +154,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 +167,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 +178,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 +218,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 +233,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 +251,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 +287,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 +329,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 +341,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 +356,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 +369,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 +384,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..e750df79eaa 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ImR_Locator_i.h" #include "Locator_NT_Service.h" #include "Locator_Options.h" @@ -91,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 */ @@ -122,7 +123,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 +135,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 +148,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 +162,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..48fd7af01a6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -1,5 +1,6 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ImR_Locator_i.h" #include "utils.h" #include "Iterator.h" @@ -52,12 +53,14 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) { return poa._retn (); } +int ImR_Locator_i::debug_ = 0; + ImR_Locator_i::ImR_Locator_i (void) : dsi_forwarder_ (*this) , ins_locator_ (0) , aam_set_ () - , debug_ (0) , read_only_ (false) + , ping_external_ (false) , unregister_if_address_reused_ (false) { // Visual C++ 6.0 is not smart enough to do a direct assignment @@ -81,12 +84,13 @@ ImR_Locator_i::~ImR_Locator_i (void) int ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts) { - orb_ = CORBA::ORB::_duplicate (orb); - debug_ = opts.debug (); - read_only_ = opts.readonly (); - startup_timeout_ = opts.startup_timeout (); - ping_interval_ = opts.ping_interval (); - unregister_if_address_reused_ = opts.unregister_if_address_reused (); + this->orb_ = CORBA::ORB::_duplicate (orb); + ImR_Locator_i::debug_ = opts.debug (); + this->read_only_ = opts.readonly (); + this->startup_timeout_ = opts.startup_timeout (); + this->ping_external_ = opts.ping_external (); + this->ping_interval_ = opts.ping_interval (); + this->unregister_if_address_reused_ = opts.unregister_if_address_reused (); CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA"); @@ -95,7 +99,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts) this->dsi_forwarder_.init (orb); this->adapter_.init (& this->dsi_forwarder_); - this->pinger_.init (orb, ACE_Time_Value (10,0)); // ping_interval_); + this->pinger_.init (orb, this->ping_interval_); // Register the Adapter_Activator reference to be the RootPOA's // Adapter Activator. @@ -149,22 +153,52 @@ 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); } } // Register the ImR for use with INS - obj = orb->resolve_initial_references ("IORTable"); + obj = orb->resolve_initial_references ("AsyncIORTable"); IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in ()); ACE_ASSERT (! CORBA::is_nil (ior_table.in ())); ior_table->set_locator (this->ins_locator_.in ()); + // initialize the repository. This will load any values that // may have been persisted before. - return this->repository_->init(this->root_poa_.in (), - this->imr_poa_.in (), - ior); + int result = this->repository_->init(this->root_poa_.in (), + this->imr_poa_.in (), + ior); + if (result == 0) + { + Locator_Repository::SIMap::ENTRY* entry = 0; + Locator_Repository::SIMap::ITERATOR it (this->repository_->servers ()); + + // Number of servers that will go into the server_list. + CORBA::ULong n = this->repository_->servers ().current_size (); + + for (CORBA::ULong i = 0; i < n; i++) + { + it.next (entry); + it.advance (); + ACE_ASSERT (entry != 0); + + const Server_Info& info = *(entry->int_id_); + // ImplementationRepository::ServerInformation_var imr_info = + // info.createImRServerInfo (); + + if (!CORBA::is_nil (info.server.in()) && + !this->pinger_.has_server (info.name.c_str())) + { + this->pinger_.add_server (info.name.c_str(), + this->ping_external_, + info.server.in()); + } + } + } + + return result; } int @@ -191,7 +225,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 +236,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 +258,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,9 +297,8 @@ ImR_Locator_i::shutdown } if (debug_ > 0 && shutdown_errs > 0) { - ACE_DEBUG (( - LM_DEBUG, - ACE_TEXT ("ImR: Some activators could not be shut down.\n"))); + ORBSVCS_DEBUG (( LM_DEBUG, + ACE_TEXT ("ImR: Some activators could not be shut down.\n"))); } } // Technically, we should wait for all the activators to unregister, but @@ -287,14 +320,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) { @@ -326,8 +359,8 @@ ImR_Locator_i::register_activator ACE_ASSERT (err == 0); ACE_UNUSED_ARG (err); - if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator registered for %C.\n"), + if (debug_ > 0) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator registered for %C.\n"), aname)); _tao_rh->register_activator (token); @@ -344,9 +377,9 @@ ImR_Locator_i::unregister_activator if (! info.null ()) { - if (info->token != token && this->debug_ > 0) + if (info->token != token && debug_ > 0) { - ACE_DEBUG (( + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("ImR: Ignoring unregister activator:%C. Wrong token.\n"), aname)); @@ -356,14 +389,14 @@ 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"), + if (debug_ > 0) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Activator %C unregistered.\n"), aname)); } else { - if (this->debug_ > 0) - ACE_DEBUG (( + if (debug_ > 0) + ORBSVCS_DEBUG (( LM_DEBUG, ACE_TEXT ("ImR: Ignoring unregister activator: %C. ") ACE_TEXT ("Unknown activator.\n"), @@ -387,8 +420,8 @@ 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)); + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server has died <%C>.\n"), name)); UpdateableServerInfo info(this->repository_.get(), name); if (! info.null ()) @@ -398,23 +431,30 @@ ImR_Locator_i::notify_child_death } else { - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Failed to find server in repository.\n"))); } + + AsyncAccessManager_ptr aam(this->find_aam (name)); + if (*aam != 0) + { + aam->notify_child_death (); + } + _tao_rh->notify_child_death (); } -char* -ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start) +bool +ImR_Locator_i::get_info_for_name (const char* name, Server_Info_Ptr &si) { ImR_SyncResponseHandler rh ("", this->orb_.in()); this->activate_server_by_name (name, manual_start, &rh); return rh.wait_for_result (); } -char* -ImR_Locator_i::activate_server_by_object (const char* object_name) +bool +ImR_Locator_i::split_key (ACE_CString &full, ACE_CString &key, Server_Info_Ptr &si) { Server_Info_Ptr si; ACE_CString key; @@ -435,7 +475,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)); } @@ -559,9 +599,9 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& if (CORBA::is_nil (ret.in ())) { - if (this->debug_ > 0) + if (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 +626,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 +640,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) @@ -619,8 +659,8 @@ ImR_Locator_i::add_or_update_server UpdateableServerInfo info(this->repository_.get(), serverKey); if (info.null ()) { - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Adding server <%C>.\n"), server)); + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Adding server <%C>.\n"), server)); this->repository_->add_server ("", serverKey, @@ -634,8 +674,8 @@ ImR_Locator_i::add_or_update_server } else { - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Updating server <%C>.\n"), + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Updating server <%C>.\n"), server)); info.edit ()->activator = options.activator.in (); @@ -649,10 +689,10 @@ ImR_Locator_i::add_or_update_server info.update_repo(); } - if (this->debug_ > 1) + if (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 +708,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 +749,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 = @@ -734,8 +774,8 @@ ImR_Locator_i::remove_server { if (this->repository_->remove_server (serverKey) == 0) { - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Removing Server <%C>...\n"), name)); @@ -746,15 +786,15 @@ ImR_Locator_i::remove_server bool wait = false; poa->destroy (etherealize, wait); } - if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 0) + 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); @@ -785,8 +825,8 @@ ImR_Locator_i::shutdown_server { ACE_ASSERT (server != 0); - if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 0) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Shutting down server <%C>.\n"), server)); @@ -798,7 +838,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 +851,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; @@ -840,9 +880,9 @@ ImR_Locator_i::shutdown_server info.edit ()->reset (); // Note : This is a good thing. It means we didn't waste our time waiting for // the server to finish shutting down. - if (this->debug_ > 1) + if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Timeout while waiting for <%C> shutdown.\n"), server)); } @@ -852,9 +892,9 @@ ImR_Locator_i::shutdown_server } catch (CORBA::Exception&) { - if (this->debug_ > 1) + if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Exception ignored while shutting down <%C>\n"), server)); } @@ -882,21 +922,21 @@ ImR_Locator_i::server_is_running bool jacorb_server = false; this->parse_id(id, server_id, name, jacorb_server); - if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 0) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %C is running at %C.\n"), name.c_str (), partial_ior)); CORBA::String_var ior = orb_->object_to_string (server); - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %C callback at %C.\n"), name.c_str (), ior.in ())); if (this->unregister_if_address_reused_) - this->repository_->unregister_if_address_reused (server_id, name, partial_ior); + this->repository_->unregister_if_address_reused (server_id, name, partial_ior, this); CORBA::Object_var obj = this->set_timeout_policy (server,ACE_Time_Value (1,0)); ImplementationRepository::ServerObject_var s = @@ -905,9 +945,9 @@ ImR_Locator_i::server_is_running UpdateableServerInfo info(this->repository_.get(), name); if (info.null ()) { - if (this->debug_ > 0) + if (debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Auto adding NORMAL server <%C>.\n"), name.c_str ())); } @@ -930,9 +970,9 @@ ImR_Locator_i::server_is_running Server_Info_Ptr temp_info = this->repository_->get_server(name); if (temp_info.null ()) { - if (this->debug_ > 0) + if (debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Auto adding failed, giving up <%C>\n"), name.c_str ())); } @@ -941,7 +981,7 @@ ImR_Locator_i::server_is_running return; } - this->pinger_.add_server (name.c_str(), s); + this->pinger_.add_server (name.c_str(), this->ping_external_, s.in()); AsyncAccessManager *aam_raw; ACE_NEW (aam_raw, AsyncAccessManager (*temp_info, true, *this)); AsyncAccessManager_ptr aam (aam_raw); @@ -953,7 +993,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 ())); @@ -967,12 +1007,12 @@ ImR_Locator_i::server_is_running info.edit ()->server = s; info.update_repo(); - this->pinger_.add_server (name.c_str(), s); + this->pinger_.add_server (name.c_str(), true, s.in()); } AsyncAccessManager_ptr aam(this->find_aam (name.c_str())); if (*aam != 0) - aam->server_is_running (partial_ior, s); + aam->server_is_running (partial_ior, s.in()); else { if (info->activation_mode != ImplementationRepository::PER_CLIENT) @@ -997,9 +1037,9 @@ ImR_Locator_i::server_is_shutting_down UpdateableServerInfo info (this->repository_.get(), server); if (info.null ()) { - if (this->debug_ > 1) + if (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)); @@ -1008,8 +1048,8 @@ ImR_Locator_i::server_is_shutting_down return; } - if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 0) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server <%C> is shutting down.\n"), server)); @@ -1047,16 +1087,16 @@ ImR_Locator_i::find { imr_info = info->createImRServerInfo (); - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Found server %C.\n"), server)); + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Found server %C.\n"), server)); } else { ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ()); imr_info->startup.activation= ImplementationRepository::NORMAL; - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Cannot find server <%C>\n"), server)); } @@ -1068,7 +1108,6 @@ ImR_Locator_i::find return; } _tao_rh->find (imr_info.in()); - // delete imr_info; } void @@ -1080,8 +1119,8 @@ ImR_Locator_i::list ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iterator; - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: List servers.\n"))); + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: List servers.\n"))); // Initialize the out variables, so if we return early, they will // not be dangling. @@ -1112,9 +1151,9 @@ ImR_Locator_i::list server_list->length (n); - if (this->debug_ > 1) + if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR_Locator_i::list: Filling ServerList with %d servers\n"), n)); } @@ -1139,9 +1178,9 @@ ImR_Locator_i::list else { imr_info->activeStatus = ImplementationRepository::ACTIVE_NO; - if (this->debug_ > 0) + if (debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR: Server %s is not active\n"), info.name.c_str ())); } @@ -1152,8 +1191,8 @@ ImR_Locator_i::list if (this->repository_->servers ().current_size () > n) { - if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, + if (debug_ > 1) + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("ImR_Locator_i::list: Creating ServerInformation ") ACE_TEXT ("Iterator\n"))); @@ -1224,7 +1263,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 ())); @@ -1263,9 +1302,9 @@ ImR_Locator_i::auto_start_servers (void) } catch (CORBA::Exception& ex) { - if (this->debug_ > 1) + if (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"); @@ -1280,6 +1319,12 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info) { if (! CORBA::is_nil (info->server.in ())) { + if (!this->pinger_.has_server (info->name.c_str())) + { + this->pinger_.add_server (info->name.c_str(), + this->ping_external_, + info->server.in()); + } return; // already connected } @@ -1311,9 +1356,14 @@ 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 ())); + this->pinger_.add_server (info->name.c_str(), + this->ping_external_, + info->server.in()); + + } catch (CORBA::Exception&) { @@ -1325,16 +1375,20 @@ bool ImR_Locator_i::is_alive (UpdateableServerInfo& info) { this->connect_server (info); - SyncListener listener (info->name.c_str(), - this->orb_.in(), - this->pinger_); - return listener.is_alive(); + SyncListener *listener = 0; + ACE_NEW_RETURN (listener, + SyncListener (info->name.c_str(), + this->orb_.in(), + this->pinger_), + false); + LiveListener_ptr llp(listener); + return listener->is_alive(); } int -ImR_Locator_i::debug () const +ImR_Locator_i::debug () { - return this->debug_; + return debug_; } LiveCheck& @@ -1356,10 +1410,24 @@ ImR_Locator_i::remove_aam (AsyncAccessManager_ptr &aam) } +void +ImR_Locator_i::remove_aam (const char *name) +{ + for (AAM_Set::ITERATOR i = this->aam_set_.begin(); + i != this->aam_set_.end(); + ++i) + { + if ((*i)->has_server (name)) + { + this->aam_set_.remove (*i); + return; + } + } +} + AsyncAccessManager * ImR_Locator_i::find_aam (const char *name) { - for (AAM_Set::ITERATOR i = this->aam_set_.begin(); i != this->aam_set_.end(); ++i) @@ -1386,6 +1454,10 @@ SyncListener::SyncListener (const char *server, { } +SyncListener::~SyncListener () +{ +} + bool SyncListener::is_alive (void) { @@ -1404,7 +1476,7 @@ SyncListener::is_alive (void) this->orb_->perform_work (delay); } this->got_it_ = false; - return this->status_ == LS_ALIVE; + return this->status_ != LS_DEAD; } bool diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h index 40ffd1c289d..ebc01e2c2b3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h @@ -59,7 +59,7 @@ public: /// Shutdown the orb. void shutdown (bool wait_for_completion); - int debug() const; + static int debug (void); // Note : See the IDL for descriptions of the operations. // Activator->Locator @@ -144,6 +144,7 @@ public: Activator_Info_Ptr get_activator (const ACE_CString& name); void remove_aam (AsyncAccessManager_ptr &aam); + void remove_aam (const char *name); AsyncAccessManager *find_aam (const char *name); private: @@ -176,6 +177,8 @@ private: private: + static int debug_; + // The class that handles the forwarding. ImR_DSI_Forwarder dsi_forwarder_; @@ -196,12 +199,11 @@ private: PortableServer::POA_var root_poa_; PortableServer::POA_var imr_poa_; - int debug_; - auto_ptr<Locator_Repository> repository_; bool read_only_; ACE_Time_Value startup_timeout_; + bool ping_external_; ACE_Time_Value ping_interval_; bool unregister_if_address_reused_; }; @@ -215,6 +217,8 @@ class SyncListener : public LiveListener public: SyncListener (const char *server, CORBA::ORB_ptr orb, LiveCheck &pinger); + virtual ~SyncListener (); + bool is_alive (void); bool status_changed (LiveStatus status); @@ -269,7 +273,7 @@ public: LOC_REMOVE_SERVER, LOC_SHUTDOWN_SERVER, LOC_SERVER_IS_RUNNING, - LOC_SERVER_IS_SHUTTING_DOWN, + LOC_SERVER_IS_SHUTTING_DOWN }; ImR_Loc_ResponseHandler (Loc_Operation_Id opid, diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 7dc1aad812b..cbb585df5b2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,9 +1,48 @@ // $Id$ -project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, portableserver, imr_client, tao_versioning_idl_defaults { +project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults { + sharedname = TAO_Async_ImR_Client_IDL + dynamicflags += ASYNC_IMR_CLIENT_BUILD_DLL + + idlflags += -Gp -Gd -Sorb \ + -I$(TAO_ROOT)/tao/ImR_Client \ + -Wb,export_macro=Async_IMR_Client_Export \ + -Wb,export_include=async_imr_client_export.h + + idlflags -= -Sa -St + + Modify_Custom(IDL) { + output_follows_input = 0 + } + + IDL_Files { + idlflags += -GA -GC + ../../tao/ImR_Client/ServerObject.idl + } + + IDL_Files { + idlflags += -GX -GH + ../../tao/ImR_Client/ImplRepo.idl + } + + Source_Files { + } + + Header_Files { + async_imr_client_export.h + } +} + + +project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, dynamicinterface, portableserver, messaging, tao_versioning_idl_defaults { sharedname = TAO_ImR_Activator_IDL dynamicflags += ACTIVATOR_IDL_BUILD_DLL - idlflags += -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h + after += Async_ImR_Client_IDL + libs += TAO_Async_ImR_Client_IDL + idlflags += -Wb,export_macro=ActivatorIDL_Export \ + -Wb,export_include=activator_idl_export.h \ + -I$(TAO_ROOT)/tao/ImR_Client + idl_files { idlflags += -GH -GC ImR_Activator.idl @@ -17,14 +56,16 @@ project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, portableserve } } -project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, imr_client, messaging, tao_versioning_idl_defaults { +project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro,tao_versioning_idl_defaults { sharedname = TAO_ImR_Locator_IDL after += ImR_Activator_IDL - libs += TAO_ImR_Activator_IDL + libs += TAO_ImR_Activator_IDL TAO_Async_ImR_Client_IDL // Dont try to build this project if ImR_Activator_IDL is not built dynamicflags += LOCATOR_IDL_BUILD_DLL - idlflags += -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h + idlflags += -Wb,export_macro=LocatorIDL_Export \ + -Wb,export_include=locator_idl_export.h \ + -I$(TAO_ROOT)/tao/ImR_Client idl_files { idlflags += -GH ImR_Locator.idl @@ -39,11 +80,11 @@ project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, port } } -project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, imr_client, messaging, pi, codecfactory { +project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, valuetype, portableserver, messaging, pi, codecfactory, svc_utils { sharedname = TAO_ImR_Activator dynamicflags += ACTIVATOR_BUILD_DLL - after += ImR_Activator_IDL ImR_Locator_IDL - libs += TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL + after += ImR_Locator_IDL + libs += TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL TAO_Async_ImR_Client_IDL // Dont try to build this project if ImR_Activator_IDL is not built Source_Files { @@ -58,11 +99,11 @@ project(ImR_Activator) : orbsvcslib, orbsvcs_output, conv_lib, acexml, avoids_mi } } -project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, portableserver, messaging, svc_utils, acexml, imr_client, iormanip, dynamicinterface { +project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, async_iortable, portableserver, messaging, svc_utils, acexml, iormanip, dynamicinterface { sharedname = TAO_ImR_Locator dynamicflags += LOCATOR_BUILD_DLL - after += ImR_Locator_IDL ImR_Activator_IDL - libs += TAO_ImR_Locator_IDL TAO_ImR_Activator_IDL + after += ImR_Locator_IDL + libs += TAO_ImR_Locator_IDL TAO_ImR_Activator_IDL TAO_Async_ImR_Client_IDL avoids += uses_wchar Source_Files { @@ -92,10 +133,10 @@ project(ImR_Locator) : orbsvcslib, orbsvcs_output, conv_lib, avoids_minimum_corb } } -project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iortable, messaging, acexml ,svc_utils, pi_server, imr_client, iormanip { +project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, async_iortable, messaging, acexml ,svc_utils, pi_server, iormanip { exename = tao_imr_locator - after += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL - libs += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL + after += ImR_Locator + libs += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL TAO_Async_ImR_Client_IDL avoids += uses_wchar // Static Debug builds on Windows will not link properly due @@ -118,10 +159,10 @@ project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, av } -project(ImR_Activator_Service) : orbsvcsexe, install, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, messaging, svc_utils, imr_client { +project(ImR_Activator_Service) : orbsvcsexe, install, acexml, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, messaging, svc_utils { exename = tao_imr_activator - after += ImR_Activator ImR_Activator_IDL ImR_Locator_IDL - libs += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL + after += ImR_Activator + libs += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL TAO_Async_ImR_Client_IDL Source_Files { ImR_Activator.cpp Activator_NT_Service.cpp @@ -131,7 +172,7 @@ project(ImR_Activator_Service) : orbsvcsexe, install, acexml, avoids_minimum_cor } -project(tao_imr) : orbsvcsexe, install, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, portableserver, imr_client, messaging { +project(tao_imr) : orbsvcsexe, install, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, portableserver, imr_client, messaging, svc_utils { install = $(ACE_ROOT)/bin exename = tao_imr Source_Files { diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index 1dab91eec44..db02e5f33b9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -16,7 +16,7 @@ #include "Locator_Repository.h" #include "tao/PortableServer/PortableServer.h" -#include "tao/ImR_Client/ImplRepoS.h" +#include "ImplRepoS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp index 55c0d283a25..c4f8ed397ab 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Locator_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Task.h" @@ -85,7 +86,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..cb56247559d 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) @@ -29,6 +29,7 @@ Options::Options () , debug_ (1) , multicast_ (false) , service_ (false) +, ping_external_ (false) , ping_interval_ (DEFAULT_PING_INTERVAL) , startup_timeout_ (DEFAULT_START_TIMEOUT) , readonly_ (false) @@ -57,7 +58,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 +75,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 +90,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 +109,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 +141,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 +167,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 +193,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 +221,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; @@ -229,13 +230,18 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) ACE_Time_Value (ACE_OS::atoi (shifter.get_current ())); } else if (ACE_OS::strcasecmp (shifter.get_current (), + ACE_TEXT ("-i")) == 0) + { + this->ping_external_ = true; + } + else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("-v")) == 0) { shifter.consume_arg (); 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 +261,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 +272,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,12 +310,12 @@ 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") ACE_TEXT (" [-r|-p file|-x file|--directory dir [--primary|--backup] ]\n") - ACE_TEXT (" [-s] [-t secs] [-v secs]\n") + ACE_TEXT (" [-s] [-t secs] [-v msecs]\n") ACE_TEXT (" -c command Runs nt service commands ('install' or 'remove')\n") ACE_TEXT (" -d level Sets the debug level (default 1)\n") ACE_TEXT (" -e Erase the persisted repository at startup\n") @@ -324,8 +330,9 @@ Options::print_usage (void) const ACE_TEXT (" --backup Replicate the ImplRepo as the backup ImR\n") ACE_TEXT (" -r Use the registry for storing/loading settings\n") ACE_TEXT (" -s Run as a service\n") - ACE_TEXT (" -t secs Server startup timeout.(Default=60s)\n") - ACE_TEXT (" -v msecs Server verification interval.(Default=10s)\n") + ACE_TEXT (" -t secs Server startup timeout.(Default = 60s)\n") + ACE_TEXT (" -v msecs Server verification interval.(Default = 10000ms)\n") + ACE_TEXT (" -i Ping servers without activators too. (Default=false)\n") ACE_TEXT (" --asynch Servant dispatching using asynch method handling\n") )); } @@ -366,7 +373,12 @@ Options::save_registry_options () (LPBYTE) this->persist_file_name_.c_str (), this->persist_file_name_.length () + 1); ACE_ASSERT (err == ERROR_SUCCESS); - DWORD tmp = this->ping_interval_.msec (); + DWORD tmp = this->ping_external_ ? 1 : 0; + err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("PingExternals"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof (DWORD)); + ACE_ASSERT (err == ERROR_SUCCESS); + + tmp = this->ping_interval_.msec (); err = ACE_TEXT_RegSetValueEx (key, ACE_TEXT ("PingInterval"), 0, REG_DWORD, (LPBYTE) &tmp, sizeof (DWORD)); ACE_ASSERT (err == ERROR_SUCCESS); @@ -450,6 +462,16 @@ Options::load_registry_options () DWORD tmp = 0; sz = sizeof(tmp); + err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("PingExternal"), 0, &type, + (LPBYTE) &tmp, &sz); + if (err == ERROR_SUCCESS) + { + ACE_ASSERT (type == REG_DWORD); + ping_external_ = tmp != 0; + } + + tmp = 0; + sz = sizeof(tmp); err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT ("PingInterval"), 0, &type, (LPBYTE) &tmp, &sz); if (err == ERROR_SUCCESS) @@ -566,6 +588,12 @@ Options::startup_timeout (void) const return this->startup_timeout_; } +bool +Options::ping_external (void) const +{ + return this->ping_external_; +} + ACE_Time_Value Options::ping_interval (void) const { diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index 77d583751bf..38c9e893ac7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -90,6 +90,17 @@ public: /// Returns the timeout value for program starting. ACE_Time_Value startup_timeout (void) const; + /// Servers may be started externally to the ImR but register with it + /// so that clients may still be forwarded to it. Traditionally, such + /// servers are not pinged by the ImR in the spirit that since its own + /// means were used to activate the service, the ImR should let the client + /// deal with the server no matter the consequences. However, the ImR is + /// in a position to give more information to the client or lists of + /// active servers, so enabling the ping_external_ option will override + /// the assumption of liveness and actively ping, based on the existing + /// rules, all registered servers. + bool ping_external (void) const; + /// If the server hasn't been verified for a while, then we'll /// ping it. Note : No timers are currently used. We simply ping() /// during indirect invocations, if this interval has elapsed. @@ -132,6 +143,9 @@ private: /// Are we running as a service? bool service_; + /// Should the ImR ping servers not started using the ImR? + bool ping_external_; + /// The amount of time between successive "are you started yet?" pings. ACE_Time_Value ping_interval_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index 93c311a3591..57f151c011d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -1,6 +1,9 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Locator_Repository.h" +#include "ImR_Locator_i.h" + #include "utils.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" @@ -52,13 +55,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 +109,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 +128,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 +233,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*/ @@ -271,11 +274,13 @@ int Locator_Repository::unregister_if_address_reused ( const ACE_CString& server_id, const ACE_CString& name, - const char* partial_ior) + const char* partial_ior, + ImR_Locator_i* imr_locator) + { 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 +298,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 +310,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 ())); } @@ -319,7 +324,7 @@ Locator_Repository::unregister_if_address_reused ( int err = 0; for (size_t i = 0; i < srvs.size (); ++i) { - + imr_locator->remove_aam (srvs[i].c_str()); if (this->remove_server (srvs[i]) != 0) { err = -1; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h index 6ccf4133131..db10b849320 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h @@ -33,6 +33,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +class ImR_Locator_i; + /** * @class Locator_Repository * @@ -62,7 +64,8 @@ public: int unregister_if_address_reused (const ACE_CString& server_id, const ACE_CString& name, - const char* partial_ior); + const char* partial_ior, + ImR_Locator_i* imr_locator); /// Add a new server to the Repository int add_server (const ACE_CString& server_id, diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h index a1deb9f6acb..5bc052c6c73 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h @@ -15,7 +15,7 @@ #include "ace/Bound_Ptr.h" -#include "tao/ImR_Client/ImplRepoC.h" +#include "ImplRepoC.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 2b8dbf523f4..2dc6cd91e72 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Shared_Backing_Store.h" #include "Server_Info.h" #include "Activator_Info.h" @@ -124,7 +125,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 +200,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 +320,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 +351,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 +393,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 +405,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 +424,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 +510,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 +518,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 +569,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 +577,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 +618,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 +678,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 +687,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 +701,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 +713,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 +760,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 +772,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 +780,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 +792,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 +819,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 +873,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 +889,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 +950,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 +963,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 +992,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 +1115,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 +1154,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 +1200,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 +1218,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 +1255,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 +1348,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 +1375,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 +1388,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..582e292d3a7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "XML_Backing_Store.h" #include "Server_Info.h" #include "Activator_Info.h" @@ -56,7 +57,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 +206,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 +233,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 +241,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 (); @@ -295,7 +296,9 @@ XML_Backing_Store::create_server(bool server_started, const Server_Info_Ptr& si) { if (!server_started || si->ior.is_empty()) - return; + { + return; + } CORBA::Object_var obj = this->orb_->string_to_object(si->ior.c_str()); if (!CORBA::is_nil(obj.in())) @@ -304,8 +307,6 @@ XML_Backing_Store::create_server(bool server_started, ImplementationRepository::ServerObject::_unchecked_narrow (obj.in()); si->last_ping = ACE_Time_Value::zero; } - else - si->server = ImplementationRepository::ServerObject::_nil(); } void @@ -319,5 +320,5 @@ XML_Backing_Store::load_activator (const ACE_CString& activator_name, Activator_Info (activator_name, token, ior)); Activator_Info_Ptr info (ai); - this->activators().rebind(activator_name, info); + this->activators().rebind(Locator_Repository::lcase (activator_name), info); } diff --git a/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h b/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h new file mode 100644 index 00000000000..a19163be766 --- /dev/null +++ b/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl Async_IMR_Client +// ------------------------------ +#ifndef ASYNC_IMR_CLIENT_EXPORT_H +#define ASYNC_IMR_CLIENT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (ASYNC_IMR_CLIENT_HAS_DLL) +# define ASYNC_IMR_CLIENT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && ASYNC_IMR_CLIENT_HAS_DLL */ + +#if !defined (ASYNC_IMR_CLIENT_HAS_DLL) +# define ASYNC_IMR_CLIENT_HAS_DLL 1 +#endif /* ! ASYNC_IMR_CLIENT_HAS_DLL */ + +#if defined (ASYNC_IMR_CLIENT_HAS_DLL) && (ASYNC_IMR_CLIENT_HAS_DLL == 1) +# if defined (ASYNC_IMR_CLIENT_BUILD_DLL) +# define Async_IMR_Client_Export ACE_Proper_Export_Flag +# define ASYNC_IMR_CLIENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ASYNC_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ASYNC_IMR_CLIENT_BUILD_DLL */ +# define Async_IMR_Client_Export ACE_Proper_Import_Flag +# define ASYNC_IMR_CLIENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ASYNC_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ASYNC_IMR_CLIENT_BUILD_DLL */ +#else /* ASYNC_IMR_CLIENT_HAS_DLL == 1 */ +# define Async_IMR_Client_Export +# define ASYNC_IMR_CLIENT_SINGLETON_DECLARATION(T) +# define ASYNC_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ASYNC_IMR_CLIENT_HAS_DLL == 1 */ + +// Set ASYNC_IMR_CLIENT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ASYNC_IMR_CLIENT_NTRACE) +# if (ACE_NTRACE == 1) +# define ASYNC_IMR_CLIENT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ASYNC_IMR_CLIENT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ASYNC_IMR_CLIENT_NTRACE */ + +#if (ASYNC_IMR_CLIENT_NTRACE == 1) +# define ASYNC_IMR_CLIENT_TRACE(X) +#else /* (ASYNC_IMR_CLIENT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ASYNC_IMR_CLIENT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ASYNC_IMR_CLIENT_NTRACE == 1) */ + +#endif /* ASYNC_IMR_CLIENT_EXPORT_H */ + +// End of auto generated file. diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 2cc1c06a8e4..4a51e64ff7a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "tao_imr_i.h" #include "tao/PortableServer/PortableServer.h" @@ -29,7 +30,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 +60,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 +71,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 +79,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 +96,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 +107,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 +122,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 +145,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 +197,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 +208,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 +222,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 +264,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 +296,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 +307,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 +328,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 +339,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 +367,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 +385,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 +396,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 +438,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 +449,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 +481,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 +492,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 +524,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 +540,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 +574,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 +601,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 +623,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 +661,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 +683,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 +703,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 +787,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 +804,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 +818,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 +835,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 +843,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 +883,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 +905,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 +926,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 +958,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 +990,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 +1023,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 +1032,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 +1063,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 +1098,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/ImplRepo_Service/utils.h b/TAO/orbsvcs/ImplRepo_Service/utils.h index 2e4effd55b9..4976f44936a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/utils.h +++ b/TAO/orbsvcs/ImplRepo_Service/utils.h @@ -2,7 +2,7 @@ #ifndef TAO_IMR_UTILS_H #define TAO_IMR_UTILS_H -#include "tao/ImR_Client/ImplRepoC.h" +#include "ImplRepoC.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index aced8420040..36e27557bca 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -17,6 +17,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "Factory_Trader.h" #include "orbsvcs/CosTradingC.h" @@ -116,7 +117,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 +198,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..384d2056ba6 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -13,6 +13,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "LifeCycle_Service.h" #include "ace/Argv_Type_Converter.h" @@ -52,7 +53,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 +62,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 +76,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 +90,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 +98,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 +115,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 +132,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 +159,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..bc0759e3b33 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -13,6 +13,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "ace/Get_Opt.h" #include "orbsvcs/LifeCycleServiceC.h" @@ -43,7 +44,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 +52,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 +98,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 +146,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/LoadBalancer.mpc b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc index c4fac513cd1..b918d058ea9 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc +++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.mpc @@ -3,7 +3,7 @@ // $Id$ -project(LoadManager): namingexe, portableserver, install, iortable, iormanip, loadbalancing { +project(LoadManager): namingexe, portableserver, install, iortable, iormanip, loadbalancing, svc_utils { exename = tao_loadmanager requires += ami interceptors Source_Files { @@ -12,7 +12,7 @@ project(LoadManager): namingexe, portableserver, install, iortable, iormanip, lo } } -project(LoadMonitor): namingexe, portableserver, install, loadbalancing { +project(LoadMonitor): namingexe, portableserver, install, loadbalancing, svc_utils { requires += ami interceptors exename = tao_loadmonitor Source_Files { diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index 237047cce37..116bc02d955 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Signal_Handler.h" #include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "tao/ORB_Core.h" @@ -20,7 +21,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 +63,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 +183,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 +216,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 +231,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 +246,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 +266,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..2f1989c1c6d 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Push_Handler.h" #include "Monitor_Signal_Handler.h" @@ -26,7 +27,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 +80,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 +168,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 +177,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 +213,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 +222,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 +284,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 +299,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 +347,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..ff0cf22f531 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Monitor_Signal_Handler.h" TAO_LB_Monitor_Signal_Handler::TAO_LB_Monitor_Signal_Handler ( @@ -30,7 +31,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..c960ae4db9d 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Signal_Handler.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" @@ -30,7 +31,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 +39,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 +96,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 +129,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..ee4ab3dec80 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Basic_Logging_Service.h" #include "ace/OS_main.h" @@ -27,7 +28,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 +51,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..58d7c1b8cc1 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Basic_Logging_Service.h" #include "ace/Get_Opt.h" #include "orbsvcs/Log/BasicLogFactory_i.h" @@ -71,7 +72,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 +122,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..cf87be5880e 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Event_Logging_Service.h" #include "ace/OS_main.h" @@ -27,7 +28,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 +51,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..d78635182df 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Event_Logging_Service.h" #include "ace/Get_Opt.h" #include "orbsvcs/Log/EventLogFactory_i.h" @@ -72,7 +73,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 +127,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..dc1a8b7e137 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 @@ -1,5 +1,6 @@ //$Id$ +#include "orbsvcs/Log_Macros.h" #include "Notify_Logging_Service.h" #include "ace/OS_main.h" #include "orbsvcs/Shutdown_Utilities.h" @@ -26,7 +27,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 +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/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 8ffcc60902d..8aa660e1b17 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Notify_Logging_Service.h" #include "ace/Get_Opt.h" #include "tao/debug.h" @@ -32,7 +33,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 +41,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 +88,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 +148,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..35bec988776 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "RTEvent_Logging_Service.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/OS_main.h" @@ -28,7 +29,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 +54,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..e3bd76826e6 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "RTEvent_Logging_Service.h" #include "tao/IORTable/IORTable.h" #include "ace/Get_Opt.h" @@ -71,7 +72,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 +105,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 +133,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..0e125d67d8f 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -9,6 +9,7 @@ #include /**/ "Naming_Service.h" #include "tao/ORB_Core.h" #include "ace/ARGV.h" +#include "orbsvcs/Log_Macros.h" #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE #define TAO_REGISTRY_SUBKEY ACE_TEXT ("SOFTWARE\\ACE\\TAO") @@ -23,7 +24,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 +172,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..2829fe15b73 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Naming_Service.h" #include "ace/OS_main.h" @@ -27,7 +28,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 +46,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..a3a5ce79133 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Notify_Service.h" #include "orbsvcs/orbsvcs/Notify/Properties.h" @@ -33,7 +34,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 +52,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..88d0ef49539 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Notify_Service.h" #include "orbsvcs/Daemon_Utilities.h" @@ -66,7 +67,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 +143,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 +170,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 +189,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 +206,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 +229,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 +252,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 +297,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 +317,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 +328,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 +346,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 +354,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 +371,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 +524,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 +534,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 +586,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 +607,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 +620,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 +661,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 +669,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 +682,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 +696,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 +750,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 +759,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..6383fc157c0 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -15,10 +15,11 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #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 +45,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/TAO_Service/TAO_Service.mpc b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc index f7a27d58b55..6dc278a02a1 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : taoexe, install { +project : taoexe, install, svc_utils { exename = tao_service } diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index 189991f6f26..50d75e2fbcc 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Clerk_i.h" #include "tao/debug.h" #include "ace/Read_Buffer.h" @@ -42,7 +43,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 +54,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 +66,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 +76,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 +130,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 +141,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 +149,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 +195,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 +215,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 +228,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 +258,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 +322,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 +421,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 +438,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 +486,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..ea2454aad2b 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Server_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" @@ -45,13 +46,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 +112,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 +177,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 +213,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 +257,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..af9a3d18e66 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Clerk_i.h" #include "ace/OS_main.h" @@ -12,7 +13,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..a80dc435991 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Server_i.h" #include "ace/OS_main.h" @@ -12,7 +13,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..e0067cc60db 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "Trading_Service.h" #include "ace/OS_main.h" @@ -19,7 +20,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..f604cdffdc2 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ace/Arg_Shifter.h" #include "Trading_Service.h" @@ -8,14 +9,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.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc index d467285bdd2..3a3477f4d4d 100644 --- a/TAO/orbsvcs/orbsvcs/AV.mpc +++ b/TAO/orbsvcs/orbsvcs/AV.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(AV) : orbsvcslib, orbsvcs_output, install, property_serv, naming, qos, tao_versioning_idl_defaults { +project(AV) : orbsvcslib, orbsvcs_output, install, property_serv, naming, qos, tao_versioning_idl_defaults, svc_utils { avoids += ace_for_tao sharedname = TAO_AV idlflags += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 22198e3a91d..3c22a0e8b17 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -9,6 +9,8 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/sfp.h" #include "orbsvcs/AV/MCast.h" @@ -229,7 +231,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 +258,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 +285,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 +302,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 +533,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 +549,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 +576,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 +591,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 +625,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 +638,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 +651,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 +687,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 +730,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 +762,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 +771,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 +789,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 +800,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 +818,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 +838,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 +861,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 +889,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 +934,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 +948,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 +976,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 +1113,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 +1206,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 +1246,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 +1528,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 +1542,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 +1559,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 +1570,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 +1591,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 +1626,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 +1634,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 +1652,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 +1667,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 +1679,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 +1690,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 +1701,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 +1718,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 +1801,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 +1921,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 +2020,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 +2030,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 +2058,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 +2102,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 +2117,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 +2138,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 +2372,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 +2413,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 +2421,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 +2451,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 +2498,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 +2506,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 +2520,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 +2544,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 +2563,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 +2618,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 +2626,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 +2651,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 +2681,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 +2689,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 +2713,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 +2748,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 +2767,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 +2832,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 +2856,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 +2878,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 +2898,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 +2996,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 +3007,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 +3059,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 +3210,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 +3480,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 +3607,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 +3646,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 +3656,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 +3731,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 +3785,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 +3842,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 +3853,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 +3908,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 +4011,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 +4024,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 +4186,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 +4252,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 +4358,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 +4375,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 +4517,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 +4536,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..58589d94052 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl @@ -2,6 +2,8 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE @@ -22,7 +24,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 +42,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..ec1d5a1320f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/AV_Core.h" #include "orbsvcs/AV/FlowSpec_Entry.h" #include "orbsvcs/AV/Transport.h" @@ -156,7 +158,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 +174,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 +223,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 +244,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 +270,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 +296,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 +322,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 +359,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 +377,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 +425,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 +474,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 +544,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 +709,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 +733,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 +760,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 +791,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 +824,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 +834,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 +842,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 +852,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 +879,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 +906,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 +935,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 +961,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 +985,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 +1009,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 +1033,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 +1060,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 +1071,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 +1079,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 +1090,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..2eae2670669 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -10,6 +10,8 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/Endpoint_Strategy.h" #include "tao/debug.h" @@ -44,7 +46,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 +59,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 +97,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 +112,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 +128,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 +141,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 +179,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 +207,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 +224,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 +259,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 +283,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 +301,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 +337,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 +368,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 +386,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..fc424893e16 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -3,6 +3,7 @@ #ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP #define TAO_AV_ENDPOINT_STRATEGY_T_CPP +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/Endpoint_Strategy_T.h" #include "tao/debug.h" @@ -64,13 +65,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 +115,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 +234,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 +323,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 +348,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 +388,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 +434,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 +467,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 +497,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 +572,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 +582,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 +649,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 +706,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 +732,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..2dabe381e62 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -4,6 +4,8 @@ // TAO_FlowSpec_Entry //------------------------------------------------------------ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/FlowSpec_Entry.h" #include "orbsvcs/AV/Protocol_Factory.h" @@ -203,12 +205,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 +241,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 +257,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 +268,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 +278,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 +320,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 +344,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 +362,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 +371,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 +427,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 +451,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 +482,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 +543,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 +566,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 +579,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 +599,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 +813,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 +896,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 +1011,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..2a138f62d96 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -3,6 +3,7 @@ #ifndef TAO_AV_FLOWS_T_CPP #define TAO_AV_FLOWS_T_CPP +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/Flows_T.h" #include "tao/debug.h" @@ -199,7 +200,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..dbe20c5849c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/MCast.h" #include "orbsvcs/AV/AVStreams_i.h" #include "tao/debug.h" @@ -46,7 +48,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 +163,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..32fec051712 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/FlowSpec_Entry.h" #include "tao/debug.h" #include "orbsvcs/AV/Policy.h" @@ -61,14 +63,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 +79,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 +93,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 +101,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..a93b2545c49 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -1,6 +1,8 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/Protocol_Factory.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" @@ -125,7 +127,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..6b7a2376bf4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -33,6 +33,8 @@ */ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/ntp-time.h" #include "orbsvcs/AV/RTCP.h" #include "orbsvcs/AV/media_timer.h" @@ -71,7 +73,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 +97,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 +122,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 +136,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 +164,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 +182,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 +393,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..12b9969f9f1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/RTCP_Channel.h" #include "orbsvcs/AV/RTP.h" #include "tao/debug.h" @@ -198,7 +200,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 +224,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 +233,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..9bdc89cf7a6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -1,4 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/RTCP_Packet.h" #include "orbsvcs/AV/RTP.h" @@ -19,7 +21,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 +251,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 +425,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 +905,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 +936,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 +1177,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..6b41e6b2e53 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -34,6 +34,8 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/RTP.h" #include "orbsvcs/AV/RTCP.h" @@ -114,7 +116,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 +322,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 +331,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 +340,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 +387,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 +478,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 +508,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 +608,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 +673,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 +682,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 +742,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..b6e0ef0cdf3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/TCP.h" #include "orbsvcs/AV/AVStreams_i.h" @@ -179,7 +181,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 +192,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 +210,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 +298,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 +329,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 +352,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 +370,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 +404,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 +426,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 +455,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 +487,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 +522,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 +544,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 +555,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 +591,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 +604,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 +653,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 +679,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 +689,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..6403b9dc602 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/sfp.h" #include "orbsvcs/AV/MCast.h" @@ -79,7 +81,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 +117,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 +153,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 +220,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 +238,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 +298,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 +306,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 +324,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 +341,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 +365,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 +376,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 +393,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 +402,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 +413,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 +427,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 +567,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..a1676add764 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/UDP.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/MCast.h" @@ -57,7 +59,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 +73,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 +85,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 +106,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 +118,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 +139,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 +147,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 +267,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 +355,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 +379,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 +460,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 +548,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 +588,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 +760,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 +810,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 +818,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 +843,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 +869,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 +900,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 +931,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 +942,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 +967,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 +979,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 +1063,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..1e72b0acac9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/default_resource.h" #include "tao/ORB_Core.h" @@ -11,7 +13,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 +38,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 +46,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 +65,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 +83,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..cf517dc3b5e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/AV/sfp.h" #include "tao/debug.h" #include "ace/ARGV.h" @@ -62,7 +64,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 +77,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 +93,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 +107,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 +122,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 +165,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 +199,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 +211,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 +227,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 +244,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 +268,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 +278,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 +300,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 +317,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 +325,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 +376,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 +387,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 +411,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 +430,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 +459,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 +635,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 +644,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 +668,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 +714,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 +734,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 +753,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 +772,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 +792,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 +812,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 +825,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 +875,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 +973,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 +1031,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 +1130,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..706d60ebe13 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -10,6 +10,8 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Concurrency/CC_LockSet.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -85,7 +87,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 +108,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 +145,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 +187,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 +284,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..ed599d3eb47 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -9,6 +9,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "ace/streams.h" #include "orbsvcs/CosConcurrencyControlC.h" #include "tao/debug.h" @@ -59,7 +60,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/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index f22d6d23160..d4120c81e06 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -73,7 +73,7 @@ project(CosConcurrency_Skel): orbsvcslib, orbsvcs_output, install, concurrency, } } -project(CosConcurrency_Serv) : orbsvcslib, orbsvcs_output, install, concurrency_skel, avoids_corba_e_micro { +project(CosConcurrency_Serv) : orbsvcslib, orbsvcs_output, install, concurrency_skel, avoids_corba_e_micro, svc_utils { sharedname = TAO_CosConcurrency_Serv dynamicflags += TAO_CONCURRENCY_SERV_BUILD_DLL tagchecks += Concurrency diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index f4bd0609486..fd7a706fa0b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" #include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h" @@ -88,7 +89,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 +128,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 +199,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 +229,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 +280,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 +306,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 +408,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 +416,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..27f5e1c37d8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_Dispatching_Task.h" #include "tao/ORB_Constants.h" @@ -33,7 +34,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..327946feb17 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -2,6 +2,7 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_DynamicImplementation.h" #include "tao/DynamicInterface/Request.h" #include "tao/DynamicInterface/Unknown_User_Exception.h" @@ -40,7 +41,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 +101,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 +111,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 +132,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 +146,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..7a4ba469921 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -15,6 +15,7 @@ // //=========================================================================== +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" @@ -147,7 +148,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 +161,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 +278,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 +291,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 +304,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 +313,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..79926396970 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_MT_Dispatching.h" @@ -40,7 +41,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..7fe469ce6e6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -4,6 +4,7 @@ // before TAO_Pseudo_{Var,Out}_T templates. All required // non-dependent names must be parsed prior to the template in // question when using compilers like g++ 3.4.x. +#include "orbsvcs/Log_Macros.h" #include "tao/DynamicInterface/DII_CORBA_methods.h" #include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" @@ -337,7 +338,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 +401,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..b77ffddc7fe 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -4,6 +4,7 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" #include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" @@ -305,7 +306,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 +347,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..f8d0efa129d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -2,6 +2,7 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #include "orbsvcs/CosEvent/CEC_Dispatching.h" #include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" @@ -224,7 +225,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 +265,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 +283,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 +295,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 +325,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 +334,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 +345,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 +396,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 +416,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 +458,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 +478,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..0defb881764 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -2,6 +2,7 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" #include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" #include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" @@ -37,7 +38,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/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc index e5747c9a3f0..c408c79b7f3 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosLoadBalancing) : orbsvcslib, orbsvcs_output, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults { +project(CosLoadBalancing) : orbsvcslib, orbsvcs_output, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults, svc_utils { sharedname = TAO_CosLoadBalancing idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h dynamicflags += TAO_LOADBALANCING_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc index fdb8bc3e2ea..4adbf7028f8 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc @@ -10,7 +10,7 @@ project(CosNaming_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl } } -project(CosNaming) : orbsvcslib, orbsvcs_output, install { +project(CosNaming) : orbsvcslib, orbsvcs_output, install, svc_utils { sharedname = TAO_CosNaming dynamicflags += TAO_NAMING_BUILD_DLL tagchecks += Naming diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 180890cbeb7..d55c710bdc4 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -248,7 +248,7 @@ project(CosNotification_Persist) : notification_serv, orbsvcs_output, install, a } } -project(CosNotification_MC): tao_versioning_idl_defaults, orbsvcs_output, naming, tao_monitor, iortable, install { +project(CosNotification_MC): tao_versioning_idl_defaults, orbsvcs_output, naming, tao_monitor, iortable, install, svc_utils { sharedname = TAO_CosNotification_MC dynamicflags += TAO_NOTIFY_MC_BUILD_DLL tagchecks += Notify diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index 1a6d99258fe..0ad6f6c5c3e 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -72,7 +72,7 @@ project(CosProperty_Skel) : orbsvcslib, orbsvcs_output, install, property, porta } } -project(CosProperty_Serv) : orbsvcslib, orbsvcs_output, install, property_skel { +project(CosProperty_Serv) : orbsvcslib, orbsvcs_output, install, property_skel, svc_utils { sharedname = TAO_CosProperty_Serv dynamicflags += TAO_PROPERTY_SERV_BUILD_DLL tagchecks += Property diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 6a6c0d61941..8b67077e1b3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_CDR_Message_Receiver.h" #include "orbsvcs/Event/ECG_CDR_Message_Sender.h" @@ -263,20 +264,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 +306,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 +372,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 +411,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 +440,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 +448,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 +495,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 +532,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 +549,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 +561,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 +592,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..ea0ad2cdb97 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_CDR_Message_Sender.h" #include "tao/CDR.h" #include "ace/SOCK_Dgram.h" @@ -21,7 +22,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 +36,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 +245,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 +255,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..df74a62ce97 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_Complex_Address_Server.h" #include "ace/SString.h" #include "ace/streams.h" @@ -37,7 +38,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 +84,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 +96,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 +105,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 +113,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 +192,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 +201,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..5aac6d70046 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_Mcast_EH.h" #include "orbsvcs/Event/ECG_UDP_Receiver.h" #include "orbsvcs/Event_Service_Constants.h" @@ -46,7 +47,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 +247,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 +271,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..b97ffe9e144 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "orbsvcs/Event/EC_Lifetime_Utils_T.h" @@ -68,7 +69,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 +95,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 +133,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 +195,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 +245,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 +256,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 +265,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 +273,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 +304,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 +323,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 +335,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 +344,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 +403,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 +461,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 +472,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 +562,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 +593,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..a5a4218981e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" #include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" #include "tao/Messaging/Messaging.h" @@ -170,7 +171,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..a6d5f20ef27 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_UDP_EH.h" #include "ace/Reactor.h" #include "ace/INET_Addr.h" @@ -31,7 +32,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 +43,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 +65,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..869e623b18b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_UDP_Receiver.h" #include "orbsvcs/Event_Utilities.h" #include "ace/SString.h" @@ -29,7 +30,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 +51,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 +61,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 +169,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 +185,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 +205,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 +215,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..a913c696385 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl @@ -2,6 +2,9 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE @@ -89,7 +92,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 +109,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..7517514d8e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,6 +9,7 @@ * */ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_UDP_Sender.h" #include "orbsvcs/Event_Utilities.h" #include "tao/CDR.h" @@ -30,14 +31,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 +58,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 +67,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 +162,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..ec83a5c164e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Reactive_Dispatching.h" #include "orbsvcs/Event/EC_MT_Dispatching.h" @@ -59,7 +60,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 +268,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 +313,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 +472,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 +491,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 +499,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 +508,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 +516,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 +542,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 +553,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..44e52d115ed 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Dispatching_Task.h" #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_Defaults.h" @@ -110,7 +111,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..99505ae065d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" #include "orbsvcs/Event/ECG_Defaults.h" #include "orbsvcs/Event_Utilities.h" @@ -84,7 +85,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 +117,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 +241,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 +270,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 +286,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 +333,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 +341,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 +391,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 +407,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 +424,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 +432,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 +440,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 +454,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 +486,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..a10b2098cc6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" #include "orbsvcs/Event/ECG_Defaults.h" #include "orbsvcs/Event_Utilities.h" @@ -141,7 +142,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 +157,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..b30a44d6b65 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Kokyu_Factory.h" #include "orbsvcs/Event/EC_Kokyu_Dispatching.h" #include "orbsvcs/Event/EC_Kokyu_Scheduling.h" @@ -58,7 +60,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 +129,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 +157,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 +187,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..619835dc43a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_MT_Dispatching.h" @@ -40,11 +41,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..16b71d22bd1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Priority_Dispatching.h" #include "orbsvcs/Event/EC_Dispatching_Task.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" @@ -77,7 +78,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..d4e40a598d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Priority_Scheduling.h" #include "orbsvcs/Event/EC_QOS_Info.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" @@ -23,7 +24,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..c24e66102ae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Sched_Factory.h" #include "orbsvcs/Event/EC_Priority_Dispatching.h" #include "orbsvcs/Event/EC_Priority_Scheduling.h" @@ -53,7 +54,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 +88,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 +116,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 +146,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..658d83cd482 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_Dispatching.h" #include "orbsvcs/Event/EC_Defaults.h" @@ -48,21 +49,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 +82,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 +104,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 +113,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 +182,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..2502bbbe980 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_Factory.h" #include "orbsvcs/Event/EC_TPC_Dispatching.h" @@ -54,7 +55,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 +82,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 +100,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 +109,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..4519384a419 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" @@ -32,7 +33,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..28489c6aa39 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_ProxySupplier.h" #if ! defined (__ACE_INLINE__) @@ -24,7 +25,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 +37,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 +56,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..0ef108f34d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl @@ -2,6 +2,9 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL extern unsigned long TAO_EC_TPC_debug_level; @@ -11,7 +14,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/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc index e09415751c3..b4d23c389de 100644 --- a/TAO/orbsvcs/orbsvcs/FTORB.mpc +++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(FTORB_Utils) : orbsvcslib, orbsvcs_output, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults { +project(FTORB_Utils) : orbsvcslib, orbsvcs_output, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults, svc_utils { sharedname = TAO_FTORB_Utils idlflags += -Wb,skel_export_include=tao/PortableServer/PolicyS.h dynamicflags += TAO_FT_ORB_UTILS_BUILD_DLL @@ -29,7 +29,7 @@ project(FTORB_Utils) : orbsvcslib, orbsvcs_output, install, iormanip, portablese } } -project(FT_ClientORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messaging, portablegroup, interceptors, threads { +project(FT_ClientORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messaging, portablegroup, interceptors, threads, svc_utils { avoids += ace_for_tao // Requires ace/UUID sharedname = TAO_FT_ClientORB dynamicflags += TAO_FT_CLIENTORB_BUILD_DLL @@ -65,7 +65,7 @@ project(FT_ClientORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messagi } } -project(FT_ServerORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messaging, portablegroup, pi_server, pi, interceptors { +project(FT_ServerORB) : orbsvcslib, orbsvcs_output, ftorbutils, install, messaging, portablegroup, pi_server, pi, interceptors, svc_utils { sharedname = TAO_FT_ServerORB dynamicflags += TAO_FT_SERVERORB_BUILD_DLL tagchecks += FT_ServerORB 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..d48d2676c1a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h" #include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h" #include "orbsvcs/FT_CORBA_ORBC.h" @@ -70,7 +71,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 +139,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 +373,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..e4ec2ec96eb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "tao/MProfile.h" @@ -240,7 +241,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.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 5715ac980a6..feb3e0f3d04 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -40,7 +40,7 @@ project (FtRtEvent) : orbsvcslib, orbsvcs_output, install, ftorbutils, rtevent_s } } -project (FTRT_ClientORB) : messaging, orbsvcslib, orbsvcs_output, pi, install { +project (FTRT_ClientORB) : messaging, orbsvcslib, orbsvcs_output, pi, install, svc_utils { sharedname = TAO_FTRT_ClientORB dynamicflags += TAO_FTRT_BUILD_DLL tagchecks += FTRT_ClientORB 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..928cb376771 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "ace/INET_Addr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -18,11 +20,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..fe440c891cf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h" @@ -25,7 +26,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..7e7121b0c88 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ace/Dynamic_Service.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h" @@ -50,7 +51,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 +68,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 +165,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..a05cebc669f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -1,5 +1,6 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h" #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" @@ -27,11 +28,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 +87,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..f7829740eea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ace/Reactor.h" #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h" #include "ace/Select_Reactor.h" @@ -46,7 +47,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..7a7e9b870df 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h" #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h" #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h" @@ -47,7 +48,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..2760efbcee2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "ace/INET_Addr.h" #include "ace/os_include/os_netdb.h" @@ -22,12 +24,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 +52,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..a7543bc8a0d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" @@ -152,7 +153,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 +188,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..eef8424fbdd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -1,4 +1,5 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_string.h" #include "ace/SString.h" #include "orbsvcs/FT_CORBA_ORBC.h" @@ -110,7 +111,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..4562cb95160 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" #include "../Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" @@ -82,7 +83,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..9c82cab7c45 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -207,7 +208,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..15b46f005a0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h" #include "../Utils/UUID.h" #include "ace/OS_NS_strings.h" @@ -41,7 +42,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..3bc8ec8ed10 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/IOPA.h" #include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h" @@ -94,7 +95,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..4c2d3ba285b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h" #include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h" #include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h" @@ -48,7 +49,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 +59,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..25a322dacb5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" #include "orbsvcs/FtRtEvent/Utils/activate_with_id.h" #include "orbsvcs/FtRtEvent/Utils/UUID.h" @@ -219,7 +220,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..e0db83257a5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -1,4 +1,5 @@ //$Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/FtRtEvent/Utils/Log.h" #if !defined(__ACE_INLINE__) @@ -21,7 +22,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..cb4f454a70f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -2,6 +2,10 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { @@ -22,7 +26,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..76d9c2e44b9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h @@ -11,6 +11,11 @@ #ifndef RESOVLE_INIT_H #define RESOVLE_INIT_H +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "tao/Versioned_Namespace.h" #include "tao/ORB.h" @@ -35,13 +40,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.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc index 5466dcabfc1..8a0fce63520 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc @@ -2,7 +2,7 @@ // // $Id$ -project : htbp, orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults { +project : htbp, orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults, svc_utils { sharedname = TAO_HTIOP idlflags += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h -SS dynamicflags += HTIOP_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index b1e7680abe7..67bb0430ca7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -1,6 +1,8 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Acceptor.h" #include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" @@ -265,7 +267,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 +279,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 +378,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 +420,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 +503,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 +518,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 +544,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 +619,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 +657,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 +715,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 +772,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 +790,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 +850,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 +861,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 +871,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 +880,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..30f1d954ce7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h" #include "orbsvcs/HTIOP/HTIOP_Transport.h" @@ -82,7 +84,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 +109,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 +135,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..ad5d9117789 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" #include "orbsvcs/HTIOP/HTIOP_Transport.h" @@ -55,7 +57,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 +108,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 +125,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 +167,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 +259,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..2ec67810b5f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Connector.h" #include "orbsvcs/HTIOP/HTIOP_Profile.h" @@ -97,7 +99,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 +170,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 +204,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 +237,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 +247,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 +269,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 +287,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..20f1bf51dd8 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -1,6 +1,8 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "orbsvcs/HTIOP/htiop_endpointsC.h" @@ -93,7 +95,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 +184,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 +349,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 +432,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 +440,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..67e7a12097d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Transport.h" #include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h" @@ -77,7 +79,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 +112,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 +189,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 +212,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 +244,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 +296,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 +317,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..a414a701c71 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "orbsvcs/IFRService/IDLType_i.h" #include "orbsvcs/IFRService/Container_i.h" @@ -41,7 +43,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 +68,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 +248,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 +337,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 +357,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 +421,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 +438,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 +453,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 +1124,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 +1138,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 +1158,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 +1189,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 +1209,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..fcba2cd91b3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/IFRService/IRObject_i.h" #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/IDLType_i.h" @@ -47,7 +49,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..2ddd93df9b3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/IFRService/OperationDef_i.h" #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/IDLType_i.h" @@ -226,7 +228,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..e69d10de9d7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/IFRService/concrete_classes.h" #include "orbsvcs/IFRService/Repository_i.h" #include "orbsvcs/IFRService/IDLType_i.h" @@ -489,7 +491,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 +500,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 +518,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 +527,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..c7cd6a5aa7e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_time.h" @@ -148,7 +149,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..208d6548e29 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_LeastLoaded.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" #include "orbsvcs/LoadBalancing/LB_Random.h" @@ -126,7 +127,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 +187,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 +247,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 +264,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 +333,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 +350,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 +406,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 +423,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 +434,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 +449,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 +462,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 +549,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..9e9dd6f6f8a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" #include "tao/debug.h" @@ -19,7 +20,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 +34,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..a2c0736974b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_LoadAverage.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" #include "orbsvcs/LoadBalancing/LB_Random.h" @@ -124,7 +125,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 +230,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 +244,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 +258,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 +279,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 +301,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 +375,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..31a8295e90a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_LoadManager.h" #include "orbsvcs/LoadBalancing/LB_MemberLocator.h" #include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h" @@ -372,7 +373,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 +389,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 +435,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 +864,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..8d4ef619680 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" #include "ace/OS_NS_sys_time.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" @@ -125,7 +126,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 +187,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 +207,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 +269,7 @@ TAO_LB_LoadMinimum::analyze_loads ( } /* - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "TOTAL == %f\n", total_load.value)); */ @@ -283,7 +284,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 +300,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 +322,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 +341,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 +399,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 +461,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 +478,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 +489,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 +504,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 +518,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 +575,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..5e7b3430caa 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h" #include "tao/debug.h" #include "ace/SString.h" @@ -197,7 +198,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..0edb006334a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" #include "orbsvcs/LoadBalancing/LB_LoadAlert.h" #include "tao/debug.h" @@ -127,7 +128,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 +147,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..8a6282c68a6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Log/Hash_LogRecordStore.h" #include "orbsvcs/Log/Hash_Iterator_i.h" @@ -136,7 +138,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 +379,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..a90c290e339 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log/Log_i.h" #include "orbsvcs/Log/LogMgr_i.h" #include "orbsvcs/Time_Utilities.h" @@ -1120,7 +1122,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..5ef52e4aeec --- /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..a532150974d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/FT_NamingManagerC.h" #include "orbsvcs/PortableGroup/PG_Property_Utils.h" @@ -31,7 +32,7 @@ #define METHOD_ENTRY(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Enter %s\n", #name \ )); \ } @@ -50,7 +51,7 @@ #define METHOD_RETURN(name) \ if (TAO_debug_level > 6) \ { \ - ACE_DEBUG (( LM_DEBUG, \ + ORBSVCS_DEBUG (( LM_DEBUG, \ "Leave %s\n", #name \ )); \ } \ @@ -192,7 +193,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 +219,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 +257,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 +275,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 +390,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 +412,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 +434,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 +447,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 +467,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 +505,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 +523,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 +547,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 +564,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 +580,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 +598,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 +623,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 +641,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 +659,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 +757,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 +784,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 +807,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..347146ca175 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h" #include "tao/corba.h" @@ -85,7 +86,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 +101,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..f46c8db66af 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -11,6 +11,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h" #include "orbsvcs/Naming/Naming_Server.h" @@ -90,7 +91,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 +136,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 +146,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 +186,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 +264,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 +295,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 +338,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 +444,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 +458,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 +472,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 +485,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 +503,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 +529,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 +537,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 +552,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 +562,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 +570,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 +588,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 +605,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 +686,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 +741,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 +770,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 +789,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 +804,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 +813,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 +844,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 +915,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 +960,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 +975,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 +986,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 +995,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 +1014,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 +1033,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 +1054,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 +1107,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 +1118,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 +1161,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 +1170,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..3fe0f3641d6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h" #include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h" @@ -42,7 +43,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 +64,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 +73,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..8e00a1329e0 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 @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h" #include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h" @@ -86,7 +87,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 +146,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 +167,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..0294b7c7c9f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/FT_NamingManagerC.h" @@ -72,7 +73,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..f6bb7c47296 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h" @@ -74,7 +75,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..186829f7969 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -10,6 +10,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/FaultTolerant/nsgroup_svc.h" #include "ace/OS_NS_strings.h" @@ -41,7 +42,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 +56,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 +69,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 +82,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 +116,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 +125,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 +137,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 +163,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 +172,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 +196,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 +209,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 +222,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 +243,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 +252,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 +264,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 +278,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 +299,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 +308,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 +346,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 +357,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 +366,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 +382,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 +404,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 +413,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 +427,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 +453,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 +465,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 +495,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 +515,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 +527,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 +560,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 +578,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 +587,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 +615,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 +643,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 +679,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 +701,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..442cc47d70d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -13,6 +13,7 @@ // Carlos O'Ryan <coryan@uci.edu> // ================================================================ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Naming_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" @@ -83,7 +84,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..42d6fc3a649 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Naming_Server.h" // Placing the include of Messanging.h at this point @@ -102,7 +104,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 +137,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 +156,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 +231,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 +272,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 +289,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 +315,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 +438,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 +512,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 +592,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 +633,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 +709,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 +770,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 +783,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 +839,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..84942c498ea 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -13,6 +13,8 @@ #ifndef NS_CONTAINER_CPP #define NS_CONTAINER_CPP +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Malloc_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -99,10 +101,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 +114,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..6d9aaad46a1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Persistent_Context_Index.h" #include "orbsvcs/Naming/Persistent_Naming_Context.h" #include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h" @@ -178,7 +179,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 +263,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 +288,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..5780e13183b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Storable_Naming_Context.h" #include "orbsvcs/Naming/Storable_Naming_Context_Factory.h" #include "orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h" @@ -331,7 +332,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 +411,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..1f0ef328be9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/AnyEvent.h" #include "orbsvcs/Notify/Consumer.h" #include "tao/corba.h" @@ -39,7 +40,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 +50,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..449328b0400 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h" #include "tao/debug.h" #include "orbsvcs/Notify/AdminProperties.h" @@ -80,7 +81,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..34caef24451 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h" #include "tao/debug.h" #include "orbsvcs/Notify/Any/PushConsumer.h" @@ -57,7 +58,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..d0ba4e34035 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/ProxyPushConsumer.h" #include "tao/debug.h" #include "orbsvcs/Notify/AdminProperties.h" @@ -83,7 +84,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..3c5b31d52a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/ProxyPushSupplier.h" #include "tao/debug.h" #include "orbsvcs/Notify/Any/PushConsumer.h" @@ -65,7 +66,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..6f84f19e964 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/PushConsumer.h" #include "ace/Bound_Ptr.h" #include "tao/Stub.h" // For debug messages printing out ORBid. @@ -71,7 +72,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 +81,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 +101,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..bed549f7365 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Buffering_Strategy.h" #include "orbsvcs/Notify/Method_Request.h" @@ -193,7 +194,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 +205,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 +287,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 +349,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..588c0c70bb9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Consumer.h" #if ! defined (__ACE_INLINE__) @@ -102,7 +103,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 +120,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 +139,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 +179,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 +191,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 +206,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 +235,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 +245,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 +257,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 +297,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 +308,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 +320,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 +331,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 +373,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 +384,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 +424,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 +435,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 +447,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 +458,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 +473,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 +525,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 +538,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 +552,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 +622,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 +631,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 +649,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..5ed4b550015 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ConsumerAdmin.h" #include "orbsvcs/Notify/Subscription_Change_Worker.h" #include "orbsvcs/Notify/Proxy.h" @@ -95,7 +96,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 +104,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 +112,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 +121,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..2a03d60c994 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/CosNotify_Service.h" #include "orbsvcs/Notify/Properties.h" #include "orbsvcs/Notify/Default_Factory.h" @@ -43,7 +44,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 +55,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 +66,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 +118,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 +148,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 +168,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 +181,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 +193,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 +212,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 +223,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 +243,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 +252,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 +263,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 +272,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 +314,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 +398,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 +427,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..8b7eb98c875 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Delivery_Request.h" #if ! defined (__ACE_INLINE__) @@ -30,14 +31,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..ae1d262a9a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ETCL_Filter.h" #include "ace/Auto_Ptr.h" #include "tao/debug.h" @@ -71,7 +72,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 +116,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 +152,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 +186,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 +195,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 +217,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 +238,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 +587,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..be54204c663 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ETCL_FilterFactory.h" #include "orbsvcs/Notify/ETCL_Filter.h" #include "orbsvcs/Notify/Properties.h" @@ -223,7 +224,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..783892b8c94 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Event.h" #if ! defined (__ACE_INLINE__) @@ -24,13 +25,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 +70,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..31d93b598a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/EventTypeSeq.h" #include "orbsvcs/Notify/Topology_Saver.h" @@ -253,7 +254,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 +296,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..61ad42ca002 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Event_Manager.h" #include "orbsvcs/Notify/ProxyConsumer.h" #include "orbsvcs/Notify/ProxySupplier.h" @@ -66,7 +67,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..362306c9e5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Method_Request_Dispatch.h" #include "orbsvcs/Notify/ProxySupplier.h" #include "orbsvcs/Notify/Consumer.h" @@ -71,7 +72,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 +139,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 +151,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 +167,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..b7f8390fcc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Method_Request_Lookup.h" #include "orbsvcs/Notify/Consumer_Map.h" #include "orbsvcs/Notify/ProxySupplier.h" @@ -67,7 +68,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 +144,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..d8b0fb9c771 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControl/MonitorManager.h" #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) @@ -50,7 +52,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 +63,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 +73,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 +186,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 +204,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 +230,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 +254,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 +320,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..313c191771f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h" #include "tao/Monitor/Monitor_Impl.h" @@ -262,7 +264,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..33b9f4ea744 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h" #include "tao/debug.h" @@ -38,7 +40,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 +62,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..3bd05a1898a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h" #include "ace/Monitor_Size.h" @@ -116,7 +118,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..741b58ce04b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h" #include "ace/Monitor_Point_Registry.h" @@ -401,7 +403,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 +452,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 +547,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 +567,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 +587,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 +607,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 +628,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 +649,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 +669,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 +689,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 +710,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 +731,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 +750,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 +780,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 +799,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 +816,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 +837,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..49fd09ee747 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp @@ -3,6 +3,7 @@ #ifndef MONITORPROXYSUPPLIER_T_CPP #define MONITORPROXYSUPPLIER_T_CPP +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h" @@ -106,7 +107,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..79d2314656a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h" #include "orbsvcs/Notify/MonitorControl/Control_Registry.h" @@ -74,7 +76,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..0b61d939e73 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Notify_Constraint_Interpreter.h" #include "orbsvcs/Notify/Notify_Constraint_Visitors.h" #include "orbsvcs/Notify/EventType.h" @@ -102,7 +103,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..4dfef2b2520 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" #include "orbsvcs/Notify/Service.h" @@ -19,7 +20,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..566d6e53a97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Object.h" #include "orbsvcs/Notify/POA_Helper.h" #include "orbsvcs/Notify/Worker_Task.h" @@ -27,13 +28,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 +96,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..c288de9000f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/POA_Helper.h" #if ! defined (__ACE_INLINE__) @@ -107,7 +108,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 +159,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 +180,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 +205,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..f6af479ef31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Persistent_File_Allocator.h" #include "tao/debug.h" @@ -168,7 +169,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 +182,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 +209,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 +220,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 +278,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 +286,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..4cbe789d226 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Properties.h" #include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" @@ -32,7 +33,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..ba1cf392883 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ProxyConsumer.h" #if ! defined (__ACE_INLINE__) @@ -119,7 +120,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..9fa8eb470a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/RT_Notify_Service.h" #include "ace/Dynamic_Service.h" #include "orbsvcs/Notify/Properties.h" @@ -20,7 +22,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..ae95372a1c5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" @@ -36,7 +38,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 +47,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 +102,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..b4c158640a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -7,6 +7,7 @@ * * @author Dale Wilson <wilson_d@ociweb.com> */ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Reconnection_Registry.h" #include "tao/debug.h" @@ -51,7 +52,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 +76,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 +116,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 +154,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 +167,7 @@ namespace TAO_Notify } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Reconnect registry: missing attribute\n") )); } @@ -190,7 +191,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 +206,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 +217,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..9a5180f0331 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Routing_Slip.h" #include "orbsvcs/Notify/Delivery_Request.h" @@ -64,7 +65,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 +129,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 +137,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 +145,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 +177,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 +185,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 +237,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 +294,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 +311,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 +322,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 +345,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 +360,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 +371,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 +392,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 +438,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 +456,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 +465,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 +476,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 +485,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 +494,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 +523,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 +537,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 +546,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 +555,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 +589,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 +612,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 +629,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 +641,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 +688,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 +711,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 +723,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 +743,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 +762,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 +794,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 +806,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 +820,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..4c652a3a8b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" #include "orbsvcs/Notify/Standard_Event_Persistence.h" #include "orbsvcs/Notify/Persistent_File_Allocator.h" @@ -155,7 +156,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 +452,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..203f967e984 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h" #include "tao/debug.h" #include "orbsvcs/Notify/Sequence/SequencePushSupplier.h" @@ -89,7 +90,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..8e71cf47315 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" #include "tao/debug.h" #include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" @@ -66,7 +67,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..2d68e2fa003 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" #include "ace/Truncate.h" #include "ace/Reactor.h" @@ -67,7 +68,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 +78,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 +102,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 +131,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 +175,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 +184,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 +196,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 +205,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 +234,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 +243,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 +267,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 +302,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..34275c453e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Standard_Event_Persistence.h" #include "orbsvcs/Notify/Persistent_File_Allocator.h" #include "tao/debug.h" @@ -64,7 +65,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 +74,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 +86,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 +95,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 +145,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..bd26cb6f700 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredEvent.h" #include "orbsvcs/Notify/PropertySeq.h" #include "orbsvcs/Notify/Consumer.h" @@ -67,7 +68,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 +84,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..6d468c28193 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h" #include "ace/Bound_Ptr.h" #include "ace/Auto_Ptr.h" @@ -85,7 +86,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..558bc94977c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" #include "tao/PortableServer/Servant_Base.h" @@ -69,7 +70,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..331784106bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -1,4 +1,5 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredPushConsumer.h" #include "ace/Bound_Ptr.h" #include "tao/Stub.h" // For debug messages printing out ORBid. @@ -53,7 +54,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 +64,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 +99,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 +115,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 +132,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..d74bb377bda 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/SupplierAdmin.h" #include "orbsvcs/Notify/Builder.h" #include "orbsvcs/Notify/ProxyConsumer.h" @@ -88,7 +89,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 +97,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 +105,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..2a4f6d88ad9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ThreadPool_Task.h" #include "orbsvcs/Notify/Properties.h" #include "orbsvcs/Notify/Timer_Queue.h" @@ -85,10 +86,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 +111,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 +151,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..0eb75f4721c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ +#include "orbsvcs/Log_Macros.h" #include "Validate_Client_Task.h" #include "EventChannelFactory.h" #include "tao/ORB_Core.h" @@ -20,7 +21,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 +50,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..9b6accca631 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/XML_Loader.h" #include "orbsvcs/Notify/Topology_Object.h" @@ -100,14 +102,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 +156,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 +187,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 +216,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..271b176a985 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/XML_Saver.h" #include "ACEXML/common/XML_Util.h" @@ -26,7 +28,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 +104,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..a9f27bf4d1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/XML_Topology_Factory.h" #include "orbsvcs/Notify/XML_Saver.h" #include "orbsvcs/Notify/XML_Loader.h" @@ -71,7 +73,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 +83,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 +95,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 +107,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 +119,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 +131,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.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc index b8c6584a988..3d3a9deca4d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(PortableGroup) : orbsvcslib, orbsvcs_output, install, naming, iormanip, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults { +project(PortableGroup) : orbsvcslib, orbsvcs_output, install, naming, iormanip, messaging, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults { sharedname = TAO_PortableGroup idlflags += -Wb,export_macro=TAO_PortableGroup_Export \ -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 6616cfd978f..f23cf76a422 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h" #include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h" @@ -100,7 +101,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 +152,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 +183,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 +223,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..66b3dd604ce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PG_FactoryRegistry.h" #include "ace/Get_Opt.h" @@ -19,7 +20,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 +37,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 +93,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 +185,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 +196,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 +234,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 +289,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 +318,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 +335,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 +365,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 +387,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 +396,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 +407,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 +420,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 +443,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 +453,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 +465,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 +498,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 +508,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 +520,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 +528,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 +537,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 +554,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 +566,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 +576,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 +611,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 +678,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..b0280392573 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -11,6 +11,7 @@ */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PG_Group_Factory.h" #include "orbsvcs/PortableGroup/PG_Property_Utils.h" #include "orbsvcs/PortableGroup/PG_Group_List_Store.h" @@ -266,7 +267,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..39546575e42 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" #include "orbsvcs/PortableGroup/PG_GenericFactory.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -783,7 +784,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 +795,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 +811,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 +952,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 +998,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..73b66255ecd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PG_Object_Group.h" #include "orbsvcs/PortableGroup/PG_conf.h" @@ -107,7 +108,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 +219,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 +249,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 +314,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 +326,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 +363,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 +380,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 +394,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 +441,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 +503,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 +553,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 +576,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 +837,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..c56076465b6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -13,6 +13,7 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PG_Property_Set.h" #include "tao/debug.h" @@ -87,7 +88,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 +156,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 +274,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 +285,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 +296,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 +307,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 +319,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 +330,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..414b3a1ccaf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" @@ -105,7 +106,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 +131,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 +148,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..93a040194ea 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h" #include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h" @@ -25,7 +26,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..9b0629baa60 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Profile.h" #include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" #include "orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h" @@ -89,7 +90,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 +128,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 +157,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 +174,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 +237,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 +268,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 +299,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 +371,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 +382,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 +394,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..1251d3e2aa3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" #include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" #include "orbsvcs/PortableGroup/UIPMC_Transport.h" @@ -55,7 +56,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 +187,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 +239,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 +256,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 +275,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 +286,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 +429,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 +451,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..b67df084eca 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Connector.h" #include "orbsvcs/PortableGroup/UIPMC_Profile.h" #include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" @@ -71,7 +72,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 +112,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 +165,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 +180,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 +198,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 +219,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 +239,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 +262,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..39c99d3cc3d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" #include "orbsvcs/PortableGroup/UIPMC_Profile.h" @@ -186,7 +187,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 +199,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..7dc9964246c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Factory.h" #include "orbsvcs/PortableGroup/UIPMC_Acceptor.h" #include "orbsvcs/PortableGroup/UIPMC_Connector.h" @@ -72,7 +73,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..134a37ff253 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h" #include "orbsvcs/PortableGroup/UIPMC_Endpoint.h" #include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h" @@ -55,7 +56,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 +117,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 +130,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 +152,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..add7689fb2e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h" #include "orbsvcs/PortableGroup/miopconf.h" #include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h" @@ -75,7 +76,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 +172,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 +197,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 +215,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 +255,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 +270,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 +286,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 +341,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 +353,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 +379,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 +401,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 +420,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 +431,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 +459,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 +468,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 +489,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 +509,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 +521,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 +569,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 +580,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 +591,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..673f4ed2a92 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Profile.h" #include "orbsvcs/PortableGroup/miopconf.h" #include "tao/CDR.h" @@ -105,7 +106,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 +119,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 +145,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 +173,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 +377,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 +408,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 +718,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 +834,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 +848,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..307822d3fe0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Transport.h" #include "orbsvcs/PortableGroup/miopconf.h" #include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h" @@ -108,7 +109,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 +124,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 +172,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 +224,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 +238,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 +275,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 +311,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 +365,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 +374,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 +395,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 +485,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..8f1ebd3cc21 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h" #include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h" @@ -59,7 +60,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..c376b17438b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/PortableGroup/miop_resource.h" #include "orbsvcs/PortableGroup/miopconf.h" #include "orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h" @@ -63,13 +64,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 +80,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 +92,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 +104,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 +117,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 +131,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 +143,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 +154,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 +176,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 +189,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 +202,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 +212,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 +224,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 +234,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 +246,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 +259,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 +268,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..100b6c41acf 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -10,6 +10,8 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" @@ -473,7 +475,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 +694,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 +866,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..89c1f23dd27 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Runtime_Scheduler.h" #include "ace/OS_NS_string.h" @@ -102,7 +103,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 +117,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 +254,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.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc index 3c938a4448f..c55a282b0b6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc +++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(SSLIOP) : orbsvcslib, orbsvcs_output, install, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults, ssliop_params_dup { +project(SSLIOP) : orbsvcslib, orbsvcs_output, install, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults, ssliop_params_dup, svc_utils { sharedname = TAO_SSLIOP idlflags += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h -SS dynamicflags += TAO_SSLIOP_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index f4a8504a424..ba594109fd4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h" #include "tao/debug.h" @@ -91,7 +92,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 +120,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 +165,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 +183,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 +201,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 +221,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 +242,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..d50124f362f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" #include "orbsvcs/SSLIOP/SSLIOP_Profile.h" @@ -474,7 +475,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 +496,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 +519,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 +535,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 +556,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 +596,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 +609,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 +669,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..d4e3c1a1dd7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" #include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h" #include "orbsvcs/SSLIOP/SSLIOP_Util.h" @@ -61,7 +62,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 +193,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 +214,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 +227,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 +383,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..589439db114 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_Connector.h" #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" #include "orbsvcs/SSLIOP/SSLIOP_Profile.h" @@ -85,7 +86,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 +138,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 +172,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 +280,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 +434,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 +457,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 +465,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 +498,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 +511,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 +530,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 +548,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 +593,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 +640,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 +661,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 +687,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 +707,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 +736,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..32baeec78bd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h" #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h" @@ -148,7 +149,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 +233,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 +253,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 +309,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 +330,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..f8609b12ce2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_Factory.h" #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h" #include "orbsvcs/SSLIOP/SSLIOP_Connector.h" @@ -161,7 +162,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 +192,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 +281,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 +348,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 +375,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 +400,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 +417,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 +454,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 +464,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 +476,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 +493,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 +504,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 +517,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 +528,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..f0006fd8958 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" #include "orbsvcs/SSLIOP/SSLIOP_Current.h" @@ -42,7 +43,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 +103,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 +159,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..fab500c1f4d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h" #include "orbsvcs/SSLIOP/SSLIOP_Current.h" #include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" @@ -171,7 +172,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..46d0b64bcc5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h" #include "orbsvcs/SSLIOP/SSLIOP_Transport.h" #include "orbsvcs/SSLIOP/SSLIOP_Profile.h" @@ -87,7 +88,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 +157,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 +213,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 +263,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 +281,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..ba31135980a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -4,6 +4,7 @@ // // ============================================================================ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Scheduler_Factory.h" @@ -70,7 +71,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 +91,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 +116,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 +152,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 +167,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 +209,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 +302,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 +319,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 +328,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 +377,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 +406,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 +414,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 +431,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 +448,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..d75fca681d5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -11,6 +11,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Sched/DynSched.h" #include "ace/Basic_Types.h" #include "ace/Sched_Params.h" @@ -433,7 +434,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 +444,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 +511,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 +1547,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 +1563,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 +1651,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 +1759,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 +1935,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 +1989,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 +2005,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 +2030,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 +2049,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 +2065,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 +2105,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 +2130,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 +2157,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 +2175,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 +2188,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 +2205,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 +2221,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 +2362,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 +2374,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 +2385,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..d7562e962e2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -12,6 +12,7 @@ #ifndef TAO_RECONFIG_SCHED_UTILS_C #define TAO_RECONFIG_SCHED_UTILS_C +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" #include "orbsvcs/Sched/Reconfig_Sched_Utils.h" @@ -134,14 +135,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 +159,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 +274,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 +324,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 +389,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 +430,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..642c852f848 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -11,6 +11,8 @@ #ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP #define TAO_RECONFIG_SCHED_UTILS_T_CPP +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" @@ -52,7 +54,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 +66,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 +77,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 +103,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 +111,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 +123,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 +135,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 +154,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 +443,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 +505,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 +638,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 +647,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 +658,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 +694,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 +703,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 +727,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 +736,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 +791,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 +812,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 +849,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 +1043,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 +1065,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..53ba2a43383 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -12,6 +12,8 @@ #ifndef TAO_RECONFIG_SCHEDULER_T_C #define TAO_RECONFIG_SCHEDULER_T_C +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Sched/Reconfig_Scheduler_T.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Auto_Ptr.h" @@ -62,7 +64,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 +98,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 +117,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 +131,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 +141,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 +165,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 +313,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 +428,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 +455,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 +477,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 +520,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 +576,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 +635,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 +691,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 +769,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 +907,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 +935,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 +964,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 +993,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 +1014,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 +1042,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 +1074,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 +1127,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 +1147,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 +1270,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 +1406,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 +1442,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 +1509,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 +1636,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 +1666,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 +1689,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 +1727,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 +1781,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 +1875,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 +1946,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 +2020,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 +2064,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 +2130,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 +2183,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 +2221,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 +2265,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 +2325,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 +2359,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 +2401,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 +2441,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 +2469,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 +2584,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..30794c45d2e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -10,6 +10,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Sched/SchedEntry.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" @@ -200,7 +201,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 +225,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 +299,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 +322,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..08d09d9b447 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -9,6 +9,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "ace/Sched_Params.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Sched/Scheduler.h" @@ -188,7 +189,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 +250,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..6e49f54f17d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -9,6 +9,7 @@ //============================================================================= +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Sched/Strategy_Scheduler.h" #include "ace/Sched_Params.h" @@ -169,7 +170,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 +310,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 +336,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 +365,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..3e5492f41b9 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "ace/Singleton.h" #include "ace/Null_Mutex.h" @@ -127,7 +128,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 +160,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 +229,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.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc index 731be11f92a..c50a6a01559 100644 --- a/TAO/orbsvcs/orbsvcs/Security.mpc +++ b/TAO/orbsvcs/orbsvcs/Security.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Security) : orbsvcslib, orbsvcs_output, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults { +project(Security) : orbsvcslib, orbsvcs_output, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults, svc_utils { sharedname = TAO_Security idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h dynamicflags += TAO_SECURITY_BUILD_DLL diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 390fe24f253..382f6570613 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Security/SL2_SecurityManager.h" #include "tao/ORB_Constants.h" @@ -132,7 +134,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 +162,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 +170,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 +243,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 +257,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 +289,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 +297,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..273205b9201 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -1,6 +1,8 @@ // -*- C++ -*- // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Security/Security_ORBInitializer.h" #include "orbsvcs/Security/Security_Current.h" @@ -29,7 +31,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..eb61b4ce5f8 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -1,6 +1,8 @@ // -*- C++ -*- // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Time/TAO_Time_Service_Clerk.h" #include "orbsvcs/Time/TAO_TIO.h" #include "orbsvcs/Time/TAO_UTO.h" @@ -25,7 +27,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..5d413b0b0e4 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Time/TAO_UTO.h" #include "orbsvcs/Time/TAO_TIO.h" #include "orbsvcs/Time/TAO_Time_Service_Server.h" @@ -40,7 +42,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..94e13e46de9 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Time/Timer_Helper.h" #include "orbsvcs/Time/TAO_Time_Service_Clerk.h" @@ -49,7 +51,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 +80,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..9d1e8667262 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -14,6 +14,8 @@ //=========================================================================== +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Trader/Trading_Loader.h" #include "orbsvcs/Daemon_Utilities.h" @@ -47,7 +49,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 +68,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 +128,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 +138,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 +152,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 +241,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 +275,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 +303,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 +332,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 +341,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 +406,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 +414,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 +455,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 (); diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc index de0dad2a116..1c99f00f1fa 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc +++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc @@ -91,7 +91,7 @@ project(*Analyzer): taoclient, fault_tolerance, notification_skel, orbsvcsexe { } } -project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*FaultConsumer): taoserver, fault_tolerance, notification_skel, orbsvcsexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, svc_utils { exename = ft_fault_consumer libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index e5e0f6f9c29..b845098cce3 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -1614,11 +1614,11 @@ do_persistence_objectgroup_test ( } catch (const CORBA::Exception& ex) { + ex._tao_print_exception ("CORBA::Exception caught:"); ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: Unable to remove member for group %C\n"), basic_group_name), RC_ERROR); - ex._tao_print_exception ("CORBA::Exception caught:"); } } diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl index 9d89fcd08cf..dd3a3855163 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl @@ -28,6 +28,7 @@ my $srv_port_base = $srva->RandomPort (); my $srv_a_id = "AAA"; my $srv_b_id = "BBB"; my $client_duration = 30; +my $ping_ext = ''; foreach my $i (@ARGV) { if ($i eq '-debug') { @@ -43,6 +44,11 @@ foreach my $i (@ARGV) { $forward_opt = "-ORBForwardOnceOnObjectNotExist 1"; $got_object_not_exist_exception = 1; } + if ($i eq '-pingexternal') { + $delay = '5'; + $forward_opt = "-ORBForwardOnceOnObjectNotExist 1"; + $ping_ext = '-i'; + } } my $imriorfile = "imr_locator.ior"; @@ -71,8 +77,9 @@ $IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator", "-ORBEndpoint "."$protocol"."://:".$port." ". "-UnregisterIfAddressReused ". "-d $imr_debug_level ". - "-o $imr_imriorfile ". - "-p $imr_imrdbfile"); + "$ping_ext ". + "-o $imr_imriorfile "); +# "-p $imr_imrdbfile"); $SRV_A = $srva->CreateProcess ("serverA", "_ORBDebugLevel = $debug_level ". "-ORBEndpoint " . "$protocol" . "://:" . "$srv_port_base/portspan=20 ". diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp index 370144b98d7..7c9099d475f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp @@ -8,6 +8,7 @@ #include "tao/IORTable/IORTable.h" #include "tao/PortableServer/Root_POA.h" +#include "tao/ImR_Client/ImR_Client.h" #include <iostream> diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp index 44a48d3022f..a0739c28438 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp @@ -7,6 +7,7 @@ #include "tao/IORTable/IORTable.h" #include "tao/PortableServer/Root_POA.h" +#include "tao/ImR_Client/ImR_Client.h" #include "ace/Get_Opt.h" #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README index 952cb9b99a8..ee5ec01375a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README @@ -54,11 +54,37 @@ Usage To run this test, run the run_test.pl perl script. It takes two optional arguments: --server_reply_delay <seconds> This is the delay in seconds the CORBA -object in S3 will make before replying to a request. +-server_reply_delay <seconds> +This is the delay in seconds the CORBA object in S3 will make before replying +to a request. -v <milliseconds> The verification interval in milliseconds for the ImR to use. -? The usage and default value of the options. + +-debug +get debug output from all the processes. The IMR Locator log output is +captured in ./imr_loc.log + +-debuglog +All the processes write log output to individual log files + +-hide_server +Use this along with the -imr_start option to test an error condition of a +registered server being removed from the filesystem. The tao_imr start +command should recover without hanging. + +-imr_start +Use this option to run a simple test where the tao_imr start command is +uesd to launch a server. +This should not time out. + +-list +Use the tao_imr list command to test. May be used with or without restarting +the locator. + +-restart_loc +Use to bounce the locator process by itself mid test. Only used by the list +test for now.
\ No newline at end of file diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp index 1bdafe6b282..f8516bff457 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp @@ -7,16 +7,21 @@ int client_num = 0; ACE_CString server_ior; +bool expect_transient = false; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); int c; while ((c = get_opts ()) != -1) switch (c) { + case 'e': + expect_transient = true; + break; + case 'k': server_ior = get_opts.opt_arg (); break; @@ -28,9 +33,10 @@ parse_args (int argc, ACE_TCHAR *argv[]) case '?': default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <server-ior> " - "\n", + ACE_TEXT ("usage: %s ") + ACE_TEXT ("-e ") + ACE_TEXT ("-k <server-ior> ") + ACE_TEXT ("\n"), argv [0]), -1); } @@ -41,32 +47,51 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { - // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); - - if (parse_args (argc, argv) != 0) - return 1; + try + { + CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); - ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Client %d sending request to %s\n", - client_num, server_ior.c_str ())); - CORBA::Object_var obj = - orb->string_to_object (server_ior.c_str ()); - ACE_ASSERT (!CORBA::is_nil (obj.in ())); - Test_var test = Test::_narrow (obj.in()); - ACE_ASSERT (!CORBA::is_nil (test.in())); - CORBA::Short n = test->get_server_num (); - ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Client %d received reply from server %d\n", - client_num, n)); + if (parse_args (argc, argv) != 0) + return 1; - return 0; + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t|%T) Client %d sending request to %C\n"), + client_num, server_ior)); + try + { + CORBA::Object_var obj = + orb->string_to_object (server_ior); + ACE_ASSERT (!CORBA::is_nil (obj.in ())); + Test_var test = Test::_narrow (obj.in()); + ACE_ASSERT (!CORBA::is_nil (test.in())); + CORBA::Short n = test->get_server_num (); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t|%T) Client %d received reply from server %d\n"), + client_num, n)); + } + catch (CORBA::TRANSIENT &) + { + if (expect_transient) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t|%T) Client %d got expected transient exception\n"), + client_num)); + } + else + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t|%T) Client %d caught unexpected transent\n"), + client_num)); + return -1; + } + } + return 0; - } - catch(const CORBA::Exception& ex) { - ex._tao_print_exception ("client:"); - } + } + catch(const CORBA::Exception& ex) + { + ex._tao_print_exception (ACE_TEXT ("client:")); + } return -1; } diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl index 00ed208ce2c..867b4662ce1 100755 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl @@ -8,30 +8,73 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' ############################################################################### use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; +use File::Copy; $status = 0; -my $debug_level = '0'; -my $imr_debug_level = $debug_level; +my $debug_level = 0; +my $imr_debug_level = 0; my $servers_count = 3; my $client_count = 2; my $server_reply_delay = 5; my $usage = 0; +my $use_imr_start = 0; +my $restart_loc = 0; +my $list_test = 0; +my $hide_server = 0; +my $expect_transient = ""; +my $notify_locator = ""; +my $debuglog = ""; +my @srvlogfile = ( "", "", "" ); +my @cltlogfile = ( "", "", "" ); +my $actlogfile = ""; +my $loclogfile = ""; +my $back_store_flag = ""; +my $back_store_file = ""; # Ping interval in milliseconds my $verification_interval_msecs = 1000; if ($#ARGV >= 0) { for (my $i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-debug') { - $debug_level = '10'; - $imr_debug_level = '10'; - $i++; + if ($ARGV[$i] eq "-debug") { + $debug_level = 10; + $imr_debug_level = 2; + $loclogfile = "imr_loc.log"; + } + elsif ($ARGV[$i] eq "-debuglog") { + $debug_level = 10; + $imr_debug_level = 3; + $debuglog = "-ORBVerboseLogging 1 -ORBLogFile "; + @srvlogfile = ( "server1.log", "server2.log", "server3.log" ); + @cltlogfile = ( "client1.log", "client2.log", "client3.log" ); + $actlogfile = "imr_act.log"; + $loclogfile = "imr_loc.log"; } - elsif ($ARGV[$i] eq "-server_reply_delay") { + elsif ($ARGV[$i] eq "-delay") { $i++; $server_reply_delay = $ARGV[$i]; + if ($server_reply_delay > 16) { + $expect_transient = "-e"; + } } + elsif ($ARGV[$i] eq "-hide_server") { + $hide_server = 1; + $notify_locator = "-l"; + } + elsif ($ARGV[$i] eq "-imr_start") { + $use_imr_start = 1; + } + elsif ($ARGV[$i] eq "-list") { + $imr_debug_level = 3; + $list_test = 1; + } + elsif ($ARGV[$i] eq "-restart_loc") { + $restart_loc = 1; + $back_store_flag = "--directory"; + $back_store_file = "."; + $server_reply_delay = 0; + } elsif ($ARGV[$i] eq "-v") { $i++; $verification_interval_msecs = $ARGV[$i]; @@ -51,7 +94,7 @@ my $ti = PerlACE::TestTarget::create_target (++$tgt_num) || die "Create target my @cli; # Have list indices match client IDs (C1, C2) with first element of list not being used. -for(my $i = 0; $i <= $client_count; $i++) { +for(my $i = 0; $i < $client_count; $i++) { push (@cli, PerlACE::TestTarget::create_target (++$tgt_num)) || die "Create target $tgt_num failed\n"; } @@ -61,11 +104,10 @@ my $port = $imr->RandomPort(); my $forward_on_exception_arg = "-ORBForwardOnceOnTransient 1"; -my $debug_arg = "-ORBDebugLevel $debug_level"; -my $imr_debug_arg = "-ORBDebugLevel $imr_debug_level"; -if ($imr_debug_level == 10) { - $debug_arg = "-ORBDebugLevel $debug_level -ORBVerboseLogging 1 -ORBLogFile"; - $imr_debug_arg = $imr_debug_arg . " -ORBVerboseLogging 1 -ORBLogFile imr_loc.log "; +my $debug_arg = "-ORBDebugLevel $debug_level " . $debuglog; +my $imr_debug_arg = "-ORBDebugLevel $debug_level "; +if ($loclogfile ne "") { + $imr_debug_arg = $imr_debug_arg . "-ORBVerboseLogging 1 -ORBLogFile $loclogfile "; } my $objprefix = "TestObject"; @@ -94,7 +136,7 @@ my @srv_server_cmd; my $debug_log_file = ""; # Have list indices match server IDs (S1, S2, S3) with first element of list not being used. -for(my $i = 0; $i <= $servers_count; $i++) { +for(my $i = 0; $i < $servers_count; $i++) { push (@srv, PerlACE::TestTarget::create_target (++$tgt_num)) || die "Create target $tgt_num failed\n"; push (@obj, $objprefix. "_" . $i); push (@srviorfile, $obj[$i] . ".ior"); @@ -108,11 +150,11 @@ for(my $i = 0; $i <= $servers_count; $i++) { push (@srv_server_cmd, $imr->LocalFile ($server_cmd)); } -for(my $i = 0; $i <= $client_count; $i++) { - if ($debug_level == 10) { - $debug_log_file = "test_client_$i" . ".log"; +for(my $i = 0; $i < $client_count; $i++) { + push (@CLI, $cli[$i]->CreateProcess ("client", "$debug_arg $cltlogfile[$i] -k file://$srviorfile[0] -n $i $forward_on_exception_arg $expect_transient")); + if ($cltlogfile[$i] ne "") { + $cli[$i]->DeleteFile ($cltlogfile[$i]); } - push (@CLI, $cli[$i]->CreateProcess ("client", "-k file://$srviorfile[1] -n $i $forward_on_exception_arg $debug_arg $debug_log_file")); } sub cleanup_output { @@ -120,7 +162,7 @@ sub cleanup_output { $act->DeleteFile ($imriorfile); $ti->DeleteFile ($imriorfile); $act->DeleteFile ($actiorfile); - for (my $i = 1; $i <= $servers_count; $i++) { + for (my $i = 0; $i < $servers_count; $i++) { $srv[$i]->DeleteFile ($srviorfile[$i]); $srv[$i]->DeleteFile ($srvstatusfile[$i]); } @@ -137,8 +179,7 @@ sub run_imr_util { my $cmd = shift; print "Running ImR utility with $cmd\n"; $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile $cmd"); -# print ">>> " . $TI->CommandLine () . "\n"; - return $TI->SpawnWaitKill($ti->ProcessStartWaitInterval()); + return $TI->SpawnWaitKill($ti->ProcessStartWaitInterval() +$server_reply_delay); } # Register a server with ImR to get its IOR, then register again so it can later be invoked. @@ -151,7 +192,8 @@ sub register_server_with_activator { $srv_debug_log = "test_server_$srv_id" . ".log"; } $srv_args = - "$debug_arg $srv_debug_log -orbuseimr 1 $refstyle ". + "$debug_arg $srvlogfile[$srv_id] -orbuseimr 1 $refstyle ". + "$expect_transient ". "$forward_on_exception_arg ". "-ORBInitRef ImplRepoService=file://$imr_imriorfile -n $srv_id"; @@ -160,7 +202,7 @@ sub register_server_with_activator { print ">>> " . $SRV[$srv_id]->CommandLine () . "\n"; $SRV[$srv_id]->Spawn (); if ($srv[$srv_id]->WaitForFileTimed ($srvstatusfile[$srv_id], - $srv[$srv_id]->ProcessStartWaitInterval() + $srv_reply_delay) == -1) { + $srv[$srv_id]->ProcessStartWaitInterval() + $server_reply_delay) == -1) { print STDERR "ERROR: cannot find file $srvstatusfile[$srv_id]\n"; $IMR->Kill (); $IMR->TimedWait (1); return 1; @@ -170,14 +212,14 @@ sub register_server_with_activator { run_imr_util("ior $obj[$srv_id] -f $srviorfile[$srv_id]"); run_imr_util("shutdown $obj[$srv_id]"); - run_imr_util("update $obj[$srv_id] -c \"server $srv_args\""); + run_imr_util("update $obj[$srv_id] -c \"./server $srv_args\""); } my $start_time = time(); cleanup_output (); -sub run_test +sub init_test { print "Running test with $servers_count servers and $obj_count objects.\n"; @@ -187,9 +229,14 @@ sub run_test print_msg ("Start ImplRepo"); + if ($loclogfile ne "") { + $imr->DeleteFile ($loclogfile); + } + $IMR->Arguments ("-o $imr_imriorfile $refstyle -orbendpoint iiop://:$port ". "$forward_on_exception_arg ". - "-d 1 $imr_debug_arg ". + "$back_store_flag $back_store_file ". + "-d $imr_debug_level $imr_debug_arg ". "-v $verification_interval_msecs"); print ">>> " . $IMR->CommandLine () . "\n"; $IMR_status = $IMR->Spawn (); @@ -218,7 +265,11 @@ sub run_test $IMR->Kill (); $IMR->TimedWait (1); return 1; } - for (my $i = 1; $i <= $servers_count; $i++) { + for (my $i = 0; $i < $servers_count; $i++) { + if ($srvllogfile[$i] ne "") { + $srv[$i]->DeleteFile ($srvlogfile[$i]); + } + if ($srv[$i]->PutFile ($imriorfile) == -1) { print STDERR "ERROR: cannot set file <$srv_imriorfile>\n"; $IMR->Kill (); $IMR->TimedWait (1); @@ -229,11 +280,12 @@ sub run_test ##### Start Activator ##### print_msg ("Start Activator"); - my $act_debug_log = ""; - if ($debug_level == 10) { - $act_debug_log = "imr_act.log"; + + if ($actlogfile ne "") { + $act->DeleteFile ($actlogfile); } - $ACT->Arguments ("$debug_arg $act_debug_log -d 1 -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); + + $ACT->Arguments ("$debug_arg $actlogfile $notify_locator -d 2 -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); print ">>> " . $ACT->CommandLine () . "\n"; $ACT_status = $ACT->Spawn (); @@ -251,70 +303,49 @@ sub run_test ##### Start S3 ##### print_msg ("Start S3"); - my $s3_debug_log = ""; - if ($debug_level == 10) { - $s3_debug_log = "test_server_3.log"; - } - $SRV[3]->Arguments ("$debug_arg $s3_debug_log -orbuseimr 1 $refstyle -ORBInitRef ImplRepoService=file://$imr_imriorfile ". - "-d $server_reply_delay -n 3"); - print ">>> " . $SRV[3]->CommandLine () . "\n"; - $SRV[3]-> Spawn(); - if ($srv[3]->WaitForFileTimed ($srvstatusfile[3], $srv[3]->ProcessStartWaitInterval()) == -1) { - print STDERR "ERROR: cannot find file $srvstatusfile[3]\n"; + + $SRV[2]->Arguments ("$debug_arg $srvlogfile[2] -orbuseimr 1 $refstyle ". + "-d $server_reply_delay ". + "-ORBInitRef ImplRepoService=file://$imr_imriorfile -n 2"); + + print ">>> " . $SRV[2]->CommandLine () . "\n"; + $SRV[2]-> Spawn(); + if ($srv[2]->WaitForFileTimed ($srvstatusfile[2], $srv[2]->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file $srvstatusfile[2]\n"; $IMR->Kill (); $IMR->TimedWait (1); return 1; } # Get its IOR so S2 can use to invoke S3 - run_imr_util("ior $obj[3] -f $srviorfile[3]"); + run_imr_util("ior $obj[2] -f $srviorfile[2]"); ##### Register S2 with ImR using Activator ##### print_msg ("Register S2 with ImR to start on demand"); - register_server_with_activator(2, 3); + register_server_with_activator(1, 2); ##### Register S1 with ImR using Activator ##### print_msg ("Register S1 with ImR to start on demand"); - register_server_with_activator(1, 2); - - ##### C1 invokes S1 ##### - - print_msg ("C1 invokes S1"); + register_server_with_activator(0, 1); - print ">>> " . $CLI[1]->CommandLine () . "\n"; - $CLI_status = $CLI[1]->Spawn (); - if ($CLI_status != 0) { - print STDERR "ERROR: client 1 returned $CLI_status\n"; - return 1; + if ($hide_server == 1) { + $name = $SRV[0]->Executable(); + rename ($name, "hidden") or die "Rename ($name, \"hidden\") failed: $!"; } +} - ##### C2 invokes S1 in parallel with C1 after ping interval ##### - - print_msg ("C2 invokes S1 in parallel with C1 after ping interval"); - - # Let ping interval pass to ensure another ping will be done. - sleep ($verification_interval_msecs / 1000 + 1); +sub fini_test +{ - print ">>> " . $CLI[2]->CommandLine () . "\n"; - $CLI_status = $CLI[2]->Spawn (); - if ($CLI_status != 0) { - print STDERR "ERROR: client 2 returned $CLI_status\n"; - return 1; - } + print_msg ("Shutting down"); - ##### Wait for clients to terminate ##### - print_msg ("Wait for clients to terminate"); - for (my $i = 1; $i <= $client_count; $i++) { - if ($CLI[$i]->WaitKill ($cli[$i]->ProcessStopWaitInterval () + $server_reply_delay + 20) == -1) { - print STDERR "ERROR: client $i not terminated correctly\n"; - $status = 1; - } + if ($hide_server == 1) { + $name = $SRV[0]->Executable(); + rename ("hidden", "server") or die "Rename ($name, \"hidden\") failed: $!"; } - print_msg ("Shutting down"); - if ($srv[1]->WaitForFileTimed ($srvstatusfile[1], $srv[1]->ProcessStartWaitInterval() + $server_reply_delay) == -1) { print STDERR "ERROR: cannot find file $srvstatusfile[1]\n"; $IMR->Kill (); $IMR->TimedWait (1); @@ -322,7 +353,7 @@ sub run_test } ##### Shutdown servers ##### - for (my $i = 1; $i <= $servers_count; $i++ ) { + for (my $i = 0; $i < $servers_count; $i++ ) { # Shutting down any server object within the server will shutdown the whole server run_imr_util ("shutdown $obj[$i]"); if ($SRV[$i]->WaitKill ($srv[$i]->ProcessStopWaitInterval ()) == -1) { @@ -351,6 +382,106 @@ sub run_test return $status; } +sub restart_imr_locator +{ + print_msg ("restarting locator"); + my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval()); + if ($IMR_status != 0) { + print STDERR "ERROR: IMR returned $IMR_status\n"; + $status = 1; + } + + print ">>> " . $IMR->CommandLine () . "\n"; + $IMR_status = $IMR->Spawn (); + + if ($IMR_status != 0) { + print STDERR "ERROR: ImplRepo Service returned $IMR_status\n"; + return 1; + } + + print "sleeping (5).... "; + sleep (5); + print "done\n"; +} + +sub run_imr_start_test +{ + init_test (); + + $result = run_imr_util ("start $obj[1]"); + + if ($hide_server == 1 && $result == 4) { + print_msg ("SUCCESS: tao_imr start $obj[1] returned $result\n"); + $result = 0 + } + + $result |= fini_test (); + + return $result; +} + +sub run_list_test +{ + init_test (); + run_imr_util ("start $obj[1]"); + run_imr_util ("start $obj[0]"); + run_imr_util ("list -a"); + + if ($restart_loc == 1) { + restart_imr_locator (); + run_imr_util ("list -a"); + } + + print "sleeping (20).... "; + sleep (20); + print "done\n"; + + run_imr_util ("list -a"); + + fini_test (); +} + +sub run_client_activate_test +{ + init_test (); + + ##### C1 invokes S1 ##### + + print_msg ("C1 invokes S1"); + + print ">>> " . $CLI[0]->CommandLine () . "\n"; + $CLI_status = $CLI[0]->Spawn (); + if ($CLI_status != 0) { + print STDERR "ERROR: client 1 returned $CLI_status\n"; + return 1; + } + + ##### C2 invokes S1 in parallel with C1 after ping interval ##### + + print_msg ("C2 invokes S1 in parallel with C1 after ping interval"); + + # Let ping interval pass to ensure another ping will be done. + sleep ($verification_interval_msecs / 1000 + 1); + + print ">>> " . $CLI[1]->CommandLine () . "\n"; + $CLI_status = $CLI[1]->Spawn (); + if ($CLI_status != 0) { + print STDERR "ERROR: client 2 returned $CLI_status\n"; + return 1; + } + + ##### Wait for clients to terminate ##### + print_msg ("Wait for clients to terminate"); + for (my $i = 0; $i < $client_count; $i++) { + if ($CLI[$i]->WaitKill ($cli[$i]->ProcessStopWaitInterval () + $server_reply_delay + 60) == -1) { + print STDERR "ERROR: client $i not terminated correctly\n"; + $status = 1; + } + } + + return fini_test (); +} + END { if (! $usage) { @@ -368,6 +499,15 @@ sub usage() { ############################################################################### ############################################################################### -my $ret = run_test(); +my $ret = 0; +if ($use_imr_start == 1) { + $ret = run_imr_start_test (); +} +elsif ($list_test == 1) { + $ret = run_list_test (); +} +else { + $ret = run_client_activate_test (); +} exit $ret; diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp index fe6e8980ca7..9565f5fe7ff 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp @@ -7,6 +7,7 @@ #include "tao/IORTable/IORTable.h" #include "tao/PortableServer/Root_POA.h" +#include "tao/ImR_Client/ImR_Client.h" #include "ace/Get_Opt.h" #include "ace/streams.h" @@ -55,12 +56,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int server_num = 0; int reply_delay_secs = 0; - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("s:d:n:?")); + bool expect_transient = false; + + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("es:d:n:?")); int c; while ((c = get_opts ()) != -1) switch (c) { + case 'e': + expect_transient = true; + break; + case 's': other_server_ior = get_opts.opt_arg (); break; @@ -75,10 +82,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) case '?': ACE_DEBUG ((LM_DEBUG, - "usage: %s " - "-s <ior-of-server-to-invoke> " - "-d <seconds to delay before initializing POA> " - "-n Number of the server\n", + ACE_TEXT ("usage: %C ") + ACE_TEXT ("-e ") + ACE_TEXT ("-s <ior-of-server-to-invoke> ") + ACE_TEXT ("-d <seconds to delay before initializing POA> ") + ACE_TEXT ("-n Number of the server\n"), argv[0])); return 1; break; @@ -94,7 +102,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableServer::POA_var test_poa = createPOA(root_poa.in(), poa_name.c_str ()); ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Server %d created POA %s\n", + ACE_TEXT ("(%P|%t|%T) Server %d created POA %C\n"), server_num, poa_name.c_str ())); PortableServer::Servant_var<Test_i> test_servant = @@ -127,16 +135,35 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (other_server_ior.length () > 0) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Server %d sending request to %s\n", + ACE_TEXT ("(%P|%t|%T) Server %d sending request to %s\n"), server_num, other_server_ior.c_str ())); - CORBA::Object_var other_server = - orb->string_to_object (other_server_ior.c_str ()); - ACE_ASSERT (!CORBA::is_nil (other_server.in ())); - Test_var test = Test::_narrow (other_server.in()); - ACE_ASSERT (!CORBA::is_nil (test.in())); - CORBA::Short n = test->get_server_num (); - ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Server %d received reply from server %d\n", server_num, n)); + try + { + CORBA::Object_var other_server = + orb->string_to_object (other_server_ior); + ACE_ASSERT (!CORBA::is_nil (other_server.in ())); + Test_var test = Test::_narrow (other_server.in()); + ACE_ASSERT (!CORBA::is_nil (test.in())); + CORBA::Short n = test->get_server_num (); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t|%T) Server %d received reply from server %d\n"), + server_num, n)); + } + catch (CORBA::TRANSIENT &) + { + if (expect_transient) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t|%T) Server %d got expected transient exception\n"), + server_num)); + } + else + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ERROR: (%P|%t|%T) Server %d got unexpected Transent\n"), + server_num)); + } + } } @@ -154,7 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) mgr->activate(); ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Server %d started serving %s\n", + ACE_TEXT ("(%P|%t|%T) Server %d started serving %C\n"), server_num, poa_name.c_str())); { @@ -169,12 +196,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy(); ACE_DEBUG ((LM_DEBUG, - "(%P|%t|%T) Server %d ending serving of %s\n", + ACE_TEXT ("(%P|%t|%T) Server %d ending serving of %C\n"), server_num, poa_name.c_str ())); } catch(const CORBA::Exception& ex) { - ex._tao_print_exception ("Server main()"); + ex._tao_print_exception (ACE_TEXT ("Server main()")); return 1; } diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc index bb6898e4972..11aab468634 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micro { +project(*server): taoserver, iortable, imr_client, avoids_minimum_corba, avoids_corba_e_micro { after += *idl exename = server IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp index 8d2594e101f..ab73cd893a9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp @@ -8,6 +8,7 @@ #include "tao/IORTable/IORTable.h" #include "tao/PortableServer/Root_POA.h" +#include "tao/ImR_Client/ImR_Client.h" #include "ace/Get_Opt.h" #include "ace/streams.h" diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index 0e6902e0620..d31721ae48e 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -71,7 +71,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh, // Indicate that this transport was opened in the server role if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, " "opened as TAO_SERVER_ROLE\n")); @@ -102,7 +102,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, ") ACE_TEXT ("could not add the handler to cache\n"))); } @@ -175,7 +175,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh, else error = ACE_TEXT("could not register new connection in the reactor"); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, ") ACE_TEXT("%s\n"), error)); } diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 3cff0a4c872..7c9a96ab2ab 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -151,7 +151,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid endpoint ") ACE_TEXT ("specification: <%C>.\n"), iop.c_str ())); @@ -238,7 +238,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid endpoint ") ACE_TEXT ("specification: <%C>.\n"), iop.c_str ())); @@ -297,7 +297,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, if (found == false) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("no usable transport protocol ") ACE_TEXT ("was found.\n"))); @@ -372,7 +372,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%C>\n"), @@ -419,7 +419,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%C>\n"), @@ -520,7 +520,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) No default endpoints ") ACE_TEXT ("opened.\n") ACE_TEXT ("Please specify one or more using ") @@ -554,7 +554,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%C>\n"), @@ -591,7 +591,7 @@ TAO_Acceptor_Registry::open_default_i (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Unable to open ") ACE_TEXT ("default acceptor for <%C>%p\n"), @@ -747,7 +747,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%C>\n"), @@ -841,7 +841,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Unable to open acceptor ") ACE_TEXT ("for <%C>%p\n"), @@ -863,7 +863,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%C>.\n"), address.c_str ())); diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 7b75c7130ed..7dbf88c5b16 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -6,6 +6,7 @@ #include "tao/AnyTypeCode/WrongTransactionA.h" #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/BooleanSeqA.h" #include "tao/AnyTypeCode/OctetSeqA.h" @@ -290,6 +291,13 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const CORBA::WS int TAO_AnyTypeCode_Adapter_Impl::Initializer (void) { + // The TAO::Unknown_IDL_Type::lock_i () is a PRIVATE thread unsafe singleton + // which we need to initialise before Unknown_IDL_Types are used in a + // threaded environment. This singleton is called for every constructed + // Unknown_IDL_Type, so just create a throw-a-way from a null typecode. + TAO::Unknown_IDL_Type singleton_initaliser (0); + ACE_UNUSED_ARG (singleton_initaliser); + return ACE_Service_Config::process_directive ( ace_svc_desc_TAO_AnyTypeCode_Adapter_Impl); } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index f880ebde6cc..23932fb77b5 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -36,7 +36,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) %N:%l ") ACE_TEXT ("silent marshaling exception ") ACE_TEXT ("in TAO::Unknown_IDL_Type::Unknown_IDL_Type\n"))); @@ -210,7 +210,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase* & val) const if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) WARNING: extracting ") ACE_TEXT ("valuetype using default ORB_Core\n"))); } @@ -251,7 +251,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr & obj) const if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) WARNING: extracting ") ACE_TEXT ("abstract base using default ORB_Core\n"))); } diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 8207d2a7efc..f48425693a4 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -328,7 +328,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, int flag) arg = "(nil)"; } - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("NVList::_tao_encode - parameter <%C>\n"), arg)); } @@ -370,7 +370,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n"))); } @@ -395,7 +395,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %C\n"), nv->name ()? nv->name () : "(no name given)" )); } diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 7bfc19d89e1..61f5d6b99ed 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -90,7 +90,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n") )); @@ -119,7 +119,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, if (retval != TAO::TRAVERSE_CONTINUE) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Any::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -213,7 +213,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode: ") ACE_TEXT ("Bad kind_ value in CDR stream\n"))); } @@ -229,7 +229,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); } @@ -307,7 +307,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n") )); @@ -342,7 +342,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -613,7 +613,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -638,7 +638,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, if (!continue_append) { - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n") )); @@ -823,7 +823,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, } // error exit if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n") )); @@ -1010,7 +1010,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, // error exit if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n"))); throw ::CORBA::MARSHAL (); @@ -1038,7 +1038,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -1086,7 +1086,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -1114,7 +1114,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -1153,7 +1153,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, "TAO (%P|%t) WARNING: extracting " "valuetype using default ORB_Core\n")); } @@ -1225,7 +1225,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index f724a6fa75a..f18b69532c1 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -82,7 +82,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) else { if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n") )); @@ -179,7 +179,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) else // bad kind_ value to be decoded { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip: ") ACE_TEXT ("Bad kind_ value in CDR stream\n"))); throw ::CORBA::BAD_TYPECODE (); @@ -191,7 +191,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) else { if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n") )); @@ -218,7 +218,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) else { if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n") )); @@ -275,7 +275,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) else { if (TAO_debug_level > 0) - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_DEBUG, ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n") )); @@ -306,7 +306,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -563,7 +563,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_String::skip detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -584,7 +584,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) if (!continue_skipping) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); throw ::CORBA::MARSHAL (); } @@ -661,7 +661,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) // error exit if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); throw ::CORBA::MARSHAL (); @@ -745,7 +745,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) // error exit if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); throw ::CORBA::MARSHAL (); @@ -772,7 +772,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -813,7 +813,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::skip detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); @@ -841,7 +841,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::skip detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -874,7 +874,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, "TAO (%P|%t) WARNING: extracting " "valuetype using default ORB_Core\n")); } @@ -967,7 +967,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::skip detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h index 393e50ede71..df3565b65fc 100644 --- a/TAO/tao/Any_Insert_Policy_T.h +++ b/TAO/tao/Any_Insert_Policy_T.h @@ -62,7 +62,7 @@ namespace TAO } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ERROR: unable to find AnyTypeCode Adapter "))); } @@ -102,7 +102,7 @@ namespace TAO { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Cannot insert a vanilla CORBA Object" " into an Any for returning the return value.\n")); } diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 8ea09608617..5cc1e241108 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -152,7 +152,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) if (TAO_debug_level == 4) { // This debug is for testing purposes! - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Asynch_Queued_Message::clone\n" "Using global pool for allocation\n")); } diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index 9de4075a3ab..db90d1ac6c5 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -23,7 +23,7 @@ TAO_BiDir_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_Bidir_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 6605805c50c..81c310f28b7 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -161,7 +161,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) if (endpoints[ndx].profile_ == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("could not parse from %C\n"), ior)); @@ -191,7 +191,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) // anything else is a violation. if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("could not parse from %C\n"), ior)); @@ -223,7 +223,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) // insufficient heap to allocate the mprofile, hence the // mprofile's size is 0, and give_profile fails. if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("mprofile.give_profile failed for i = %d\n"), i)); @@ -279,7 +279,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, // No valid IPv6 address specified but that will come out later. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_CORBALOC_Parser: ") ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } @@ -324,7 +324,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, // initialized. Just throw an exception. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Cannot determine hostname.\n"))); diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 0f7adf72a1a..54db4972bcf 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -102,7 +102,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) // Check if the Object reference is nil. if (CORBA::is_nil (name_context.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "Cannot resolve Naming Service: CORBANAME_Parser\n"), 0); @@ -111,7 +111,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) if (!is_a) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "Cannot narrow Naming Service: " "CORBANAME_Parser\n"), 0); diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp index 557709055d0..797af515024 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp @@ -43,7 +43,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, if (repo == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) CSD_Default_Servant_Dispatcher::") ACE_TEXT("create_POA could not find ") ACE_TEXT("TAO_CSD_Strategy_Repository\n"))); diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index fa6a549f8de..24cbb88ca02 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -100,7 +100,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch ( // However, in this case, we cannot close the connection // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); @@ -140,7 +140,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch ( // However, in this case, we cannot close the connection // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); @@ -354,7 +354,7 @@ TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Operation_Details const *& from, if (! from_non_const->marshal_args (outcdr)) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("(%P|%T) TAO::CSD::FW_Server_Request_Wrapper::") ACE_TEXT("clone TAO_Operation_Details failed\n"))); return false; diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp index 142da69b110..5b289d5819b 100644 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp @@ -27,7 +27,7 @@ TAO_CSD_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_CSD_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp index 6edc8f51d44..8c78d072105 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp @@ -25,7 +25,7 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa) if (CORBA::is_nil(poa)) { if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) CSD Strategy cannot ") ACE_TEXT("be applied to a nil POA.\n"))); return false; @@ -34,7 +34,7 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa) if (!CORBA::is_nil(this->poa_.in())) { if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) CSD Strategy already ") ACE_TEXT("applied to a POA.\n"))); return false; @@ -47,7 +47,7 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa) if (poa_impl == 0) { if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) CSD Strategy cannot ") ACE_TEXT("be applied to a non CSD POA.\n"))); return false; diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl index 377e2358591..3171057f28d 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl @@ -71,7 +71,7 @@ TAO::CSD::Strategy_Base::dispatch_request default: if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) Unknown result (%d) from call to ") ACE_TEXT("dispatch_remote_request_i().\n"), result)); // Since we do not know what to do here, just do the minimum, which diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp index cafa923b557..07de03d9b98 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp @@ -18,7 +18,7 @@ TAO::CSD::Strategy_Proxy::custom_strategy if (this->strategy_impl_) { if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) Error - TAO::CSD::Strategy_Proxy ") ACE_TEXT("object already has a custom strategy.\n"))); @@ -28,7 +28,7 @@ TAO::CSD::Strategy_Proxy::custom_strategy if (CORBA::is_nil(strategy)) { if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) Error - TAO::CSD::Strategy_Proxy ") ACE_TEXT("supplied with a NIL custom strategy.\n"))); diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp index 860301366be..fdb6b8834b4 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp @@ -60,7 +60,7 @@ TAO_CSD_Strategy_Repository::add_strategy (const ACE_CString& name, if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("Strategy_Repository::add_strategy for %C\n"), name.c_str ())); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp index 112baa42833..76f1fb18ec9 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp @@ -48,7 +48,7 @@ TAO::CSD::TP_Strategy_Factory::init (int argc, { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TP_Strategy_Factory - ") ACE_TEXT ("cannot initialize strategy repo\n"))); } @@ -111,7 +111,7 @@ TAO::CSD::TP_Strategy_Factory::init (int argc, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("CSD_ORB_Loader: Unknown option ") ACE_TEXT("<%s>.\n"), argv[curarg])); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index 80f1ac5f23a..c73f851478f 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -23,7 +23,7 @@ TAO::CSD::TP_Task::add_request(TP_Request* request) if (!this->accepting_requests_) { - ACE_DEBUG((LM_DEBUG,"(%P|%t) TP_Task::add_request() - " + TAOLIB_DEBUG((LM_DEBUG,"(%P|%t) TP_Task::add_request() - " "not accepting requests\n")); return false; } @@ -54,7 +54,7 @@ TAO::CSD::TP_Task::open(void* args) if (tmp == 0) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("(%P|%t) TP_Task failed to open. ") ACE_TEXT ("Invalid argument type passed to open().\n")), -1); @@ -66,7 +66,7 @@ TAO::CSD::TP_Task::open(void* args) // We can't activate 0 threads. Make sure this isn't the case. if (num < 1) { - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("(%P|%t) TP_Task failed to open. ") ACE_TEXT ("num_threads (%u) is less-than 1.\n"), num), @@ -76,7 +76,7 @@ TAO::CSD::TP_Task::open(void* args) // Likewise, we can't activate too many. Make sure this isn't the case. if (num > MAX_THREADPOOL_TASK_WORKER_THREADS) { - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("(%P|%t) TP_Task failed to open. ") ACE_TEXT ("num_threads (%u) is too large. ") ACE_TEXT ("Max is %d.\n"), @@ -92,7 +92,7 @@ TAO::CSD::TP_Task::open(void* args) if (this->opened_) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("(%P|%t) TP_Task failed to open. ") ACE_TEXT ("Task has previously been open()'ed.\n")), -1); @@ -104,7 +104,7 @@ TAO::CSD::TP_Task::open(void* args) { // Assumes that when activate returns non-zero return code that // no threads were activated. - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("(%P|%t) TP_Task failed to activate ") ACE_TEXT ("(%d) worker threads.\n"), num), diff --git a/TAO/tao/Cache_Entries_T.cpp b/TAO/tao/Cache_Entries_T.cpp index 98e058ae85a..2cd1a8021a6 100644 --- a/TAO/tao/Cache_Entries_T.cpp +++ b/TAO/tao/Cache_Entries_T.cpp @@ -20,7 +20,7 @@ namespace TAO this->is_connected_ = transport->is_connected(); transport->add_reference (); if (TAO_debug_level > 9) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Cache_IntId_T::Cache_IntId_T, ") ACE_TEXT ("this=%@ Transport[%d] is%Cconnected\n"), this, transport->id (), (is_connected_ ? " " : " not "))); @@ -58,7 +58,7 @@ namespace TAO Cache_IntId_T<TRANSPORT_TYPE>::recycle_state (Cache_Entries_State st) { if (TAO_debug_level > 9) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Cache_IntId_T::") + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Cache_IntId_T::") ACE_TEXT ("recycle_state, %C->%C Transport[%d] IntId=%@\n"), state_name (recycle_state_), state_name (st), transport_ ? transport_->id() : 0, this)); diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index 990a20182c2..143cbcaba40 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -68,7 +68,7 @@ TAO_Codeset_Descriptor::ncs (ACE_CDR::ULong n) if (this->max_bytes_ == 0) { if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) TAO_Codeset_Descriptor::ncs, ") ACE_TEXT("unknown codeset id 0x%x\n"), n)); diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 1264a62973e..62d1fc2b67b 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -110,13 +110,13 @@ TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile, if (trans.is_tcs_set ()) { if(TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ") ACE_TEXT ("transport already set\n"))); return; } if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ") ACE_TEXT ("No codeset component in profile\n"))); @@ -140,7 +140,7 @@ TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile, computeTCS (remote.ForCharData, this->codeset_info_.ForCharData); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ") ACE_TEXT("setting char translator (%08x)\n"), tcs)); @@ -150,7 +150,7 @@ TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile, this->codeset_info_.ForWcharData); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ") ACE_TEXT("setting wchar translator (%08x)\n"), tcs)); @@ -193,7 +193,7 @@ TAO_Codeset_Manager_i::process_service_context (TAO_ServerRequest &request) if (request.transport()->is_tcs_set()) return; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("Codeset_Manager_i::process_service_context ") ACE_TEXT("no codeset context in request, using defaults\n") @@ -207,7 +207,7 @@ TAO_Codeset_Manager_i::process_service_context (TAO_ServerRequest &request) ACE_CString tcs_w_locale; ACE_Codeset_Registry::registry_to_locale (tcs_c, tcs_c_locale, 0, 0); ACE_Codeset_Registry::registry_to_locale (tcs_w, tcs_w_locale, 0, 0); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("process_service_context, ") ACE_TEXT ("using tcsc <%C> (%08x), tcsw <%C> (%08x)\n"), @@ -245,7 +245,7 @@ TAO_Codeset_Manager_i::generate_service_context (TAO_Operation_Details &opd, ACE_CString tcs_w_locale; ACE_Codeset_Registry::registry_to_locale (codeset_cntx.char_data, tcs_c_locale, 0, 0); ACE_Codeset_Registry::registry_to_locale (codeset_cntx.wchar_data, tcs_w_locale, 0, 0); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("generate_service_context, ") ACE_TEXT ("using tcs_c <%C> (%08x), tcs_w <%C> (%08x)\n"), @@ -360,7 +360,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core& core) else { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Codeset_Manager_i::open skipping ") ACE_TEXT("redundant load of UTF8_Latin1_Factory\n") )); @@ -378,7 +378,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core& core) else { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Codeset_Manager_i::open skipping ") ACE_TEXT("redundant load of UTF16_BOM_Factory\n") )); @@ -401,7 +401,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core& core) this->codeset_info_.ForCharData) == -1) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("configure_codeset_factories, failed to init ") ACE_TEXT ("char codeset factories\n"))); @@ -411,7 +411,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core& core) this->codeset_info_.ForWcharData) == -1) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("configure_codeset_factories, failed to init ") ACE_TEXT ("wchar codeset factories\n"))); @@ -438,7 +438,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, if (tlist->translator_factory_ == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("init_ccs, Unable to load ") ACE_TEXT ("code set translator <%s>, %m\n"), @@ -449,7 +449,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, if (tlist->translator_factory_->ncs() != cs_comp.native_code_set) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("init_ccs, codeset translator <%s> ") ACE_TEXT ("has wrong ncs (%d), %m\n"), @@ -467,7 +467,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, tlist->translator_factory_->tcs(); if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::") ACE_TEXT ("init_ccs, Loaded Codeset translator ") ACE_TEXT ("<%s>, ncs = %08x tcs = %08x\n"), diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp index 83571c9d6bb..bf8f141653a 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp @@ -41,7 +41,7 @@ TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::init (int argc, ACE_TCHAR* argv[]) this->TAO_Codeset_Translator_Factory::init (argc,argv); ACE_NEW_RETURN (translator_,NCS_TO_TCS,-1); if( TAO_debug_level > 0 ) - ACE_DEBUG((LM_DEBUG, "TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::init() entered\n")); + TAOLIB_DEBUG((LM_DEBUG, "TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::init() entered\n")); return 0; } diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index 64123cd9130..0ce8840b917 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -58,7 +58,7 @@ TAO_UTF16_BOM_Factory::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)TAO_UTF16_BOM_Factory parameter error: %s\n") ACE_TEXT ("Usage: TAO_UTF16_BOM_Factory \"-forceBE\"\n") , argv[narg] @@ -129,7 +129,7 @@ TAO_UTF16_BOM_Factory::create_translator () const if (this->translator_ == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UTF16_BOM_Factory: ") ACE_TEXT ("Cannot create translator\n") )); diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 4c0d0c04755..1751a364c5c 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -34,7 +34,7 @@ TAO_UTF16_BOM_Translator::TAO_UTF16_BOM_Translator (bool forceBE) : forceBE_(forceBE) { if (TAO_debug_level > 1) - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UTF16_BOM_Translator: ") ACE_TEXT("forceBE %d\n"), this->forceBE_ ? 1:0 )); } diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 604167f74b4..5e8a3ee1b09 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -81,7 +81,7 @@ TAO_UTF8_Latin1_Factory::create_translator () const if (this->translator_ == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_UTF8_Latin1_Factory cannot ") ACE_TEXT("create TAO_UTF8_Latin1_Translator\n") )); diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index 02bc1e31b21..b7e5fd8e205 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp @@ -44,7 +44,7 @@ Zlib_CompressorFactory::get_compressor ( compressor = (*it).second.in(); } catch (...) { - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT("(%P | %t) ERROR: ZlibCompressor - Unable to create Zlib Compressor at level [%d].\n"), int(compression_level)),0); } diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index 652e83f3265..738018c977d 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -3,7 +3,7 @@ #ifndef TAO_CONDITION_CPP #define TAO_CONDITION_CPP #include "tao/Condition.h" -#include "ace/Log_Msg.h" +#include "tao/debug.h" #if !defined (__ACE_INLINE__) # include "tao/Condition.inl" @@ -47,7 +47,7 @@ template <class MUTEX> TAO_Condition<MUTEX>::~TAO_Condition (void) { if (this->remove () == -1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("TAO_Condition::~TAO_Condition"))); diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 0030af8cb4b..ffc0280895d 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -64,7 +64,7 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock, sizeof (snd_size)) == -1) { if (TAO_debug_level) - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Connection_Handler::") ACE_TEXT ("set_socket_option, setting SO_SNDBUF failed ") ACE_TEXT ("'%m'\n"))); @@ -82,7 +82,7 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock, sizeof (int)) == -1) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Connection_Handler::") ACE_TEXT ("set_socket_option, setting SO_RCVBUF failed ") ACE_TEXT ("'%m'\n"))); @@ -111,7 +111,7 @@ TAO_Connection_Handler::svc_i (void) int result = 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Connection_Handler::svc_i begin\n"))); // Here we simply synthesize the "typical" event loop one might find @@ -162,13 +162,13 @@ TAO_Connection_Handler::svc_i (void) current_timeout = timeout; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler::svc_i - " "loop <%d>\n", current_timeout.msec ())); } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler::svc_i - end\n")); return result; @@ -226,7 +226,7 @@ TAO_Connection_Handler::handle_input_eh (ACE_HANDLE h, ACE_Event_Handler *eh) if (!this->transport ()->wait_strategy ()->can_process_upcalls ()) { if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, " "not going to handle_input on transport " "because upcalls temporarily suspended on this thread\n", @@ -236,7 +236,7 @@ TAO_Connection_Handler::handle_input_eh (ACE_HANDLE h, ACE_Event_Handler *eh) if (this->transport ()->wait_strategy ()->defer_upcall (eh) != 0) { if (TAO_debug_level > 5) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, " "Error deferring upcall handler[%d]\n", this->transport ()->id (), @@ -274,7 +274,7 @@ TAO_Connection_Handler::handle_input_internal ( if (TAO_debug_level > 6) { ACE_HANDLE const handle = eh->get_handle(); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::handle_input_internal, " "handle = %d/%d\n", t_id, handle, h)); @@ -300,7 +300,7 @@ TAO_Connection_Handler::handle_input_internal ( if (TAO_debug_level > 6) { ACE_HANDLE const handle = eh->get_handle (); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::handle_input_internal, " "handle = %d/%d, retval = %d\n", t_id, handle, h, return_value)); @@ -330,7 +330,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) size_t const id = this->transport ()->id (); if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" "close_connection_eh, purging entry from cache\n", handle)); @@ -358,7 +358,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" "close_connection_eh, removing from the reactor\n", handle)); @@ -382,7 +382,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) // buffering if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" "close_connection_eh, cancel all timers\n", handle)); @@ -407,7 +407,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Connection_Handler[%d]::" "close_connection_eh end\n", id)); diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 619ba114b4c..66ec952cf7a 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -73,7 +73,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) { if (connector->open (orb_core) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry") ACE_TEXT ("::open: unable to open connector for ") ACE_TEXT ("<%C>.\n"), @@ -177,7 +177,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::") ACE_TEXT ("create_profile: Unknown profile tag 0x%x\n"), tag)); @@ -189,7 +189,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry") ACE_TEXT ("::create_profile: ") ACE_TEXT ("WARNING: extracting object from ") diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp index 96a6354b72c..edbbb3f4c59 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp +++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp @@ -22,7 +22,7 @@ TAO_DiffServPolicy_ORBInitializer::pre_init ( if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_RT_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp index 0cc309685d0..8c1ed23e121 100644 --- a/TAO/tao/DynamicAny/DynValue_i.cpp +++ b/TAO/tao/DynamicAny/DynValue_i.cpp @@ -161,7 +161,7 @@ TAO_DynValue_i::get_correct_base_type ( currentBase = base_types.size (); if (!currentBase) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::get_correct_base_type () ") ACE_TEXT ("BaseTypesList_t is not initialised\n"))); return 0; @@ -172,7 +172,7 @@ TAO_DynValue_i::get_correct_base_type ( index -= base_types[currentBase]->member_count (); if (!currentBase) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::get_correct_base_type () ") ACE_TEXT ("BaseTypesList_t is not large enough\n"))); return 0; @@ -582,7 +582,7 @@ TAO_DynValue_i::insert_val (CORBA::ValueBase *value) TAO_OutputCDR out; if (!CORBA::ValueBase::_tao_marshal (out, value)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::insert_val ") ACE_TEXT ("can not marshal value\n") )); throw DynamicAny::DynAny::InvalidValue (); @@ -763,7 +763,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) if (!out_cdr.write_long (valuetag) || (1u < trunc_ids && !out_cdr.write_ulong (trunc_ids)) ) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem writing <value-tag> header\n"))); throw CORBA::INTERNAL (); @@ -784,7 +784,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) if (!CORBA::ValueBase:: _tao_write_repository_id (out_cdr, repo_id) ) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem writing header repo_ids\n"))); throw CORBA::INTERNAL (); @@ -804,7 +804,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) { if (!ci.start_chunk (out_cdr)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem writing basetype start chucks\n"))); throw CORBA::INTERNAL (); @@ -839,7 +839,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) // Start chunk for this base-type's STATE if (!ci.start_chunk (out_cdr)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem writing base-type ") ACE_TEXT ("%u state start chuck\n"), @@ -869,7 +869,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) *unk= dynamic_cast<TAO::Unknown_IDL_Type *> (impl); if (!unk) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem obtaining Unknown_IDL_Type\n"))); throw CORBA::INTERNAL (); @@ -908,7 +908,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) // base-type's STATE if we have written the whole state. if (currentBase < trunc_ids && !ci.end_chunk (out_cdr)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem writing base-type ") ACE_TEXT ("%u state end chuck\n"), @@ -924,7 +924,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) { if (!ci.end_chunk (out_cdr)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::to_outputCDR() ") ACE_TEXT ("problem writing basetype end chucks\n"))); throw CORBA::INTERNAL (); @@ -958,7 +958,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) if (!result) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("_tao_unmarshal_header() failed\n") )); this->set_to_null (); @@ -977,7 +977,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) // circular linked list?) if (TAO_debug_level) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("Any contains Indirected ValueType\n") )); } @@ -992,7 +992,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) CORBA::Long offset = 0; if (!strm.read_long (offset) || 0 <= offset) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("Can't read/understand ") ACE_TEXT ("Indirected ValueType offset\n") )); @@ -1007,7 +1007,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) *original = 0; if (strm.get_value_map()->get()->find (pos, original)) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("Can't find Indirected ValueType ") ACE_TEXT ("offset in map\n") )); @@ -1030,7 +1030,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) start_of_valuetype, reinterpret_cast<void *> (this))) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("Failed to record this into value_map\n") )); throw CORBA::INTERNAL (); @@ -1066,7 +1066,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) // allow truncation. if (!is_chunked) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR()\n") ACE_TEXT (" type %C requires truncation to %C but is not chunked type.\n"), ids[i].c_str (), @@ -1079,7 +1079,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) } if (i == num_ids) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("couldn't find matching repo_id!\n"))); this->set_to_null (); @@ -1096,7 +1096,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) { if (!ci.handle_chunking (strm)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("problem reading basetype start chucks\n"))); this->set_to_null (); @@ -1131,7 +1131,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) // Read past the start chunk for this base-type's state if (!ci.handle_chunking (strm)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("problem reading base-type ") ACE_TEXT ("%u state start chuck\n"), @@ -1202,7 +1202,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm) ci.handle_chunking (strm) : ci.skip_chunks (strm) )) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ") ACE_TEXT ("problem reading base-type ") ACE_TEXT ("%u state end chuck\n"), diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 2c6a8a8c1e3..a53b1fc7221 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -86,7 +86,7 @@ namespace TAO if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - DII_Invocation::" "handle_user_exception\n")); } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index c4694a26f57..9225703f6d9 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -41,7 +41,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( { if (TAO_debug_level > 2) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, "TAO (%P|%t) - DII_Deferred_Reply_Dispatcher::dispatch_reply " "clone_from failed\n")); @@ -67,7 +67,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level >= 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"))); } @@ -176,7 +176,7 @@ TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level >= 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P | %t):") ACE_TEXT ("TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply: status = %d\n"), this->reply_status_)); diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp index 37d5d882cde..a80282e520f 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp @@ -56,7 +56,7 @@ TAO_DII_Reply_Handler::handle_location_forward (TAO_InputCDR &incoming, { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Base DII_Reply_Handler::") ACE_TEXT("handle_location_forward called, ") ACE_TEXT("reply_status = %d\n"), diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 51bc039a815..dbdac7b836a 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -370,7 +370,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, case GIOP::LOCATION_FORWARD_PERM: default: // @@ (JP) Don't know what to do about any of these yet. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) unhandled reply status\n"))); } } diff --git a/TAO/tao/Dynamic_TP/DTP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp index 79f7defa0ec..09cbd9eefaa 100644 --- a/TAO/tao/Dynamic_TP/DTP_Config.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp @@ -174,7 +174,7 @@ TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - ") ACE_TEXT ("Unrecognized argv[%d], %C\n"), curarg, argv[curarg])); @@ -188,7 +188,7 @@ TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - ") ACE_TEXT ("thread count constraint ") ACE_TEXT ("violated, min: %d <= init: %d <= max: ") @@ -215,7 +215,7 @@ TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - ") ACE_TEXT ("cannot initialize registry\n"))); } @@ -295,7 +295,7 @@ TAO_DTP_Config::report_option_value_error (const ACE_TCHAR* option_name, { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - unknown ") ACE_TEXT ("argument <%s> for <%s>\n"), option_value, option_name)); diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp index 5ce868d61b1..fc8e97f187f 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp @@ -32,7 +32,7 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n") ACE_TEXT ("(%P|%t) Unable to narrow ") ACE_TEXT ("\"PortableInterceptor::ORBInitInfo_ptr\" to\n") @@ -59,7 +59,7 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (config_mgr == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n") ACE_TEXT ("(%P|%t) Unable to resolve DTP_Config ") ACE_TEXT ("object\n"))); @@ -94,7 +94,7 @@ TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::post_init ") ACE_TEXT ("using thread pool name %s\n"), dtp_name)); } @@ -109,7 +109,7 @@ TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) if (config_registry == 0 || !config_registry->find(dtp_name, def)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::") ACE_TEXT ("post_init:\n") ACE_TEXT ("(%P|%t) Unable to resolve ") diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp index 838e0a7e3d1..ae4794722eb 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp @@ -45,7 +45,7 @@ TAO_DTP_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_ORB_Loader - ") ACE_TEXT ("DTPORB argument missing value\n"))); } @@ -56,7 +56,7 @@ TAO_DTP_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_ORB_Loader -") ACE_TEXT (" Unrecognized argv[%d], %C\n"), curarg, argv[curarg])); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp index 6b88f7bf138..c363e8f7553 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp @@ -59,7 +59,7 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - ") ACE_TEXT ("cannot initialize strategy repo\n"))); } @@ -73,7 +73,7 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - ") ACE_TEXT ("parsing args\n"))); } @@ -102,7 +102,7 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) */ if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("DTP_POA_Loader: Missing option\n") ACE_TEXT ("Usage: -DTPPOAConfigMap <comma-separated ") ACE_TEXT ("list of POAs>:<POA Config Name>\n") @@ -132,7 +132,7 @@ TAO_DTP_POA_Loader::load_poa_map (ACE_TCHAR *map, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("DTP_POA_Loader: Missing option\n") ACE_TEXT ("Usage: -DTPPOAConfigMap <comma-separated ") ACE_TEXT ("list of POAs>:<POA Config Name>\n<%s>.\n"), @@ -175,7 +175,7 @@ TAO_DTP_POA_Loader::report_option_value_error (const ACE_TCHAR* name, { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - unknown ") ACE_TEXT ("argument <%s> for <%s>\n"), value, name)); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp index e715319750b..6a54615da0b 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp @@ -84,7 +84,7 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ") ACE_TEXT ("cannot retrieve configuration repo\n"))); } @@ -95,7 +95,7 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) TAO_DTP_Definition config_entry; if (!config_repo->find (this->dynamic_tp_config_name_, config_entry)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ") ACE_TEXT ("warning: config not found...using ") ACE_TEXT ("defaults!\n"))); @@ -397,7 +397,7 @@ TAO_DTP_POA_Strategy::set_dtp_config (TAO_DTP_Definition &tp_config) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy: ") ACE_TEXT ("Initialized with:\n") ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy initial_pool_threads_=") diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp index 181325fa050..0f32ad86680 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp @@ -52,7 +52,7 @@ TAO_DTP_Task::add_request (TAO::CSD::TP_Request* request) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() ") ACE_TEXT ("not accepting requests.\n") ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() ") @@ -82,7 +82,7 @@ TAO_DTP_Task::add_request (TAO::CSD::TP_Request* request) this->work_available_.signal (); if (TAO_debug_level > 4 ) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() - ") ACE_TEXT ("work available\n"))); } @@ -136,7 +136,7 @@ TAO_DTP_Task::open (void* /* args */) //if (tmp == 0) // { // //FUZZ: disable check_for_lack_ACE_OS - // ACE_ERROR_RETURN ((LM_ERROR, + // TAOLIB_ERROR_RETURN ((LM_ERROR, // ACE_TEXT ("(%P|%t) DTP_Task::open() failed to open. ") // ACE_TEXT ("Invalid argument type passed to open().\n")), // -1); @@ -153,7 +153,7 @@ TAO_DTP_Task::open (void* /* args */) if (TAO_debug_level > 4) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() initialized with:\n") ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() init_threads_ \t\t: [%d]\n") ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() min_pool_threads_ \t\t: [%d]\n") @@ -173,7 +173,7 @@ TAO_DTP_Task::open (void* /* args */) // We can't activate 0 threads. Make sure this isn't the case. if (num < 1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DTP_Task::open() failed to open. ") ACE_TEXT ("num_threads (%u) is less-than 1.\n"), num), @@ -188,7 +188,7 @@ TAO_DTP_Task::open (void* /* args */) if (this->opened_) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DTP_Task::open() failed to open. ") ACE_TEXT ("Task has previously been open()'ed.\n")), -1); @@ -201,7 +201,7 @@ TAO_DTP_Task::open (void* /* args */) { if (this->activate (THR_NEW_LWP | THR_DETACHED, num, 1) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) DTP_Task::open() failed to activate ") ACE_TEXT ("(%d) worker threads.\n"), num), @@ -226,7 +226,7 @@ TAO_DTP_Task::open (void* /* args */) 0, stack_sz_arr) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) DTP_Task::open() failed to activate ") ACE_TEXT ("(%d) worker threads.\n"), num), @@ -267,7 +267,7 @@ TAO_DTP_Task::clear_request (TAO::CSD::TP_Request_Handle &r) if (TAO_debug_level > 4 ) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Decrementing num_queue_requests.") ACE_TEXT ("New queue depth:%d\n"), @@ -283,7 +283,7 @@ TAO_DTP_Task::svc (void) ++this->busy_threads_; if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("New thread created.\n"))); } @@ -301,7 +301,7 @@ TAO_DTP_Task::svc (void) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Decrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), @@ -327,7 +327,7 @@ TAO_DTP_Task::svc (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Existing thread expiring.\n"))); } @@ -339,7 +339,7 @@ TAO_DTP_Task::svc (void) ++this->busy_threads_; if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Incrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), @@ -364,7 +364,7 @@ TAO_DTP_Task::svc (void) this->thread_stack_size_ == 0 ? 0 : &this->thread_stack_size_) != 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) DTP_Task::svc() failed to grow ") ACE_TEXT ("to %d worker threads.\n"), count)); } @@ -372,7 +372,7 @@ TAO_DTP_Task::svc (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Growing threadcount. ") ACE_TEXT ("New thread count:%d\n"), @@ -417,7 +417,7 @@ TAO_DTP_Task::close(u_long flag) size_t in_task = (this->thr_mgr ()->task () == this) ? 1 : 0; if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::close() ") ACE_TEXT ("shutting down. in_task = %d, Count = %d \n"), in_task, this->thr_count ())); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 1aa8134e253..597a97b1590 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -54,7 +54,7 @@ TAO_DTP_Thread_Pool_Threads::svc (void) catch (const ::CORBA::Exception& ex) { // No point propagating this exception. Print it out. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("orb->run() raised exception for thread %t\n"))); ex._tao_print_exception (""); @@ -72,7 +72,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) // exit the loop and this thread ends itself. if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP Pool %d - ") ACE_TEXT ("Starting worker, count = %d; ") ACE_TEXT ("setting timeout for %d sec, %d usec\n"), @@ -92,7 +92,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) bool timeout = errno == ETIME; if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP Pool %d ") ACE_TEXT ("run: above_min = %d, timeout = %d\n"), this->pool_.id(), this->pool_.above_minimum(), timeout)); @@ -111,7 +111,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP Pool %d ") ACE_TEXT ("Terminating worker, remaining pool thread count = %d\n"), this->pool_.id (), @@ -135,7 +135,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) // held. if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) DTP Pool %d new_dynamic_thread, max = %d, current = %d\n"), this->id_, this->definition_.max_threads_, (int)this->threads_.thr_count ())); } @@ -153,7 +153,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) (int)this->active_count_ < this->definition_.max_threads_)) { if (TAO_debug_level > 7) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) DTP Pool %d new_dynamic_thread, ") ACE_TEXT ("count = %d, creating new thread\n"), this->id_, @@ -163,7 +163,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Pool %d Thread %t: ") ACE_TEXT ("cannot create dynamic thread\n"), this->id_)); @@ -221,7 +221,7 @@ TAO_DTP_Thread_Pool::create_initial_threads (void) if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) DTP_Thread_Pool::create_initial_threads ") ACE_TEXT ("Creating %d threads\n"), count)); @@ -325,7 +325,7 @@ TAO_DTP_Thread_Pool::wait (void) this->threads_.wait (); if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) DTP_Thread_Pool::wait, ") ACE_TEXT ("active_count = %d, thread_count = %d\n"), this->active_count_, threads_.thr_count())); diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp index c90af733458..ce7a2bbe0af 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp @@ -45,7 +45,7 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, } if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) EndpointPolicy filtering acceptors") ACE_TEXT(" - mprofile has %d profiles,") ACE_TEXT(" endpoint list has %d entries\n"), @@ -59,7 +59,7 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, TAO_Endpoint * ep_in_pfile = pfile->base_endpoint (); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Testing profile %d - ") ACE_TEXT("it contains %d endpoints\n"), pfile_ndx, pfile->endpoint_count())); @@ -93,7 +93,7 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, //Get next endpoint before removing current one. TAO_Endpoint * next = ep_in_pfile->next (); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EndpointPolicy filter ") ACE_TEXT ("removing endpoint\n"))); pfile->remove_generic_endpoint (ep_in_pfile); @@ -102,7 +102,7 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, else { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EndpointPolicy filter ") ACE_TEXT ("Endpoint matched policy value\n"))); ep_in_pfile = ep_in_pfile->next(); @@ -120,14 +120,14 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, --pfile_ndx; // Step back one. We've just shifted the profile list. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) EndpointPolicy filter ") ACE_TEXT("removing profile\n"))); } else if (ep_count != 0) { if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) EndpointPolicy filter ") ACE_TEXT("profile retained with %d endpoints\n"), ep_count)); @@ -136,7 +136,7 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, if (mprofile.profile_count () == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) EndpointPolicy filter ") ACE_TEXT("eliminated all profiles\n"))); @@ -144,7 +144,7 @@ TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, } if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) EndpointPolicy filter returning mprofile ") ACE_TEXT("with %d profiles\n"), mprofile.profile_count())); diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 347f302c616..4446f7348f1 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -177,7 +177,7 @@ CORBA::Environment::print_exception (const char *info, { const char *id = this->exception_->_rep_id (); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %C\n"), info)); @@ -190,12 +190,12 @@ CORBA::Environment::print_exception (const char *info, // @@ we can use the exception's typecode to dump all the data // held within it ... - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) user exception, ID '%C'\n"), id)); } else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) no exception, %C\n"), info)); } diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 99066477aa2..6ccb0efa2d0 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -90,7 +90,7 @@ void CORBA::Exception::_tao_print_exception (const char *user_provided_info, FILE *) const { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) EXCEPTION, %C\n") ACE_TEXT ("%C\n"), user_provided_info, diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index b2ea77be367..69a4193caa3 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -41,7 +41,7 @@ TAO_Exclusive_TMS::request_id (void) ++this->request_id_generator_; if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::request_id - <%d>\n"), this->request_id_generator_)); @@ -83,7 +83,7 @@ TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) if (!this->rd_ || this->request_id_ != params.request_id_) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::dispatch_reply - <%d != %d>\n"), this->request_id_, params.request_id_)); @@ -108,7 +108,7 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id) if (!this->rd_ || this->request_id_ != request_id) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::reply_timed_out - <%d != %d>\n"), this->request_id_, request_id)); diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp index 813e88cd156..c38ea31aff2 100644 --- a/TAO/tao/FlResource/FlResource_Factory.cpp +++ b/TAO/tao/FlResource/FlResource_Factory.cpp @@ -25,7 +25,7 @@ namespace TAO 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - ACE_FlReactor created\n")); } diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp index e4bd6cb5a9d..0cca01ab3f1 100644 --- a/TAO/tao/FoxResource/FoxResource_Factory.cpp +++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp @@ -29,7 +29,7 @@ namespace TAO 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - ACE_FoxReactor created\n")); } diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 75191cd5645..2e3d2b085e6 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -94,7 +94,7 @@ TAO_GIOP_Message_Base::generate_request_header ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing GIOP header\n"))); } @@ -109,7 +109,7 @@ TAO_GIOP_Message_Base::generate_request_header ( if (!generator_parser->write_request_header (op, spec, cdr)) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing request header\n"))); return -1; @@ -136,7 +136,7 @@ TAO_GIOP_Message_Base::generate_locate_request_header ( if (!this->write_protocol_header (GIOP::LocateRequest, giop_version, cdr)) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing GIOP header\n"))); return -1; @@ -147,7 +147,7 @@ TAO_GIOP_Message_Base::generate_locate_request_header ( (op.request_id (), spec, cdr)) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing locate request header\n"))); @@ -171,7 +171,7 @@ TAO_GIOP_Message_Base::generate_reply_header ( if (!this->write_protocol_header (GIOP::Reply, giop_version, cdr)) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing GIOP header\n"))); return -1; @@ -187,7 +187,7 @@ TAO_GIOP_Message_Base::generate_reply_header ( if (!generator_parser->write_reply_header (cdr, params)) { if (TAO_debug_level > 4) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing reply ") ACE_TEXT ("header\n"))); @@ -229,7 +229,7 @@ TAO_GIOP_Message_Base::generate_fragment_header (TAO_OutputCDR & cdr, || !generator_parser->write_fragment_header (cdr, request_id)) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Error in writing GIOP header\n"))); return -1; @@ -286,7 +286,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream, TAO_Stub *stub, TA if (log_msg && !compressed) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("TAO_GIOP_Message_Base::format_message, ") ACE_TEXT ("GIOP message not compressed\n"))); @@ -401,7 +401,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, { if (TAO_debug_level > 0) { - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::extract_next_message, ") ACE_TEXT ("out of memory\n"))); } @@ -437,7 +437,7 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::extract_next_message, ") ACE_TEXT ("out of memory\n"))); } @@ -515,7 +515,7 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::consolidate_node, ") ACE_TEXT ("error parsing header\n") )); } @@ -762,7 +762,7 @@ TAO_GIOP_Message_Base::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ERROR: Unable to decompress ") ACE_TEXT ("data (Server is not ZIOP enabled).\n"))); @@ -881,7 +881,7 @@ TAO_GIOP_Message_Base::process_reply_message ( // Something really critical happened, we will forget about // every reply on this connection. if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - GIOP_Message_Base[%d]::process_reply_message, ") ACE_TEXT ("dispatch reply failed\n"), params.transport_->id ())); @@ -915,7 +915,7 @@ TAO_GIOP_Message_Base::generate_exception_reply ( // Close the handle. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ") ACE_TEXT ("generate_exception_reply ()\n"))); return -1; @@ -1046,7 +1046,7 @@ TAO_GIOP_Message_Base::process_request ( if (!(output << forward_to.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ERROR: Unable to marshal ") ACE_TEXT ("forward reference.\n"))); @@ -1065,7 +1065,7 @@ TAO_GIOP_Message_Base::process_request ( { // No exception but some kind of error, yet a // response is required. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") ACE_TEXT ("cannot send reply\n"), ACE_TEXT ("TAO_GIOP_Message_Base::process_request"))); @@ -1090,7 +1090,7 @@ TAO_GIOP_Message_Base::process_request ( { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") ACE_TEXT ("cannot send exception\n"), ACE_TEXT ("process_connector_request ()"))); @@ -1109,7 +1109,7 @@ TAO_GIOP_Message_Base::process_request ( // However, in this case, we cannot close the connection // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); @@ -1143,7 +1143,7 @@ TAO_GIOP_Message_Base::process_request ( &exception) == -1 && TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_request[3], ") ACE_TEXT ("%p: ") ACE_TEXT ("cannot send exception\n"), @@ -1159,7 +1159,7 @@ TAO_GIOP_Message_Base::process_request ( // user) when the client was not expecting a response. // However, in this case, we cannot close the connection // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); } @@ -1237,7 +1237,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, status_info.status = GIOP::OBJECT_FORWARD; status_info.forward_location_var = forward_to; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") ACE_TEXT ("called: forwarding\n"))); } @@ -1246,7 +1246,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, // We got no exception, so the object is here. status_info.status = GIOP::OBJECT_HERE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") ACE_TEXT ("found\n"))); } @@ -1254,7 +1254,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, { // Normal exception, so the object is not here status_info.status = GIOP::UNKNOWN_OBJECT; - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") ACE_TEXT ("not here\n"))); } @@ -1265,7 +1265,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, // Normal exception, so the object is not here status_info.status = GIOP::UNKNOWN_OBJECT; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ") ACE_TEXT ("CORBA exception raised\n"))); } @@ -1274,7 +1274,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, // Normal exception, so the object is not here status_info.status = GIOP::UNKNOWN_OBJECT; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::process_locate_request - ") ACE_TEXT ("C++ exception raised\n"))); } @@ -1319,7 +1319,7 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), ACE_TEXT ("TAO_GIOP_Message_Base::make_send_locate_reply"))); } @@ -1374,7 +1374,7 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) if (result == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %u\n"), transport->id ())); } @@ -1483,13 +1483,13 @@ TAO_GIOP_Message_Base:: if (result == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) error closing connection %u, errno = %d\n"), transport->id (), ACE_ERRNO_GET)); } transport->close_connection (); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) shut down transport, handle %d\n"), transport-> id ())); } @@ -1620,7 +1620,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, } // Print. - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - GIOP_Message_Base::dump_msg, ") ACE_TEXT("%C GIOP message v%c.%c, %d data bytes, %s endian, ") ACE_TEXT("Type %C[%u]\n"), @@ -1631,7 +1631,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"), message_name, *id)); - ACE_HEX_DUMP ((LM_DEBUG, + TAOLIB_HEX_DUMP ((LM_DEBUG, (const char *) ptr, len, ACE_TEXT ("GIOP message"))); @@ -1686,7 +1686,7 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ") ACE_TEXT ("out of memory, failed to allocate queued data object\n"))); } diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index ef455e37fc5..a88e711e1f4 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -24,7 +24,7 @@ TAO_GIOP_Message_Generator_Parser::parse_reply ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply :") ACE_TEXT ("extracting request id\n"))); } @@ -39,7 +39,7 @@ TAO_GIOP_Message_Generator_Parser::parse_reply ( { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, ") ACE_TEXT ("extracting reply status\n"))); } @@ -61,7 +61,7 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( if (!cdr.read_ulong (params.request_id_)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t|%N|%l):parse_locate_reply, ") ACE_TEXT ("extracting request id\n"))); @@ -79,7 +79,7 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( if (!cdr.read_ulong (locate_reply_status)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO N|(%P|%t|l) parse_locate_reply, ") ACE_TEXT ("extracting locate reply status\n"))); diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index c68abdac691..3075e1a72e1 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -56,7 +56,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%N |%l) Unable to handle this request\n"))); } return false; @@ -132,7 +132,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%N | %l) Unable to handle this request\n"))); } return false; @@ -290,7 +290,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_reply_mesg ( { if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t|%N|%l) write_locate_reply_mesg-") ACE_TEXT (" cannot marshal object reference\n") @@ -429,7 +429,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_reply ( { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) parse_reply, ") ACE_TEXT ("extracting context\n"))); } diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 5d58a82d21f..88c604c5e3a 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -186,7 +186,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg ( { if (TAO_debug_level > 0) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t|%N|%l) write_locate_reply_mesg-") ACE_TEXT (" cannot marshal object reference\n") @@ -282,7 +282,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) parse_request_header, ") ACE_TEXT ("extracting context\n"))); } @@ -342,7 +342,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_reply ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) parse_reply, ") ACE_TEXT ("extracting context\n"))); } @@ -427,7 +427,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%N |%l) Unable to handle this request\n"))); } return false; @@ -453,7 +453,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%N |%l) Unable to handle this request\n"))); } return false; @@ -484,7 +484,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%N |%l) Unable to handle this request\n"))); } return false; @@ -494,7 +494,7 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( default: if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%N |%l) Unable to handle this request\n"))); } return false; diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index c9ff4f18ce5..8d9134310b9 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -31,7 +31,7 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming) { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::parse_message_header_i\n") )); } @@ -63,13 +63,13 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming) char const * const which = (this->message_type_ == GIOP::CloseConnection) ? "CloseConnection" : (this->message_type_ == GIOP::MessageError) ? "MessageError" : "unknown"; - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - GIOP %C received\n"), which)); } return 0; default: if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("TAO_GIOP_Message_State::parse_magic_bytes, ") ACE_TEXT ("Message of size zero recd.\n"))); @@ -89,7 +89,7 @@ TAO_GIOP_Message_State::parse_magic_bytes (char *buf) && buf [3] == 0x50)) // 'P' { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("TAO_GIOP_Message_State::parse_magic_bytes, ") ACE_TEXT ("bad %cIOP header: ") @@ -109,7 +109,7 @@ TAO_GIOP_Message_State::get_version_info (char *buf) { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - GIOP_Message_State::get_version_info\n")); } @@ -124,7 +124,7 @@ TAO_GIOP_Message_State::get_version_info (char *buf) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - bad version <%d.%d>\n"), incoming_major, incoming_minor)); } @@ -144,7 +144,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n") )); } @@ -158,7 +158,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, ") ACE_TEXT ("invalid byte order <%d> for version <1.0>\n"), this->byte_order_)); diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp index 9d6e130f24e..7fee51b1146 100644 --- a/TAO/tao/HTTP_Client.cpp +++ b/TAO/tao/HTTP_Client.cpp @@ -6,6 +6,7 @@ #include "tao/HTTP_Handler.h" #include "ace/OS_NS_string.h" +#include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -38,7 +39,7 @@ TAO_HTTP_Client::read (ACE_Message_Block *mb) // Connect to the server if (connector_.connect (brp, this->inet_addr_) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Client::read, Connector error\n"), -1); + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Client::read, Connector error\n"), -1); } return HTTP_reader.byte_count (); diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp index fab1fe5d253..7326bccad4c 100644 --- a/TAO/tao/HTTP_Handler.cpp +++ b/TAO/tao/HTTP_Handler.cpp @@ -7,6 +7,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" +#include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -35,10 +36,10 @@ int TAO_HTTP_Handler::open (void *) { if (this->send_request () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, send_request failed\n"), -1); + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, send_request failed\n"), -1); if (this->receive_reply () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1); + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1); return 0; } @@ -88,7 +89,7 @@ TAO_HTTP_Reader::send_request (void) if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_) + ACE_OS::strlen (filename_) + ACE_OS::strlen (request_suffix_) + 4)) - ACE_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, request too large!"), -1); + TAOLIB_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, request too large!"), -1); // Create a message to send to the server requesting retrieval of the file int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, @@ -97,7 +98,7 @@ TAO_HTTP_Reader::send_request (void) // Send the message to server if (peer ().send_n (mesg, len) != len) - ACE_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, error sending request\n"), -1); + TAOLIB_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, error sending request\n"), -1); return 0; } @@ -116,7 +117,7 @@ TAO_HTTP_Reader::receive_reply (void) { //Make sure that response type is 200 OK if (ACE_OS::strstr (buf,"200 OK") == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, Response is not 200 OK\n" ), -1); // Search for the header termination string "\r\n\r\n", or "\n\n". If @@ -135,7 +136,7 @@ TAO_HTTP_Reader::receive_reply (void) } else { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, error while reading header\n"), -1); } @@ -155,7 +156,7 @@ TAO_HTTP_Reader::receive_reply (void) // Copy over all the data bytes into our message buffer. if (curr->copy (buf_ptr, bytes_read) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, error copying data into Message_Block\n"), -1); + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, error copying data into Message_Block\n"), -1); } // read the rest of the data into a number of ACE_Message_Blocks and @@ -184,7 +185,7 @@ TAO_HTTP_Reader::receive_reply (void) } else { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, Error while reading header\n"), -1); } } while (num_recvd != 0); diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp index 8c13007d25b..042b5bdf573 100644 --- a/TAO/tao/HTTP_Parser.cpp +++ b/TAO/tao/HTTP_Parser.cpp @@ -89,7 +89,7 @@ TAO_HTTP_Parser::parse_string (const char *nior, if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - HTTP_Parser::parse_string, getting IOR from <%s> <%s> <%d>\n"), hostname, filename, port)); } diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index bdbede71cad..ee10fc313d5 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -277,7 +277,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, address==%C, options=%C\n"), address, options)); @@ -289,7 +289,7 @@ TAO_IIOP_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, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("hostname already set\n\n")), @@ -340,7 +340,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, (addr.get_type () != AF_INET6 || addr.is_ipv4_mapped_ipv6 ())) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("non-IPv6 endpoints not allowed when ") @@ -351,7 +351,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, specified host=%C:%d\n"), (specified_hostname.length() == 0 ? "<null>" : specified_hostname.c_str()), @@ -374,7 +374,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("Overriding address in IOR with %C\n"), @@ -410,7 +410,7 @@ TAO_IIOP_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, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open_default, ") ACE_TEXT ("hostname already set\n\n")), @@ -469,7 +469,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->reuse_addr_) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("%p\n"), ACE_TEXT ("cannot open acceptor"))); @@ -490,7 +490,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, for (ACE_UINT32 p = requested_port; p <= last_port; p++) { if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("trying to listen on port %d\n"), p)); @@ -513,7 +513,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, if (! found_a_port) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("cannot open acceptor in port range (%d,%d)") ACE_TEXT ("- %p\n"), @@ -529,7 +529,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, addr.is_any ()) { if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT("setting IPV6_V6ONLY\n"))); @@ -540,7 +540,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, (void *) &on, sizeof (on)) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("%p\n"), ACE_TEXT ("cannot set IPV6_V6ONLY"))); @@ -555,7 +555,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, if (this->base_acceptor_.acceptor ().get_local_addr (address) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("%p\n"), ACE_TEXT ("cannot get local addr"))); @@ -581,7 +581,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, { for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("listening on: <%C:%u>\n"), this->hosts_[i], @@ -608,7 +608,7 @@ TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core, if (this->hostname_in_ior_ != 0) { if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) IIOP_Acceptor - ") ACE_TEXT ("Overriding the hostname with <%C>\n"), this->hostname_in_ior_)); @@ -689,7 +689,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address, if (cp_pos == 0) { // No valid IPv6 address specified. - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("Invalid IPv6 decimal address specified\n\n")), @@ -826,7 +826,7 @@ TAO_IIOP_Acceptor::dotted_decimal_address (const ACE_INET_Addr &addr, if (tmp == 0 || result != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::dotted_decimal_address, ") ACE_TEXT ("- %p\n"), @@ -861,7 +861,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - Unable to probe network ") ACE_TEXT ("interfaces. Using default.\n"))); } @@ -974,7 +974,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) if (this->endpoint_count_ == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) TAO_IIOP_Acceptor::probe_interfaces ") ACE_TEXT("found no usable addresses, def_type = %d\n"), def_type)); @@ -1075,7 +1075,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_IIOP_Acceptor::object_key, v%d.%d\n"), major, minor)); @@ -1092,7 +1092,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_IIOP_Acceptor::object_key, ") ACE_TEXT ("error while decoding host/port\n"))); } @@ -1156,7 +1156,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (end == begin) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Zero length IIOP option.\n"))); result = -1; break; @@ -1178,12 +1178,12 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (argc > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP") ACE_TEXT (" endpoint has %d unknown options:\n"), argc)); for (int i = 0; i < argc; i++) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("\t%C\n"), argv[i]->c_str())); result = -1; @@ -1205,7 +1205,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP option <%C> is ") ACE_TEXT ("missing a value.\n"), argv[i]->c_str ()), @@ -1215,7 +1215,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, ACE_CString value = argv[i]->substring (slot + 1); if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length IIOP ") ACE_TEXT ("option name.\n")), -1); @@ -1224,7 +1224,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, int range = static_cast <int> (ACE_OS::atoi (value.c_str ())); // @@ What's the lower bound on the range? zero, or one? if (range < 1 || range > ACE_MAX_DEFAULT_PORT) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint ") ACE_TEXT ("portspan: <%C>\n") ACE_TEXT ("Valid range 1 -- %d\n"), diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 01dd226b5ce..c62f95c02be 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -29,7 +29,7 @@ TAO_IIOP_Connection_Handler::add_reference (void) if (TAO_debug_level > 9) { TAO_Transport *tport = this->transport (); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::") ACE_TEXT("add_reference, up to %d\n"), tport != 0 ? tport->id () : 0, @@ -46,7 +46,7 @@ TAO_IIOP_Connection_Handler::remove_reference (void) Reference_Count rc = TAO_IIOP_SVC_HANDLER::remove_reference (); if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::") ACE_TEXT("remove_reference, down to %d\n"), tport != 0 ? tport->id () : 0, @@ -84,7 +84,7 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler ( if (TAO_debug_level > 9) { TAO_Transport *tport = static_cast<TAO_Transport *> (specific_transport); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::") ACE_TEXT("IIOP_Connection_Handler, ") ACE_TEXT("this=%@\n"), @@ -101,7 +101,7 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) if (TAO_debug_level > 9) { TAO_Transport *tport = this->transport (); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler[%d]::") ACE_TEXT("~IIOP_Connection_Handler, ") ACE_TEXT("this=%@, transport=%@\n"), @@ -115,7 +115,7 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_TEXT("~IIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); @@ -266,7 +266,7 @@ TAO_IIOP_Connection_Handler::open (void*) { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ") ACE_TEXT("couldn't set hop limit\n\n"))); } @@ -293,7 +293,7 @@ TAO_IIOP_Connection_Handler::open (void*) return -1; if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ") ACE_TEXT("The local addr is <%C:%d>\n"), local_addr.get_host_addr (), @@ -310,7 +310,7 @@ TAO_IIOP_Connection_Handler::open (void*) sizeof(remote_as_string)); (void) local_addr.addr_to_string (local_as_string, sizeof(local_as_string)); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO(%P|%t) - IIOP_Connection_Handler::open, ") ACE_TEXT("Holy Cow! The remote addr and ") ACE_TEXT("local addr are identical (%s == %s)\n"), @@ -332,7 +332,7 @@ TAO_IIOP_Connection_Handler::open (void*) (void) remote_addr.addr_to_string (remote_as_string, sizeof(remote_as_string)); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ") ACE_TEXT("invalid connection from IPv4 mapped IPv6 interface <%s>!\n"), remote_as_string)); @@ -349,7 +349,7 @@ TAO_IIOP_Connection_Handler::open (void*) if (remote_addr.addr_to_string (client_addr, sizeof (client_addr)) == -1) return -1; - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::open, IIOP ") ACE_TEXT ("connection to peer <%s> on %d\n"), client_addr, this->peer ().get_handle ())); @@ -390,7 +390,7 @@ TAO_IIOP_Connection_Handler::close_connection (void) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Unable to set ") ACE_TEXT ("SO_LINGER on %d\n"), this->peer ().get_handle ())); @@ -445,7 +445,7 @@ TAO_IIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, this->reset_state (TAO_LF_Event::LFS_TIMEOUT); if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_IIOP_Connection_Handler[%d]::" + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_IIOP_Connection_Handler[%d]::" "handle_timeout reset state to LFS_TIMEOUT\n", this->transport ()-> id())); } @@ -504,7 +504,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( if (TAO_debug_level > 0 && len == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_TEXT("process_listen_point_list, ") ACE_TEXT("Received list of size 0, check client config.\n"))); @@ -541,7 +541,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_TEXT("process_listen_point_list, ") ACE_TEXT("Listening port [%d] on [%C]\n"), @@ -591,7 +591,7 @@ TAO_IIOP_Connection_Handler::set_tos (int tos) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_TEXT("set_dscp_codepoint -> IPV6_TCLASS not supported yet\n"))); } @@ -612,7 +612,7 @@ TAO_IIOP_Connection_Handler::set_tos (int tos) if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_TEXT("set_dscp_codepoint -> dscp: %x; result: %d; %C\n"), tos, @@ -676,7 +676,7 @@ TAO_IIOP_Connection_Handler::abort (void) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Unable to set ") ACE_TEXT ("SO_LINGER on %d\n"), this->peer ().get_handle ())); diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 1a4d18a4083..05ab0e5d7a5 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -165,7 +165,7 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP connection failed.\n") ACE_TEXT (" This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -200,7 +200,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, // Give users a clue to the problem. if (TAO_debug_level > 1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::make_connection, ") ACE_TEXT("connection to <%C:%d> failed (%p)\n"), iiop_endpoint->host (), @@ -231,7 +231,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::make_connection, ") ACE_TEXT ("connection to <%C:%d> completed unsuccessfully\n"), iiop_endpoint->host (), @@ -262,7 +262,7 @@ TAO_IIOP_Connector::make_parallel_connection ( ++max_count; if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::") ACE_TEXT ("make_parallel_connection, ") ACE_TEXT ("to %d endpoints\n"), max_count)); @@ -367,7 +367,7 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler, #endif /* ACE_HAS_IPV6 */ if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::begin_connection, ") ACE_TEXT ("to <%C:%d> which should %s\n"), iiop_endpoint->host(), @@ -474,7 +474,7 @@ TAO_IIOP_Connector::complete_connection (int result, timeout)) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::") ACE_TEXT ("complete_connection, wait for completion ") ACE_TEXT ("failed for 1 pending connect\n"))); @@ -490,7 +490,7 @@ TAO_IIOP_Connector::complete_connection (int result, timeout)) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::") ACE_TEXT ("complete_connection, wait for completion ") ACE_TEXT ("failed for %d pending connects\n"), @@ -540,7 +540,7 @@ TAO_IIOP_Connector::complete_connection (int result, { for (unsigned i = 0; i < count; i++) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::complete_connection,") ACE_TEXT (" connection to <%C:%d> failed (%p)\n"), ep_list[i]->host (), @@ -570,7 +570,7 @@ TAO_IIOP_Connector::complete_connection (int result, if (transport->connection_handler()->error_detected()) { if (TAO_debug_level > 0) - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connector::make_connection, ") ACE_TEXT("transport in error before cache!\n"))); transport->connection_handler()->cancel_pending_connection(); @@ -579,7 +579,7 @@ TAO_IIOP_Connector::complete_connection (int result, if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::make_connection, ") ACE_TEXT ("new %s connection to <%C:%d> on Transport[%d]\n"), transport->is_connected() ? @@ -615,7 +615,7 @@ TAO_IIOP_Connector::complete_connection (int result, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) IIOP_Connector::make_connection, ") ACE_TEXT ("could not add new connection to cache\n"))); } @@ -631,7 +631,7 @@ TAO_IIOP_Connector::complete_connection (int result, if (svc_handler->error_detected()) { if (TAO_debug_level > 0) - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - IIOP_Connector::make_connection, ") ACE_TEXT("transport in error after cache!\n"))); svc_handler->cancel_pending_connection(); diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index ee04a5cb407..be98bc1a382 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -164,7 +164,7 @@ TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr, { if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Endpoint::set, ") ACE_TEXT ("%p\n"), ACE_TEXT ("cannot determine hostname"))); @@ -175,7 +175,7 @@ TAO_IIOP_Endpoint::set (const ACE_INET_Addr &addr, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Endpoint::set, ") ACE_TEXT ("%p\n"), ACE_TEXT ("cannot determine hostname and hostaddr"))); diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 79e01c083bc..b9147d11d3a 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -101,7 +101,7 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr) cdr.read_ushort (port) == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - ") ACE_TEXT ("error while decoding host/port\n"))); return -1; @@ -168,7 +168,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) // No valid IPv6 address specified. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("\nTAO (%P|%t) IIOP_Profile: ") ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } @@ -196,7 +196,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) // See formal-04-03-01, section 13.6.10.3 if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("\nTAO (%P|%t) IIOP_Profile: ") ACE_TEXT ("Host address may be omited only when no port has been specified.\n"))); } @@ -286,7 +286,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior) // initialized. Just throw an exception. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("IIOP_Profile::parse_string ") ACE_TEXT ("- %p\n\n"), @@ -600,7 +600,7 @@ TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO - IIOP_Profile::create_profile_body " "no object key marshalled\n")); } diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index c4cb2025e99..4620e8bc735 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -70,7 +70,7 @@ TAO_IIOP_Transport::send (iovec *iov, int iovcnt, { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::send, ") ACE_TEXT ("send failure (errno: %d) - %m\n"), this->id (), ACE_ERRNO_GET)); @@ -150,7 +150,7 @@ TAO_IIOP_Transport::sendfile (TAO_MMAP_Allocator * allocator, if (retval <= 0 && TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::sendfile, ") ACE_TEXT ("sendfile failure - %m (errno: %d)\n"), this->id (), @@ -176,7 +176,7 @@ TAO_IIOP_Transport::recv (char *buf, // occur in thread-per-connection. if (n == -1 && TAO_debug_level > 4 && errno != ETIME) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv, ") ACE_TEXT ("read failure - %m errno %d\n"), this->id (), @@ -258,7 +258,7 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream, // a core. %m would then be softer on this. if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::send_message, ") ACE_TEXT ("write failure - %m\n"), this->id ())); @@ -310,7 +310,7 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) if (this->get_listen_point (listen_point_list, *acceptor) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, " "error getting listen_point\n")); @@ -322,7 +322,7 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) if (listen_point_list.length () == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, " "listen_point list is empty, client should send a list " "with at least one point\n")); @@ -371,7 +371,7 @@ TAO_IIOP_Transport::get_listen_point ( if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ") ACE_TEXT ("could not resolve local host address\n")), -1); @@ -397,7 +397,7 @@ TAO_IIOP_Transport::get_listen_point ( endpoint_addr[index], interface_name.out ()) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ") ACE_TEXT ("could not resolve local host name\n")), -1); @@ -429,7 +429,7 @@ TAO_IIOP_Transport::get_listen_point ( if (TAO_debug_level >= 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Listen_Point_List[%d] = <%C:%d>\n"), len, point.host.in (), diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 894b2536e41..b89d50abaea 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -84,7 +84,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (TAO_Root_POA* poa) if (name.in () != 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, "(%P|%t) Exception thrown while processing " "IORInterceptor \"%C\">\n", name.in ())); diff --git a/TAO/tao/IORTable/Async_IORTable.cpp b/TAO/tao/IORTable/Async_IORTable.cpp new file mode 100644 index 00000000000..c516c6d3528 --- /dev/null +++ b/TAO/tao/IORTable/Async_IORTable.cpp @@ -0,0 +1,25 @@ +/* -*- C++ -*- */ + +// ================================================================= +/** + * @file Async_IORTable.cpp + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + * + */ +// ================================================================= + +#include "tao/IORTable/Async_IORTable.h" +#include "tao/IORTable/Async_Table_Adapter.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +int +TAO_Async_IORTable_Initializer::init (void) +{ + return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Async_Table_Adapter_Factory); +} + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/Async_IORTable.h b/TAO/tao/IORTable/Async_IORTable.h new file mode 100644 index 00000000000..0799b2a7ce3 --- /dev/null +++ b/TAO/tao/IORTable/Async_IORTable.h @@ -0,0 +1,49 @@ +// -*- C++ -*- + + +//============================================================================= +/** + * @file Async_IORTable.h + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + + +#ifndef TAO_ASYNC_IORTABLE_H +#define TAO_ASYNC_IORTABLE_H + +#include /**/ "ace/pre.h" + +#include "tao/IORTable/async_iortable_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Versioned_Namespace.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_Async_IORTable_Export TAO_Async_IORTable_Initializer +{ +public: + /// Used to force the initialization of the ORB code. + static int init (void); +}; + +static int +TAO_Requires_Async_IORTable_Initializer = TAO_Async_IORTable_Initializer::init (); + +TAO_END_VERSIONED_NAMESPACE_DECL + +#define TAO_IORTABLE_SAFE_INCLUDE +#include "tao/IORTable/Locate_ResponseHandler.h" +#include "tao/IORTable/Async_IORTableC.h" +#undef TAO_IORTABLE_SAFE_INCLUDE + +#include /**/ "ace/post.h" + +#endif /* TAO_ASYNC_IORTABLE_H */ diff --git a/TAO/tao/IORTable/Async_IORTable.mpc b/TAO/tao/IORTable/Async_IORTable.mpc new file mode 100644 index 00000000000..043295a7122 --- /dev/null +++ b/TAO/tao/IORTable/Async_IORTable.mpc @@ -0,0 +1,54 @@ +//$Id$ +project(*core_idl) : tao_versioning_idl_defaults, install { + custom_only = 1 + IDL_Files { + idlflags += -Gp -Gd -Sci -SS -Sorb \ + -Wb,export_macro=TAO_Async_IORTable_Export \ + -Wb,export_include=tao/IORTable/async_iortable_export.h \ + -Wb,stub_export_file=async_iortable_export.h \ + -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \ + -Wb,safe_include=tao/IORTable/Async_IORTable.h \ + -iC tao/IORTable -Gxhst + Async_IORTable.pidl + } + + specific { + install_dir = tao/IORTable + } +} + +project(Async_IORTable) : taolib, portableserver, iortable, dynamicinterface, tao_output, install, taoidldefaults { + after += *core_idl + sharedname = TAO_Async_IORTable + dynamicflags += TAO_Async_IORTable_BUILD_DLL + + Source_Files { + Async_IORTable.cpp + Async_IOR_Table_Impl.cpp + Async_Table_Adapter.cpp + Locate_ResponseHandler.cpp + Async_IORTableC.cpp + } + + Header_Files { + Async_IORTable.h + Async_IOR_Table_Impl.h + Async_Table_Adapter.h + Locate_ResponseHandler.h + async_iortable_export.h + Async_IORTableC.h + Async_IORTableS.h + } + + Resource_Files { + TAO_Async_IORTable.rc + } + + Pkgconfig_Files { + TAO_Async_IORTable.pc.in + } + + specific { + install_dir = tao/IORTable + } +} diff --git a/TAO/tao/IORTable/Async_IORTable.pidl b/TAO/tao/IORTable/Async_IORTable.pidl new file mode 100644 index 00000000000..639567a24b9 --- /dev/null +++ b/TAO/tao/IORTable/Async_IORTable.pidl @@ -0,0 +1,33 @@ +/** + * @file Async_IORTable.pidl + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + * + * @brief Pre-compiled IDL source for the IORTable module. + */ + +#ifndef TAO_IORTABLE_ASYNC_IORTABLE_PIDL +#define TAO_IORTABLE_ASYNC_IORTABLE_PIDL + +#include "tao/IORTable/IORTable.pidl" + +/// Define a module to avoid namespace pollution +module IORTable +{ + /** + * The application can provide a callback interface to locate object + * keys dynamically. + */ + native Locate_ResponseHandler; + local interface AsyncLocator : Locator + { + /// Uses AMH semantics to send IOR for @a object_key via the supplied + /// response handler + void async_locate (in Locate_ResponseHandler rh, in string object_key); + + }; +}; + +#endif /* TAO_IORTABLE_ASYNC_IORTABLE_PIDL */ diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp new file mode 100644 index 00000000000..67af6285b00 --- /dev/null +++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp @@ -0,0 +1,73 @@ +/** + * @file Async_IOR_Table_Impl.cpp + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + * + */ + +#include "tao/IORTable/Async_IOR_Table_Impl.h" +#include "tao/PortableServer/ForwardRequestC.h" +#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h" +#include "ace/Guard_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl (void) +{ +} + +TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl (void) +{ +} + +void +TAO_Async_IOR_Table_Impl::async_find (::IORTable::Locate_ResponseHandler handler, + const char *object_key) +{ + // We don't want the lock held during locate, so make it go out + // of scope before then. + { + ACE_CString key (object_key); + ACE_CString ior; + TAO_AMH_Locate_ResponseHandler_var rh = handler; + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); + if (this->map_.find (key, ior) == 0) + { + rh->forward_ior (ior.c_str(), false); + return; + } + if (CORBA::is_nil (this->async_locator_.in ())) + { + if (CORBA::is_nil (this->locator_.in ())) + { + rh->raise_excep (IORTable::NotFound ()); + } + else + { + try + { + ior = this->locator_->locate (object_key); + rh->forward_ior (ior.c_str(), false); + } + catch (CORBA::Exception &ex) + { + rh->raise_excep (ex); + } + } + return; + } + } + this->async_locator_->async_locate (handler, object_key); +} + +void +TAO_Async_IOR_Table_Impl::set_locator (IORTable::Locator_ptr locator) +{ + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); + this->locator_ = IORTable::Locator::_duplicate (locator); + this->async_locator_ = IORTable::AsyncLocator::_narrow (locator); +} + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h new file mode 100644 index 00000000000..f6f254dce66 --- /dev/null +++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h @@ -0,0 +1,66 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Async_IOR_Table_Impl.h + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + + +#ifndef TAO_ASYNC_IOR_TABLE_IMPL_H +#define TAO_ASYNC_IOR_TABLE_IMPL_H + +#include /**/ "ace/pre.h" + +#include "tao/IORTable/Async_IORTable.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Hash_Map_Manager_T.h" +#include "ace/Null_Mutex.h" +#include "tao/LocalObject.h" +#include "ace/SString.h" +#include "tao/Objref_VarOut_T.h" +#include "tao/IORTable/IOR_Table_Impl.h" + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_Async_IOR_Table_Impl : public virtual TAO_IOR_Table_Impl +{ +public: + /// Constructor + TAO_Async_IOR_Table_Impl (void); + virtual ~TAO_Async_IOR_Table_Impl (void); + + virtual bool async_available (void) { return true; } + + virtual void async_find (::IORTable::Locate_ResponseHandler rh, + const char *object_key); + + virtual void set_locator (IORTable::Locator_ptr locator); + +private: + /// The locator + IORTable::AsyncLocator_var async_locator_; +}; + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include /**/ "ace/post.h" + +#endif /* TAO_ASYNC_IOR_TABLE_IMPL */ diff --git a/TAO/tao/IORTable/Async_Table_Adapter.cpp b/TAO/tao/IORTable/Async_Table_Adapter.cpp new file mode 100644 index 00000000000..bce713089a2 --- /dev/null +++ b/TAO/tao/IORTable/Async_Table_Adapter.cpp @@ -0,0 +1,127 @@ +/** + * @file Async_Table_Adapter.cpp + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + * + */ + +#include "tao/IORTable/Async_Table_Adapter.h" +#include "tao/IORTable/Async_IOR_Table_Impl.h" +#include "tao/IORTable/Locate_ResponseHandler.h" + +#include "tao/ORB_Core.h" +#include "tao/Server_Strategy_Factory.h" +#include "tao/Object.h" +#include "tao/Stub.h" +#include "tao/ORB.h" +#include "tao/Profile.h" +#include "tao/TAO_Server_Request.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Async_Table_Adapter::TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core) + : TAO_Table_Adapter (orb_core) +{ +} + +TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter (void) +{ +} + +void +TAO_Async_Table_Adapter::open (void) +{ + ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); + TAO_Async_IOR_Table_Impl *impl = 0; + ACE_NEW_THROW_EX (impl, + TAO_Async_IOR_Table_Impl (), + CORBA::NO_MEMORY ()); + + this->root_ = impl; + this->closed_ = false; +} + +int +TAO_Async_Table_Adapter::dispatch (TAO::ObjectKey &key, + TAO_ServerRequest &request, + CORBA::Object_out forward_to) +{ + TAO_IOR_Table_Impl_var rootref; + { + ACE_GUARD_RETURN (ACE_Lock, + ace_mon, + *this->lock_, + TAO_Adapter::DS_MISMATCHED_KEY); + if (this->closed_) + { + return TAO_Adapter::DS_MISMATCHED_KEY; + } + rootref = this->root_; + } + + if (this->root_->async_available ()) + { + // construct a callback handler + TAO_AMH_Locate_ResponseHandler_ptr rhp; + ACE_NEW_RETURN (rhp, + TAO_AMH_Locate_ResponseHandler (request), + DS_MISMATCHED_KEY); + TAO_AMH_Locate_ResponseHandler_var rh (rhp); + this->find_object (rh, key); + return 0; + } + + if (this->TAO_Table_Adapter::find_object (key, forward_to)) + { + request.forward_location (forward_to); + return TAO_Adapter::DS_FORWARD; + } + else + return TAO_Adapter::DS_MISMATCHED_KEY; +} + +void +TAO_Async_Table_Adapter::find_object (IORTable::Locate_ResponseHandler rh, + TAO::ObjectKey &key) +{ + CORBA::String_var object_key; + TAO::ObjectKey::encode_sequence_to_string (object_key.out (), key); + TAO_Async_IOR_Table_Impl * aroot = + dynamic_cast<TAO_Async_IOR_Table_Impl *>(this->root_.ptr()); + if (aroot != 0) + { + aroot->async_find (rh, object_key.in ()); + } + else + { + rh->raise_excep (IORTable::NotFound ()); + } +} + +// **************************************************************** + +TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory (void) +{ +} + +TAO_Adapter* +TAO_Async_Table_Adapter_Factory::create (TAO_ORB_Core *oc) +{ + TAO_Adapter* ptr = 0; + ACE_NEW_RETURN (ptr, + TAO_Async_Table_Adapter (*oc), + 0); + return ptr; +} + +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_FACTORY_DEFINE (TAO_Async_IORTable, TAO_Async_Table_Adapter_Factory) +ACE_STATIC_SVC_DEFINE (TAO_Async_Table_Adapter_Factory, + ACE_TEXT ("TAO_Async_IORTable"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_Async_Table_Adapter_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) diff --git a/TAO/tao/IORTable/Async_Table_Adapter.h b/TAO/tao/IORTable/Async_Table_Adapter.h new file mode 100644 index 00000000000..69df36b5229 --- /dev/null +++ b/TAO/tao/IORTable/Async_Table_Adapter.h @@ -0,0 +1,75 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Async_Table_Adapter.h + * + * $Id$ + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + + +#ifndef TAO_ASYNC_TABLE_ADAPTER_H +#define TAO_ASYNC_TABLE_ADAPTER_H +#include /**/ "ace/pre.h" + +#include "tao/IORTable/async_iortable_export.h" +#include "tao/IORTable/Async_IORTable.h" +#include "tao/IORTable/Async_IOR_Table_Impl.h" + +#include "tao/IORTable/Table_Adapter.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +class TAO_Async_IORTable_Export TAO_Async_Table_Adapter : public TAO_Table_Adapter +{ +public: + + /// Constructor + TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core); + + /// Destructor + virtual ~TAO_Async_Table_Adapter (void); + + // = The TAO_Adapter methods, please check tao/Adapter.h for the + // documentation + virtual void open (void); + + virtual int dispatch (TAO::ObjectKey &key, + TAO_ServerRequest &request, + CORBA::Object_out foward_to); + +protected: + /// Helper method to find an object bound in the table. + void find_object (::IORTable::Locate_ResponseHandler rh, + TAO::ObjectKey &key); + +}; + +// **************************************************************** + +class TAO_Async_IORTable_Export TAO_Async_Table_Adapter_Factory : + public TAO_Table_Adapter_Factory +{ +public: + /// Constructor + TAO_Async_Table_Adapter_Factory (void); + + /// The TAO_Adapter_Factory methods, please read tao/Adapter.h for + /// details. + virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); +}; + +TAO_END_VERSIONED_NAMESPACE_DECL + +ACE_STATIC_SVC_DECLARE (TAO_Async_Table_Adapter_Factory) +ACE_FACTORY_DECLARE (TAO_Async_IORTable, TAO_Async_Table_Adapter_Factory) + +#include /**/ "ace/post.h" +#endif /* TAO_ASYNC_TABLE_ADAPTER_H */ diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index b2dd0ab5d6f..a3292cb6714 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -17,23 +17,35 @@ project(*core_idl) : tao_versioning_idl_defaults, install { } } -project(IORTable) : taolib, portableserver, dynamicinterface, tao_output, install, taoidldefaults { +project(IORTable) : taolib, portableserver, tao_output, install, taoidldefaults { after += *core_idl sharedname = TAO_IORTable dynamicflags += TAO_IORTable_BUILD_DLL Source_Files { - *.cpp + IORTable.cpp + IOR_Table_Impl.cpp + Table_Adapter.cpp IORTableC.cpp } Header_Files { - *.h + IORTable.h + IOR_Table_Impl.h + Table_Adapter.h iortable_export.h IORTableC.h IORTableS.h } + Resource_Files { + TAO_IORTable.rc + } + + Pkgconfig_Files { + TAO_IORTable.pc.in + } + specific { install_dir = tao/IORTable } diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl index 0088477dcd6..e36cf6439fe 100644 --- a/TAO/tao/IORTable/IORTable.pidl +++ b/TAO/tao/IORTable/IORTable.pidl @@ -65,19 +65,6 @@ module IORTable raises (NotFound); }; - /// Callback interface to locate object keys dynamically - /** - * The application can provide a callback interface to locate object - * keys dynamically. - */ - native Locate_ResponseHandler; - local interface AsyncLocator : Locator - { - /// Uses AMH semantics to send IOR for @a object_key via the supplied - /// response handler - void async_locate (in Locate_ResponseHandler rh, in string object_key); - - }; }; #endif /* TAO_IORTABLE_IORTABLE_PIDL */ diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 664e60231eb..058c07fb69b 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -9,7 +9,6 @@ #include "tao/IORTable/IOR_Table_Impl.h" #include "tao/PortableServer/ForwardRequestC.h" -#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h" #include "ace/Guard_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index 19c24eb0dda..98bbedccc8a 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -35,12 +35,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_IOR_Table_Impl; +class TAO_IORTable_Export TAO_IOR_Table_Impl; typedef TAO_IOR_Table_Impl *TAO_IOR_Table_Impl_ptr; typedef TAO_Objref_Var_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var; typedef TAO_Objref_Out_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out; -class TAO_IOR_Table_Impl +class TAO_IORTable_Export TAO_IOR_Table_Impl : public virtual IORTable::Table, public virtual ::CORBA::LocalObject { @@ -54,10 +54,7 @@ public: /// Constructor TAO_IOR_Table_Impl (void); - bool async_available (void) const - { - return this->use_async_; - } + virtual bool async_available (void) { return false; } /// Find the object, using the locator if it is not on the table. char *find (const char *object_key); @@ -80,7 +77,7 @@ public: virtual void set_locator (IORTable::Locator_ptr the_locator); //@} -private: +protected: typedef ACE_Hash_Map_Manager_Ex <ACE_CString, ACE_CString, ACE_Hash <ACE_CString>, ACE_Equal_To <ACE_CString>, diff --git a/TAO/tao/IORTable/TAO_Async_IORTable.pc.in b/TAO/tao/IORTable/TAO_Async_IORTable.pc.in new file mode 100644 index 00000000000..61c13a4b888 --- /dev/null +++ b/TAO/tao/IORTable/TAO_Async_IORTable.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: TAO_Async_IORTable +Description: TAO Async IOR Table Library +Requires: TAO TAO_IORTable +Version: @VERSION@ +Libs: -L${libdir} -lTAO_Async_IORTable +Cflags: -I${includedir} diff --git a/TAO/tao/IORTable/TAO_Async_IORTable.rc b/TAO/tao/IORTable/TAO_Async_IORTable.rc new file mode 100644 index 00000000000..a60ace62dd1 --- /dev/null +++ b/TAO/tao/IORTable/TAO_Async_IORTable.rc @@ -0,0 +1,30 @@ +#include "../Version.h" + +1 VERSIONINFO + FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 + PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "IORTable\0" + VALUE "FileVersion", TAO_VERSION "\0" + VALUE "InternalName", "TAO_Async_IORTableDLL\0" + VALUE "LegalCopyright", "\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "TAO_Async_IORTable.DLL\0" + VALUE "ProductName", "TAO\0" + VALUE "ProductVersion", TAO_VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index 994ead28bdd..d67940fc662 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -9,7 +9,6 @@ #include "tao/IORTable/Table_Adapter.h" #include "tao/IORTable/IOR_Table_Impl.h" -#include "tao/IORTable/Locate_ResponseHandler.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index 73b3a6d10b8..4802e1ba710 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -58,7 +58,7 @@ public: virtual CORBA::Long initialize_collocated_object (TAO_Stub *stub); -private: +protected: static ACE_Lock * create_lock (TAO_SYNCH_MUTEX &l); /// Helper method to find an object bound in the table. diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 66c83596235..1e4df8d8a8e 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -38,7 +38,7 @@ namespace CORBA::String_var profile_str = profile.to_string (); // if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("************** IMR partial IOR =\n%C\n"), profile_str.in ())); @@ -49,7 +49,7 @@ namespace else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Could not parse ImR IOR, skipping ImRification\n"))); return CORBA::Object::_nil(); } @@ -60,7 +60,7 @@ namespace ior += key_str; // if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("************** ImR-ified IOR =\n%C\n\n"), ior.c_str ())); @@ -173,7 +173,7 @@ namespace info = "because couldn't ImR-ify profile_in_use"; break; } - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT("ERROR: %C. ") ACE_TEXT("Defaulting to ImR-ifying profile_in_use\n"), desc)); @@ -181,7 +181,7 @@ namespace } } - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, ACE_TEXT ("ERROR: %C, ") ACE_TEXT ("but cannot default to ImR-ifying profile_in_use %C\n"), desc, @@ -216,7 +216,7 @@ namespace TAO if (CORBA::is_nil (imr.in ())) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: No usable IMR initial reference ") ACE_TEXT ("available but use IMR has been specified.\n"))); throw ::CORBA::TRANSIENT ( @@ -233,7 +233,7 @@ namespace TAO CORBA::String_var ior = orb->object_to_string (imr.in ()); imr_info = ACE_CString (", IMR IOR=") + ior.in (); } - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Notifying ImR of startup%s\n"), imr_info.c_str ())); } @@ -251,7 +251,7 @@ namespace TAO if (CORBA::is_nil (imr_locator.in ())) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: Narrowed IMR initial reference ") ACE_TEXT ("is nil but use IMR has been specified.\n"))); @@ -287,14 +287,14 @@ namespace TAO if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ()) { - ACE_ERROR ((LM_ERROR, "Invalid ImR ServerObject, bailing out.\n")); + TAOLIB_ERROR ((LM_ERROR, "Invalid ImR ServerObject, bailing out.\n")); return; } CORBA::String_var full_ior = root_poa->_get_orb()->object_to_string (obj.in ()); TAO_Profile& profile = *(svr->_stubobj ()->profile_in_use ()); CORBA::String_var ior = profile.to_string(); - ACE_DEBUG((LM_INFO, + TAOLIB_DEBUG((LM_INFO, "\n\nfull_ior=<%s>\n\nior=<%s>\n\n", full_ior.in(), ior.in())); @@ -305,7 +305,7 @@ namespace TAO const ACE_CString partial_ior (ior.in (), (pos - ior.in ()) + 1); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Informing IMR that we are running at: %C\n"), partial_ior.c_str ())); @@ -342,7 +342,7 @@ namespace TAO } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Successfully notified ImR of Startup\n"))); } @@ -362,7 +362,7 @@ namespace TAO if (TAO_debug_level > 0) { CORBA::String_var poaname = poa->the_name (); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Notifying IMR of Shutdown server:%s\n"), poaname.in ())); } @@ -383,7 +383,7 @@ namespace TAO // configured to drop replies during shutdown (it does by default in // the LF model) we get a COMM_FAILURE exception which we ignore if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Ignoring COMM_FAILURE while unregistering") ACE_TEXT ("from ImR.\n"))); } @@ -391,7 +391,7 @@ namespace TAO { // Similarly, there are cases where we could get a TRANSIENT. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Ignoring TRANSIENT while unregistering") ACE_TEXT ("from ImR.\n"))); } @@ -453,7 +453,7 @@ namespace TAO { if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Missing ImR IOR, will not use the ImR\n"))); } return CORBA::Object::_nil(); diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc index 95b22fe231e..45e933b2d0f 100644 --- a/TAO/tao/ImR_Client/ImR_Client.mpc +++ b/TAO/tao/ImR_Client/ImR_Client.mpc @@ -1,22 +1,24 @@ //$Id$ + project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { - idlflags += -Gp -Gd -Sorb -GA -GC\ + idlflags += -Gp -Gd -Sorb -GA\ -Wb,export_macro=TAO_IMR_Client_Export \ -Wb,export_include=tao/ImR_Client/imr_client_export.h \ -iC tao/ImR_Client idlflags -= -Sa -St - ServerObject.pidl + ServerObject.idl } IDL_Files { - idlflags += -Gp -Gd -Sorb -GX -GH \ + idlflags += -Gp -Gd -Sorb -GX\ + -I$(TAO_ROOT)/tao/ImR_Client \ -Wb,export_macro=TAO_IMR_Client_Export \ -Wb,export_include=tao/ImR_Client/imr_client_export.h \ -iC tao/ImR_Client idlflags -= -Sa -St - ImplRepo.pidl + ImplRepo.idl } specific { @@ -56,4 +58,7 @@ project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefault specific { install_dir = tao/ImR_Client } + + IDL_Files { + } } diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.idl index 1679ed50b21..ff3abd7c5ba 100644 --- a/TAO/tao/ImR_Client/ImplRepo.pidl +++ b/TAO/tao/ImR_Client/ImplRepo.idl @@ -1,15 +1,13 @@ // -*- IDL -*- /** - * @file ImplRepo.pidl - * * $Id$ */ #ifndef TAO_IMRCLIENT_IMPLREPO_PIDL #define TAO_IMRCLIENT_IMPLREPO_PIDL -#include "tao/ImR_Client/ServerObject.pidl" +#include "ServerObject.idl" module ImplementationRepository { diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.idl index 479bc1f38dc..e14c68e42c7 100644 --- a/TAO/tao/ImR_Client/ServerObject.pidl +++ b/TAO/tao/ImR_Client/ServerObject.idl @@ -1,8 +1,6 @@ // -*- IDL -*- /** - * @file ServerObject.pidl - * * $Id$ */ diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index cccf024bcfb..f72485b9884 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -86,7 +86,7 @@ namespace TAO if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Invocation_Adapter::invoke_i, ") ACE_TEXT("making a %C invocation\n"), TAO::translate_collocation_strategy(strat))); @@ -121,7 +121,7 @@ namespace TAO if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Invocation_Adapter::invoke_i, ") ACE_TEXT("handling forwarded locations\n"))); } @@ -147,7 +147,7 @@ namespace TAO { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Invocation_Adapter::get_stub, ") ACE_TEXT ("raising CORBA::INTERNAL because of nil ") ACE_TEXT ("stub.\n"))); @@ -252,7 +252,7 @@ namespace TAO if (TAO_debug_level) { if (max_wait_time && *max_wait_time == ACE_Time_Value::zero) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Invocation_Adapter::invoke_remote_i, ") ACE_TEXT ("max wait time consumed during transport resolution\n"))); } @@ -423,7 +423,7 @@ namespace TAO { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Invocation_Adapter::collocation_strategy, ") ACE_TEXT ("request for through poa collocation ") ACE_TEXT ("without needed collocation opportunity.\n"))); @@ -449,7 +449,7 @@ namespace TAO { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Invocation_Adapter::collocation_strategy, ") ACE_TEXT ("request for direct collocation ") ACE_TEXT ("without needed collocation opportunity.\n"))); diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index 621f6a58946..40c5e745567 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -48,7 +48,7 @@ TAO_LF_CH_Event::state_changed_i (int new_state) id = ch->transport ()->id (); } - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_LF_CH_Event[%d]::" + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_LF_CH_Event[%d]::" "state_changed_i, state %C->%C\n", id, TAO_LF_Event::state_name(prev_state_), @@ -146,7 +146,7 @@ TAO_LF_CH_Event::set_state (int new_state) { id = ch->transport ()->id (); } - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_LF_CH_Event[%d]::set_state, " + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_LF_CH_Event[%d]::set_state, " "state_ is LFS_TIMEOUT\n", id)); } } diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp index 0019092a013..67472a49429 100644 --- a/TAO/tao/LF_Strategy_Complete.cpp +++ b/TAO/tao/LF_Strategy_Complete.cpp @@ -4,7 +4,7 @@ #include "tao/LF_Follower.h" #include "tao/Leader_Follower.h" #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -39,7 +39,7 @@ TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset, int const result = lf.elect_new_leader (); if (result == -1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Failed to wake up ") ACE_TEXT ("a follower thread\n"))); } diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index cdc9255a2e0..c048d2bc5a0 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -79,7 +79,7 @@ TAO_Leader_Follower::elect_new_leader_i (void) TAO_LF_Follower* const follower = this->follower_set_.head (); #if defined (TAO_DEBUG_LEADER_FOLLOWER) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::elect_new_leader_i - ") ACE_TEXT ("follower is %@\n"), follower)); @@ -103,7 +103,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai { if (this->event_loop_threads_condition_.wait () == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::") ACE_TEXT ("wait_for_client_leader_to_complete - ") ACE_TEXT ("Condition variable wait failed\n"))); @@ -119,7 +119,7 @@ TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wai if (this->event_loop_threads_condition_.wait (&tv) == -1) { if (errno != ETIME) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::") ACE_TEXT ("wait_for_client_leader_to_complete - ") ACE_TEXT ("Condition variable wait failed\n"))); @@ -209,7 +209,7 @@ TAO_Leader_Follower::defer_event (ACE_Event_Handler* eh) ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), -1); if (TAO_debug_level > 7) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::defer_event, ") ACE_TEXT ("deferring event handler[%d]\n"), eh->get_handle ())); @@ -236,7 +236,7 @@ TAO_Leader_Follower::resume_events () { // @@todo: need to think about what is the action that // we can take when we get here with an error?! - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Leader_Follower::resume_events, ") ACE_TEXT ("an event handler[%d] has been resumed, ") ACE_TEXT ("notified the reactor, retval=%d.\n"), @@ -302,7 +302,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, return -1; if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" (follower), cond <%@>\n"), t_id, follower.get ())); @@ -345,7 +345,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, if (follower->wait (max_wait_time) == -1) { if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, ") ACE_TEXT (" (follower) [no timer, cond failed]\n"), t_id)); @@ -364,7 +364,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, if (follower->wait (&tv) == -1) { if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait, ") ACE_TEXT ("(follower) [has timer, follower failed]\n"), t_id )); @@ -396,7 +396,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, if (this->elect_new_leader () == -1 && TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, ") ACE_TEXT("elect_new_leader failed\n"), t_id )); @@ -418,7 +418,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // both wake up as a follower and as the next leader. if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" done (follower), successful %d\n"), t_id, @@ -446,7 +446,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, { if (TAO_debug_level >= 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, ") ACE_TEXT ("Would become client leader, ") ACE_TEXT ("but generating new thread\n"), @@ -463,7 +463,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, { if (TAO_debug_level >= 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event, ") ACE_TEXT ("Becoming client leader.\n"), t_id)); @@ -494,7 +494,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // Run the reactor event loop. if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" (leader) enter reactor event loop\n"), t_id)); @@ -529,7 +529,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, } if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" (leader) exit reactor event loop\n"), t_id)); @@ -552,14 +552,14 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, if (this->event_loop_threads_waiting_ && !this->leader_available ()) { if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" (client) waking and yielding to allow event thread leadership\n"), t_id)); // Wake up the next leader (in case not yet done) if (this->elect_new_leader () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" failed to elect new leader\n"), t_id), @@ -588,14 +588,14 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, // thread. if (this->elect_new_leader () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" failed to elect new leader\n"), t_id), -1); if (result == -1 && !this->reactor_->reactor_event_loop_done ()) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,") ACE_TEXT (" handle_events failed\n"), t_id), diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h index adf73728c6e..b2c3bc41341 100644 --- a/TAO/tao/Load_Protocol_Factory_T.h +++ b/TAO/tao/Load_Protocol_Factory_T.h @@ -51,7 +51,7 @@ namespace TAO if (protocol_factory == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, + TAOLIB_ERROR ((LM_WARNING, ACE_TEXT("(%P|%t) WARNING - No <%C> found in Service") ACE_TEXT(" Repository. Using default instance.\n"), name)); @@ -85,7 +85,7 @@ namespace TAO if (protocol_set.insert (item) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%C> to protocol factory set.\n"), item->protocol_name ().c_str ())); @@ -100,7 +100,7 @@ namespace TAO if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Loaded default ") ACE_TEXT("protocol <%C>\n"), name)); diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 80600b7d718..b3d18778280 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -55,7 +55,7 @@ TAO::ObjectKey * CORBA::LocalObject::_key (void) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot get _key from a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -78,7 +78,7 @@ char * CORBA::LocalObject::_repository_id (void) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot get _repository_id from a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -94,7 +94,7 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr, CORBA::Flags) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _create_request for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); @@ -111,7 +111,7 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr, CORBA::Flags) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _create_request for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); @@ -121,7 +121,7 @@ CORBA::Request_ptr CORBA::LocalObject::_request (const char *) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _request for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); @@ -131,7 +131,7 @@ CORBA::Object_ptr CORBA::LocalObject::_get_component (void) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _get_component for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -141,7 +141,7 @@ CORBA::InterfaceDef_ptr CORBA::LocalObject::_get_interface (void) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _get_interface for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -156,7 +156,7 @@ CORBA::Policy_ptr CORBA::LocalObject::_get_policy (CORBA::PolicyType) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _get_policy for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -166,7 +166,7 @@ CORBA::Policy_ptr CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _get_cached_policy for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -177,7 +177,7 @@ CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &, CORBA::SetOverrideType) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _set_policy_overrides for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -187,7 +187,7 @@ CORBA::PolicyList * CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _get_policy_overrides for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -197,7 +197,7 @@ CORBA::Boolean CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _validate_connection for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); @@ -209,7 +209,7 @@ CORBA::ORB_ptr CORBA::LocalObject::_get_orb (void) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot call _get_orb for a LocalObject!\n"))); throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index e3b12883ae7..c1a9db86408 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -124,7 +124,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, #endif /* !ACE_HAS_IPV6 */ || acceptor.get_local_addr (my_addr) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("acceptor.open () || ") ACE_TEXT ("acceptor.get_local_addr () failed\n"))); result = -1; @@ -135,7 +135,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, { ACE_TCHAR addr[64]; my_addr.addr_to_string (addr, sizeof(addr)); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT(" TAO (%P|%t) - MCAST_Parser: acceptor local address %s.\n"), addr)); } @@ -153,7 +153,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, && mde.length () != 0) if (multicast_addr.set (mde.c_str()) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("ORB.cpp: Multicast address setting failed\n"))); stream.close (); dgram.close (); @@ -164,7 +164,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, // Open the datagram. if (dgram.open (ACE_Addr::sap_any, multicast_addr.get_type ()) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Unable to open the Datagram!\n"))); result = -1; } @@ -229,18 +229,18 @@ TAO_MCAST_Parser::multicast_query (char* & buf, multicast_addr); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsent multicast request."))); // Check for errors. if (result == -1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("error sending IIOP multicast"))); else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n%N; Sent multicast.") ACE_TEXT ("# of bytes sent is %d.\n"), result)); @@ -255,7 +255,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, 0, &tv) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("multicast_query: unable to accept"))); result = -1; @@ -272,7 +272,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, &tv); if (result != sizeof (ior_len)) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("multicast_query: unable to receive ") ACE_TEXT ("ior length"))); @@ -288,7 +288,7 @@ TAO_MCAST_Parser::multicast_query (char* & buf, buf = CORBA::string_alloc (ior_len); if (buf == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("multicast_query: unable to ") ACE_TEXT ("allocate memory"))); @@ -304,11 +304,11 @@ TAO_MCAST_Parser::multicast_query (char* & buf, 0, &tv); if (result == -1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ( "%p\n"), ACE_TEXT ("error reading ior"))); else if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%N: service resolved to IOR <%C>\n"), buf)); } @@ -318,14 +318,14 @@ TAO_MCAST_Parser::multicast_query (char* & buf, } if (result == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("\nmulticast discovery of %C failed.\n"), service_name)); if (ACE_OS::strcasecmp (service_name, "NameService") == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("Specify -m 1 when starting Naming_Service,\n") ACE_TEXT("or see http://www.theaceorb.com/faq/#115\n") ACE_TEXT("for using NameService without multicast.\n\n"))); @@ -367,7 +367,7 @@ TAO_MCAST_Parser::assign_to_variables (char const * mcast_name) // No valid IPv6 address specified. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("\nTAO (%P|%t) MCAST_Parser: ") ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index 55577afaeef..d836d35c731 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -184,7 +184,7 @@ TAO_MProfile::add_profile (TAO_Profile *pfile) pfiles_[last_++] = pfile; if (pfile && pfile->_incr_refcnt () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to increment reference ") ACE_TEXT ("count in add_profile!\n")), -1); diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index bf2ea0b9bbd..2dd102a5c73 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -157,7 +157,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { // No exception but some kind of error, yet a response // is required. - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"), ACE_TEXT ("TAO_AMH_Response_Handler::_tao_rh_send_reply") @@ -196,6 +196,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (const CORBA::Exception &ex) // this: the caller already knows this because it is part of the // ExceptionHolder information. +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && (TAO_HAS_MINIMUM_POA == 0) const PortableServer::ForwardRequest *fr = PortableServer::ForwardRequest::_downcast (&ex); if (fr != 0) @@ -209,6 +210,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (const CORBA::Exception &ex) this->_tao_out << fr->forward_reference; } else +#endif { if (CORBA::SystemException::_downcast (&ex)) { @@ -232,7 +234,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (const CORBA::Exception &ex) TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("TAO_AMH_Response_Handler:") ACE_TEXT (" could not send exception reply\n"))); @@ -286,7 +288,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd, if (!(this->_tao_out << fwd)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ERROR: Unable to marshal ") ACE_TEXT ("forward reference.\n"))); return; @@ -299,7 +301,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t|%N|%l): ") ACE_TEXT ("TAO_AMH_Response_Handler: could not send ") ACE_TEXT ("location forward reply\n"))); diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 3e189293220..0de1273408c 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -51,7 +51,7 @@ namespace TAO if (TAO_debug_level >= 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO_Messaging (%P|%t) - Asynch_Invocation_Adapter::" "invoke\n")); } diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 158005a98b5..f631abe4bed 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -66,7 +66,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) { if (TAO_debug_level > 2) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Reply_Dispatcher::dispatch_reply ") ACE_TEXT ("clone_from failed\n"))); @@ -95,7 +95,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) if (TAO_debug_level >= 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Reply_Dispatcher") ACE_TEXT ("::dispatch_reply status = %d\n"), this->reply_status_)); diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index 423b420b006..267e897a680 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -49,7 +49,7 @@ TAO_Asynch_Timeout_Handler::handle_timeout (const ACE_Time_Value &, { if (TAO_debug_level >= 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Timeout_Handler") ACE_TEXT ("::handle_timeout, request %d timed out\n"), this->request_id_)); @@ -59,7 +59,7 @@ TAO_Asynch_Timeout_Handler::handle_timeout (const ACE_Time_Value &, { if (TAO_debug_level >= 1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Timeout_Handler") ACE_TEXT ("::handle_timeout, unable to dispatch timed out request %d\n"), this->request_id_)); diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index 41be84ff27c..3cf4d666914 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -89,7 +89,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, { ACE_UINT64 msecs; const_cast<ACE_Time_Value const &> (time_value).msec (msecs); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Connect timeout is ") ACE_TEXT ("%Q milliseconds\n"), msecs)); @@ -168,7 +168,7 @@ TAO_ConnectionTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) { ACE_UINT64 msecs; const_cast<ACE_Time_Value const &> (time_value).msec (msecs); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Connect timeout is ") ACE_TEXT ("%Q milliseconds\n"), msecs)); diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 11544f753b4..c33530ed796 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -25,7 +25,7 @@ TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr inf if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_Messaging_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" @@ -83,7 +83,7 @@ TAO_Messaging_ORBInitializer::register_value_factory ( if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_Messaging_ORBInitializer::register_value_factory:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index ea3cb9c66c3..15a0ad3c14f 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -92,7 +92,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, { ACE_UINT64 msecs; const_cast<ACE_Time_Value const &> (time_value).msec (msecs); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Request timeout is ") ACE_TEXT ("%Q milliseconds\n"), msecs)); @@ -170,7 +170,7 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) { ACE_UINT64 msecs; const_cast<ACE_Time_Value const &> (time_value).msec (msecs); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Request timeout is ") ACE_TEXT ("%Q milliseconds\n"), msecs)); diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp index 90c0e441f7d..c065df48145 100644 --- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp +++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp @@ -133,7 +133,7 @@ namespace TAO if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Eager_Buffering_Sync_Strategy::timer_check, " "Now = %u, Current = %u, New = %u\n", now.msec (), current_deadline.msec (), diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 76a5edacdd9..3b634593918 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -51,7 +51,7 @@ TAO_Muxed_TMS::request_id (void) ++this->request_id_generator_; if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Muxed_TMS[%d]::request_id, <%d>\n", this->transport_->id (), this->request_id_generator_)); @@ -73,7 +73,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::bind_dispatcher, ") ACE_TEXT ("null reply dispatcher\n"))); } @@ -85,7 +85,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, if (result != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::bind_dispatcher, ") ACE_TEXT ("bind dispatcher failed: result = %d, request id = %d\n"), result, request_id)); @@ -136,7 +136,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) if (result == 0 && rd) { if (TAO_debug_level > 8) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ") ACE_TEXT ("id = %d\n"), params.request_id_)); @@ -148,7 +148,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ") ACE_TEXT ("unbind dispatcher failed, id %d: result = %d\n"), params.request_id_, @@ -185,7 +185,7 @@ TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id) { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::reply_timed_out, ") ACE_TEXT ("id = %d\n"), request_id)); @@ -202,7 +202,7 @@ TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::reply_timed_out, ") ACE_TEXT ("unbind dispatcher failed, id %d: result = %d\n"), request_id, diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index c668ad3813e..bd1ea2cab89 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -156,7 +156,7 @@ CORBA::ORB::destroy (void) if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("CORBA::ORB::destroy() called on ORB <%C>.\n"), this->orb_core ()->orbid ())); } @@ -251,7 +251,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) if (adapter == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ORB unable to find the ") ACE_TEXT ("NVList Adapter instance"))); @@ -309,7 +309,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv) if (adapter == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ORB unable to find the ") ACE_TEXT ("NVList Adapter instance"))); @@ -887,6 +887,10 @@ CORBA::ORB::resolve_initial_references (const char *name, { result = this->orb_core ()->resolve_ior_table (); } + else if (ACE_OS::strcmp (name, TAO_OBJID_ASYNCIORTABLE) == 0) + { + result = this->orb_core ()->resolve_async_ior_table (); + } else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0) { result = this->orb_core ()->resolve_dynanyfactory (); @@ -1168,7 +1172,7 @@ namespace TAO return oc->configuration (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to find ORB: %s. Invalid shared ") ACE_TEXT ("configuration argument \"%s\"\n"), orbid.c_str (), arg)); @@ -1183,7 +1187,7 @@ namespace TAO // Unknown value if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: -ORBGestalt unknown value <%s>\n"), orbconfig_string.c_str())); @@ -1324,7 +1328,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) // Check for errors returned from <TAO_Internal::open_services>. if (result != 0 && errno != ENOENT) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) %p\n"), ACE_TEXT ("Unable to initialize the ") ACE_TEXT ("Service Configurator"))); @@ -1365,7 +1369,7 @@ CORBA::ORB_init (int &argc, ACE_TCHAR *argv[], const char *orbid) if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Created new ORB <%s>\n"), orbid_string.c_str ())); } @@ -1485,7 +1489,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) if (CORBA::is_nil (obj) || obj->_stubobj () == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Nil object reference or TAO_Stub ") ACE_TEXT ("pointer is zero when converting\n") ACE_TEXT ("object reference to URL IOR.\n"))); @@ -1508,7 +1512,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj) } if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Cannot stringify given ") ACE_TEXT ("object. No or only unknown profiles.\n"))); diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 0ec90d435f8..3c0af47ba17 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -32,7 +32,7 @@ namespace PortableInterceptor // Make sure TAO's singleton manager is initialized. if (TAO_Singleton_Manager::instance ()->init () == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - register_orb_initializer: ") ACE_TEXT ("Unable to pre-initialize TAO\n"))); } @@ -64,7 +64,7 @@ namespace PortableInterceptor } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) %p\n"), ACE_TEXT ("ERROR: ORBInitializer Registry unable to find the ") ACE_TEXT ("ORBInitializer Registry instance"))); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 9722a7162bc..0fcd0a1643d 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -203,6 +203,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid, dynany_factory_ (CORBA::Object::_nil ()), ior_manip_factory_ (CORBA::Object::_nil ()), ior_table_ (CORBA::Object::_nil ()), + async_ior_table_ (CORBA::Object::_nil ()), monitor_ (CORBA::Object::_nil ()), orb_ (CORBA::ORB::_nil ()), root_poa_ (), @@ -651,7 +652,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) } else { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("WARNING: Unknown option to ") ACE_TEXT ("'-ORBCollocation': %s\n"), opt)); } @@ -734,7 +735,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '='); if (pos == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Invalid ORBInitRef argument '%s'") ACE_TEXT ("format is ObjectID=IOR\n"), current_arg)); @@ -751,7 +752,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) std::make_pair (InitRefMap::key_type (object_id), InitRefMap::data_type (IOR))).second) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Duplicate -ORBInitRef ") ACE_TEXT ("argument '%s'\n"), current_arg)); @@ -793,7 +794,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBResources")))) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("\"-ORBResources\" has been ") ACE_TEXT ("deprecated.\n"))); @@ -802,7 +803,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLogFile")))) { - // redirect all ACE_DEBUG and ACE_ERROR output to a file + // redirect all TAOLIB_DEBUG and TAOLIB_ERROR output to a file // USAGE: -ORBLogFile <file> // default: if <file> is present = append // if <file> is not present = create @@ -1207,7 +1208,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) if (TAO_debug_level > 0) { current_arg = arg_shifter.get_current (); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unknown \"-ORB\" option ") ACE_TEXT ("<%s>.\n"), ((current_arg == 0) ? ACE_TEXT("<NULL>") @@ -1244,7 +1245,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Environment variable ") ACE_TEXT ("TAO_ORBENDPOINT set to invalid value ") ACE_TEXT ("<%C>.\n"), @@ -1283,7 +1284,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) if (trf == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ORB Core unable to find a ") ACE_TEXT ("Resource Factory instance"))); @@ -1303,7 +1304,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) ACE_Reactor *reactor = this->reactor (); if (reactor == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ORB Core unable to initialize reactor"))); throw ::CORBA::INITIALIZE ( @@ -1317,7 +1318,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) if (ssf == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ORB Core unable to find a ") ACE_TEXT ("Server Strategy Factory instance"))); @@ -1421,7 +1422,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) this->codeset_manager_->open(*this); else if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORB_Core: ") ACE_TEXT("Codeset Manager not available\n"))); @@ -1532,7 +1533,7 @@ TAO_ORB_Core::fini (void) if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Destroying ORB <%C>\n"), this->orbid_)); } @@ -1573,7 +1574,7 @@ TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_f { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Deleting old gui_resource_factory.\n")); } delete TAO_TSS_Resources::instance ()->gui_resource_factory_; @@ -2241,7 +2242,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) if (TAO_debug_level > 10) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ") ACE_TEXT ("start [%s]\n"), perform_work?ACE_TEXT("perform_work"):ACE_TEXT("run"))); @@ -2292,7 +2293,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) if (TAO_debug_level > 10) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ") ACE_TEXT ( "calling handle_events()\n"))); } @@ -2301,7 +2302,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) if (TAO_debug_level > 10) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ") ACE_TEXT ("handle_events() returns %d\n"), result)); @@ -2339,7 +2340,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) if (TAO_debug_level > 10) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ORB_Core::run, ") ACE_TEXT ("ends with result = %d\n"), result)); @@ -2503,7 +2504,7 @@ TAO_ORB_Core::destroy_interceptors (void) // .. catch all the exceptions.. if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Exception in TAO_ORB_Core") ACE_TEXT ("::destroy_interceptors ()\n"))); } @@ -2541,7 +2542,7 @@ TAO_ORB_Core::resolve_typecodefactory_i (void) if (loader == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to instantiate ") ACE_TEXT ("a TypeCodeFactory_Loader\n"))); throw ::CORBA::ORB::InvalidName (); @@ -2727,22 +2728,20 @@ TAO_ORB_Core::resolve_iormanipulation_i (void) void TAO_ORB_Core::resolve_ior_table_i (void) { - TAO_Adapter_Factory *factory = - ACE_Dynamic_Service<TAO_Adapter_Factory>::instance - (this->configuration (), - ACE_TEXT ("TAO_IORTable")); - + TAO_Adapter_Factory *factory = 0; + ACE_Dynamic_Service<TAO_Adapter_Factory>::instance + (this->configuration (), ACE_TEXT("TAO_IORTable")); if (factory == 0) { this->configuration ()->process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_IORTable", - "TAO_IORTable", - TAO_VERSION, - "_make_TAO_Table_Adapter_Factory", - "")); + "TAO_IORTable", + TAO_VERSION, + "_make_TAO_Table_Adapter_Factory", + "")); factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance - (this->configuration (), ACE_TEXT ("TAO_IORTable")); + (this->configuration (), ACE_TEXT("TAO_IORTable")); } if (factory != 0) @@ -2761,6 +2760,40 @@ TAO_ORB_Core::resolve_ior_table_i (void) } void +TAO_ORB_Core::resolve_async_ior_table_i (void) +{ + TAO_Adapter_Factory *factory = 0; + ACE_Dynamic_Service<TAO_Adapter_Factory>::instance + (this->configuration (), ACE_TEXT("TAO_Async_IORTable")); + if (factory == 0) + { + this->configuration ()->process_directive + (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Async_IORTable", + "TAO_Async_IORTable", + TAO_VERSION, + "_make_TAO_Async_Table_Adapter_Factory", + "")); + factory = + ACE_Dynamic_Service<TAO_Adapter_Factory>::instance + (this->configuration (), ACE_TEXT("TAO_Async_IORTable")); + } + + if (factory != 0) + { + ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this)); + iortable_adapter->open (); + + CORBA::Object_var tmp_root = iortable_adapter->root (); + + this->adapter_registry_.insert (iortable_adapter.get ()); + + // It is now (exception) safe to release ownership from the auto pointers + this->async_ior_table_= tmp_root._retn (); + iortable_adapter.release (); + } +} + +void TAO_ORB_Core::resolve_monitor_i (void) { TAO_Object_Loader *loader = @@ -2794,7 +2827,7 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane, { if (this->orb_params ()->add_endpoints (lane, endpoints) != 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ") ACE_TEXT ("Invalid endpoint(s) specified: <%C>.\n"), endpoints.c_str ())); @@ -3219,7 +3252,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Setting primary connection ") ACE_TEXT("timeout hook\n"))); } @@ -3230,7 +3263,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Setting alternate connection ") ACE_TEXT("timeout hook\n"))); } @@ -3239,7 +3272,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook) else if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Not overwriting alternate ") ACE_TEXT ("connection timeout hook. It is %@\n"), TOCSRi->alt_connection_timeout_hook_)); @@ -3342,7 +3375,7 @@ TAO_ORB_Core::add_interceptor ( } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ERROR: ORB Core unable to find the ") ACE_TEXT ("IORInterceptor Adapter Factory instance"))); @@ -3399,7 +3432,7 @@ TAO_ORB_Core::add_interceptor ( } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ERROR: ORB Core unable to find the ") ACE_TEXT ("Client Request Interceptor Adapter Factory ") @@ -3448,7 +3481,7 @@ TAO_ORB_Core::add_interceptor ( } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ERROR: ORB Core unable to find the ") ACE_TEXT ("Server Request Interceptor Adapter Factory ") @@ -3472,7 +3505,7 @@ TAO_ORB_Core::add_interceptor ( } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ERROR: ORB Core unable to find the ") ACE_TEXT ("Client Request Interceptor Adapter Factory ") @@ -3496,7 +3529,7 @@ TAO_ORB_Core::add_interceptor ( } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %p\n"), ACE_TEXT ("ERROR: ORB Core unable to find the ") ACE_TEXT ("Server Request Interceptor Adapter Factory ") diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 085522ec1a8..dc7776f4340 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -665,6 +665,9 @@ public: /// Resolve the IOR Table reference for this ORB. CORBA::Object_ptr resolve_ior_table (void); + /// Resolve the Async IOR Table reference for this ORB. + CORBA::Object_ptr resolve_async_ior_table (void); + /// Resolve the Monitor reference for this ORB. CORBA::Object_ptr resolve_monitor (void); @@ -996,9 +999,12 @@ private: void operator=(const TAO_ORB_Core&); //@} - /// Obtain and cache the dynamic any factory object reference. + /// Obtain and cache the ior table object reference. void resolve_ior_table_i (void); + /// Obtain and cache the async ior table object reference. + void resolve_async_ior_table_i (void); + /// Checks to see whether collocation optimizations have to be /// applied on objects in the @a other_orb CORBA::Boolean is_collocation_enabled (TAO_ORB_Core *other_orb, @@ -1047,6 +1053,9 @@ protected: /// The cached object reference for the IORTable. CORBA::Object_ptr ior_table_; + /// The cached object reference for the Async_IORTable. + CORBA::Object_ptr async_ior_table_; + /// The cached object reference for the Monitor. CORBA::Object_ptr monitor_; diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 1a6cc237f54..c15111f7e6b 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -521,6 +521,18 @@ TAO_ORB_Core::resolve_ior_table (void) } ACE_INLINE CORBA::Object_ptr +TAO_ORB_Core::resolve_async_ior_table (void) +{ + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, + CORBA::Object::_nil ()); + if (CORBA::is_nil (this->async_ior_table_)) + { + this->resolve_async_ior_table_i (); + } + return CORBA::Object::_duplicate (this->async_ior_table_); +} + +ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_monitor (void) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 55ea29155a8..a18b676e29b 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -211,7 +211,7 @@ CORBA::Object::_is_a (const char *type_id) if (this->protocol_proxy_ == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy for %C\n"), type_id)); @@ -317,7 +317,7 @@ CORBA::Object::_key (void) if (TAO_debug_level > 2) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Null object key return from ") ACE_TEXT ("profile in use\n"))); } @@ -375,7 +375,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, if (ctx != 0 || this->protocol_proxy_ == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy for %C\n"), operation)); @@ -420,7 +420,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx, if (ctx != 0 || this->protocol_proxy_ == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy for %C\n"), operation)); @@ -463,7 +463,7 @@ CORBA::Object::_request (const char *operation) else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy for %C\n"), operation)); @@ -539,7 +539,7 @@ CORBA::Object::_get_policy (CORBA::PolicyType type) else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy in _get_policy\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -556,7 +556,7 @@ CORBA::Object::_get_cached_policy (TAO_Cached_Policy_Type type) else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy in _get_policy\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -573,7 +573,7 @@ CORBA::Object::_set_policy_overrides ( if (!this->protocol_proxy_) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy in _get_policy\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -616,7 +616,7 @@ CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types) else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy in _get_policy\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -675,7 +675,7 @@ CORBA::Object::_get_orb (void) else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - No protocol proxy in _get_policy\n"))); throw ::CORBA::NO_IMPLEMENT (); @@ -752,7 +752,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - Object::tao_object_initialize ") ACE_TEXT ("WARNING: extracting object from ") ACE_TEXT ("default ORB_Core\n"))); @@ -789,7 +789,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) { if (mp.give_profile (pfile) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ERROR: give_profile\n") ACE_TEXT (" returned -1\n"))); } @@ -801,7 +801,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) { // @@ This occurs when profile creation fails when decoding the // profile from the IOR. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ERROR: XXXXX Could not create all ") ACE_TEXT ("profiles while extracting object\n") ACE_TEXT ("TAO (%P|%t) ERROR: reference from the ") @@ -851,7 +851,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) WARNING: extracting object from ") ACE_TEXT ("default ORB_Core\n"))); } @@ -892,7 +892,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - Object::tao_object_initialize ") ACE_TEXT ("WARNING: extracting object from ") ACE_TEXT ("default ORB_Core\n"))); @@ -916,7 +916,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { if (mp.give_profile (pfile) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ERROR: give_profile\n") ACE_TEXT (" returned -1\n"))); } @@ -928,7 +928,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { // @@ This occurs when profile creation fails when decoding the // profile from the IOR. - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ERROR: Could not create all ") ACE_TEXT ("profiles while extracting object [%d, %d]\n") ACE_TEXT ("TAO (%P|%t) - ERROR: reference from the ") diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 27140875d7d..ff6a399f1cb 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -50,7 +50,7 @@ TAO_Object_Ref_Table::unregister_initial_reference ( { if (TAO_debug_level > 1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Object_Ref_Table::bind_i: ") ACE_TEXT ("Could not unregister object <%C> ") ACE_TEXT ("from the ORB\n"), @@ -84,7 +84,7 @@ TAO_Object_Ref_Table::bind_i (const char *id, CORBA::Object_ptr obj) { if (TAO_debug_level > 1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Object_Ref_Table::bind_i: ") ACE_TEXT ("Could not register duplicate object <%C> ") ACE_TEXT ("with the ORB\n"), diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp index 0a4c7ac28b0..c72f4c85f87 100644 --- a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp +++ b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp @@ -68,7 +68,7 @@ TAO_On_Demand_Fragmentation_Strategy::fragment ( cdr.more_fragments (true); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - On_Demand_Fragmentation_Strategy::fragment, " "sending fragment of size %d\n", cdr.total_length ())); diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index 6204a586ca3..9dc4e619e1c 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -384,7 +384,7 @@ TAO_ClientRequestInfo::request_id (void) else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) ClientRequestInfo::request_id() failed\n" "(%P|%t) since its request ID generator is not\n" "(%P|%t) supported on this platform.\n")); diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp b/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp index dabc0d6836f..750ae1424d2 100644 --- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp +++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.cpp @@ -21,7 +21,7 @@ PortableInterceptor::DLL_Resident_ORB_Initializer::DLL_Resident_ORB_Initializer { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Construct DLL_Resident_ORB_Initializer for @%@\n"), initializer_.operator->() )); @@ -32,7 +32,7 @@ PortableInterceptor::DLL_Resident_ORB_Initializer::~DLL_Resident_ORB_Initializer { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Destruct DLL_Resident_ORB_Initializer for @%@\n"), initializer_.operator->() )); diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 32e0f3e1f94..a1fec68d4a5 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -219,7 +219,7 @@ namespace TAO // Exceptions should not be propagated beyond this call. if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Exception in ") ACE_TEXT ("Interceptor_List") ACE_TEXT ("::destroy_interceptors ()\n"))); diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index f39d9b646ea..c26ae569a63 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -82,7 +82,7 @@ TAO::ORBInitializer_Registry::fini (void) --i; if (TAO_debug_level > 8) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORBInitializer_Registry::fini clearing %d @%@\n"), + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORBInitializer_Registry::fini clearing %d @%@\n"), i, this->initializers_[i].operator->() )); } @@ -111,7 +111,7 @@ TAO::ORBInitializer_Registry::register_orb_initializer ( // Add the given ORBInitializer to the sequence. if (TAO_debug_level > 8) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORBInitializer_Registry::register_orb_initializer %d @%@\n"), + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ORBInitializer_Registry::register_orb_initializer %d @%@\n"), cur_len, init )); } diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index cba4fc2913d..0f3d6ab4115 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -28,7 +28,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier) && (&this->lazy_copy_->current_slot_table () == &this->slot_table_)) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l\n"))); + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l\n"))); throw ::CORBA::INTERNAL (); } diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp index 156153378da..efbf86d4a06 100644 --- a/TAO/tao/Parser_Registry.cpp +++ b/TAO/tao/Parser_Registry.cpp @@ -58,7 +58,7 @@ TAO_Parser_Registry::open (TAO_ORB_Core *orb_core) --number_of_names; if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) Failed to find Service Object" + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) Failed to find Service Object" " for %C.\n", names[i])); } } diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index 0a3bfa57f57..1edb5349d8b 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -41,7 +41,7 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Skipping validator [%@] ") ACE_TEXT ("since it would create a circular list\n"), validator)); diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 815bdf3dc6a..6197d346b35 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -118,7 +118,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( TAO_Multiple_Id_Strategy, CORBA::NO_MEMORY ()); #else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "Multiple Id Strategy not supported with CORBA/e\n")); #endif } @@ -137,7 +137,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( CORBA::NO_MEMORY ()); #else ACE_UNUSED_ARG (persistent_id_policy); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "Persistent Id Strategy not supported with CORBA/e\n")); #endif } @@ -160,7 +160,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( TAO_User_Id_Strategy, CORBA::NO_MEMORY ()); #else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "User Id Assignment not supported with CORBA/e\n")); #endif } @@ -177,7 +177,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( TAO_System_Id_With_Multiple_Id_Strategy, CORBA::NO_MEMORY ()); #else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "System Id Assignment with multiple " "not supported with CORBA/e\n")); #endif @@ -222,7 +222,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( CORBA::NO_MEMORY ()); break; #else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "linear option for " "-ORBUniqueidPolicyReverseDemuxStrategy " "not supported with minimum POA maps. " @@ -257,7 +257,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( CORBA::NO_MEMORY ()); break; #else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "linear option for -ORBUseridPolicyDemuxStrategy " "not supported with minimum POA maps. " "Ingoring option to use default...\n")); @@ -291,7 +291,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( #else case TAO_LINEAR: case TAO_DYNAMIC_HASH: - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "linear and dynamic options for -ORBSystemidPolicyDemuxStrategy " "are not supported with minimum POA maps. " "Ingoring option to use default...\n")); @@ -514,7 +514,7 @@ TAO_Unique_Id_Strategy::bind_using_user_id ( ACE_CString hex_idstr; hexstring (hex_idstr, idstr.in (), user_id.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Unique_Id_Strategy::" "bind_using_user_id: type=%C, id=%C\n", repository_id.in (), @@ -542,7 +542,7 @@ TAO_Unique_Id_Strategy::unbind_using_user_id ( ACE_CString hex_idstr; hexstring (hex_idstr, idstr.in (), entry->user_id_.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Unique_Id_Strategy::unbind_using_user_id: id=%C\n", hex_idstr.c_str() )); @@ -711,7 +711,7 @@ TAO_Multiple_Id_Strategy::bind_using_user_id ( ACE_CString hex_idstr; hexstring (hex_idstr, idstr.in (), user_id.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Multiple_Id_Strategy::" "bind_using_user_id: type=%C, id=%C\n", repository_id.in (), @@ -739,7 +739,7 @@ TAO_Multiple_Id_Strategy::unbind_using_user_id ( ACE_CString hex_idstr; hexstring (hex_idstr, idstr.in (), entry->user_id_.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Multiple_Id_Strategy::unbind_using_user_id: id=%C\n", hex_idstr.c_str() )); @@ -1011,7 +1011,7 @@ TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id ( ACE_CString hex_idstr; hexstring (hex_idstr, idstr.in (), entry->user_id_.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_System_Id_With_Unique_Id_Strategy::" "bind_using_system_id: type=%C, id=%C\n", repository_id.in (), @@ -1069,7 +1069,7 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id ( ACE_CString hex_idstr; hexstring (hex_idstr, idstr.in (), entry->user_id_.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_System_Id_With_Multiple_Id_Strategy::" "bind_using_system_id: type=%C, id=%C\n", repository_id.in (), diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 64125e36789..0e35e72667f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -35,7 +35,7 @@ namespace TAO ACE_Dynamic_Service <IdAssignmentStrategy>::instance (strategy_name); if (strategy == 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), strategy_name)); diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 550b416663b..20d16cf497b 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -23,7 +23,7 @@ namespace TAO ACE_Dynamic_Service<IdUniquenessStrategy>::instance ("IdUniquenessStrategyMultiple"); if (strategy == 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ERROR, Unable to get ") ACE_TEXT ("IdUniquenessStrategyMultiple"))); @@ -38,7 +38,7 @@ namespace TAO if (strategy_factory != 0) strategy = strategy_factory->create (value); else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ERROR, Unable to get ") ACE_TEXT ("IdUniquenessStrategyUniqueFactory"))); diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index cf426d70b8b..884b5b7157e 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -25,7 +25,7 @@ namespace TAO } case ::PortableServer::MULTIPLE_ID : { - ACE_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index 9a41f2b1915..0ad1d25ed95 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -37,7 +37,7 @@ namespace TAO ACE_Dynamic_Service<ImplicitActivationStrategy>::instance (strategy_name); if (strategy == 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), strategy_name)); diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index e859a50587f..cba6cc54506 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -37,7 +37,7 @@ namespace TAO if (strategy_factory != 0) strategy = strategy_factory->create (value); else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), strategy_name)); diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 0c82a670673..bbf189d97f2 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -97,7 +97,7 @@ namespace TAO // When we don't have a ImR_Client adapter, but the user // has specified that the ImR has to be used we have an // error situation which has to be reported. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR: No ImR_Client library ") ACE_TEXT ("available but use IMR has been specified.\n"))); diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index 349374e809f..21c978c7dec 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -26,7 +26,7 @@ namespace TAO } case ::PortableServer::TRANSIENT : { - ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index d51455af87d..f95bd64abbe 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -21,7 +21,7 @@ namespace TAO { case ::PortableServer::PERSISTENT : { - ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl")); break; } case ::PortableServer::TRANSIENT : diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 3b4940e3f6f..315d6d19c9f 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -182,7 +182,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; #else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "linear option for -ORBPersistentidPolicyDemuxStrategy " "not supported with minimum POA maps. " "Ingoring option to use default...\n")); @@ -212,7 +212,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ #else case TAO_LINEAR: case TAO_DYNAMIC_HASH: - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "linear and dynamic options for -ORBTransientidPolicyDemuxStrategy " "are not supported with minimum POA maps. " "Ingoring option to use default...\n")); @@ -1176,7 +1176,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void) } catch (const ::CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete " "threw exception it should not have!\n")); } diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index 29e37c7bda2..e03cc272ccd 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -42,7 +42,7 @@ TAO_Binary_Search_OpTable::find (const char *opname, TAO_operation_db_entry const * const entry = lookup (opname); if (entry == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Binary_Search_Table:find failed\n")), -1); // Valid entry. Figure out the skel_ptr. @@ -62,7 +62,7 @@ TAO_Binary_Search_OpTable::find (const char *opname, TAO_operation_db_entry const * const entry = lookup (opname); if (entry == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Binary_Search_Table:find failed\n")), -1); diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 918c6f5e765..6674ec34112 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -46,7 +46,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable ( // @@ (ASG): what happens if bind fails ??? if (this->bind (db[i].opname, s) == -1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("bind failed"))); } diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 95739497b67..7f74c9b14b0 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -49,7 +49,7 @@ TAO_Linear_Search_OpTable::find (const char *opname, TAO_operation_db_entry const * const entry = lookup (opname); if (entry == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Linear_Search_Table:find failed\n")), -1); @@ -70,7 +70,7 @@ TAO_Linear_Search_OpTable::find (const char *opname, TAO_operation_db_entry const * const entry = lookup (opname); if (entry == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Linear_Search_Table:find failed\n")), -1); diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index 53444157d75..8bda68e2ab6 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -44,7 +44,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, if (entry == 0) { skelfunc = 0; // insure that somebody can't call a wrong function! - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%C' (length=%d) failed\n"), opname ? opname : "<null string>", length), @@ -69,7 +69,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, if (entry == 0) { skelfunc = 0; // insure that somebody can't call a wrong function! - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%C' (length=%d) failed\n"), opname ? opname : "<null string>", length), diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 03bff4ef0f1..18c8aa44eff 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -78,7 +78,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, // it. throw PortableServer::POA::InvalidPolicy (); #else - ACE_ERROR ((LM_ERROR, "Invalid policy\n")); + TAOLIB_ERROR ((LM_ERROR, "Invalid policy\n")); #endif } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 75be8246496..2926b1c345e 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -29,7 +29,7 @@ namespace TAO } default : { - ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 42f778c5e21..37de98b0d91 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -32,7 +32,7 @@ namespace TAO } default : { - ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index dbaadb81a5d..58fc42ee29d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -66,7 +66,7 @@ namespace TAO if (strategy_factory != 0) strategy = strategy_factory->create (value, srvalue); else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ERROR, Unable to get ") ACE_TEXT ("RequestProcessingStrategyFactory"))); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 89ade874fbc..243c668dbf1 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -36,7 +36,7 @@ namespace TAO } case ::PortableServer::NON_RETAIN : { - ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl")); break; } } @@ -44,7 +44,7 @@ namespace TAO } default : { - ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index f2b2c9bc23d..10fe91d4753 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -32,7 +32,7 @@ namespace TAO { case ::PortableServer::RETAIN : { - ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl")); break; } case ::PortableServer::NON_RETAIN : @@ -45,7 +45,7 @@ namespace TAO } default : { - ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index e203b22a0fa..ebf256b0a4f 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -40,7 +40,7 @@ namespace TAO if (strategy_factory == 0) { if (TAO_debug_level > 1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), strategy_factory_name)); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index e9284dd771b..bc00bd2f036 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -31,7 +31,7 @@ namespace TAO } case ::PortableServer::RETAIN : { - ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 503131137db..f8aa128e6c0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -364,7 +364,7 @@ namespace TAO if (deactivated) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) TAO_Root_POA::is_servant_in_map: waiting for servant to deactivate\n"))); // We are going to wait on this condition variable; the POA @@ -411,7 +411,7 @@ namespace TAO if (deactivated) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) TAO_Root_POA::is_user_id_in_map: waiting for servant to deactivate\n"))); // We are going to wait on this condition variable; the POA diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index a453de132ef..b530d045063 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -28,7 +28,7 @@ namespace TAO } case ::PortableServer::NON_RETAIN : { - ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl")); break; } } diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index b9fe653988b..c9281b877e7 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -27,7 +27,7 @@ namespace TAO if (strategy_factory != 0) strategy = strategy_factory->create (value); else - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ERROR, Unable to get ") ACE_TEXT ("ThreadStrategySingleFactory"))); @@ -40,7 +40,7 @@ namespace TAO ACE_Dynamic_Service<ThreadStrategy>::instance ("ThreadStrategyORBControl"); if (strategy == 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("ERROR, Unable to get ") ACE_TEXT ("ThreadStrategyORBControl"))); diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index 8967b90a273..28ee4688c2d 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -31,7 +31,7 @@ namespace TAO } case ::PortableServer::ORB_CTRL_MODEL : { - ACE_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl")); + TAOLIB_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl")); break; } } diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 4fdde3441a8..7038265ead7 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -159,7 +159,7 @@ TAO_Profile::decode (TAO_InputCDR& cdr) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Profile::decode - v%d.%d\n"), this->version_.major, this->version_.minor)); @@ -219,7 +219,7 @@ TAO_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, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%d bytes out of %d left after profile data\n"), cdr.length (), encap_len)); @@ -329,7 +329,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Profile::policies: ") ACE_TEXT ("Null Policy List!\n"))); } @@ -490,7 +490,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl) // spec. ptc/99-05-03 we just ignore these // un-understood policies. if (TAO_debug_level >= 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("The IOR contains unsupported ") ACE_TEXT ("policies.\n"))); } @@ -525,7 +525,7 @@ TAO_Profile::verify_orb_configuration (void) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Cannot add ") ACE_TEXT ("IOP::TaggedComponent to profile.\n") ACE_TEXT ("(%P|%t) Standard profile components ") @@ -558,7 +558,7 @@ TAO_Profile::verify_profile_version (void) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Cannot add ") ACE_TEXT ("IOP::TaggedComponent to GIOP 1.0") ACE_TEXT ("IOR profile.\n") diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 1e74a539c96..3cd827bb48e 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -196,13 +196,6 @@ namespace TAO this->stub_->orb_core ()->call_sync_scope_hook (this->stub_, has_synchronization, sync_scope); - - // If this stub has synchronization that's not "none", we need to - // have the transport schedule output at the appropriate time. - if (has_synchronization && sync_scope != Messaging::SYNC_NONE) - { - this->transport_->set_flush_in_post_open (); - } } return true; diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp index 8d84d34d8f1..cef6c5155ee 100644 --- a/TAO/tao/QtResource/QtResource_Factory.cpp +++ b/TAO/tao/QtResource/QtResource_Factory.cpp @@ -19,7 +19,7 @@ namespace TAO { // synchronized by external locks if (this->qapp_ == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - QApplication is undefined.", " Cannot create ACE_QtReactor\n")); return 0; @@ -32,7 +32,7 @@ namespace TAO 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - ACE_QtReactor created\n")); } diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp index 32b929cdb8f..9e636c75944 100644 --- a/TAO/tao/Queued_Data.cpp +++ b/TAO/tao/Queued_Data.cpp @@ -144,7 +144,7 @@ TAO_Queued_Data::release (TAO_Queued_Data *qd) if (TAO_debug_level == 4) { // This debug is for testing purposes! - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Queued_Data[%d]::release\n", "Using global pool for releasing\n")); } @@ -188,7 +188,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd) if (TAO_debug_level == 4) { // This debug is for testing purposes! - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Queued_Data[%d]::duplicate\n", "Using global pool for allocation\n")); } diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp index 45bacc3d3f2..72bf59a71b9 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp @@ -98,7 +98,7 @@ TAO_Linear_Network_Priority_Mapping::to_network ( RTCORBA::NetworkPriority &network_priority) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO_Linear_Network_Priority_Mapping::to_network corba_priority %d\n", corba_priority)); @@ -113,7 +113,7 @@ TAO_Linear_Network_Priority_Mapping::to_network ( network_priority = dscp[array_slot]; if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO_Linear_Network_Priority_Mapping::to_network = %x\n", network_priority)); @@ -125,7 +125,7 @@ TAO_Linear_Network_Priority_Mapping::to_CORBA (RTCORBA::NetworkPriority network_ RTCORBA::Priority &/*corba_priority*/) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO_Linear_Network_Priority_Mapping::to_CORBA network_priority %d\n", network_priority)); diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp index 6ddfc80ec2b..5bdbd659f4f 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp @@ -142,7 +142,7 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, && (native_priority < this->max_ || native_priority > this->min_))) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Linear_Priority_Mapping::to_CORBA: " " priority %d out of range [%d,%d]\n", native_priority, this->min_, this->max_)); diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp index 717acb9244a..94d168a0e76 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp @@ -31,7 +31,7 @@ TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Multi_Priority_Mapping::ctor: " " base_native_priority %d out of range [%d,%d]\n", base_native_priority_, this->min_, this->max_)); @@ -44,7 +44,7 @@ TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Multi_Priority_Mapping::ctor: " " base_native_priority %d out of range [%d,%d]\n", base_native_priority_, this->min_, this->max_)); @@ -56,7 +56,7 @@ TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Multi_Priority_Mapping::ctor: " " base_corba_priority %d out of range [%d,%d]\n", base_corba_priority_, RTCORBA::minPriority, RTCORBA::maxPriority)); @@ -77,7 +77,7 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Multi_Priority_Mapping::to_native: " " corba priority %d out of range [%d,%d]\n", corba_priority, RTCORBA::minPriority, this->base_corba_priority_)); @@ -148,7 +148,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Multi_Priority_Mapping::to_CORBA: " " priority %d out of range [%d,%d]\n", native_priority, this->min_, this->base_corba_priority_)); diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index c2b4652406b..5ed4886629a 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -37,7 +37,7 @@ TAO_RT_Current::the_priority (void) if (result == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "ERROR: TAO_RT_Current::the_priority. " + TAOLIB_DEBUG ((LM_DEBUG, "ERROR: TAO_RT_Current::the_priority. " "RT CORBA Priority accessed in a thread where it has not been set.\n")); // Spec does not define a minor code throw CORBA::INITIALIZE (); diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 006f8c0dedc..95a4ae1a1df 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -226,7 +226,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "ERROR: TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile. " + TAOLIB_DEBUG ((LM_DEBUG, "ERROR: TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile. " "Unable to access RT CORBA Priority in client thread " "accessing object with CLIENT_PROPAGATED priority model.\n")); throw CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 7e406b772f1..f68cd7b8ed9 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -76,7 +76,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_RT_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 2b6012e33be..a7b6133ef7f 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -83,7 +83,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT; else - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("RT_ORB_Loader - unknown argument") ACE_TEXT(" <%s> for -ORBPriorityMapping\n"), name)); @@ -112,7 +112,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) sched_policy = THR_SCHED_RR; } else - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("RT_ORB_Loader - unknown argument") ACE_TEXT(" <%s> for -ORBSchedPolicy\n"), name)); @@ -129,7 +129,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) ACE_TEXT("PROCESS")) == 0) scope_policy = THR_SCOPE_PROCESS; else - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("RT_ORB_Loader - unknown argument") ACE_TEXT(" <%s> for -ORBScopePolicy\n"), name)); @@ -168,7 +168,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) arg_shifter.ignore_arg (); if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("RT_ORB_Loader: Unknown option ") ACE_TEXT("<%s>.\n"), argv[curarg])); diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 8d5e4119720..9a3ddad05e0 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -415,7 +415,7 @@ CORBA::Long TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO_RT_Protocols_Hooks::get_dscp_codepoint\n")); CORBA::Long codepoint = 0; @@ -434,7 +434,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "Cannot convert corba priority %d " "to network priority\n", priority)); @@ -533,7 +533,7 @@ TAO_RT_Protocols_Hooks::get_thread_native_priority ( if (ACE_Thread::getprio (current, priority) == -1) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("RT_Protocols_Hooks::get_thread_native_priority: ") ACE_TEXT (" ACE_Thread::get_prio failed\n"))); @@ -624,7 +624,7 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority ( if (ACE_Thread::setprio (current, native_priority) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%N,%l) Error setting thread ") ACE_TEXT ("priority to %d, errno %d %m\n"), native_priority, diff --git a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp index c4c1d86e756..11895e71006 100644 --- a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp +++ b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp @@ -65,7 +65,7 @@ TAO_RT_Service_Context_Handler::generate_service_context ( else { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, "ERROR: TAO_RT_Protocols_Hooks::rt_service_context. " + TAOLIB_ERROR ((LM_ERROR, "ERROR: TAO_RT_Protocols_Hooks::rt_service_context. " "Unable to access RT CORBA Priority in client thread " "accessing object with CLIENT_PROPAGATED priority model.\n")); throw CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 9eba4ece9d3..6081d741bd9 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -61,7 +61,7 @@ TAO_Thread_Pool_Threads::svc (void) catch (const ::CORBA::Exception& ex) { // No point propagating this exception. Print it out. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "orb->run() raised exception for thread %t\n")); ex._tao_print_exception (""); @@ -141,7 +141,7 @@ TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n") ACE_TEXT ("Current number of dynamic threads left = %d; ") ACE_TEXT ("RTCorba worker thread is ending!\n"), @@ -196,7 +196,7 @@ TAO_Thread_Lane::new_dynamic_thread (void) this->dynamic_threads_.thr_count () < this->dynamic_threads_number_) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n") ACE_TEXT ("Current number of dynamic threads = %d; ") ACE_TEXT ("static threads = %d; max dynamic threads = %d\n") @@ -213,7 +213,7 @@ TAO_Thread_Lane::new_dynamic_thread (void) THR_BOUND | THR_DETACHED); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Pool %d Lane %d Thread %t: ") ACE_TEXT ("cannot create dynamic thread\n"), this->pool_.id (), @@ -274,7 +274,7 @@ TAO_Thread_Lane::validate_and_map_priority (void) if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - creating thread at ") ACE_TEXT ("(corba:native) priority %d:%d\n"), this->lane_priority_, diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 49d2f50c077..c753eab7ea4 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -64,7 +64,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_ASSERT (lane->pool ().id () == thread_pool->id ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Using thread pool with lane ") ACE_TEXT ("(%P|%t|%d|%d): original thread ") ACE_TEXT ("CORBA/native priority %d/%d not changed\n"), @@ -167,7 +167,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t): %C processing using %C ") ACE_TEXT ("original thread CORBA/native priority %d/%d ") ACE_TEXT ("not changed\n"), @@ -180,7 +180,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( // current thread priority. Therefore, print out a simpler message. #else /* ACE_HAS_THREADS */ - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t): %C processing using %C ") ACE_TEXT ("original thread CORBA/native priority ") ACE_TEXT ("not changed\n"), @@ -217,7 +217,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( CORBA::Short native_priority = 0; tph->get_thread_native_priority (native_priority); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%C processing using %C ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"), @@ -234,7 +234,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%C processing using %C ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("is the same as the target priority\n"), diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 1fa0db26350..ebed2944da4 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -119,7 +119,7 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name) if (impl == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "Missing scheduling context OR DT cancelled\n")); throw ::CORBA::BAD_INV_ORDER (); return; @@ -515,7 +515,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, if (dttask->activate_task (base_priority, stack_size) == -1) { - ACE_ERROR((LM_ERROR, + TAOLIB_ERROR((LM_ERROR, "Unable to activate DistributableThread\n")); delete dttask; @@ -566,7 +566,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority, ) == -1) { if (ACE_OS::last_error () == EPERM) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Insufficient privilege to run this test.\n")), -1); } @@ -688,7 +688,7 @@ TAO_RTScheduler_Current_i::cancel_thread (void) this->guid_.get_buffer (), this->guid_.length ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Distributable Thread - %d is cancelled\n", guid)); diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index 79d870c7042..f69259b7ed9 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -34,7 +34,7 @@ TAO_RTScheduler_ORB_Initializer::pre_init ( // orb_core() TAO extension. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "In pre_init\n")); TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info); @@ -42,7 +42,7 @@ TAO_RTScheduler_ORB_Initializer::pre_init ( if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) Security_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" @@ -125,7 +125,7 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr // ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "In post_init\n")); CORBA::Object_var rt_current_obj = @@ -136,7 +136,7 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr if (CORBA::is_nil (rt_current.in ())) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "(%P|%t) ::post_init\n" "(%P|%t) Unable to narrow to RTCORBA::Current\n")); throw ::CORBA::INTERNAL (); diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index c4d3092bdec..9e127aab5a3 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -24,7 +24,7 @@ TAO_RTScheduler_Loader::init (int, ACE_TCHAR* []) ACE_TRACE ("TAO_RTScheduler_Loader::init"); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "In RTScheduler_Loader::init\n")); // Only allow initialization once. diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index d376ba678e0..7d8e4049504 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -21,7 +21,7 @@ void Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Client_Interceptor::send_request\n")); // Temporary current. @@ -52,7 +52,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) guid.length ()); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "The Guid is %d %d\n", id, TAO_RTScheduler_Current::guid_counter.value_i ())); @@ -65,7 +65,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) int result = current->dt_hash ()->bind (guid, dt); if (result != 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "No Scheduling Segment Context\n")); throw ::CORBA::INTERNAL (); @@ -116,7 +116,7 @@ void Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Client_Interceptor::send_poll\n")); TAO_RTScheduler_Current_i *current = 0; @@ -135,7 +135,7 @@ void Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Client_Interceptor::receive_reply\n")); TAO_RTScheduler_Current_i *current = 0; @@ -154,7 +154,7 @@ void Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Client_Interceptor::receive_exception\n")); TAO_TSS_Resources *tss = TAO_TSS_Resources::instance (); @@ -166,7 +166,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt { if (ri == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "ri = 0\n")); return; } @@ -176,14 +176,14 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt if (CORBA::is_nil (type.in ())) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "type = 0\n")); return; } const char * id = type->id (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Received Exception %C\n", id)); @@ -210,7 +210,7 @@ void Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Client_Interceptor::receive_other\n")); TAO_RTScheduler_Current_i *current = 0; @@ -249,7 +249,7 @@ Server_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Server_Interceptor::receive_request_service_contexts\n")); } @@ -259,7 +259,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Server_Interceptor::receive_request\n")); IOP::ServiceContext_var serv_cxt; @@ -272,13 +272,13 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr catch (const ::CORBA::Exception&) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Invalid Service Request\n")); return; } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Request from Distributable Thread\n")); RTScheduling::Current::IdType_var guid_var; @@ -308,7 +308,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr if (guid_var->length () == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "The scheduler MUST retreive and return the " "GUID from the service context\n")); return; @@ -325,7 +325,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr guid.length ()); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "The Guid is %d\n", id)); @@ -360,7 +360,7 @@ void Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Server_Interceptor::send_reply\n")); TAO_RTScheduler_Current_i *current = 0; @@ -378,7 +378,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) return; } - else ACE_DEBUG ((LM_DEBUG, + else TAOLIB_DEBUG ((LM_DEBUG, "Thread Not Cancelled\n")); @@ -399,7 +399,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) tss->rtscheduler_previous_current_impl_ = 0; } - else ACE_DEBUG ((LM_DEBUG, + else TAOLIB_DEBUG ((LM_DEBUG, "Send Reply Current is 0\n")); } @@ -407,7 +407,7 @@ void Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Server_Interceptor::send_exception\n")); TAO_RTScheduler_Current_i *current = 0; @@ -430,7 +430,7 @@ void Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Server_Interceptor::send_other\n")); TAO_RTScheduler_Current_i *current = 0; diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index 2b8e814914c..4a9e04ee050 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -51,7 +51,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev, if (TAO_debug_level > 2) { //FUZZ: disable check_for_lack_ACE_OS - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Waiting in the Reactor for ") ACE_TEXT ("connection completion - wait ()\n"))); //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index 38b1346fc52..ae97851cf2c 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -74,7 +74,7 @@ namespace TAO { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Remote_Invocation::init_target_spec, ") ACE_TEXT ("Error in finding index for ") @@ -192,7 +192,7 @@ namespace TAO if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Remote_Invocation::send_message, ") ACE_TEXT ("failure while sending message\n"))); diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 06ecdc7f706..12019966ad6 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -53,7 +53,7 @@ TAO_Resume_Handle::handle_input_return_value_hook (int& return_value) if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " "overriding return value of 1 with retval = %d\n", return_value)); @@ -69,7 +69,7 @@ TAO_Resume_Handle::handle_input_return_value_hook (int& return_value) if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " "handle_input returning -1, so handle is not resumed.\n")); } diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp index a2b952a20d6..b7fc77c053d 100644 --- a/TAO/tao/Storable_File_Guard.cpp +++ b/TAO/tao/Storable_File_Guard.cpp @@ -13,6 +13,7 @@ #include "tao/Storable_Base.h" #include "tao/SystemException.h" +#include "tao/debug.h" TAO::Storable_File_Guard:: Storable_File_Guard (bool redundant, bool use_backup) @@ -228,7 +229,7 @@ TAO::Storable_File_Guard::load () { // Failed to load from primary. ACE_CString state_str = Storable_Base::state_as_string (ex.get_state()); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) ERROR: State %s ") ACE_TEXT ("encountered reading persistent ") ACE_TEXT ("state from file\n%s\n"), @@ -242,7 +243,7 @@ TAO::Storable_File_Guard::load () if (!result) { - ACE_ERROR ((LM_INFO, + TAOLIB_ERROR ((LM_INFO, ACE_TEXT ("TAO: (%P|%t) Attempting to restore ") ACE_TEXT ("from backup\n"))); @@ -252,18 +253,18 @@ TAO::Storable_File_Guard::load () } catch (const Storable_Read_Exception) { // Still having trouble reading from the file. Time to bail. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) ERROR: Unable to restore ") ACE_TEXT ("the state from backup.\n"))); throw; } - ACE_ERROR ((LM_INFO, + TAOLIB_ERROR ((LM_INFO, ACE_TEXT ("TAO: (%P|%t) The state was restored ") ACE_TEXT ("from backup.\n"))); } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) ERROR: Could not read ") ACE_TEXT ("backup file\n"))); throw; diff --git a/TAO/tao/Storable_FlatFileStream.cpp b/TAO/tao/Storable_FlatFileStream.cpp index 80325c112e0..f59d047ebe3 100644 --- a/TAO/tao/Storable_FlatFileStream.cpp +++ b/TAO/tao/Storable_FlatFileStream.cpp @@ -17,6 +17,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_stat.h" #include "ace/Numeric_Limits.h" +#include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -95,12 +96,12 @@ namespace else if (!some_read) { // Nothing was read - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) ERROR: could not read from file\n"))); if (ferror (f1)) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "%p\n", "fread error")); } @@ -167,14 +168,14 @@ TAO::Storable_FlatFileStream::open() #ifndef ACE_WIN32 if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR (file_.c_str()), 0666) != 0 ) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #else if( (filelock_.handle_= ACE_OS::open (file_.c_str(), flags, 0)) == ACE_INVALID_HANDLE ) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), ACE_ERRNO_GET, ACE_OS::strerror(ACE_ERRNO_GET)), @@ -182,7 +183,7 @@ TAO::Storable_FlatFileStream::open() #endif this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR (fdmode)); if (this->fl_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "Cannot fdopen file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), ACE_ERRNO_GET, ACE_OS::strerror(ACE_ERRNO_GET)), @@ -215,7 +216,7 @@ TAO::Storable_FlatFileStream::flock (int whence, int start, int len) if( ACE_OS::strcmp(mode_.c_str(), "r") == 0 ) { if (ACE_OS::flock_rdlock(&filelock_, whence, start, len) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Storable_FlatFileStream::flock, ") ACE_TEXT ("Error trying to get a read lock for file %s\n"), @@ -226,7 +227,7 @@ TAO::Storable_FlatFileStream::flock (int whence, int start, int len) else { if (ACE_OS::flock_wrlock(&filelock_, whence, start, len) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Storable_FlatFileStream::flock, ") ACE_TEXT ("Error trying to get a write lock for file %s\n"), @@ -247,7 +248,7 @@ TAO::Storable_FlatFileStream::funlock (int whence, int start, int len) ACE_UNUSED_ARG (len); #else if (ACE_OS::flock_unlock(&filelock_, whence, start, len) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Storable_FlatFileStream::funlock, ") ACE_TEXT ("Error trying to unlock file %s\n"), @@ -263,7 +264,7 @@ TAO::Storable_FlatFileStream::last_changed(void) ACE_stat st; if (ACE_OS::fstat(filelock_.handle_, &st) != 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Storable_FlatFileStream::last_changed, ") ACE_TEXT ("Error getting file information\n"))); @@ -420,7 +421,7 @@ TAO::Storable_FlatFileStream::create_backup () int result = file_copy(this->fl_, backup); if (result != 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) ERROR: Unable to create backup ") ACE_TEXT ("of file\n%s\n"), file_.c_str ())); } diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp index d2daaafcd66..6648e571ed0 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp @@ -236,7 +236,7 @@ TAO_COIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) COIOP_Profile::decode - v%d.%d\n"), major, minor)); @@ -251,7 +251,7 @@ TAO_COIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO_COIOP_Acceptor::object_key - ") ACE_TEXT ("error while decoding host/port"))); } @@ -314,7 +314,7 @@ TAO_COIOP_Acceptor::parse_options (const char *str) if (end == begin) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length COIOP option.\n")), -1); } @@ -326,7 +326,7 @@ TAO_COIOP_Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) COIOP option <%C> is ") ACE_TEXT ("missing a value.\n"), opt.c_str ()), @@ -338,21 +338,21 @@ TAO_COIOP_Acceptor::parse_options (const char *str) begin = end + 1; if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length COIOP ") ACE_TEXT ("option name.\n")), -1); if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid COIOP endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n")), -1); } else { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid COIOP option: <%C>\n"), name.c_str ()), -1); diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp index e14bd8e9794..28c31505e0d 100644 --- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp @@ -56,7 +56,7 @@ TAO_COIOP_Connection_Handler::~TAO_COIOP_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - COIOP_Connection_Handler::") ACE_TEXT("~COIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp index b2c075c2426..e45c29db741 100644 --- a/TAO/tao/Strategies/COIOP_Profile.cpp +++ b/TAO/tao/Strategies/COIOP_Profile.cpp @@ -78,7 +78,7 @@ TAO_COIOP_Profile::decode_profile (TAO_InputCDR& cdr) if (cdr.read_string (uuid.out ()) == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) COIOP_Profile::decode - ") ACE_TEXT ("error while uuid"))); return -1; @@ -264,7 +264,7 @@ TAO_COIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO - COIOP_Profile::create_profile_body " "no object key marshalled\n")); } diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index fbcd50fe5df..3fb43c512f3 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -251,7 +251,7 @@ TAO_DIOP_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, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Acceptor::open, ") ACE_TEXT ("hostname already set\n\n")), @@ -303,7 +303,7 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core, (addr.get_type () != AF_INET6 || addr.is_ipv4_mapped_ipv6 ())) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Acceptor::open, ") ACE_TEXT ("non-IPv6 endpoints not allowed when ") @@ -314,7 +314,7 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core, if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Acceptor::open, specified host=%C:%d\n"), (specified_hostname.length () == 0 ? "<null>" : specified_hostname.c_str ()), @@ -361,7 +361,7 @@ TAO_DIOP_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, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Acceptor::open_default, ") ACE_TEXT ("hostname already set\n\n")), @@ -428,7 +428,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, if (this->connection_handler_->peer ().get_local_addr (address) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DIOP_Acceptor::open_i, ") ACE_TEXT ("%p"), ACE_TEXT ("cannot get local addr\n\n"))); @@ -449,7 +449,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, { for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Acceptor::open_i, ") ACE_TEXT ("listening on: <%C:%u>\n"), this->hosts_[i], @@ -539,7 +539,7 @@ TAO_DIOP_Acceptor::parse_address (const char *address, if (cp_pos == 0) { // No valid IPv6 address specified. - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Acceptor::open, ") ACE_TEXT ("invalid IPv6 decimal address specified\n\n")), @@ -675,7 +675,7 @@ TAO_DIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr, if (tmp == 0 || result != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Acceptor::dotted_decimal_address, ") ACE_TEXT ("%p\n\n"), @@ -711,7 +711,7 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - Unable to probe network ") ACE_TEXT ("interfaces. Using default."))); } @@ -823,7 +823,7 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type) if (this->endpoint_count_ == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - DIOP_Acceptor::probe_interfaces, ") ACE_TEXT("found no usable addresses, def_type = %d\n"), def_type)); @@ -924,7 +924,7 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Profile::object_key, v%d.%d\n"), major, minor)); @@ -941,7 +941,7 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Acceptor::object_key, ") ACE_TEXT ("error while decoding host/port"))); } @@ -1004,7 +1004,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) if (end == begin) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Zero length DIOP option.\n")), -1); } @@ -1016,7 +1016,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - DIOP option <%C> is ") ACE_TEXT ("missing a value.\n"), opt.c_str ()), @@ -1028,21 +1028,21 @@ TAO_DIOP_Acceptor::parse_options (const char *str) begin = end + 1; if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Zero length DIOP ") ACE_TEXT ("option name.\n")), -1); if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Invalid DIOP endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n")), -1); } else { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Invalid DIOP option: <%C>\n"), name.c_str ()), -1); diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 6421ec82b35..12ae11fbeb9 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -58,7 +58,7 @@ TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - DIOP_Connection_Handler::") ACE_TEXT ("~DIOP_Connection_Handler, ") ACE_TEXT ("release_os_resources() failed %m\n"))); @@ -178,7 +178,7 @@ TAO_DIOP_Connection_Handler::open (void*) { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - DIOP_Connection_Handler::open, ") ACE_TEXT("couldn't set hop limit\n\n"))); } @@ -188,7 +188,7 @@ TAO_DIOP_Connection_Handler::open (void*) if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - DIOP_Connection_Handler::open, ") ACE_TEXT("listening on: <%C:%u>\n"), this->local_addr_.get_host_name (), @@ -248,7 +248,7 @@ TAO_DIOP_Connection_Handler::open_server (void) if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - DIOP_Connection_Handler::open_server, ") ACE_TEXT("listening on %C:%d\n"), this->local_addr_.get_host_name (), @@ -367,7 +367,7 @@ TAO_DIOP_Connection_Handler::set_tos (int tos) { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - DIOP_Connection_Handler::" "set_dscp_codepoint -> IPV6_TCLASS not supported yet\n")); } @@ -388,7 +388,7 @@ TAO_DIOP_Connection_Handler::set_tos (int tos) if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - DIOP_Connection_Handler::" "set_dscp_codepoint, dscp: %x; result: %d; %C\n", tos, diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 612cbe8da62..c09033cb43f 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -72,7 +72,7 @@ TAO_DIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -112,7 +112,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, (void) remote_address.addr_to_string (remote_as_string, sizeof remote_as_string); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - DIOP_Connection_Handler::open, ") ACE_TEXT ("invalid connection to IPv4 mapped IPv6 interface <%s>!\n"), remote_as_string)); @@ -152,7 +152,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - DIOP_Connector::make_connection, ") ACE_TEXT ("could not make a new connection\n"))); } @@ -161,7 +161,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, } if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Connector::connect, ") ACE_TEXT ("new connection on HANDLE %d\n"), svc_handler->peer ().get_handle ())); @@ -176,7 +176,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, // Give users a clue to the problem. if (TAO_debug_level > 3) - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - DIOP_Connector::make_connection, ") ACE_TEXT ("connection to <%C:%u> failed (%p)\n"), diop_endpoint->host (), @@ -198,7 +198,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - DIOP_Connector::make_connection, ") ACE_TEXT ("could not add the new connection to cache\n"))); } diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index f72a0d6f009..711c9c93338 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -102,7 +102,7 @@ TAO_DIOP_Endpoint::set (const ACE_INET_Addr &addr, { if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Endpoint::set, ") ACE_TEXT ("%p\n"), ACE_TEXT ("cannot determine hostname"))); @@ -112,7 +112,7 @@ TAO_DIOP_Endpoint::set (const ACE_INET_Addr &addr, if (tmp == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Endpoint::set, ") ACE_TEXT ("%p\n"), diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 2f5fc3c19b1..138be0fe703 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -96,7 +96,7 @@ TAO_DIOP_Profile::decode_profile (TAO_InputCDR& cdr) || cdr.read_ushort (this->endpoint_.port_) == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Profile::decode_profile, ") ACE_TEXT ("error while decoding host/port\n"))); return -1; @@ -152,7 +152,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior) // No valid IPv6 address specified. if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("\nTAO (%P|%t) - DIOP_Profile::parse_string_i, ") ACE_TEXT ("invalid IPv6 decimal address specified.\n"))); } @@ -178,7 +178,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("\nTAO (%P|%t) DIOP_Profile: ") ACE_TEXT ("Host address may be omited only when no port has been specified.\n"))); } @@ -262,7 +262,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior) // initialized. Just throw an exception. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("DIOP_Profile::parse_string_i, ") ACE_TEXT ("%p\n\n"), @@ -489,7 +489,7 @@ TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - DIOP_Profile::create_profile_body, " "no object key marshalled\n")); } diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index d054252f6ca..ba4f63f3355 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -79,7 +79,7 @@ TAO_DIOP_Transport::recv (char *buf, if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - DIOP_Transport::recv, received %d bytes from %C:%d %d\n", n, from_addr.get_host_name (), @@ -91,7 +91,7 @@ TAO_DIOP_Transport::recv (char *buf, // Now the message has been read if (n == -1 && TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Transport::recv, %p\n"), ACE_TEXT ("TAO - read message failure ") ACE_TEXT ("recv ()\n"))); @@ -272,7 +272,7 @@ TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream, if (n == -1) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DIOP_Transport::send_message, ") ACE_TEXT ("closing transport %d after fault %p\n"), this->id (), diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index d2ddba7e29c..8a889701104 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -25,7 +25,7 @@ TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv; if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector: ") ACE_TEXT ("Initializing timeout hook tv = %d sec, %d usec\n"), tv.sec(), tv.usec())); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 9d3b6ea28ed..f4dac0ef5ae 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -223,7 +223,7 @@ TAO_SCIOP_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, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("SCIOP_Acceptor::open, ") ACE_TEXT ("hostname already set\n\n")), @@ -281,7 +281,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, const char *port_loc = port_separator_loc; ++port_loc; if (port_loc == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("SCIOP_Acceptor::open - ") ACE_TEXT ("no port number after the ") @@ -321,7 +321,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Check that at least one hostname was obtained. if (hostnames.size() < 1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("SCIOP_Acceptor::open - ") ACE_TEXT ("no hostnames in string \"%C\"\n"), @@ -415,7 +415,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Overriding address in IOR with %C\n"), this->hostname_in_ior_)); } @@ -460,7 +460,7 @@ TAO_SCIOP_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, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("SCIOP_Acceptor::open_default - ") ACE_TEXT ("hostname already set\n\n")), @@ -516,7 +516,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, this->concurrency_strategy_) == -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) SCIOP_Acceptor::open_i ") ACE_TEXT ("- %p\n\n"), ACE_TEXT ("cannot open acceptor"))); @@ -537,7 +537,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, for (ACE_UINT32 p = requested_port; p <= last_port; p++) { if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SCIOP_Acceptor::open_i() ") ACE_TEXT ("trying to listen on port %d\n"), p)); @@ -558,7 +558,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, if (! found_a_port) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) SCIOP_Acceptor::open_i ") ACE_TEXT ("cannot open acceptor in port range (%d,%d)") ACE_TEXT ("- %p\n\n"), @@ -575,7 +575,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, { // @@ Should this be a catastrophic error??? if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) SCIOP_Acceptor::open_i ") ACE_TEXT ("- %p\n\n"), ACE_TEXT ("cannot get local addr"))); @@ -599,7 +599,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, { for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%C:%u>\n"), this->hosts_[i], @@ -679,7 +679,7 @@ TAO_SCIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr, if (tmp == 0 || result != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SCIOP_Acceptor::dotted_decimal_address ") ACE_TEXT ("- %p\n\n"), @@ -715,7 +715,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) Unable to probe network ") ACE_TEXT ("interfaces. Using default.\n"))); } @@ -773,7 +773,7 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Overriding address in IOR with %C\n"), this->hostname_in_ior_)); } @@ -829,7 +829,7 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames, // Set the size of the array to the number of hostnames if (hostnames_out.size(num_hostnames) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Could not allocate storage ") ACE_TEXT ("for %d hostnames in SCIOP endpoint\n"), num_hostnames), @@ -886,7 +886,7 @@ TAO_SCIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SCIOP_Profile::decode - v%d.%d\n"), major, minor)); @@ -903,7 +903,7 @@ TAO_SCIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) TAO_SCIOP_Acceptor::object_key - ") ACE_TEXT ("error while decoding host/port"))); } @@ -966,7 +966,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) end = len; if (end == begin) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length SCIOP option.\n")), -1); else if (end != ACE_CString::npos) @@ -977,7 +977,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SCIOP option <%C> is ") ACE_TEXT ("missing a value.\n"), opt.c_str ()), @@ -987,14 +987,14 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) ACE_CString value = opt.substring (slot + 1); if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length SCIOP ") ACE_TEXT ("option name.\n")), -1); if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SCIOP endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n")), -1); @@ -1004,7 +1004,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) int range = static_cast<int> (ACE_OS::atoi (value.c_str ())); // @@ What's the lower bound on the range? zero, or one? if (range < 1 || range > ACE_MAX_DEFAULT_PORT) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SCIOP endpoint ") ACE_TEXT ("portspan: <%C>\n") ACE_TEXT ("Valid range 1 -- %d\n"), @@ -1018,7 +1018,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) this->hostname_in_ior_ = value.rep (); } else - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SCIOP option: <%C>\n"), name.c_str ()), -1); diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index c79fc982932..66e43ea20bd 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -68,7 +68,7 @@ TAO_SCIOP_Connection_Handler::~TAO_SCIOP_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - SCIOP_Connection_Handler::") ACE_TEXT("~scIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); @@ -178,7 +178,7 @@ TAO_SCIOP_Connection_Handler::open (void*) { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - SCIOP_Connection_Handler::open, ") ACE_TEXT("couldn't set hop limit\n\n"))); } @@ -204,7 +204,7 @@ TAO_SCIOP_Connection_Handler::open (void*) return -1; if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO(%P|%t) - SCIOP_Connection_Handler::open, ") ACE_TEXT("The local addr is (%C)\n"), local_addr.get_host_addr ())); @@ -221,7 +221,7 @@ TAO_SCIOP_Connection_Handler::open (void*) sizeof(remote_as_string)); (void) local_addr.addr_to_string (local_as_string, sizeof(local_as_string)); - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO(%P|%t) - TAO_SCIOP_Connection_Handler::open, ") ACE_TEXT("Holy Cow! The remote addr and ") ACE_TEXT("local addr are identical (%s == %s)\n"), @@ -238,7 +238,7 @@ TAO_SCIOP_Connection_Handler::open (void*) if (remote_addr.addr_to_string (client, sizeof (client)) == -1) return -1; - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SCIOP_Connection_Handler::open, SCIOP ") ACE_TEXT ("connection to peer <%s> on %d\n"), client, this->peer ().get_handle ())); @@ -371,7 +371,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%C]\n"), listen_point.port, listen_point.host.in ())); @@ -412,7 +412,7 @@ TAO_SCIOP_Connection_Handler::set_tos (int tos) if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - SCIOP_Connection_Handler::") ACE_TEXT("set_dscp_codepoint -> dscp: %x; result: %d; %C\n"), tos, diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 8ae059b136f..df61f931f78 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -97,7 +97,7 @@ TAO_SCIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SCIOP connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -152,7 +152,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, sciop_endpoint->object_addr (); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - SCIOP_Connector::make_connection_i, ") ACE_TEXT("to <%C:%d> which should %s\n"), sciop_endpoint->host(), @@ -210,7 +210,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, timeout)) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector::" + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector::" "make_connection_i, " "wait for completion failed\n")); } @@ -228,7 +228,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, // Give users a clue to the problem. if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - SCIOP_Connector::make_connection_i, ") ACE_TEXT("connection to <%C:%d> failed (%p)\n"), sciop_endpoint->host (), sciop_endpoint->port (), @@ -252,7 +252,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, // At this point, the connection has be successfully connected. // #REFCOUNT# is one. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " "new %C connection to <%C:%d> on Transport[%d]\n", transport->is_connected() ? "connected" : "not connected", @@ -272,7 +272,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " "could not add the new connection to cache\n")); } @@ -300,7 +300,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, (void) transport->close_connection (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Connector [%d]::make_connection_i, " "could not register the transport " "in the reactor.\n", diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 072c3f27aa2..91c43e680b7 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -109,7 +109,7 @@ TAO_SCIOP_Endpoint::set (const ACE_INET_Addr &addr, if (tmp == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SCIOP_Endpoint::set ") ACE_TEXT ("- %p\n\n"), @@ -310,7 +310,7 @@ TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) CORBA::string_dup (path.c_str ()); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "(%P|%t) Adding path [%C] " " as preferred path for [%C]\n", path.c_str (), this->host_.in ())); diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 83899b63a7e..ad40eb2aae2 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -91,7 +91,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr) if (cdr.read_ushort (this->endpoint_.port_) == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SCIOP_Profile::decode - ") ACE_TEXT ("error while decoding host/port"))); return -1; @@ -207,7 +207,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior // initialized. Just throw an exception. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SCIOP_Profile::parse_string ") ACE_TEXT ("- %p\n\n"), @@ -391,7 +391,7 @@ TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO - IIOP_Profile::create_profile_body " "no object key marshalled\n")); } diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 9556063e708..ab959ab26ed 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -75,7 +75,7 @@ TAO_SCIOP_Transport::recv (char *buf, TAO_debug_level > 4 && errno != ETIME) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SCIOP_Transport[%d]::recv, ") ACE_TEXT ("read failure - %m\n"), this->id ())); @@ -149,7 +149,7 @@ TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream, if (n == -1) { if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SCIOP_Transport[%d]::send_message, ") ACE_TEXT (" write failure - %m\n"), this->id ())); @@ -201,7 +201,7 @@ TAO_SCIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) if (this->get_listen_point (listen_point_list, *acceptor) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - SCIOP_Transport::set_bidir_info, " "error getting listen_point\n")); @@ -244,7 +244,7 @@ TAO_SCIOP_Transport::get_listen_point ( if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Could not resolve local ") ACE_TEXT ("host address in ") ACE_TEXT ("get_listen_point()\n")), @@ -261,7 +261,7 @@ TAO_SCIOP_Transport::get_listen_point ( local_addr, local_interface.out ()) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Could not resolve local host") ACE_TEXT (" name\n")), -1); diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 4e5071e5371..22d9c7f40e3 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -259,7 +259,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) this->concurrency_strategy_) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, %p\n\n"), ACE_TEXT ("cannot open acceptor"))); return -1; @@ -275,7 +275,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) if (this->base_acceptor_.acceptor ().get_local_addr (this->address_) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, %p\n\n"), ACE_TEXT ("cannot get local addr\n"))); return -1; @@ -293,7 +293,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) if (tmp == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("SHMIOP_Acceptor::open_i, ") ACE_TEXT ("- %p, "), @@ -311,7 +311,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) if (this->address_.get_host_name (tmp_host, sizeof tmp_host) != 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, - %p\n"), ACE_TEXT ("cannot cache hostname\n"))); return -1; @@ -326,7 +326,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ") ACE_TEXT ("listening on : <%C:%u>\n"), this->host_.c_str (), @@ -365,7 +365,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Profile::decode, v%d.%d\n"), major, minor)); @@ -382,7 +382,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::object_key, ") ACE_TEXT ("error while decoding host/port\n"))); } @@ -454,7 +454,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) end = len; if (end == begin) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length SHMIOP option.\n")), -1); else if (end != ACE_CString::npos) @@ -465,7 +465,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SHMIOP option <%C> is ") ACE_TEXT ("missing a value.\n"), opt.c_str ()), @@ -477,20 +477,20 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) begin = end + 1; if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Zero length SHMIOP ") ACE_TEXT ("option name.\n")), -1); if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n")), -1); } else - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%C>\n"), name.c_str ()), -1); diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 51ea5dd0095..2a67896783f 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -56,7 +56,7 @@ TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - SHMIOP_Connection_Handler::") ACE_TEXT("~SHMIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); @@ -143,7 +143,7 @@ TAO_SHMIOP_Connection_Handler::open (void*) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP connection from client") ACE_TEXT ("<%s> on %d\n"), local_as_string, this->peer ().get_handle ())); diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index f8f79841c20..8d3246b590b 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -102,7 +102,7 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SHMIOP connection failed.\n") ACE_TEXT ("TAO (%P|%t) This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -122,7 +122,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_Time_Value *timeout) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") ACE_TEXT ("looking for SHMIOP connection.\n"))); @@ -136,7 +136,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, shmiop_endpoint->object_addr (); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "making a new connection to <%C:%d>\n", shmiop_endpoint->host (), @@ -164,7 +164,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, // Give users a clue to the problem. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") ACE_TEXT ("connection to <%C:%u> failed (%p)\n"), shmiop_endpoint->host (), @@ -191,7 +191,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, // At this point, the connection has be successfully connected. // #REFCOUNT# is one. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "new %C connection to <%C:%d> on Transport[%d]\n", transport->is_connected() ? "connected" : "not connected", @@ -212,7 +212,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") ACE_TEXT("could not add the new connection to cache\n"))); } @@ -240,7 +240,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, (void) transport->close_connection (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - SHMIOP_Connector [%d]::make_connection, " "could not register the transport in the reactor.\n", transport->id ())); diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp index 2e7fbb565db..d17e5622a9a 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp @@ -98,7 +98,7 @@ TAO_SHMIOP_Endpoint::set (const ACE_INET_Addr &addr, { if (use_dotted_decimal_addresses == 0 && TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Endpoint::set, ") ACE_TEXT ("- %p cannot determine hostname\n"))); } @@ -107,7 +107,7 @@ TAO_SHMIOP_Endpoint::set (const ACE_INET_Addr &addr, if (tmp == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("SHMIOP_Endpoint::set ") ACE_TEXT ("- %p\n"), diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index e13b03ac3c3..77a8fd74df5 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -106,7 +106,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::decode - ") ACE_TEXT ("error while decoding host/port"))); } @@ -213,7 +213,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string if (tmp == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nTAO (%P|%t) ") ACE_TEXT ("SHMIOP_Profile::parse_string ") ACE_TEXT ("- %p\n\n"), @@ -240,7 +240,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::parse_string () -\n") ACE_TEXT ("TAO (%P|%t) ACE_INET_Addr::set () failed"))); } @@ -387,7 +387,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO - UIOP_Profile::create_profile_body " "no object key marshalled\n")); } diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 3428412db55..4a9ac59a84e 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -92,7 +92,7 @@ TAO_SHMIOP_Transport::recv (char *buf, { if (TAO_debug_level > 3 && errno != ETIME) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Transport::recv, %p\n"), ACE_TEXT ("TAO - read message failure ") ACE_TEXT ("recv_i ()\n"))); @@ -111,7 +111,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input\n", this->id ())); } @@ -214,7 +214,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input, " "error growing message buffer\n", this->id () )); @@ -319,7 +319,7 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream, if (n == -1) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) closing transport %d after fault %p\n"), this->id (), ACE_TEXT ("send_message ()\n"))); diff --git a/TAO/tao/Strategies/Strategies_ORBInitializer.cpp b/TAO/tao/Strategies/Strategies_ORBInitializer.cpp index 05913f2a6ac..326deb6c136 100644 --- a/TAO/tao/Strategies/Strategies_ORBInitializer.cpp +++ b/TAO/tao/Strategies/Strategies_ORBInitializer.cpp @@ -18,7 +18,7 @@ TAO_Strategies_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr in if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO_Strategies_ORBInitializer::pre_init:\n" "(%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index b6c0aecd997..ceb1eb92359 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -279,7 +279,7 @@ TAO_UIOP_Acceptor::open_i (const char *rendezvous, // rendezvous point here if (TAO_debug_level > 5) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "\nTAO (%P|%t) - UIOP_Acceptor::open_i - " "listening on: <%C>\n", addr.get_path_name ())); @@ -329,7 +329,7 @@ TAO_UIOP_Acceptor::rendezvous_point (ACE_UNIX_Addr &addr, // most UNIX domain socket rendezvous points can only be less than // 108 characters long. if (length < ACE_OS::strlen (rendezvous)) - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, "TAO (%P|%t) - UIOP rendezvous point was truncated to <%s>\n" "since it was longer than %d characters long.\n", addr.get_path_name (), @@ -362,7 +362,7 @@ TAO_UIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIOP_Profile::decode - v%d.%d\n"), major, minor)); @@ -376,7 +376,7 @@ TAO_UIOP_Acceptor::object_key (IOP::TaggedProfile &profile, // Get rendezvous_point if (cdr.read_string (rendezvous) == 0) { - ACE_ERROR ((LM_ERROR, "error decoding UIOP rendezvous_point")); + TAOLIB_ERROR ((LM_ERROR, "error decoding UIOP rendezvous_point")); return -1; } @@ -437,7 +437,7 @@ TAO_UIOP_Acceptor::parse_options (const char *str) end = len; if (end == begin) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) Zero length UIOP option.\n"), -1); else if (end != ACE_CString::npos) @@ -449,7 +449,7 @@ TAO_UIOP_Acceptor::parse_options (const char *str) if (slot == len - 1 || slot == ACE_CString::npos) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - UIOP option <%C> is " "missing a value.\n", opt.c_str ()), @@ -461,20 +461,20 @@ TAO_UIOP_Acceptor::parse_options (const char *str) begin = end + 1; if (name.length () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - Zero length UIOP " "option name.\n"), -1); if (name == "priority") { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Invalid UIOP endpoint format: ") ACE_TEXT ("endpoint priorities no longer supported.\n")), -1); } else - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - Invalid UIOP option: <%C>\n", name.c_str ()), -1); diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 2b46582703c..ec7d6e7e064 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -54,7 +54,7 @@ TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler (void) if (result == -1 && TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - UIOP_Connection_Handler::") ACE_TEXT("~UIOP_Connection_Handler, ") ACE_TEXT("release_os_resources() failed %m\n"))); @@ -121,7 +121,7 @@ TAO_UIOP_Connection_Handler::open (void*) return -1; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) UIOP connection to server ") ACE_TEXT ("<%C> on %d\n"), addr.get_path_name (), this->peer ().get_handle ())); diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index ed02a463ef0..00b74247ff9 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -82,7 +82,7 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len) if (separator == 0) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_UIOP_CONNECTOR::corbaloc_scan error: " "explicit terminating charactor '|' is missing from <%C>", str)); @@ -111,7 +111,7 @@ TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIOP failure.\n") ACE_TEXT ("TAO (%P|%t) - This is most likely ") ACE_TEXT ("due to a hostname lookup ") @@ -130,7 +130,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *max_wait_time) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIUP_Connector::make_connection, ") ACE_TEXT ("looking for UIOP connection.\n"))); @@ -144,7 +144,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, uiop_endpoint->object_addr (); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIUP_Connector::make_connection, ") ACE_TEXT ("making a new connection\n"))); @@ -186,7 +186,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, max_wait_time)) { if (TAO_debug_level > 2) - ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector::" + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector::" "make_connection, " "wait for completion failed\n")); } @@ -203,7 +203,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, { // Give users a clue to the problem. if (TAO_debug_level > 3) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector::make_connection, " "connection to <%C> failed (%p)\n", uiop_endpoint->rendezvous_point (), @@ -225,7 +225,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, // At this point, the connection has be successfully created // connected or not connected, but we have a connection. if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - UIOP_Connector::make_connection, " "new %C connection to <%C> on Transport[%d]\n", transport->is_connected() ? "connected" : "not connected", @@ -244,7 +244,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - UIOP_Connector::make_connection, ") ACE_TEXT ("could not add the new connection to Cache\n"))); } @@ -272,7 +272,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, (void) transport->close_connection (); if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - UIOP_Connector [%d]::make_connection, " "could not register the transport " "in the reactor.\n", diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index e74fcd28d0b..e3646f463ea 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -286,7 +286,7 @@ TAO_UIOP_Profile::decode_profile (TAO_InputCDR& cdr) // Get rendezvous_point if (cdr.read_string (rendezvous) == 0) { - ACE_DEBUG ((LM_DEBUG, "error decoding UIOP rendezvous_point")); + TAOLIB_DEBUG ((LM_DEBUG, "error decoding UIOP rendezvous_point")); return -1; } @@ -300,7 +300,7 @@ TAO_UIOP_Profile::decode_profile (TAO_InputCDR& cdr) // exception. if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) UIOP_Profile::decode - ") ACE_TEXT ("ACE_UNIX_Addr::set() failed\n"))); } @@ -330,7 +330,7 @@ TAO_UIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const encap << this->ref_object_key_->object_key (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "(%P|%t) TAO - UIOP_Profile::create_profile_body " "no object key marshalled\n")); } @@ -432,7 +432,7 @@ TAO_UIOP_Profile::decode_endpoints (void) // exception. if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) UIOP_Profile::decode_endpoints - ") ACE_TEXT ("ACE_UNIX_Addr::set() failed\n"))); } diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 3ce9ff785c5..09c633c870b 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -70,7 +70,7 @@ TAO_UIOP_Transport::recv (char *buf, TAO_debug_level > 4 && errno != ETIME) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - UIOP_Transport::recv, %p %p\n"), ACE_TEXT ("TAO - read message failure ") ACE_TEXT ("recv ()\n"))); @@ -141,7 +141,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream, if (n == -1) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) closing transport %d after fault %p\n"), this->id (), ACE_TEXT ("send_message ()\n"))); diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index a18de20b366..86cb0754aa0 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -103,7 +103,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) // are useless if (this->factory_disabled_) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n") ACE_TEXT ("Advanced Resource Factory is disabled\n"))); return 0; @@ -131,7 +131,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) { if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ORBReactorRegistry")) == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("TAO_Advanced_Resource_Factory::init - ") ACE_TEXT("-ORBReactorRegistry no longer supported\n")), -1); @@ -140,7 +140,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorLock")))) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO_Advanced_Resource_Factory - obsolete -ORBReactorLock ") ACE_TEXT("option, please use -ORBReactorType\n"))); @@ -292,7 +292,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) // advantage of the LIFO strategy, select_mt hangs. if (this->threadqueue_type_ != TAO_THREAD_QUEUE_NOT_SET && this->reactor_type_ != TAO_REACTOR_TP) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Advanced_Resource_Factory: -ORBReactorThreadQueue ") ACE_TEXT ("option can only be used with -ORBReactorType ") ACE_TEXT ("tp.\n"))); @@ -389,7 +389,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ())); if ((*factory)->factory () == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to load ") ACE_TEXT("protocol <%C>, %m\n"), name.c_str ()), @@ -398,7 +398,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Loaded protocol <%C>\n"), name.c_str ())); } @@ -635,7 +635,7 @@ TAO_Advanced_Resource_Factory::create_purging_strategy (void) 0); break; default: - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("Unknown connection purging strategy ") ACE_TEXT("type was found.\n"))); @@ -669,7 +669,7 @@ TAO_Advanced_Resource_Factory::report_option_value_error ( const ACE_TCHAR* option_name, const ACE_TCHAR* option_value) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT("Advanced_Resource_Factory - unknown argument") ACE_TEXT(" <%s> for <%s>\n"), option_value, @@ -680,7 +680,7 @@ void TAO_Advanced_Resource_Factory::report_unsupported_error ( const ACE_TCHAR* option_name) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT("Advanced_Resource_Factory - <%s>") ACE_TEXT(" not supported on this platform\n"), option_name)); diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index b6bdbeaea36..6536a3328a9 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -57,7 +57,7 @@ TAO_Stub::TAO_Stub (const char *repository_id, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO: (%P|%t) TAO_Stub created with default ") ACE_TEXT ("ORB core\n"))); } @@ -118,7 +118,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, this->profile_lock_)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::add_forward_profiles, ") ACE_TEXT ("acquired profile lock this = 0x%x\n"), this)); @@ -170,7 +170,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index) -1)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::create_ior_info, acquired ") ACE_TEXT ("profile lock this = 0x%x\n"), this)); @@ -347,7 +347,7 @@ TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile) // it to disappear, so increase the reference count by one!! if (pfile && (pfile->_incr_refcnt () == 0)) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) unable to increment profile ref!\n")), 0); } @@ -540,7 +540,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) 0)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::marshal, acquired ") ACE_TEXT ("profile lock this = 0x%x\n"), this)); diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index 3e705e80dbe..f217ce10e9a 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -59,7 +59,7 @@ TAO_Stub::reset_profiles (void) this->profile_lock_)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::reset_profiles, acquired ") ACE_TEXT ("profile lock this = 0x%x\n"), this)); @@ -152,7 +152,7 @@ TAO_Stub::next_profile_i (void) ACE_MT (ACE_GUARD_RETURN (TAO_REVERSE_LOCK, ace_mon, reverse, 0)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::next_profile_i, ") ACE_TEXT ("released profile lock to reinitialize ") ACE_TEXT ("this = 0x%x\n"), @@ -164,7 +164,7 @@ TAO_Stub::next_profile_i (void) } if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::next_profile_i, ") ACE_TEXT ("reacquired profile lock on object ") ACE_TEXT ("this = 0x%x\n"), @@ -192,7 +192,7 @@ TAO_Stub::next_profile (void) 0)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::next_profile, acquired profile lock this = 0x%x\n"), this)); } return this->next_profile_i (); @@ -225,7 +225,7 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles) 0)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::base_profiles, acquired profile lock this = 0x%x\n"), this)); } @@ -251,7 +251,7 @@ TAO_Stub::next_profile_retry (void) 0)); if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Stub::next_profile_retry, acquired profile lock this = 0x%x\n"), this)); } diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 1429a1a678d..c04a0eda3e0 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -91,7 +91,7 @@ namespace TAO this->retry_state_->forward_on_exception_increment(FOE_TRANSIENT)) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("remote_twoway retrying on TRANSIENT ") ACE_TEXT ("exception\n"))); @@ -281,7 +281,7 @@ namespace TAO if (TAO_debug_level > 0 && max_wait_time) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply, ") ACE_TEXT ("timeout after recv is <%u> status <%d>\n"), max_wait_time->msec (), @@ -295,7 +295,7 @@ namespace TAO // time if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("wait_for_reply, ") ACE_TEXT ("recovering after an error\n"))); @@ -341,7 +341,7 @@ namespace TAO this->retry_state_->forward_on_reply_closed_increment ()) { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("wait_for_reply, forward profile on ") ACE_TEXT ("connection closed\n"))); @@ -426,7 +426,7 @@ namespace TAO { // permanent condition not given if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("check_reply_status: unexpected ") ACE_TEXT ("LOCATION_FORWARD_PERM reply\n"))); @@ -480,7 +480,7 @@ namespace TAO if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("location_forward being handled\n"))); } @@ -510,7 +510,7 @@ namespace TAO TAO_INVOKE_FAILURE); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_user_exception\n"))); @@ -530,7 +530,7 @@ namespace TAO if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_user_exception - ") ACE_TEXT ("raising exception %C\n"), @@ -554,7 +554,7 @@ namespace TAO Reply_Guard mon (this, TAO_INVOKE_FAILURE); if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_system_exception\n"))); @@ -642,7 +642,7 @@ namespace TAO mon.set_status (TAO_INVOKE_RESTART); if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_system_exception, profile forwarding ") ACE_TEXT ("on exception "), @@ -706,7 +706,7 @@ namespace TAO ex->completed (CORBA::CompletionStatus (completion)); if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_system_exception, about to raise\n"))); @@ -762,7 +762,7 @@ namespace TAO this->retry_state_->forward_on_exception_increment(FOE_TRANSIENT)) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Synch_Oneway_Invocation::") ACE_TEXT ("remote_oneway retrying on TRANSIENT ") ACE_TEXT ("exception\n"))); @@ -819,7 +819,7 @@ namespace TAO if (r->register_handler (eh, ACE_Event_Handler::READ_MASK) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Synch_Oneway_Invocation::") ACE_TEXT ("remote_oneway transport[%d] ") ACE_TEXT ("registration withreactor ") @@ -838,7 +838,7 @@ namespace TAO else { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Synch_Oneway_Invocation::") ACE_TEXT ("remote_oneway, queueing message\n"))); diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp index a9c571468fd..60d8afa23d7 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.cpp +++ b/TAO/tao/Synch_Reply_Dispatcher.cpp @@ -92,7 +92,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply ( { if (TAO_debug_level > 2) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply " "clone_from failed\n")); } diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 4969bcc967d..153f8c7db4b 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -216,7 +216,7 @@ CORBA::SystemException::_tao_minor_code (u_int location, int errno_value) void CORBA::SystemException::_tao_print_system_exception (FILE *) const { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) system exception, ID '%C'\n"), this->_info ().c_str ())); } @@ -945,7 +945,7 @@ CORBA::name ::_tao_type (void) const \ return adapter->_tao_type_ ## name (); \ else \ { \ - ACE_ERROR ((LM_ERROR, \ + TAOLIB_ERROR ((LM_ERROR, \ ACE_TEXT ("(%P|%t) %p\n"), \ ACE_TEXT ("Unable to find the ") \ ACE_TEXT ("AnyTypeCode Adapter instance"))); \ diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index aeb47f3d6c8..f52e81c49d4 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -248,7 +248,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Initializing the ") ACE_TEXT ("process-wide service context\n"))); } @@ -327,7 +327,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Failed to open process-") ACE_TEXT ("wide service configuration context\n"))); } @@ -336,7 +336,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) else { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Did not find default ") ACE_TEXT ("svc.conf\n"))); status = 0; @@ -348,7 +348,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) // one or more directives failed, but we don't know which if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - process-wide service ") ACE_TEXT ("configuration context had %d failed ") ACE_TEXT ("directives\n"), status)); @@ -356,19 +356,19 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) } if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Completed initializing the ") ACE_TEXT ("process-wide service context\n"))); if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default ORB services initialization begins\n"))); // Load more ORB-related services register_additional_services_i (theone); if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default ORB services initialization completed\n"))); // Notify all other threads that may be waiting, that the global @@ -397,7 +397,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, if (service_open_count == 1) { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Waiting for the default ") ACE_TEXT ("ORB to complete the global ") ACE_TEXT ("initialization\n"))); @@ -406,7 +406,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, TAO_Ubergestalt_Ready_Condition::instance ()->wait ()); if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - The default ") ACE_TEXT ("ORB must have completed the global ") ACE_TEXT ("initialization...\n"))); @@ -415,7 +415,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, else { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - We are%Cthe default ") ACE_TEXT ("ORB ...\n"), (service_open_count == 0) ? " " : " not ")); @@ -458,7 +458,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, int status = parse_global_args_i(argc, argv, global_svc_config_argv, false); if (status == -1 && TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Skipping the process-wide ") ACE_TEXT ("service configuration, service_open_count ") ACE_TEXT ("= %d, status = %d\n"), @@ -466,7 +466,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, status)); if (TAO_debug_level > 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Initializing the ") ACE_TEXT ("orb-specific services\n"))); @@ -490,7 +490,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, if (errno != ENOENT) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Failed to open ORB-specific ") ACE_TEXT ("service configuration\n"))); return -1; @@ -498,7 +498,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, else { if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Did not find default ") ACE_TEXT ("svc.conf\n"))); status = 0; @@ -510,7 +510,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, // one or more directives failed, but we don't know which if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ORB-specific service ") ACE_TEXT ("configuration context had %d failed ") ACE_TEXT ("directives\n"), status)); @@ -625,7 +625,7 @@ namespace { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ORB_Core: ") ACE_TEXT ("Unable to initialize ") ACE_TEXT ("Codeset Manager\n"))); @@ -837,7 +837,7 @@ namespace // the errno is set to ENOENT for some reason. errno = EINVAL; - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Error, unable to open file <%s>") ACE_TEXT (", referenced by -ORBSvcConf option\n"), current_arg), @@ -971,7 +971,7 @@ namespace TAO_debug_level = 1; } - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_debug_level == %d\n"), TAO_debug_level)); } diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 79f0a65900e..08095c8091d 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -281,7 +281,7 @@ TAO_ServerRequest::init_reply (void) if ((*this->outgoing_ << object_ptr) == 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ServerRequest::init_reply, ") ACE_TEXT ("TAO_GIOP_ServerRequest::marshal - ") ACE_TEXT ("marshal encoding forwarded objref failed\n"))); @@ -333,7 +333,7 @@ TAO_ServerRequest::send_no_exception_reply (void) { // No exception but some kind of error, yet a response // is required. - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_no_exception_reply, ") ACE_TEXT ("cannot send NO_EXCEPTION reply\n") @@ -360,7 +360,7 @@ TAO_ServerRequest::tao_send_reply (void) { // No exception but some kind of error, yet a response // is required. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply, ") ACE_TEXT ("cannot send reply\n"))); } @@ -430,7 +430,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) reply_params, ex) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::") ACE_TEXT ("tao_send_reply_exception, ") ACE_TEXT ("could not make exception reply\n"))); @@ -444,7 +444,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) this, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::") ACE_TEXT ("tao_send_reply_exception, ") ACE_TEXT ("could not send exception reply\n"))); @@ -452,7 +452,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) } catch (const ::CORBA::BAD_PARAM &bp_ex) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::") ACE_TEXT ("tao_send_reply_exception, ") ACE_TEXT ("could not marshal exception reply\n"))); @@ -467,7 +467,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex) // However, in this case, we cannot close the connection // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::tao_send_reply_exception, ") ACE_TEXT ("exception thrown ") ACE_TEXT ("but client is not waiting a response\n"))); @@ -530,7 +530,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) if (this->mesg_base_->generate_reply_header (*this->outgoing_, reply_params) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") ACE_TEXT ("could not make cached reply\n"))); @@ -543,7 +543,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) if (!this->outgoing_->good_bit ()) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") ACE_TEXT ("could not marshal reply\n"))); } @@ -556,7 +556,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) this, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") ACE_TEXT ("could not send cached reply\n"))); } diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp index 700087892bd..3698696ddab 100644 --- a/TAO/tao/TAO_Singleton.cpp +++ b/TAO/tao/TAO_Singleton.cpp @@ -15,7 +15,7 @@ #include "ace/Guard_T.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "tao/debug.h" #include "ace/os_include/os_typeinfo.h" #if !defined (__ACE_INLINE__) @@ -31,9 +31,9 @@ TAO_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("TAO_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %@"), + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %@"), TAO_Singleton<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + TAOLIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } @@ -128,9 +128,9 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("TAO_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %@"), + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %@"), TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + TAOLIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp index 18e2242501a..16a5c5e0a91 100644 --- a/TAO/tao/Tagged_Profile.cpp +++ b/TAO/tao/Tagged_Profile.cpp @@ -37,7 +37,7 @@ TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile) { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)TAO_Tagged_Profile\n"))); } diff --git a/TAO/tao/Time_Policy_Manager.cpp b/TAO/tao/Time_Policy_Manager.cpp index 012463b4301..47f73fa6d65 100644 --- a/TAO/tao/Time_Policy_Manager.cpp +++ b/TAO/tao/Time_Policy_Manager.cpp @@ -96,7 +96,7 @@ ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void) this->time_policy_name_.c_str ()); if (this->time_policy_strategy_ == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Time_Policy_Manager: ") ACE_TEXT ("FAILED to load time policy strategy '%C'\n"), this->time_policy_name_.c_str ())); @@ -105,7 +105,7 @@ ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void) if (TAO_debug_level > 1) { - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - TAO_Time_Policy_Manager: ") ACE_TEXT ("loaded time policy strategy '%C'\n"), this->time_policy_name_.c_str ())); diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp index 1a9d0161a60..b8cfe45001a 100644 --- a/TAO/tao/TkResource/TkResource_Factory.cpp +++ b/TAO/tao/TkResource/TkResource_Factory.cpp @@ -25,7 +25,7 @@ namespace TAO 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - ACE_TkReactor created\n")); } diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index b85f65966e1..6d385195fa6 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -54,7 +54,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, { ACE_GUARD (ACE_Log_Msg, ace_mon, *ACE_Log_Msg::instance ()); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("sending %d buffers\n"), id, location, iovcnt)); @@ -69,7 +69,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, iov_len = current_transfer; } - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("buffer %d/%d has %d bytes\n"), id, location, @@ -98,7 +98,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, len = 512; } - ACE_HEX_DUMP ((LM_DEBUG, + TAOLIB_HEX_DUMP ((LM_DEBUG, static_cast<char*> (iov[i].iov_base) + offset, len, header)); @@ -106,7 +106,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, current_transfer -= iov_len; } - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("end of data\n"), id, location)); @@ -199,7 +199,7 @@ TAO_Transport::~TAO_Transport (void) { if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::~Transport\n"), + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::~Transport\n"), this->id_ )); } @@ -339,7 +339,7 @@ TAO_Transport::register_if_necessary (void) // Registration failures. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_if_necessary, ") ACE_TEXT ("could not register the transport ") ACE_TEXT ("in the reactor.\n"), @@ -369,7 +369,7 @@ TAO_Transport::register_handler (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_handler\n"), this->id ())); } @@ -390,7 +390,7 @@ TAO_Transport::register_handler (void) if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_handler - ") ACE_TEXT ("registering event handler with reactor\n"), this->id ())); @@ -411,7 +411,7 @@ TAO_Transport::remove_handler (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::remove_handler\n"), this->id ())); } @@ -433,7 +433,7 @@ TAO_Transport::remove_handler (void) if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::remove_handler - ") ACE_TEXT ("removing event handler from reactor\n"), this->id ())); @@ -448,7 +448,7 @@ TAO_Transport::remove_handler (void) ACE_Event_Handler::DONT_CALL) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::remove_handler - ") ACE_TEXT ("reactor->remove_handler failed\n"), this->id ())); @@ -496,7 +496,7 @@ TAO_Transport::generate_locate_request ( { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::generate_locate_request, ") ACE_TEXT ("error while marshalling the LocateRequest header\n"), this->id ())); @@ -520,7 +520,7 @@ TAO_Transport::generate_request_header ( { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::generate_request_header, ") ACE_TEXT ("error while marshalling the Request header\n"), this->id())); @@ -549,7 +549,7 @@ TAO_Transport::purge_entry (void) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::purge_entry, ") ACE_TEXT ("entry is %@\n"), this->id (), this->cache_map_entry_)); @@ -569,7 +569,7 @@ TAO_Transport::make_idle (void) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"), this->id ())); } @@ -591,7 +591,7 @@ TAO_Transport::handle_output (TAO::Transport::Drain_Constraints const & dc) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output") ACE_TEXT (" - block_on_io=%d, timeout=%d.%06d\n"), this->id (), @@ -607,7 +607,7 @@ TAO_Transport::handle_output (TAO::Transport::Drain_Constraints const & dc) if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output, ") ACE_TEXT ("drain_queue returns %d/%d\n"), this->id (), @@ -626,7 +626,16 @@ TAO_Transport::format_queue_message (TAO_OutputCDR &stream, if (this->messaging_object ()->format_message (stream, stub, 0) != 0) return -1; - return this->queue_message_i (stream.begin (), max_wait_time); + if (this->queue_message_i (stream.begin (), max_wait_time) != 0) + return -1; + + // check the buffering constraints to see what must be done in post_open() + bool must_flush = false; + this->flush_in_post_open_ |= + this->check_buffering_constraints_i (stub, + must_flush); + + return 0; } int @@ -697,7 +706,7 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Transport[%d]::send_synchronous_message_i, ") ACE_TEXT ("timeout encountered before any bytes sent\n"), @@ -726,7 +735,7 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, synch_message.remove_from_list (this->head_, this->tail_); if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::") ACE_TEXT ("send_synchronous_message_i, ") ACE_TEXT ("error while scheduling flush - %m\n"), @@ -761,7 +770,7 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, ") ACE_TEXT ("error while sending message - %m\n"), this->id ())); @@ -793,7 +802,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb, if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_reply_message_i, ") ACE_TEXT ("preparing to add to queue before leaving\n"), this->id ())); @@ -819,7 +828,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb, { if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::send_reply_" + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::send_reply_" "message_i, dequeuing msg due to schedule_output " "failure\n", this->id ())); } @@ -874,7 +883,7 @@ TAO_Transport::schedule_output_i (void) { if (TAO_debug_level > 1) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Transport[%d]::schedule_output_i, ") ACE_TEXT ("no reactor,") @@ -896,7 +905,7 @@ TAO_Transport::schedule_output_i (void) { if (TAO_debug_level > 3) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Transport[%d]::schedule_output_i ") ACE_TEXT ("event handler not found in reactor,") @@ -910,7 +919,7 @@ TAO_Transport::schedule_output_i (void) if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::schedule_output_i\n"), this->id ())); } @@ -926,7 +935,7 @@ TAO_Transport::cancel_output_i (void) if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cancel_output_i\n"), this->id ())); } @@ -940,7 +949,7 @@ TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */, { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_timeout, ") ACE_TEXT ("timer expired\n"), this->id ())); @@ -1032,7 +1041,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[], { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") ACE_TEXT ("send() returns 0\n"), this->id ())); @@ -1043,7 +1052,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[], { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") ACE_TEXT ("error during send() (errno: %d) - %m\n"), this->id (), ACE_ERRNO_GET)); @@ -1071,7 +1080,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[], if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") ACE_TEXT ("byte_count = %d, head_is_empty = %d\n"), this->id(), byte_count, this->queue_is_empty_i ())); @@ -1112,7 +1121,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ") ACE_TEXT ("Discarding expired queued message.\n"), this->id ())); @@ -1138,7 +1147,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ") ACE_TEXT ("helper retval = %d\n"), this->id (), static_cast<int> (retval.dre_))); @@ -1165,7 +1174,7 @@ TAO_Transport::drain_queue_i (TAO::Transport::Drain_Constraints const & dc) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ") ACE_TEXT ("helper retval = %d\n"), this->id (), static_cast<int> (retval.dre_))); @@ -1198,7 +1207,7 @@ TAO_Transport::cleanup_queue_i () { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ") ACE_TEXT ("cleaning up complete queue\n"), this->id ())); @@ -1229,7 +1238,7 @@ TAO_Transport::cleanup_queue_i () if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ") ACE_TEXT ("discarded %d messages, %u bytes.\n"), this->id (), msg_count, byte_count)); @@ -1245,7 +1254,7 @@ TAO_Transport::cleanup_queue (size_t byte_count) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ") ACE_TEXT ("byte_count = %d\n"), this->id (), byte_count)); @@ -1256,7 +1265,7 @@ TAO_Transport::cleanup_queue (size_t byte_count) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ") ACE_TEXT ("after transfer, bc = %d, all_sent = %d, ml = %d\n"), this->id (), byte_count, i->all_data_sent (), @@ -1283,7 +1292,7 @@ TAO_Transport::cleanup_queue (size_t byte_count) } } -int +bool TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush) { // First let's compute the size of the queue: @@ -1321,7 +1330,10 @@ TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush) } // ... set the new timer, also cancel any previous timers ... - if (set_timer) + // Check for connected state since this method may be called + // before the connection is established and than there will be no + // reactor available yet. + if (set_timer && this->is_connected_) { ACE_Event_Handler *eh = this->event_handler_i (); ACE_Reactor * const reactor = eh->reactor (); @@ -1347,7 +1359,7 @@ TAO_Transport::report_invalid_event_handler (const char *caller) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::report_invalid_event_handler") ACE_TEXT ("(%C) no longer associated with handler [tag=%d]\n"), this->id (), caller, this->tag_)); @@ -1452,7 +1464,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") ACE_TEXT ("trying to send the message (ml = %d)\n"), this->id (), total_length)); @@ -1477,7 +1489,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") ACE_TEXT ("fatal error in ") ACE_TEXT ("send_message_block_chain_i - %m\n"), @@ -1504,7 +1516,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, } // If it was partially sent, then push to front of queue and don't flush - if (errno == ETIME) + if (n == -1 && errno == ETIME) { timeout_encountered = true; if (byte_count == 0) @@ -1513,7 +1525,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, //We can't return -1 here, since that would end up closing the tranpsort if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Transport[%d]::send_asynchronous_message_i, ") ACE_TEXT ("timeout encountered before any bytes sent\n"), @@ -1529,7 +1541,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") ACE_TEXT ("partial send %d / %d bytes\n"), this->id (), byte_count, total_length)); @@ -1555,7 +1567,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::") ACE_TEXT ("send_asynchronous_message_i, ") ACE_TEXT ("cannot queue message for - %m\n"), @@ -1566,7 +1578,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") ACE_TEXT ("message is queued\n"), this->id ())); @@ -1579,7 +1591,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, //the socket before looking at the queue). if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::") ACE_TEXT ("send_asynchronous_message_i, ") ACE_TEXT ("timeout after partial send, closing.\n"), @@ -1617,7 +1629,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::") ACE_TEXT ("send_asynchronous_message_i, ") ACE_TEXT ("flushing transport.\n"), @@ -1643,7 +1655,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, //We can't return -1 here, since that would end up closing the tranpsort if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("Transport[%d]::send_asynchronous_message_i, ") ACE_TEXT ("2 timeout encountered before any bytes sent\n"), @@ -1693,7 +1705,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input\n"), this->id ())); } @@ -1707,7 +1719,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, { if (TAO_debug_level > 2) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") ACE_TEXT ("error while parsing the head of the queue\n"), this->id())); @@ -1735,7 +1747,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") ACE_TEXT ("error consolidating incoming message\n"), this->id ())); @@ -1749,7 +1761,7 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") ACE_TEXT ("error parsing incoming message\n"), this->id ())); @@ -1770,7 +1782,7 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") ACE_TEXT ("missing data\n"), this->id ())); @@ -1794,7 +1806,7 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") ACE_TEXT ("error, consolidated message is NULL\n"), this->id ())); @@ -1809,7 +1821,7 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") ACE_TEXT ("error processing consolidated message\n"), this->id ())); @@ -1833,7 +1845,7 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") ACE_TEXT ("error processing message\n"), this->id ())); @@ -1874,7 +1886,7 @@ TAO_Transport::consolidate_enqueue_message (TAO_Queued_Data *q_data) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_enqueue_message, ") ACE_TEXT ("error, consolidated message is NULL\n"), this->id ())); @@ -1918,7 +1930,7 @@ TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh, if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ") ACE_TEXT ("enter (missing data == %d)\n"), this->id (), q_data->missing_data ())); @@ -1956,7 +1968,7 @@ TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh, if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ") ACE_TEXT ("read bytes %d\n"), this->id (), n)); @@ -2032,7 +2044,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") ACE_TEXT ("enter\n"), this->id ())); @@ -2144,7 +2156,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, // activated. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") ACE_TEXT ("Error - endless loop detection, closing connection"), this->id ())); @@ -2173,7 +2185,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") ACE_TEXT ("read %d bytes\n"), this->id (), n)); @@ -2206,7 +2218,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") ACE_TEXT ("error consolidating message from input buffer\n"), this->id () )); @@ -2386,7 +2398,7 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") ACE_TEXT ("notify reactor\n"), this->id ())); @@ -2451,7 +2463,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") ACE_TEXT ("entering (missing data == %d)\n"), this->id(), qd->missing_data ())); @@ -2469,7 +2481,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") ACE_TEXT ("received CloseConnection message - %m\n"), this->id())); @@ -2506,7 +2518,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") ACE_TEXT ("error in process_reply_message - %m\n"), this->id ())); @@ -2526,7 +2538,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") ACE_TEXT ("error processing CancelRequest\n"), this->id ())); @@ -2545,7 +2557,7 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") ACE_TEXT ("received MessageError, closing connection\n"), this->id ())); @@ -2569,7 +2581,7 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh) { if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, %d enqueued\n"), this->id (), this->incoming_message_queue_.queue_length () )); } @@ -2583,7 +2595,7 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh) if (TAO_debug_level > 3) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ") ACE_TEXT ("the size of the queue is [%d]\n"), this->id (), @@ -2595,7 +2607,7 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ") ACE_TEXT ("notify reactor\n"), this->id ())); @@ -2641,7 +2653,7 @@ TAO_Transport::notify_reactor_now (void) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ") ACE_TEXT ("notify to Reactor\n"), this->id ())); @@ -2654,7 +2666,7 @@ TAO_Transport::notify_reactor_now (void) { // @todo: need to think about what is the action that // we can take when we get here. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ") ACE_TEXT ("notify to the reactor failed..\n"), this->id ())); @@ -2734,7 +2746,7 @@ TAO_Transport::pre_close (void) { if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::pre_close\n"), + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::pre_close\n"), this->id_)); } // @TODO: something needs to be done with is_connected_. Checking it is @@ -2757,7 +2769,7 @@ TAO_Transport::post_open (size_t id) { if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport::post_open, ") + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport::post_open, ") ACE_TEXT ("tport id changed from %d to %d\n"), this->id_, id)); } this->id_ = id; @@ -2780,7 +2792,7 @@ TAO_Transport::post_open (size_t id) throw CORBA::INTERNAL (); this->flush_in_post_open_ = false; - (void) flushing_strategy->schedule_output (this); + (void)flushing_strategy->schedule_output (this); } } else @@ -2796,7 +2808,7 @@ TAO_Transport::post_open (size_t id) if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_open , ") ACE_TEXT ("could not register the transport ") ACE_TEXT ("in the reactor.\n"), @@ -2814,7 +2826,7 @@ TAO_Transport::post_open (size_t id) if (TAO_debug_level > 9 && !this->cache_map_entry_) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_open") + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_open") ACE_TEXT (", cache_map_entry_ is 0\n"), this->id_)); } diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 84920bf9c7a..ee09b443200 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -666,9 +666,6 @@ public: /// Accessor for synchronizing Transport OutputCDR access TAO_SYNCH_MUTEX &output_cdr_lock (void); - /// Set the flush in post open flag - void set_flush_in_post_open (void); - /// Can the transport be purged? bool can_be_purged (void); @@ -978,7 +975,7 @@ private: void cleanup_queue_i (); /// Check if the buffering constraints have been reached - int check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush); + bool check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush); /// Send a synchronous message, i.e. block until the message is on /// the wire diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index c3085630617..df8885faf5f 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -205,12 +205,6 @@ TAO_Transport::sent_byte_count (void) const return this->sent_byte_count_; } -ACE_INLINE void -TAO_Transport::set_flush_in_post_open (void) -{ - this->flush_in_post_open_ = true; -} - #if TAO_HAS_TRANSPORT_CURRENT == 1 ACE_INLINE TAO::Transport::Stats* diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp index 54def73cda8..23acdbcd1df 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp @@ -35,7 +35,7 @@ namespace TAO if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) TAO::Transport::ORBInitializer::pre_init - " "Panic: unable to narrow the ORBInitInfo_ptr\n")); diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp index 5b19d7419aa..8afbf059eb6 100644 --- a/TAO/tao/Transport_Acceptor.cpp +++ b/TAO/tao/Transport_Acceptor.cpp @@ -29,7 +29,7 @@ TAO_Acceptor::handle_accept_error (ACE_Event_Handler* base_acceptor) if (errno == EMFILE || errno == ENFILE) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - " + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - " "TAO_Acceptor::handle_accept_error - " "Too many files open\n")); @@ -76,7 +76,7 @@ TAO_Acceptor::handle_expiration (ACE_Event_Handler* base_acceptor) return -1; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - " + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - " "TAO_Acceptor::handle_expiration - " "Re-registering the acceptor\n")); diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index e4b903bc5b0..d02e619272a 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -115,7 +115,7 @@ namespace TAO { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::bind_i, ") ACE_TEXT ("Transport[%d] @ hash:index{%d:%d}\n"), int_id.transport ()->id (), @@ -138,7 +138,7 @@ namespace TAO retval = -1; if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - Transport_Cache_Manager_T::bind_i, ") ACE_TEXT("ERROR: unable to bind transport, cache is full\n"))); } @@ -163,7 +163,7 @@ namespace TAO entry->item ().recycle_state (int_id.recycle_state ()); if (TAO_debug_level > 9 && entry->item ().is_connected () != int_id.is_connected ()) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_") ACE_TEXT ("Manager::bind_i, Updating existing ") ACE_TEXT ("entry sets is_connected to %C\n"), @@ -178,7 +178,7 @@ namespace TAO ext_id.index (ext_id.index () + 1); if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::bind_i, ") ACE_TEXT ("Unable to bind Transport[%d] @ hash:index{%d:%d}. ") ACE_TEXT ("Trying with a new index\n"), @@ -192,7 +192,7 @@ namespace TAO { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - Transport_Cache_Manager_T::bind_i, ") ACE_TEXT("ERROR: unable to bind transport\n"))); } @@ -204,7 +204,7 @@ namespace TAO { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::bind_i: ") ACE_TEXT ("Success Transport[%d] @ hash:index{%d:%d}. ") ACE_TEXT ("Cache size is [%d]\n"), @@ -256,7 +256,7 @@ namespace TAO ACE_Event_Handler::DONT_CALL) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T[%d]") ACE_TEXT ("::find_transport, remove_handler failed\n"), transport->id ())); @@ -305,7 +305,7 @@ namespace TAO if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ") ACE_TEXT ("Found available Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), @@ -318,7 +318,7 @@ namespace TAO { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ") ACE_TEXT ("Found connecting Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), @@ -344,7 +344,7 @@ namespace TAO ++busy_count; if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::find_i, ") ACE_TEXT ("Found busy Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), @@ -478,7 +478,7 @@ namespace TAO if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::") ACE_TEXT ("is_entry_available_i[%d], %C, state is %C\n"), entry.int_id_.transport () ? entry.int_id_.transport ()->id () : 0, @@ -501,7 +501,7 @@ namespace TAO if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::") ACE_TEXT ("is_entry_purgable_i[%d], %C, state is %C\n"), entry.int_id_.transport ()->id (), @@ -529,7 +529,7 @@ namespace TAO if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::") ACE_TEXT ("is_entry_connecting_i[%d], %C, state is %C\n"), entry.int_id_.transport () ? entry.int_id_.transport ()->id () : 0, @@ -587,7 +587,7 @@ namespace TAO if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::purge, ") ACE_TEXT ("Trying to purge %d of %d cache entries\n"), amount, @@ -607,7 +607,7 @@ namespace TAO if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::purge, ") ACE_TEXT ("Purgable Transport[%d] found in ") ACE_TEXT ("cache\n"), @@ -618,7 +618,7 @@ namespace TAO { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T") ACE_TEXT ("::purge, Unable to add transport[%d] ") ACE_TEXT ("on the to-be-closed set, so ") @@ -659,7 +659,7 @@ namespace TAO if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::purge, ") ACE_TEXT ("Cache size after purging is [%d]\n"), this->current_size () @@ -725,7 +725,7 @@ namespace TAO if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::fill_set_i, ") ACE_TEXT ("current_size = %d, cache_maximum = %d\n"), current_size, cache_maximum)); diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl index 0fecfabf643..faadb1190b6 100644 --- a/TAO/tao/Transport_Cache_Manager_T.inl +++ b/TAO/tao/Transport_Cache_Manager_T.inl @@ -71,7 +71,7 @@ namespace TAO return; if (TAO_debug_level > 9 && state != entry->item ().is_connected ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T") + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T") ACE_TEXT ("::mark_connected, %s Transport[%d]\n"), (state ? ACE_TEXT("true") : ACE_TEXT("false")), entry->item ().transport ()->id () diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index b717d8027fd..eba839a3e95 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -131,7 +131,7 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ") ACE_TEXT ("<%C>\n"), string)); @@ -316,7 +316,7 @@ TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::parallel_connect: ") ACE_TEXT ("found a transport [%d]\n"), base_transport->id ())); @@ -354,7 +354,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT ("transport [%d], Connection Timed out.\n"), transport->id ())); @@ -366,7 +366,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT ("transport [%d], Connection failed. (%d)\n"), transport->id (), ACE_ERRNO_GET)); @@ -385,7 +385,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT("transport [%d], connection is open: no wait.\n"), transport->id () )); @@ -397,7 +397,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT("waiting on transport [%d]\n"), transport->id () )); @@ -421,7 +421,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT(" timeout while waiting on transport [%d]\n"), transport->id () )); @@ -435,7 +435,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, if (complain10times > 0) { --complain10times; - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT(" unknown error waiting on transport [%d] (%d)\n"), transport->id (), @@ -453,7 +453,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 5) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT("transport [%d], wait completed ok.\n"), transport->id () )); @@ -465,7 +465,7 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") ACE_TEXT ("Connection not complete [%d] reset state to ") ACE_TEXT ("LFS_CONNECTION_WAIT\n"), transport->id ())); @@ -508,7 +508,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Transport_Connector::connect, ") ACE_TEXT("error in transport from cache\n"))); } @@ -520,7 +520,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Transport_Connector::connect, ") ACE_TEXT("closed transport from cache\n"))); } @@ -533,7 +533,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { TAO::Connection_Role cr = base_transport->opened_as (); - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::connect, ") ACE_TEXT("got an existing %C Transport[%d] in role %C\n"), base_transport->is_connected () ? "connected" : @@ -568,7 +568,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 2) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - Transport_Connector::connect," " wait for completion failed\n")); } @@ -581,7 +581,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, // Registration failures. if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "TAO (%P|%t) - Transport_Connector::connect, " "could not register the transport [%d]" "in the reactor.\n", @@ -600,7 +600,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("Transport_Connector::waiting ") ACE_TEXT("for connection on transport [%d]\n"), @@ -629,7 +629,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("Transport_Connector::non-blocking:") ACE_TEXT("returning unconnected ") @@ -669,7 +669,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Connector::") ACE_TEXT ("connect, make_connection failed\n"))); } @@ -678,7 +678,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("Transport_Connector::connect, ") ACE_TEXT("opening Transport[%d] in ") @@ -692,7 +692,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r, { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Post_connect_hook ") ACE_TEXT("failed. ") ACE_TEXT("Purging transport[%d]\n"), @@ -734,7 +734,7 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], Failed to cache transport.\n"), @@ -746,7 +746,7 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], Connection timed out.\n"), @@ -759,7 +759,7 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], Connection failed. (%d) %p\n"), @@ -771,7 +771,7 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], Connection not complete.\n"), @@ -788,7 +788,7 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("going to wait for connection completion on ") @@ -800,7 +800,7 @@ TAO_Connector::wait_for_connection_completion ( if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], wait done result = %d\n"), @@ -830,7 +830,7 @@ TAO_Connector::wait_for_connection_completion ( if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], Connection timed out.\n"), @@ -843,7 +843,7 @@ TAO_Connector::wait_for_connection_completion ( // Report that making the connection failed if (TAO_debug_level > 2) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("transport [%d], wait for completion failed") @@ -863,7 +863,7 @@ TAO_Connector::wait_for_connection_completion ( reset_state (TAO_LF_Event::LFS_CONNECTION_WAIT); if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - TAO_Connector[%d]::") ACE_TEXT("wait_for_connection_completion reset_state to ") ACE_TEXT("LFS_CONNECTION_WAIT\n"), transport->id ())); @@ -915,14 +915,14 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("waiting for connection completion on ") ACE_TEXT("%d transports, ["), count)); for (unsigned int i = 0; i < count; i++) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("%d%C"),transport[i]->id (), (i < (count -1) ? ", " : "]\n"))); } @@ -943,7 +943,7 @@ TAO_Connector::wait_for_connection_completion ( the_winner = mev->winner()->transport(); if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Connector::") ACE_TEXT ("wait_for_connection_completion, ") ACE_TEXT ("transport [%d]\n"), @@ -974,7 +974,7 @@ TAO_Connector::wait_for_connection_completion ( // because we touched the reactor and errno could be changed if (TAO_debug_level > 2) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Transport_Connector::") ACE_TEXT ("wait_for_connection_completion, failed\n") )); @@ -990,7 +990,7 @@ TAO_Connector::wait_for_connection_completion ( { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - Transport_Connector::") ACE_TEXT("wait_for_connection_completion, ") ACE_TEXT("no connected transport for a blocked connection, ") diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index 9c200c0263e..2edd4871992 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -44,7 +44,7 @@ TAO_ORB_Manager::init (int &argc, this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA); if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the POA.\n")), -1); @@ -70,7 +70,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, { // Check to see if root poa has to be created. if (this->init (argc, argv, orb_name) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Error in init.\n")), -1); @@ -137,7 +137,7 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name, PortableServer::Servant servant) { if (object_name == 0) - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\n(%P|%t) TAO_ORB_Manager::register: ") ACE_TEXT ("object_name is null!")), 0); diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index aa7e4890288..611859dfac0 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -64,7 +64,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) if (result == 0) { - ACE_ERROR ((LM_INFO, + TAOLIB_ERROR ((LM_INFO, "%T %C (%P|%t) Ready %C\n", name_, servant.identity () )); @@ -86,7 +86,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) orb->shutdown (1); - ACE_ERROR ((LM_INFO, + TAOLIB_ERROR ((LM_INFO, "%T %C (%P|%t) Terminated normally. %C\n", name_, servant.identity () @@ -94,7 +94,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "%T %C (%P|%t) Registration failed: %m\n", name_ )); result = -1; @@ -102,7 +102,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "%T %C (%P|%t) ORB manager init failed\n", name_ )); result = -1; diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 0ad4564bac3..05f0072cd16 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -257,7 +257,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs) if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("operator>> CORBA::AbstractBase ") ACE_TEXT ("not value_tag\n"))); return false; @@ -279,7 +279,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, "TAO (%P|%t) WARNING: extracting " "valuetype using default ORB_Core\n")); } @@ -291,7 +291,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs) // We should throw an exception, if there were an appropriate one. if (factory.in() == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%N:%l): The following unknown type was received: `%s'."), repo_id_stream.in ())); return false; diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 6a152cfaede..6fe76a84f62 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -325,7 +325,7 @@ CORBA::ValueBase::_tao_unmarshal_header ( } else { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_pre, ") ACE_TEXT ("unknown repo_id\n") )); @@ -336,7 +336,7 @@ CORBA::ValueBase::_tao_unmarshal_header ( { if (TAO_debug_level) { - ACE_ERROR (( + TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_pre, ") ACE_TEXT ("unknown value tag: %x\n"), @@ -365,7 +365,7 @@ CORBA::ValueBase::_tao_unmarshal_find_factory ( orb_core = TAO_ORB_Core_instance (); if (TAO_debug_level) { - ACE_DEBUG (( + TAOLIB_DEBUG (( LM_WARNING, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_find_factory, ") ACE_TEXT ("WARNING: extracting valuetype using default ORB_Core\n") )); @@ -398,7 +398,7 @@ CORBA::ValueBase::_tao_unmarshal_find_factory ( { if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_find_factory, ") ACE_TEXT ("OBV factory is null, id=%C\n"), id)); @@ -417,14 +417,14 @@ CORBA::ValueBase::_tao_unmarshal_find_factory ( VERIFY_MAP (TAO_InputCDR, value_map, Value_Map); if (strm.get_value_map ()->get()->bind (start_of_valuetype, valuetype) != 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_find_factory, ") ACE_TEXT ("Failed to bound value %x=%x, id=%C\n"), start_of_valuetype, valuetype, id )); } else if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_find_factory, ") ACE_TEXT ("bound value %x=%x, id=%C\n"), start_of_valuetype, valuetype, id )); @@ -483,7 +483,7 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm, if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l CORBA::ValueBase::_tao_validate_box_type, ") ACE_TEXT ("not value_tag\n"))); return false; @@ -570,18 +570,18 @@ CORBA::ValueBase::_tao_unmarshal_value_indirection (TAO_InputCDR &strm, if (9 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) ValueBase::_tao_unmarshal_value_indirection, pos %x\n"), pos)); TAO_InputCDR::Value_Map* map = strm.get_value_map()->get (); for (TAO_InputCDR::Value_Map::ITERATOR it = map->begin (); it != map->end (); ++ it) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) ValueBase::_tao_unmarshal_value_indirection, %x=%x\n"), it->ext_id_, it->int_id_)); + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) ValueBase::_tao_unmarshal_value_indirection, %x=%x\n"), it->ext_id_, it->int_id_)); } } void * v = 0; if (strm.get_value_map()->get()->find (pos, v) != 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ") ACE_TEXT ("ValueBase::_tao_unmarshal_value_indirection, ") ACE_TEXT ("did not find %x in map %x\n"), @@ -590,7 +590,7 @@ CORBA::ValueBase::_tao_unmarshal_value_indirection (TAO_InputCDR &strm, } else if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_value_indirection, found %x=%x\n"), pos,v)); } @@ -617,7 +617,7 @@ CORBA::ValueBase::_tao_unmarshal_repo_id_indirection (TAO_InputCDR &strm, } else if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_repo_id_indirection, found %x=%C\n"), pos, id.c_str ())); } @@ -643,7 +643,7 @@ CORBA::ValueBase::_tao_unmarshal_codebase_url_indirection (TAO_InputCDR &strm, } else if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_unmarshal_codebase_url_indirection, found %x=%C\n"), pos, codebase_url.c_str ())); } @@ -693,7 +693,7 @@ CORBA::ValueBase::_tao_write_special_value (TAO_OutputCDR &strm, { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ValueBase::_tao_write_special_value, found value %x=%x\n"), value, pos)); } @@ -706,7 +706,7 @@ CORBA::ValueBase::_tao_write_special_value (TAO_OutputCDR &strm, CORBA::Long const offset= -strm.offset (pos); if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_write_special_value, indirection %d=%x\n"), offset, (void *)(strm.current()->wr_ptr () + offset) )); } @@ -726,7 +726,7 @@ CORBA::ValueBase::_tao_write_special_value (TAO_OutputCDR &strm, } else if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_marshal, bound value %x=%x\n"), value, strm.current()->wr_ptr())); } @@ -856,7 +856,7 @@ CORBA::ValueBase::_tao_write_repository_id (TAO_OutputCDR &strm, CORBA::Long offset= -strm.offset (pos); if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_write_repository_id, id %C indirection %d\n"), id.c_str(), offset)); } @@ -877,7 +877,7 @@ CORBA::ValueBase::_tao_write_repository_id (TAO_OutputCDR &strm, } if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_write_repository_id, bound %C - %x\n"), id.c_str (), strm.current()->wr_ptr ())); } @@ -1051,7 +1051,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm) // tag is an end tag if (-tag > this->value_nesting_level_) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_ChunkInfo::handle_chunking, received end tag ") ACE_TEXT ("%d > value_nesting_level %d\n"), -tag, @@ -1208,14 +1208,14 @@ CORBA::ValueBase::_tao_read_repository_id (TAO_InputCDR& strm, { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_read_repository_id, found %x=%C\n"), pos, mapped_id.c_str ())); } if (ACE_OS::strcmp (mapped_id.c_str (), id.c_str ()) != 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_read_repository_id, found %C in map for %C\n"), mapped_id.c_str (), id.c_str ())); throw CORBA::INTERNAL (); @@ -1227,7 +1227,7 @@ CORBA::ValueBase::_tao_read_repository_id (TAO_InputCDR& strm, } else if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_read_repository_id, bound %x=%C\n"), pos, id.c_str ())); } @@ -1290,7 +1290,7 @@ CORBA::ValueBase::_tao_read_codebase_url (TAO_InputCDR& strm, { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_read_codebase_url, found %x=%C\n"), pos, mapped_url.c_str ())); } @@ -1305,7 +1305,7 @@ CORBA::ValueBase::_tao_read_codebase_url (TAO_InputCDR& strm, { if (TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - %N:%l ValueBase::_tao_read_codebase_url, bound %x=%C\n"), pos, codebase_url.c_str ())); } diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp index e8fe993ae51..31786c565a5 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.cpp +++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp @@ -35,7 +35,7 @@ namespace TAO tss->upcalls_temporarily_suspended_on_this_thread_ = true; if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Wait_On_LF_No_Upcall[%d]::wait, " "disabling upcalls\n", t->id ())); } @@ -49,7 +49,7 @@ namespace TAO if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Wait_On_LF_No_Upcall[%d]::wait, " "re-enabling upcalls\n", this->t_->id ())); } @@ -109,7 +109,7 @@ namespace TAO Wait_On_LF_No_Upcall::defer_upcall (ACE_Event_Handler* eh) { if (TAO_debug_level > 6) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Wait_On_LF_No_Upcall[%d]::defer_upcall, " "deferring upcall on transport " "because upcalls temporarily suspended on this thread\n", diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp index 9864010e872..ad785d1ed31 100644 --- a/TAO/tao/Wait_On_Read.cpp +++ b/TAO/tao/Wait_On_Read.cpp @@ -119,7 +119,7 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time, return 0; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Wait_On_Read[%d]::wait (), ") ACE_TEXT ("registering handle for cleanup\n"), this->transport_->id ())); @@ -134,7 +134,7 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time, ACE_Event_Handler::READ_MASK) == -1) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Wait_On_Read[%d]::wait (), ") ACE_TEXT ("registration with reactor returned an error\n"), this->transport_->id ())); diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 7d14692b3d6..d78511038b1 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -156,7 +156,7 @@ CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const return adapter->_tao_type_WrongTransaction (); else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("Unable to find the ") ACE_TEXT ("AnyTypeCode Adapter instance"))); diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp index 93ae7031aeb..17f3a88f604 100644 --- a/TAO/tao/XtResource/XtResource_Factory.cpp +++ b/TAO/tao/XtResource/XtResource_Factory.cpp @@ -21,7 +21,7 @@ namespace TAO // synchronized by external locks if (this->context_ == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - XtAppContext is undefined.") ACE_TEXT(" Cannot create ACE_XtReactor\n"))); return 0; @@ -34,7 +34,7 @@ namespace TAO 0); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - ACE_XtReactor created\n")); } diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp index 10639d797e8..c3469cc9fe7 100644 --- a/TAO/tao/ZIOP/ZIOP.cpp +++ b/TAO/tao/ZIOP/ZIOP.cpp @@ -135,7 +135,7 @@ TAO_ZIOP_Loader::dump_msg (const char *type, const u_char *ptr, static const char digits[] = "0123456789ABCD"; int const byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01; - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ZIOP_Loader::dump_msg, ") ACE_TEXT ("ZIOP message v%c.%c %C, %B data bytes, %s endian, ") ACE_TEXT ("original_data_length = %B, ") @@ -149,7 +149,7 @@ TAO_ZIOP_Loader::dump_msg (const char *type, const u_char *ptr, TAO_ZIOP_Loader::ziop_compressorid_name (compressor_id), static_cast <int> (compression_level))); - ACE_HEX_DUMP ((LM_DEBUG, + TAOLIB_HEX_DUMP ((LM_DEBUG, (const char *) ptr, len, ACE_TEXT ("ZIOP message"))); @@ -166,7 +166,7 @@ TAO_ZIOP_Loader::decompress (Compression::Compressor_ptr compressor, } catch (::Compression::CompressionException &e) { - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("ZIOP (%P|%t) TAO_ZIOP_Loader::decompress, ") ACE_TEXT ("decompression failed, %C\n"), e._info ().c_str ()), @@ -206,7 +206,7 @@ TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, if (!(cdr >> data)) { - ACE_DEBUG ((LM_DEBUG, "ZIOP (%P|%t) decompress failed to demarshal data.\n")); + TAOLIB_DEBUG ((LM_DEBUG, "ZIOP (%P|%t) decompress failed to demarshal data.\n")); return false; } @@ -234,7 +234,7 @@ TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, if (mb.copy ((char*)myout.get_buffer (false), static_cast<size_t> (data.original_length)) != 0) - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::decompress, ") ACE_TEXT ("failed to copy decompressed data, ") @@ -260,14 +260,14 @@ TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, } catch (const ::Compression::UnknownCompressorId &) { - ACE_DEBUG ((LM_DEBUG, "ZIOP (%P|%t) client used ZIOP with an unregistered (at the server) compressor (ID %d: %C)\n", + TAOLIB_DEBUG ((LM_DEBUG, "ZIOP (%P|%t) client used ZIOP with an unregistered (at the server) compressor (ID %d: %C)\n", static_cast <int> (data.compressor), TAO_ZIOP_Loader::ziop_compressorid_name (data.compressor))); return false; } } else { - ACE_DEBUG ((LM_DEBUG, "ZIOP (%P|%t) failed to obtain compression manager\n")); + TAOLIB_DEBUG ((LM_DEBUG, "ZIOP (%P|%t) failed to obtain compression manager\n")); return false; } #else /* TAO_HAS_ZIOP */ @@ -340,7 +340,7 @@ TAO_ZIOP_Loader::compress (Compression::Compressor_ptr compressor, } catch (::Compression::CompressionException &e) { - ACE_ERROR_RETURN((LM_ERROR, + TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("ZIOP (%P|%t) TAO_ZIOP_Loader::compress, ") ACE_TEXT ("compression failed, %C\n"), e._info ().c_str ()), @@ -376,7 +376,7 @@ TAO_ZIOP_Loader::check_min_ratio (const ::Compression::CompressionRatio &this_ra { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) TAO_ZIOP_Loader::check_min_ratio, ") ACE_TEXT ("this ratio (%4.2f <= %4.2f) min ratio, ") ACE_TEXT ("average so far %4.2f (allowed compression).\n"), @@ -385,7 +385,7 @@ TAO_ZIOP_Loader::check_min_ratio (const ::Compression::CompressionRatio &this_ra } else if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) TAO_ZIOP_Loader::check_min_ratio, ") ACE_TEXT ("COMPRESSION_MIN_RATIO_POLICY applied, ") ACE_TEXT ("this ratio (%4.2f > %4.2f) min ratio, ") @@ -410,7 +410,7 @@ TAO_ZIOP_Loader::get_compressor_details ( if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::get_compressor_details, ") ACE_TEXT ("compressor policy found, compressor = %C@%d\n"), @@ -423,7 +423,7 @@ TAO_ZIOP_Loader::get_compressor_details ( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::get_compressor_details, ") ACE_TEXT ("no appropriate compressor found\n"))); @@ -451,7 +451,7 @@ TAO_ZIOP_Loader::get_compression_details( use_ziop = srp->compression_enabled (); if (!use_ziop && TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::get_compression_details, ") ACE_TEXT ("ZIOP enabled policy not set\n"))); @@ -462,7 +462,7 @@ TAO_ZIOP_Loader::get_compression_details( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::get_compression_details, ") ACE_TEXT ("compression_enabling_policy is NIL, no ZIOP\n"))); @@ -486,7 +486,7 @@ TAO_ZIOP_Loader::get_compression_details( { if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::get_compression_details, ") ACE_TEXT("compressor ID/Level list policy not found\n"))); @@ -526,7 +526,7 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_ERROR, + TAOLIB_DEBUG ((LM_ERROR, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::complete_compression, ") ACE_TEXT ("Compressor failed to compress message!\n"))); @@ -537,7 +537,7 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, { if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::complete_compression, ") ACE_TEXT ("compressed length (%u >= %u) ") @@ -578,7 +578,7 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, } else if (TAO_debug_level > 8) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Loader::complete_compression, ") ACE_TEXT ("COMPRESSION_LOW_VALUE_POLICY applied, ") @@ -685,7 +685,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("client policies not available (did not compress).\n"))); @@ -702,7 +702,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("clientCompressionEnablingPolicy (did not compress).\n"))); @@ -719,7 +719,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("serverCompressionEnablingPolicy (did not compress).\n"))); @@ -735,7 +735,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("no clientCompressorIdLevelListPolicy (did not compress).\n"))); @@ -754,7 +754,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("no serverCompressorIdLevelListPolicy (did not compress).\n"))); @@ -783,7 +783,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S clientEntry->compression_level); if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("Found (Server %d: %C@%d == Client %d: %C@%d) using @%d.\n"), @@ -818,7 +818,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S if (7 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("checking (Server %d: %C@%d != Client %d: %C@%d).\n"), @@ -834,7 +834,7 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_ORB_Core &orb_core, TAO_S if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT("TAO_ZIOP_Loader::marshal_data (server_reply), ") ACE_TEXT("no matching CompressorIdLevelListPolicy (did not compress).\n"))); diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp index 297f4fbac7d..294d365d10d 100644 --- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp +++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp @@ -27,7 +27,7 @@ TAO_ZIOP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "ZIOP (%P|%t) TAO_ZIOP_ORBInitializer::pre_init:\n" "ZIOP (%P|%t) Unable to narrow " "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp index 7224fcda2e5..c112a99e5eb 100644 --- a/TAO/tao/ZIOP/ZIOP_Stub.cpp +++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp @@ -186,7 +186,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("no clientCompressorIdLevelListPolicy (did not compress).\n"))); @@ -216,7 +216,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) { if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("no serverCompressorIdLevelListPolicy (but allow_ziop_no_server_policies in force).\n"))); @@ -225,7 +225,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) } else if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("no serverCompressorIdLevelListPolicy (did not compress).\n"))); @@ -259,7 +259,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) // This shouldn't happen, it's basically an internal error. if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("could not copy clientCompressorIdLevelListPolicy (did not compress).\n"))); @@ -284,7 +284,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) serverEntry->compression_level); if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("found (Client %d: %C@%d == Server %d: %C@%d) using @%d.\n"), @@ -302,7 +302,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) if (7 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("checking (Client %d: %C@%d != Server %d: %C@%d).\n"), @@ -318,7 +318,7 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) if (6 < TAO_debug_level) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("ZIOP (%P|%t) ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT("no matching CompressorIdLevelListPolicy (did not compress).\n"))); diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp index 45275055613..86d5ab1c254 100644 --- a/TAO/tao/debug.cpp +++ b/TAO/tao/debug.cpp @@ -14,4 +14,6 @@ TAO_Export unsigned int TAO_debug_level = 0; TAO_Export unsigned int TAO_orbdebug = 0; +TAO_Export ACE_Log_Category TAO_log_category("TAO"); + TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h index 762fec2e4eb..90c497a2dbe 100644 --- a/TAO/tao/debug.h +++ b/TAO/tao/debug.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/Versioned_Namespace.h" +#include "ace/Log_Category.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -37,7 +38,67 @@ extern TAO_Export unsigned int TAO_debug_level; // debug messages on (1) or off (0) extern TAO_Export unsigned int TAO_orbdebug; +extern TAO_Export ACE_Log_Category TAO_log_category; + TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_NLOGGING) +#if !defined (TAOLIB_HEX_DUMP) +# define TAOLIB_HEX_DUMP(X) do {} while (0) +#endif +#if !defined (TAOLIB_ERROR_RETURN) +# define TAOLIB_ERROR_RETURN(X, Y) return (Y) +#endif +#if !defined (TAOLIB_ERROR) +# define TAOLIB_ERROR(X) do {} while (0) +#endif +#if !defined (TAOLIB_DEBUG) +# define TAOLIB_DEBUG(X) do {} while (0) +#endif +#else +#if !defined (TAOLIB_HEX_DUMP) +#define TAOLIB_HEX_DUMP(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::TAO_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 (TAOLIB_ERROR_RETURN) +#define TAOLIB_ERROR_RETURN(X, Y) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::TAO_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 (TAOLIB_ERROR) +#define TAOLIB_ERROR(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::TAO_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 (TAOLIB_DEBUG) +#define TAOLIB_DEBUG(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = TAO_VERSIONED_NAMESPACE_NAME::TAO_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 /* TAO_DEBUG_H */ diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 5e3044e9b98..e71d7a0505f 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -310,14 +310,14 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { // Can we assume there is an argument after the option? // curarg++; - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, "Client_Strategy_Factory - " "unknown option <%s>\n", argv[curarg])); } else { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, "Client_Strategy_Factory - " "ignoring option <%s>\n", argv[curarg])); @@ -485,7 +485,7 @@ TAO_Default_Client_Strategy_Factory::report_option_value_error ( const ACE_TCHAR* option_name, const ACE_TCHAR* option_value) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("Client_Strategy_Factory - unknown argument") ACE_TEXT (" <%s> for <%s>\n"), option_value, option_name)); diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 76d27c9226c..11c8190ab30 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -175,7 +175,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) // are useless if (this->factory_disabled_) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - Warning: Resource_Factory options ") ACE_TEXT ("ignored. ") ACE_TEXT ("Default Resource Factory is disabled\n"))); @@ -243,7 +243,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), -1); if (pset->insert (item) == -1) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unable to add protocol factories ") ACE_TEXT ("for %s: %m\n"), argv[curarg])); @@ -456,7 +456,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) #if TAO_HAS_SENDFILE == 1 this->output_cdr_allocator_type_ = MMAP_ALLOCATOR; #else - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("MMAP allocator unsupport on this platform"))); #endif /* TAO_HAS_SENDFILE==1 */ } @@ -484,7 +484,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) #if TAO_HAS_SENDFILE == 1 this->output_cdr_allocator_type_ = MMAP_ALLOCATOR; #else - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("Zero copy writes unsupported on this platform\n"))); #endif /* TAO_HAS_SENDFILE==1 */ } @@ -494,14 +494,14 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { // Can we assume there is an argument after the option? // ++curarg; - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory - ") ACE_TEXT ("unknown option <%s>\n"), argv[curarg])); } else { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory - ") ACE_TEXT ("ignoring option <%s>\n"), argv[curarg])); @@ -655,7 +655,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) ACE_Dynamic_Service<TAO_Protocol_Factory>::instance (name.c_str ())); if ((*factory)->factory () == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Unable to load ") ACE_TEXT ("protocol <%C>, %p\n"), name.c_str (), @@ -665,7 +665,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Loaded protocol <%C>\n"), name.c_str ())); } @@ -720,7 +720,7 @@ TAO_Default_Resource_Factory::time_policy_manager (void) const if (tpm == 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Default_Resource_Factory::time_policy_manager: ") ACE_TEXT ("FAILED to retrieve service Time_Policy_Manager\n"))); } @@ -1090,7 +1090,7 @@ TAO_Default_Resource_Factory::create_purging_strategy (void) } else { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("no usable purging strategy ") ACE_TEXT ("was found.\n"))); @@ -1162,7 +1162,7 @@ TAO_Default_Resource_Factory::report_option_value_error ( const ACE_TCHAR* option_name, const ACE_TCHAR* option_value) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory - unknown ") ACE_TEXT ("argument <%s> for <%s>\n"), option_value, option_name)); @@ -1174,7 +1174,7 @@ TAO_Default_Resource_Factory::disable_factory (void) this->factory_disabled_ = 1; if (this->options_processed_) { - ACE_DEBUG ((LM_WARNING, + TAOLIB_DEBUG ((LM_WARNING, ACE_TEXT ("TAO (%P|%t) - Warning: Resource_Factory options ignored\n") ACE_TEXT ("Default Resource Factory is disabled\n"))); } @@ -1189,7 +1189,7 @@ TAO_Default_Resource_Factory::codeset_manager(void) if (factory == 0) { if (TAO_debug_level >= 2) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory") ACE_TEXT (" - unable to find codeset manager factory.\n"))); return 0; @@ -1200,7 +1200,7 @@ TAO_Default_Resource_Factory::codeset_manager(void) if (mgr == 0) { if (TAO_debug_level >= 2) - ACE_DEBUG ((LM_INFO, + TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory") ACE_TEXT (" - unable to create codeset manager.\n"))); return 0; @@ -1210,7 +1210,7 @@ TAO_Default_Resource_Factory::codeset_manager(void) ACE_Auto_Ptr<TAO_Codeset_Manager> safemgr (mgr); if (TAO_debug_level >= 1) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Default_Resource_Factory - codeset manager=%@\n"), mgr)); diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index 424b43e5806..74d3888767d 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -1,7 +1,7 @@ // $Id$ #include "tao/default_server.h" -#include "ace/Log_Msg.h" +#include "tao/debug.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -319,14 +319,14 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { // Can we assume there is an argument after the option? // ++curarg; - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("Server_Strategy_Factory - ") ACE_TEXT("unknown option <%s>\n"), argv[curarg])); } else { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT("Server_Strategy_Factory - ") ACE_TEXT("ignoring option <%s>\n"), argv[curarg])); @@ -340,7 +340,7 @@ TAO_Default_Server_Strategy_Factory::report_option_value_error ( const ACE_TCHAR* option_name, const ACE_TCHAR* option_value) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("Server_Strategy_Factory - unknown argument") ACE_TEXT (" <%s> for <%s>\n"), option_value, option_name)); diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h index db1a56e641b..6574465af59 100644 --- a/TAO/tao/objectid.h +++ b/TAO/tao/objectid.h @@ -52,6 +52,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define TAO_OBJID_POLICYCURRENT "PolicyCurrent" #define TAO_OBJID_IORMANIPULATION "IORManipulation" #define TAO_OBJID_IORTABLE "IORTable" +#define TAO_OBJID_ASYNCIORTABLE "AsyncIORTable" #define TAO_OBJID_DYNANYFACTORY "DynAnyFactory" #define TAO_OBJID_TYPECODEFACTORY "TypeCodeFactory" #define TAO_OBJID_RTORB "RTORB" diff --git a/TAO/tests/Bug_3384_Regression/Client_i.cpp b/TAO/tests/Bug_3384_Regression/Client_i.cpp new file mode 100644 index 00000000000..02cc611be0d --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/Client_i.cpp @@ -0,0 +1,11 @@ +// $Id$ + +#include "Client_i.h" + +Client::~Client () {} + +void Client::reply (const char * msg) +{ + this->reply_count_++; + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client::reply -> %s\n", msg)); +} diff --git a/TAO/tests/Bug_3384_Regression/Client_i.h b/TAO/tests/Bug_3384_Regression/Client_i.h new file mode 100644 index 00000000000..c9e63137ff0 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/Client_i.h @@ -0,0 +1,21 @@ +// $Id$ + +#include "TestS.h" + +class Client : public POA_Test::Client +{ +public: + Client () + : POA_Test::Client(), + reply_count_ (0) {} + virtual ~Client (); + + virtual void reply ( + const char * msg); + + int reply_count () { return this->reply_count_; } + +private: + int reply_count_; +}; + diff --git a/TAO/tests/Bug_3384_Regression/README.txt b/TAO/tests/Bug_3384_Regression/README.txt new file mode 100644 index 00000000000..bdae00f5a60 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/README.txt @@ -0,0 +1,20 @@ +/** + +$Id$ + +@page Bug_3384_Regression Test README File + +A regression test for a bug in (un)reliable oneways with the SYNC_NONE scope. +The test verifies if a oneway sent as the first request on a new transport +gets correctly pushed out as soon as the new transort has connected. +This is a regression test for: + +http://ace.cs.wustl.edu/bugzilla/show_bug.cgi?id=3384 + + To run the test use the run_test.pl script: + +$ ./run_test.pl + + the script returns 0 if there are no errors. + +*/ diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp new file mode 100644 index 00000000000..7535a7ba5b8 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp @@ -0,0 +1,28 @@ +// $Id$ + +#include "Server_i.h" + +Server::~Server () {} + +void Server::setup ( + ::Test::Client_ptr cli) +{ + this->cli_ = Test::Client::_duplicate (cli); +} + +void Server::request ( + ::CORBA::Long sel) +{ + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server::request -> %d\n", sel)); + if (! CORBA::is_nil (this->cli_.in ())) + { + this->cli_->reply ("Hello world!"); + } +} + +void Server::shutdown ( + void) +{ + this->orb_->shutdown (0); +} + diff --git a/TAO/tests/Bug_3384_Regression/Server_i.h b/TAO/tests/Bug_3384_Regression/Server_i.h new file mode 100644 index 00000000000..a86ce789ee4 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/Server_i.h @@ -0,0 +1,27 @@ +// $Id$ + +#include "TestS.h" + +class Server : public POA_Test::Server +{ +public: + Server (CORBA::ORB_ptr orb) + : POA_Test::Server(), + orb_ (CORBA::ORB::_duplicate (orb)) {} + virtual ~Server (); + + virtual void setup ( + ::Test::Client_ptr cli); + + virtual void request ( + ::CORBA::Long sel); + + virtual void shutdown ( + void); + +private: + CORBA::ORB_var orb_; + ::Test::Client_var cli_; +}; + + diff --git a/TAO/tests/Bug_3384_Regression/Test.idl b/TAO/tests/Bug_3384_Regression/Test.idl new file mode 100644 index 00000000000..26e3211af05 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/Test.idl @@ -0,0 +1,20 @@ +// $Id$ + +module Test +{ + interface Client + { + oneway void reply (in string msg); + }; + + interface Server + { + void setup (in Client cli); + + oneway void request (in long sel); + + oneway void shutdown (); + }; + +}; + diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp new file mode 100644 index 00000000000..c62f3924f2b --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/client.cpp @@ -0,0 +1,212 @@ +// $Id$ + +#include "Client_i.h" +#include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_unistd.h" +#include "ace/Task.h" + +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ +class Worker : public ACE_Task_Base +{ +public: + Worker (CORBA::ORB_ptr orb); + // ctor + + virtual int svc (void); + // The thread entry point. + +private: + CORBA::ORB_var orb_; + // The orb +}; + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + int result = 1; + + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(ior); + + Test::Server_var test_server = + Test::Server::_narrow(tmp.in ()); + + if (CORBA::is_nil (test_server.in ())) + ACE_ERROR_RETURN ((LM_DEBUG, + "ERROR: Nil reference in Test::Server reference <%s>\n", + ior), + 1); + + CORBA::Any scope_as_any; + scope_as_any <<= Messaging::SYNC_NONE; + + CORBA::PolicyList policies(1); policies.length (1); + policies[0] = + orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, + scope_as_any); + + tmp = test_server->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE); + + policies[0]->destroy (); + + Test::Server_var test_server_no_sync = + Test::Server::_narrow(tmp.in ()); + + if (CORBA::is_nil (test_server_no_sync.in ())) + ACE_ERROR_RETURN ((LM_DEBUG, + "ERROR: Nil reference in Test::Server reference <%s>\n", + ior), + 1); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + if (CORBA::is_nil (poa_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Unable to initialize the POA.\n"), + 1); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + + poa_manager->activate (); + + Worker worker (orb.in ()); + if (worker.activate (THR_NEW_LWP | THR_JOINABLE, + 1) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot activate client server thread\n"), + 1); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test starting . . .\n")); + + Client client_impl; + + PortableServer::ObjectId_var id = + root_poa->activate_object (&client_impl); + + tmp = root_poa->id_to_reference (id.in ()); + + Test::Client_var test_client = + Test::Client::_narrow (tmp.in ()); + + // setup client callback at server + test_server_no_sync->setup (test_client.in ()); + + // send oneway request to server + test_server_no_sync->request (1); + + // sleep 2 sec to give ample opportunity for oneway reply to be received by worker + ACE_OS::sleep (2); + + // check if reply received + if (client_impl.reply_count () > 0) + { + ACE_DEBUG ((LM_INFO, "(%P|%t) Oneway reply correctly received\n")); + + result = 0; // test OK + } + else + { + ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Oneway reply not received\n")); + + // send second request to trigger reception of first and second reply + test_server_no_sync->request (2); + + // sleep 2 sec to give ample opportunity for oneway reply to be received by worker + ACE_OS::sleep (2); + + if (client_impl.reply_count () > 1) + { + ACE_DEBUG ((LM_INFO, "(%P|%t) Received both replies after second request\n")); + } + else + { + ACE_ERROR ((LM_ERROR, "(%P|%t) FATAL ERROR: Still no replies received\n")); + } + } + + // shutdown server (use original synchronous reference to be sure to deliver message) + test_server->shutdown (); + + // shutdown worker + orb->shutdown (1); + + worker.thr_mgr ()->wait (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return result; +} + +// **************************************************************** + +Worker::Worker (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +int +Worker::svc (void) +{ + try + { + this->orb_->run (); + } + catch (const CORBA::Exception&) + { + } + return 0; +} diff --git a/TAO/tests/Bug_3384_Regression/run_test.pl b/TAO/tests/Bug_3384_Regression/run_test.pl new file mode 100755 index 00000000000..492b0db7d72 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/run_test.pl @@ -0,0 +1,73 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "test.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 285); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/TAO/tests/Bug_3384_Regression/server.cpp b/TAO/tests/Bug_3384_Regression/server.cpp new file mode 100644 index 00000000000..41b9ef0b2d6 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/server.cpp @@ -0,0 +1,126 @@ +// $Id$ + +#include "Server_i.h" +#include "tao/Messaging/Messaging.h" +#include "tao/AnyTypeCode/Any.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var object = + orb->resolve_initial_references ("PolicyCurrent"); + + CORBA::PolicyCurrent_var policy_current = + CORBA::PolicyCurrent::_narrow (object.in ()); + + if (CORBA::is_nil (policy_current.in ())) + { + ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n")); + return 1; + } + CORBA::Any scope_as_any; + scope_as_any <<= Messaging::SYNC_NONE; + + CORBA::PolicyList policies(1); policies.length (1); + policies[0] = + orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, + scope_as_any); + + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); + + policies[0]->destroy (); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + if (parse_args (argc, argv) != 0) + return 1; + + Server *server_impl = 0; + ACE_NEW_RETURN (server_impl, + Server (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(server_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (server_impl); + + object = root_poa->id_to_reference (id.in ()); + + Test::Server_var test_server = Test::Server::_narrow (object.in ()); + + CORBA::String_var ior = orb->object_to_string (test_server.in ()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/TAO/tests/Bug_3384_Regression/test.mpc b/TAO/tests/Bug_3384_Regression/test.mpc new file mode 100644 index 00000000000..6799573d8b1 --- /dev/null +++ b/TAO/tests/Bug_3384_Regression/test.mpc @@ -0,0 +1,41 @@ +// -*- MPC -*- +// $Id$ + +project(*Bug_3384_Regression_idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Bug_3384_Regression_Server): taoserver, messaging, strategies { + after += *Bug_3384_Regression_idl + Source_Files { + server.cpp + Server_i.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } +} + +project(*Bug_3384_Regression_Client): taoserver, messaging, strategies { + exename = client + after += *Bug_3384_Regression_idl + Source_Files { + client.cpp + Client_i.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } +} + + diff --git a/TAO/tests/IORTable_Locator/Test.mpc b/TAO/tests/IORTable_Locator/Test.mpc new file mode 100644 index 00000000000..730fdbd2166 --- /dev/null +++ b/TAO/tests/IORTable_Locator/Test.mpc @@ -0,0 +1,52 @@ +// -*- MPC -*- +// $Id$ + +project(*IORTable_Locator_idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + simple_test.idl + } + custom_only = 1 +} + +project(*IORTable_Locator_Server): taoserver, iortable { + after += *IORTable_Locator_idl + Source_Files { + simple_test_i.cpp + server.cpp + } + Source_Files { + simple_testS.cpp + simple_testC.cpp + } + IDL_Files { + } +} + +project(*Async_IORTable_Locator_Server): taoserver, async_iortable { + exename = async_server + after += *IORTable_Locator_idl + Source_Files { + simple_test_i.cpp + async_server.cpp + } + Source_Files { + simple_testS.cpp + simple_testC.cpp + } + IDL_Files { + } +} + +project(*IORTable_Locator_Client): taoclient { + after += *IORTable_Locator_idl + exename = client + Source_Files { + client.cpp + } + Source_Files { + simple_testC.cpp + } + IDL_Files { + } +} diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp new file mode 100644 index 00000000000..0b5dbcc48c5 --- /dev/null +++ b/TAO/tests/IORTable_Locator/async_server.cpp @@ -0,0 +1,203 @@ +// $Id$ + +#include "simple_test_i.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_strings.h" + +#include "tao/ORB_Core.h" +#include "tao/IORTable/Async_IORTable.h" +#include "tao/IORTable/IORTable.h" +#include "tao/LocalObject.h" +#include "tao/PortableServer/PortableServer.h" + +CORBA::String_var testIOR; + +ACE_CString ior_table_name = "IORTable"; +bool use_async_locator = false; + +//************************************************************************* +class AsyncLocatorTask + : public virtual IORTable::AsyncLocator, + public virtual CORBA::LocalObject +{ +public: + AsyncLocatorTask (CORBA::ORB_ptr orb); + + void async_locate (IORTable::Locate_ResponseHandler rh, const char *); + char * locate (const char *); + +private: + CORBA::ORB_var orb_; +}; + +void +AsyncLocatorTask::async_locate (IORTable::Locate_ResponseHandler rh, const char * id) +{ + CORBA::Object_var fwdObj = orb_->string_to_object(testIOR.in ()); + CORBA::String_var fwdString = orb_->object_to_string(fwdObj.in ()); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("in async_locate! Forwarding client %C to: %C\n"), + id, fwdString.in ())); + + rh->forward_ior (fwdString._retn(), false); +} + +char * +AsyncLocatorTask::locate (const char * id) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("In async locator::locate, id = %C, throwing\n"), + id)); + throw IORTable::NotFound (); + return 0; +} + + +AsyncLocatorTask::AsyncLocatorTask (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +//************************************************************************* +class SyncLocatorTask + : public virtual IORTable::Locator, + public virtual CORBA::LocalObject +{ +public: + SyncLocatorTask (CORBA::ORB_ptr orb); + + char * locate (const char *); + +private: + CORBA::ORB_var orb_; +}; + +char * +SyncLocatorTask::locate (const char * id) +{ + CORBA::Object_var fwdObj = orb_->string_to_object(testIOR.in ()); + CORBA::String_var fwdString = orb_->object_to_string(fwdObj.in ()); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("in synch locate: Forwarding client %C to: %C\n"), + id, + fwdString.in ())); + + return fwdString._retn(); +} + +SyncLocatorTask::SyncLocatorTask (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + for (int c = 1; c < argc; c++) + { + if (ACE_OS::strcasecmp (argv[c], ACE_TEXT ("-aa")) == 0) + { + ior_table_name = "AsyncIORTable"; + use_async_locator = true; + } + else if (ACE_OS::strcasecmp (argv[c], ACE_TEXT ("-as")) == 0) + { + ior_table_name = "AsyncIORTable"; + use_async_locator = false; + } + else + { + return -1; + } + } + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) == -1) + return -1; + + CORBA::Object_var poa_object = + orb->resolve_initial_references ("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + Simple_Test_i *test_impl = 0; + ACE_NEW_RETURN (test_impl, + Simple_Test_i (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer (test_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + simple::SimpleTest_T_var theServer = + simple::SimpleTest_T::_narrow (object.in ()); + + testIOR = orb->object_to_string (theServer.in ()); + + poa_manager->activate (); + + // Create task. + IORTable::Locator_var iorloc; + if (use_async_locator) + { + ACE_NEW_RETURN (iorloc, + AsyncLocatorTask (orb.in ()), + 1); + } + else + { + ACE_NEW_RETURN (iorloc, + SyncLocatorTask (orb.in ()), + 1); + } + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("Server - using ior table object: %C\n"), + ior_table_name.c_str())); + // Resolve the IORTable and set the locator + CORBA::Object_var iorTableObj = + orb->resolve_initial_references(ior_table_name.c_str()); + + IORTable::Table_var local_ior_table = + IORTable::Table::_narrow (iorTableObj.in ()); + + local_ior_table->set_locator (iorloc.in()); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("Server - event loop finished\n"))); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception (ACE_TEXT ("Server - Exception caught:")); + return 1; + } + + return 0; +} diff --git a/TAO/tests/IORTable_Locator/client.cpp b/TAO/tests/IORTable_Locator/client.cpp new file mode 100644 index 00000000000..6ec26e074ad --- /dev/null +++ b/TAO/tests/IORTable_Locator/client.cpp @@ -0,0 +1,88 @@ +// $Id$ + +#include "simple_testC.h" +#include "ace/Get_Opt.h" +#include "ace/Task.h" + +const ACE_TCHAR *testIOR = ACE_TEXT ("corbaloc:iiop:localhost:15989/SIMPLE_TEST_KEY"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'a': + testIOR = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-a <cobraloc>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "MY_TEST_ORB"); + + if (parse_args (argc, argv) != 0) + return 1; + + try + { + ACE_DEBUG ((LM_DEBUG, + "OK, now try to resolve a remote " + "IORTable::Locator entry...\n")); + + CORBA::Object_var clientObj = orb->string_to_object (testIOR); + + simple::SimpleTest_T_var simpleTestClient = + simple::SimpleTest_T::_narrow (clientObj.in ()); + + if (CORBA::is_nil (simpleTestClient.in ())) + { + ACE_ERROR ((LM_ERROR, + "Simpe client is nil!\n")); + return 1; + } + + ACE_DEBUG ((LM_DEBUG, + "We narrowed the object, now let's invoke it!\n")); + + simpleTestClient->shutdown (); + } + catch(const CORBA::OBJ_ADAPTER &objAdapter) + { + objAdapter._tao_print_exception ("CAUGHT OBJ_ADAPTER!!!"); + } + catch(const CORBA::OBJECT_NOT_EXIST &objNE) + { + objNE._tao_print_exception ("CAUGHT OBJECT NOT EXIST!!!"); + } + + ACE_DEBUG ((LM_DEBUG, + "Leaving!\n")); + } + catch (const CORBA::Exception &ex) + { + ex._tao_print_exception ("CAUGHT EXCEPTION: "); + return -1; + } + + return 0; +} diff --git a/TAO/tests/IORTable_Locator/run_test.pl b/TAO/tests/IORTable_Locator/run_test.pl new file mode 100755 index 00000000000..ad6d0854092 --- /dev/null +++ b/TAO/tests/IORTable_Locator/run_test.pl @@ -0,0 +1,83 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; +$server_name = "server"; +$async_opt = ""; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } + elsif ($i eq "-async_1") { + $server_name = "async_server"; + } + elsif ($i eq "-async_2") { + $server_name = "async_server"; + $async_opt = "-as"; + } + elsif ($i eq "-async_3") { + $server_name = "async_server"; + $async_opt = "-aa"; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create failed\n"; + +my $TARGETHOSTNAME = $client->HostName (); +my $port = $client->RandomPort (); + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ($server_name, "$async_opt -ORBdebuglevel $debug_level -ORBListenEndpoints iiop://$TARGETHOSTNAME:$port"); +$CL = $client->CreateProcess ("client", + "-ORBdebuglevel $debug_level ". + "-a corbaloc:iiop:$TARGETHOSTNAME:$port/SIMPLE_TEST_KEY"); + +print "Starting $server_name $async_opt\n"; +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +sleep(3); + +print "Client\n"; +$client_status = $CL->Spawn (); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->WaitKill ($client->ProcessStopWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/TAO/tests/IORTable_Locator/server.cpp b/TAO/tests/IORTable_Locator/server.cpp new file mode 100644 index 00000000000..977e38eb068 --- /dev/null +++ b/TAO/tests/IORTable_Locator/server.cpp @@ -0,0 +1,116 @@ +// $Id$ + +#include "simple_test_i.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "tao/ORB_Core.h" +#include "tao/IORTable/IORTable.h" +#include "tao/LocalObject.h" +#include "tao/PortableServer/PortableServer.h" + +CORBA::String_var testIOR; + +//************************************************************************* +class Task + : public virtual IORTable::Locator, + public virtual CORBA::LocalObject +{ +public: + Task (CORBA::ORB_ptr orb); + + char * locate (const char *); + +private: + CORBA::ORB_var orb_; +}; + +char * +Task::locate (const char * id) +{ + CORBA::Object_var fwdObj = orb_->string_to_object(testIOR.in ()); + CORBA::String_var fwdString = orb_->object_to_string(fwdObj.in ()); + + ACE_DEBUG ((LM_DEBUG, + "IN LOCATOR! Forwarding client %C to: %C\n", + id, + fwdString.in ())); + + return fwdString._retn(); +} + +Task::Task (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references ("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + Simple_Test_i *test_impl = 0; + ACE_NEW_RETURN (test_impl, + Simple_Test_i (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer (test_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (test_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + simple::SimpleTest_T_var theServer = + simple::SimpleTest_T::_narrow (object.in ()); + + testIOR = orb->object_to_string (theServer.in ()); + + poa_manager->activate (); + + // Create task. + Task *task = 0; + ACE_NEW_RETURN (task, + Task (orb.in ()), + 1); + IORTable::Locator_var iorloc_transfer (task); + + // Resolve the IORTable and set the locator + CORBA::Object_var iorTableObj = + orb->resolve_initial_references("IORTable"); + + IORTable::Table_var local_ior_table = + IORTable::Table::_narrow (iorTableObj.in ()); + + local_ior_table->set_locator (task); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "Server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Server - Exception caught:"); + return 1; + } + + return 0; +} diff --git a/TAO/tests/IORTable_Locator/simple_test.idl b/TAO/tests/IORTable_Locator/simple_test.idl new file mode 100644 index 00000000000..308e9420436 --- /dev/null +++ b/TAO/tests/IORTable_Locator/simple_test.idl @@ -0,0 +1,14 @@ +// $Id$ + +#ifndef _SIMPLE_TEST_ +#define _SIMPLE_TEST_ + +module simple { + interface SimpleTest_T + { + void shutdown(); + }; +}; + +#endif + diff --git a/TAO/tests/IORTable_Locator/simple_test_i.cpp b/TAO/tests/IORTable_Locator/simple_test_i.cpp new file mode 100644 index 00000000000..a29bc9495f7 --- /dev/null +++ b/TAO/tests/IORTable_Locator/simple_test_i.cpp @@ -0,0 +1,16 @@ +// +// $Id$ +// + +#include "simple_test_i.h" + +Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +void +Simple_Test_i::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/TAO/tests/IORTable_Locator/simple_test_i.h b/TAO/tests/IORTable_Locator/simple_test_i.h new file mode 100644 index 00000000000..0a5f17eeeda --- /dev/null +++ b/TAO/tests/IORTable_Locator/simple_test_i.h @@ -0,0 +1,26 @@ +// +// $Id$ +// + +#ifndef HELLO_H +#define HELLO_H + +#include "simple_testS.h" + +class Simple_Test_i + : public virtual POA_simple::SimpleTest_T +{ +public: + /// Constructor + Simple_Test_i (CORBA::ORB_ptr orb); + + // = The skeleton methods + virtual void shutdown (void); + +private: + /// Use an ORB reference to convert strings to objects and shutdown + /// the application. + CORBA::ORB_var orb_; +}; + +#endif /* HELLO_H */ diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp index e2449b14b0a..f8b55d99ce7 100644 --- a/TAO/utils/logWalker/HostProcess.cpp +++ b/TAO/utils/logWalker/HostProcess.cpp @@ -152,7 +152,7 @@ HostProcess::has_endpoint (const Endpoint& addr, bool listen) !i.done(); ++i) { - Endpoint *elem; + Endpoint *elem = 0; i.next (elem); if (*elem == addr) return true; diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 25bd4d1da29..5364d2c1914 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -295,15 +295,10 @@ Invocation::dump_finish_line (ostream &strm, size_t indent) strm << setw(7) << this->repl_octets_->log_posn() << " " << setw(0); const char *opname = ""; - const char *dir_2 = " in "; if (this->req_octets_ != 0) { opname = this->req_octets_->operation(); - if (this->req_octets_->sending()) - { - dir_2 = " from "; - } } if (opname == 0 || opname[0] == 0) |