diff options
| author | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-11 18:07:48 +0000 |
|---|---|---|
| committer | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-11 18:07:48 +0000 |
| commit | 432d3732add8423c4c199942b977cee7d8f7af39 (patch) | |
| tree | 991b03a4a95b1ed7c995b43398f71b7a7cd2c2f7 | |
| parent | f264d8c177c982a6f4d54aa9e1bf5d7e04658c2b (diff) | |
| download | ATCD-432d3732add8423c4c199942b977cee7d8f7af39.tar.gz | |
Thu Apr 11 18:03:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
208 files changed, 1436 insertions, 1112 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f0128b58b42..c1a3674fd5e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,260 @@ +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): @@ -12,9 +269,9 @@ Thu Apr 11 17:18:36 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> 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 + policy which makes the transport honour buffering constraints on the first oneway request queued before the connection is established. This fixes Bugzilla 3384. @@ -31,7 +288,7 @@ Thu Apr 11 16:51:31 UTC 2013 Martin Corino <mcorino@remedy.nl> 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 + state since this method can now be called in both a connected as well as unconnected state. * bin/tao_orb_tests.lst: 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/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/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/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..023c6f1085f 100644 --- a/TAO/tao/LF_Strategy_Complete.cpp +++ b/TAO/tao/LF_Strategy_Complete.cpp @@ -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..45259bf8786 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") @@ -232,7 +232,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 +286,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 +299,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..84c99140e01 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"))); @@ -1168,7 +1168,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 +1183,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 +1324,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 +1365,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 +1485,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 +1508,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..62b581afa45 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -651,7 +651,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 +734,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 +751,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 +793,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 +802,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 +1207,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 +1244,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 +1283,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 +1303,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 +1317,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 +1421,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 +1532,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 +1573,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 +2241,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 +2292,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 +2301,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 +2339,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 +2503,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 +2541,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 (); @@ -2794,7 +2794,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 +3219,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 +3230,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 +3239,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 +3342,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 +3399,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 +3448,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 +3472,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 +3496,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/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/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..6c4f91c1081 100644 --- a/TAO/tao/TAO_Singleton.cpp +++ b/TAO/tao/TAO_Singleton.cpp @@ -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 2ef3cd684c7..5c58908d935 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 (), @@ -706,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"), @@ -735,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"), @@ -770,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 ())); @@ -802,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 ())); @@ -828,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 ())); } @@ -883,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,") @@ -905,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,") @@ -919,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 ())); } @@ -935,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 ())); } @@ -949,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 ())); @@ -1041,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 ())); @@ -1052,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)); @@ -1080,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 ())); @@ -1121,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 ())); @@ -1147,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_))); @@ -1174,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_))); @@ -1207,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 ())); @@ -1238,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)); @@ -1254,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)); @@ -1265,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 (), @@ -1359,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_)); @@ -1464,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)); @@ -1489,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"), @@ -1525,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"), @@ -1541,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)); @@ -1567,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"), @@ -1578,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 ())); @@ -1591,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"), @@ -1629,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"), @@ -1655,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"), @@ -1705,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 ())); } @@ -1719,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())); @@ -1747,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 ())); @@ -1761,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 ())); @@ -1782,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 ())); @@ -1806,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 ())); @@ -1821,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 ())); @@ -1845,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 ())); @@ -1886,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 ())); @@ -1930,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 ())); @@ -1968,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)); @@ -2044,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 ())); @@ -2156,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 ())); @@ -2185,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)); @@ -2218,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 () )); @@ -2398,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 ())); @@ -2463,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 ())); @@ -2481,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())); @@ -2518,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 ())); @@ -2538,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 ())); @@ -2557,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 ())); @@ -2581,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 () )); } @@ -2595,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 (), @@ -2607,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 ())); @@ -2653,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 ())); @@ -2666,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 ())); @@ -2746,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 @@ -2769,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; @@ -2808,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"), @@ -2826,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/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..d8c00ec3e30 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) break;\ + 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)); |