diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify')
59 files changed, 337 insertions, 275 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 171fae5d70a..55cbf08504d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -188,7 +188,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, if (type == "subscriptions") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload subscription %d\n"), static_cast<int> (id) )); @@ -200,7 +200,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, else if (type == "filter_admin") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n"), static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index e7b1b61ea8a..4f39ccb53e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -47,7 +47,7 @@ public: _CrtMemState diff; _CrtMemDifference (&diff, &before_, &after); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %s: New heap blocks: %d; bytes: %d\n"), name_.c_str (), static_cast<int> (diff.lCounts[_NORMAL_BLOCK]), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 14ce46c8381..1f0ef328be9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/AnyEvent.h" #include "orbsvcs/Notify/Consumer.h" #include "tao/corba.h" @@ -39,7 +40,7 @@ CORBA::Boolean TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_AnyEvent::do_match ()\n")); return filter->match(*this->event_); @@ -49,7 +50,7 @@ void TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_AnyEvent::push\n")); consumer->push (*this->event_); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 8f2b142f342..449328b0400 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h" #include "tao/debug.h" #include "orbsvcs/Notify/AdminProperties.h" @@ -80,7 +81,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 9603d8a9636..34caef24451 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h" #include "tao/debug.h" #include "orbsvcs/Notify/Any/PushConsumer.h" @@ -57,7 +58,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 92362902145..d0ba4e34035 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/ProxyPushConsumer.h" #include "tao/debug.h" #include "orbsvcs/Notify/AdminProperties.h" @@ -83,7 +84,7 @@ TAO_Notify_ProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index aae6d178396..3c5b31d52a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/ProxyPushSupplier.h" #include "tao/debug.h" #include "orbsvcs/Notify/Any/PushConsumer.h" @@ -65,7 +66,7 @@ TAO_Notify_ProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index 45b6ffbdc18..6f84f19e964 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Any/PushConsumer.h" #include "ace/Bound_Ptr.h" #include "tao/Stub.h" // For debug messages printing out ORBid. @@ -71,7 +72,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer) //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Any push init dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Any push init dispatching ORB id is %s.\n", obj->_stubobj()->orb_core()->orbid())); } //--cj end @@ -80,7 +81,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer) catch (const CORBA::TRANSIENT& ex) { ex._tao_print_exception ("Got a TRANSIENT in NS_PushConsumer::init"); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this)); } catch (const CORBA::Exception&) { @@ -100,7 +101,7 @@ TAO_Notify_PushConsumer::push (const CORBA::Any& payload) { //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Any push dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Any push dispatching ORB id is %s.\n", this->push_consumer_->_stubobj()->orb_core()->orbid())); } //--cj end diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index fcba741ef1f..bed549f7365 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Buffering_Strategy.h" #include "orbsvcs/Notify/Method_Request.h" @@ -193,7 +194,7 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* met { if (this->queue (method_request) == -1) { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, "Notify (%P|%t) - Panic! failed to enqueue event\n")); return -1; } @@ -204,7 +205,7 @@ TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* met } else { - ACE_DEBUG((LM_DEBUG, + ORBSVCS_DEBUG((LM_DEBUG, "Notify (%P|%t) - Panic! did not attempt to enqueue event\n")); return -1; } @@ -286,26 +287,26 @@ TAO_Notify_Buffering_Strategy::queue (TAO_Notify_Method_Request_Queueable* metho order == CosNotification::FifoOrder) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in fifo order\n")); return this->msg_queue_.enqueue_tail (method_request); } if (order == CosNotification::PriorityOrder) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in priority order\n")); return this->msg_queue_.enqueue_prio (method_request); } if (order == CosNotification::DeadlineOrder) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - enqueue in deadline order\n")); return this->msg_queue_.enqueue_deadline (method_request); } if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid order policy\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid order policy\n")); return this->msg_queue_.enqueue_tail (method_request); } @@ -348,7 +349,7 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* met else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - Invalid discard policy\n")); result = this->msg_queue_.dequeue_head (mb); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 3f794fd2c7f..588c0c70bb9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Consumer.h" #if ! defined (__ACE_INLINE__) @@ -102,7 +103,7 @@ TAO_Notify_Consumer::enqueue_request ( TAO_Notify_Method_Request_Event_Queueable (*request, event), CORBA::NO_MEMORY ()); - if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG, + if (DEBUG_LEVEL > 3) ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d: enqueue_request (%d) @%@.\n"), static_cast<int> (this->proxy ()->id ()), request->sequence (), @@ -119,7 +120,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req if (! this->pending_events().is_empty ()) { if (DEBUG_LEVEL > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -138,7 +139,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req if (this->is_suspended_ == 1) { if (DEBUG_LEVEL > 3) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -178,7 +179,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request) case DISPATCH_RETRY: { if (DEBUG_LEVEL > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d enqueing event %d due ") ACE_TEXT ("to failed dispatch.\n"), static_cast<int> (this->proxy ()->id ()), @@ -190,7 +191,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request) case DISPATCH_DISCARD: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Error during ") ACE_TEXT ("direct dispatch. Discarding event:%d.\n"), static_cast<int> (this->proxy ()->id ()), @@ -205,7 +206,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request) case DISPATCH_FAIL: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Failed during ") ACE_TEXT ("direct dispatch :%d. Discarding event.\n"), static_cast<int> (this->proxy ()->id ()), @@ -234,7 +235,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { request->event ()->push (this); if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d dispatched single event %d.\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -244,7 +245,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -256,7 +257,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request catch (const CORBA::TRANSIENT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) Transient (minor=%d) %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -296,7 +297,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request catch (const CORBA::TIMEOUT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push ") ACE_TEXT ("(request) %s\n"), this->proxy ()->id (), @@ -307,7 +308,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request catch (const CORBA::COMM_FAILURE& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %u::push ") ACE_TEXT ("(request) %s\n"), this->proxy ()->id (), @@ -319,7 +320,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) SystemException %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -330,7 +331,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request } catch (const CORBA::Exception&) { - ACE_ERROR ( (LM_ERROR, + ORBSVCS_ERROR ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push ") ACE_TEXT ("(request) Caught unexpected exception ") ACE_TEXT ("pushing event to consumer.\n"), @@ -372,7 +373,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::OBJECT_NOT_EXIST& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -383,7 +384,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::TRANSIENT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() Transient (minor=%d) %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -423,7 +424,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::TIMEOUT& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%u::dispatch_batch() %s\n"), this->proxy ()->id (), @@ -434,7 +435,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) catch (const CORBA::COMM_FAILURE& ex) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%u::dispatch_batch() %s\n"), this->proxy ()->id (), @@ -446,7 +447,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() SystemException %s\n"), static_cast<int> (this->proxy ()->id ()), @@ -457,7 +458,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) } catch (const CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer ") ACE_TEXT ("%d::dispatch_batch() Caught unexpected ") ACE_TEXT ("exception pushing batch to consumer.\n"), @@ -472,7 +473,7 @@ void TAO_Notify_Consumer::dispatch_pending (void) { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d dispatching pending events. Queue size: %d\n"), static_cast<int> (this->proxy ()->id ()), this->pending_events().size () @@ -524,7 +525,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( case DISPATCH_RETRY: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence () @@ -537,7 +538,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( case DISPATCH_DISCARD: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Error during ") ACE_TEXT ("dispatch. Discarding event:%d.\n"), static_cast<int> (this->proxy ()->id ()), @@ -551,7 +552,7 @@ TAO_Notify_Consumer::dispatch_from_queue ( case DISPATCH_FAIL: { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Failed. ") ACE_TEXT ("Discarding event %d.\n"), static_cast<int> (this->proxy ()->id ()), @@ -621,7 +622,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) if (DEBUG_LEVEL > 5) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"), static_cast<int> (this->proxy ()->id ()), tv.msec ())); } @@ -630,7 +631,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) this->timer_->schedule_timer (this, tv, ACE_Time_Value::zero); if (this->timer_id_ == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () ") ACE_TEXT ("Error scheduling timer.\n"), static_cast<int> (this->proxy ()->id ()) @@ -648,7 +649,7 @@ TAO_Notify_Consumer::cancel_timer (void) if (this->timer_.isSet() && this->timer_id_ != -1) { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Consumer %d canceling dispatch timer.\n"), static_cast<int> (this->proxy ()->id ()) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index de8fc25335f..5ed4b550015 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ConsumerAdmin.h" #include "orbsvcs/Notify/Subscription_Change_Worker.h" #include "orbsvcs/Notify/Proxy.h" @@ -95,7 +96,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, TAO_Notify::Topology_Object* result = this; if (type == "proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -103,7 +104,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, } else if (type == "structured_proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -111,7 +112,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, } else if (type == "sequence_proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -120,7 +121,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, #if 0 else if (type == "ec_proxy_push_supplier") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 0362bcd53af..2a03d60c994 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/CosNotify_Service.h" #include "orbsvcs/Notify/Properties.h" #include "orbsvcs/Notify/Default_Factory.h" @@ -43,7 +44,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTDispatching")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) @@ -54,7 +55,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTSourceEval")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) @@ -65,27 +66,27 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTLookup")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) { supplier_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads\n"))); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTListenerEval")) == 0) { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads\n"))); } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) { // Since this option is always added to consumer_threads, we'll // deprecate it in favor of that option. - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -ListenerThreads option has been deprecated, use -DispatchingThreads\n"))); consumer_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); @@ -117,12 +118,12 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { properties->separate_dispatching_orb ( static_cast<bool> (ACE_OS::atoi(current_arg))); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Using separate Dispatching ORB\n"))); } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-UseSeparateDispatchingORB usage.\n"), @@ -147,7 +148,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) op = CosNotifyChannelAdmin::OR_OP; else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-DefaultConsumerAdminFilterOp usage.\n"), @@ -167,7 +168,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) op = CosNotifyChannelAdmin::OR_OP; else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-DefaultSupplierAdminFilterOp usage.\n"), @@ -180,7 +181,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) { arg_shifter.consume_arg (); TAO_Notify_PROPERTIES::instance()->validate_client (true); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using reactive client control.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Using reactive client control.\n"))); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ValidateClientDelay")) == 0) { @@ -192,7 +193,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-ValidateClientDelay usage.\n"), @@ -211,7 +212,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) WARNING: Unrecognized ") ACE_TEXT ("argument (%s). Ignoring invalid ") ACE_TEXT ("-ValidateClientDelay usage.\n"), @@ -222,7 +223,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Ignoring unknown option for Notify Factory: %s\n"), arg_shifter.get_current() )); @@ -242,7 +243,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per ConsumerAdmin QoS { if (consumer_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each ConsumerAdmin.\n", consumer_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each ConsumerAdmin.\n", consumer_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, consumer_threads); properties->default_consumer_admin_qos_properties (qos); @@ -251,7 +252,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per SupplierAdmin QoS { if (supplier_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each SupplierAdmin.\n", supplier_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each SupplierAdmin.\n", supplier_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, supplier_threads); properties->default_supplier_admin_qos_properties (qos); @@ -262,7 +263,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per ProxyConsumer QoS { if (supplier_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each Supplier.\n", supplier_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each Supplier.\n", supplier_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, supplier_threads); // lookup thread per proxy doesn't make sense. properties->default_proxy_consumer_qos_properties (qos); @@ -271,7 +272,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) // Set the per ProxySupplier QoS { if (consumer_threads > 0) - ACE_DEBUG((LM_DEBUG, "Using %d threads for each Consumer.\n", consumer_threads)); + ORBSVCS_DEBUG((LM_DEBUG, "Using %d threads for each Consumer.\n", consumer_threads)); CosNotification::QoSProperties qos; this->set_threads (qos, consumer_threads); properties->default_proxy_supplier_qos_properties (qos); @@ -313,14 +314,14 @@ TAO_CosNotify_Service::fini (void) void TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb) { - ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n")); if (TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb()) { // got here by way of svc.conf. no second orb supplied so create one if (CORBA::is_nil (TAO_Notify_PROPERTIES::instance()->dispatching_orb())) { - ACE_DEBUG ((LM_DEBUG, "No dispatching orb supplied. Creating default one.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "No dispatching orb supplied. Creating default one.\n")); int argc = 0; ACE_TCHAR *argv0 = 0; @@ -397,7 +398,7 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb) orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ()); @@ -426,7 +427,7 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (object.in ())) - ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); + ORBSVCS_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n")); PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index 08d1dd913b9..8b7eb98c875 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Delivery_Request.h" #if ! defined (__ACE_INLINE__) @@ -30,14 +31,14 @@ Delivery_Request::Delivery_Request (const Routing_Slip_Ptr & routing_slip, size_ , request_id_ (request_id) , delivery_type_ (0) { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Delivery_Request:: constructor\n") )); } Delivery_Request::~Delivery_Request () { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Delivery_Request:: destructor\n") )); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 66c9ed15961..ae1d262a9a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ETCL_Filter.h" #include "ace/Auto_Ptr.h" #include "tao/debug.h" @@ -71,7 +72,7 @@ TAO_Notify_Constraint_Expr::load_child ( CORBA::ULong len = this->constr_expr.event_types.length (); if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload EventType %d \n"), len + 1)); @@ -115,13 +116,13 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter () catch (const CORBA::Exception&) { if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Error in Filter dtor\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Error in Filter dtor\n"))); // @@ eat exception. } if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Filter Destroyed\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Filter Destroyed\n"))); } char* @@ -151,7 +152,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Added an empty constraint to filter\n"))); if (this->constraint_expr_list_.bind (cnstr_id, notify_constr_expr) == -1) @@ -185,7 +186,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i if (cnstr_id == 0) { if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Added constraint %C to filter %d\n"), expr.constraint_expr.in (), this->id_)); @@ -194,7 +195,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i else { if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Loaded constraint %C to filter %d\n"), expr.constraint_expr.in (), this->id_)); } @@ -216,7 +217,7 @@ TAO_Notify_ETCL_Filter::add_constraints ( CORBA::ULong const constraint_length = constraint_list.length (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("constraint_length = %d\n"), constraint_length)); @@ -237,7 +238,7 @@ TAO_Notify_ETCL_Filter::add_constraints ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Adding constraint %d, %C\n"), pop_index, constraint_list [pop_index].constraint_expr.in ())); @@ -586,7 +587,7 @@ TAO_Notify_ETCL_Filter::load_child (const ACE_CString &type, constraint_expr_ids_ = id; if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload filter %d constraint %d\n"), static_cast<int> (this->id_), static_cast<int> (id))); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 55972f57961..be54204c663 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ETCL_FilterFactory.h" #include "orbsvcs/Notify/ETCL_Filter.h" #include "orbsvcs/Notify/Properties.h" @@ -223,7 +224,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type, { TAO_Notify_Object::ID const id = ACE_OS::atoi (value); if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload filter %d\n"), static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 003b4e6cd5c..783892b8c94 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Event.h" #if ! defined (__ACE_INLINE__) @@ -24,13 +25,13 @@ TAO_Notify_Event::TAO_Notify_Event (void) , time_ (ACE_OS::gettimeofday ()) { // if (TAO_debug_level > 0) - // ACE_DEBUG ((LM_DEBUG,"event:%x created\n", this )); + // ORBSVCS_DEBUG ((LM_DEBUG,"event:%x created\n", this )); } TAO_Notify_Event::~TAO_Notify_Event () { // if (TAO_debug_level > 1) - // ACE_DEBUG ((LM_DEBUG,"event:%x destroyed\n", this )); + // ORBSVCS_DEBUG ((LM_DEBUG,"event:%x destroyed\n", this )); } void TAO_Notify_Event::release (void) @@ -69,7 +70,7 @@ TAO_Notify_Event::unmarshal (TAO_InputCDR & cdr) result = TAO_Notify_StructuredEvent::unmarshal (cdr); break; default: - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Event::unmarshal: unknown event code %d\n"), code)); break; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 922b871eeaa..8947a8d539b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -512,7 +512,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, else if (type == "consumer_admin") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload consumer_admin %d\n") , static_cast<int> (id) )); @@ -535,7 +535,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, else if (type == "supplier_admin") { if (DEBUG_LEVEL) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload supplier_admin %d\n") , static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 9f13cd4ec58..33536380395 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -214,7 +214,7 @@ TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::Channe void TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factory* f) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) Debug Topology_Factory installed in EventChannelFactory.\n") )); // If the above meessage appears when you don't expect it @@ -239,7 +239,7 @@ TAO_Notify_EventChannelFactory::load_topology (void) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Topology persistence disabled.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Topology persistence disabled.\n"))); } this->loading_topology_ = false; } @@ -319,7 +319,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) { //@@todo: tell the rspm it's an orphan, but we can't during reload // we need collect these and come back later to remove them - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reload persistent event failed.\n") )); } @@ -328,7 +328,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notify Service: Configuration error. Event Persistence requires Topology Persistence.\n") )); throw CORBA::PERSIST_STORE(); @@ -377,7 +377,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type, TAO_Notify::Topology_Object * result = this; if (type == "channel") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannelFactory reload channel %d\n") , static_cast<int> (id) )); @@ -510,7 +510,7 @@ TAO_Notify_EventChannelFactory::activate_self (void) { if (DEBUG_LEVEL > 9) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self\n") )); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self\n") )); } this->reconnect (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index 66dcf492e9d..eb5c4166582 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -3,7 +3,7 @@ #include "orbsvcs/Notify/EventType.h" #include "ace/ACE.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_string.h" #if ! defined (__ACE_INLINE__) @@ -123,7 +123,7 @@ TAO_Notify_EventType::is_special (void) const void TAO_Notify_EventType::dump (void) const { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%s,%s)", this->event_type_.domain_name.in (), this->event_type_.type_name.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 5828fd92d0f..31d93b598a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/EventTypeSeq.h" #include "orbsvcs/Notify/Topology_Saver.h" @@ -253,7 +254,7 @@ TAO_Notify_EventTypeSeq::dump (void) const for (iter.first (); iter.next (event_type); iter.advance ()) { event_type->dump (); - ACE_DEBUG ((LM_DEBUG, ", ")); + ORBSVCS_DEBUG ((LM_DEBUG, ", ")); } } @@ -295,7 +296,7 @@ TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id, if ((type == "subscription") && et.init(attrs)) { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Event_Type reload subscription\n") )); inherited::insert(et); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index bb33172973f..61ad42ca002 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Event_Manager.h" #include "orbsvcs/Notify/ProxyConsumer.h" #include "orbsvcs/Notify/ProxySupplier.h" @@ -66,7 +67,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, "destroying consumer/supplier map count = %d/%d,\n", + ORBSVCS_DEBUG ((LM_DEBUG, "destroying consumer/supplier map count = %d/%d,\n", this->consumer_map().proxy_count (), this->supplier_map().proxy_count ())); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 4c3e8b47459..362306c9e5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Method_Request_Dispatch.h" #include "orbsvcs/Notify/ProxySupplier.h" #include "orbsvcs/Notify/Consumer.h" @@ -71,7 +72,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void) parent.filter_operator ()); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Notify (%P|%t) Proxysupplier %x filter ") ACE_TEXT ("eval result = %d\n"), &this->proxy_supplier_ , val)); @@ -138,7 +139,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( if (proxy_supplier != 0) { if (DEBUG_LEVEL > 6) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT (" reload event for %C\n"), textpath.c_str())); @@ -150,14 +151,14 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0); //@@todo if (proxy_consumer == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT ("::unmarshal: unknown proxy id %C\n"), textpath.c_str())); } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT ("::unmarshal: wrong type of proxy id %C\n"), textpath.c_str())); @@ -166,7 +167,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Dispatch") ACE_TEXT ("::unmarshal: Cant read proxy id path\n"))); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 6a0120758fd..b7f8390fcc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Method_Request_Lookup.h" #include "orbsvcs/Notify/Consumer_Map.h" #include "orbsvcs/Notify/ProxySupplier.h" @@ -67,7 +68,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (void) parent.filter_operator ()); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Notify (%P|%t) Proxyconsumer %x filter ") + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Notify (%P|%t) Proxyconsumer %x filter ") ACE_TEXT("eval result = %d\n"), &this->proxy_consumer_ , val)); @@ -143,14 +144,14 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Lookup_No_Copy::unmarshal: unknown proxy id\n") )); } } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Method_Request_Lookup_No_Copy::unmarshal: Cant read proxy id path\n") )); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index 1a29bd03d23..d8b0fb9c771 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControl/MonitorManager.h" #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) @@ -50,7 +52,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) this->task_.ior_output_ = opts.opt_arg (); if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_MonitorManager: Setting IOR output file to: %s"), this->task_.ior_output_.c_str ())); } @@ -61,7 +63,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) ACE_TCHAR * orbArgs = opts.opt_arg (); if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_MonitorManager: Setting Orb arguments to: %s"), orbArgs)); } @@ -71,14 +73,14 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_MonitorManager: Not using naming service"))); } this->task_.use_name_svc_ = false; } break; case ':': - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_MonitorManager: %s requires an argument\n"), opts.last_option ()), -1); @@ -184,7 +186,7 @@ TAO_MonitorManager::ORBTask::svc (void) { if (CORBA::is_nil (this->orb_.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_MonitorManager: Unable to " "initialize the ORB\n"), 1); @@ -202,7 +204,7 @@ TAO_MonitorManager::ORBTask::svc (void) if (CORBA::is_nil (poa.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_MonitorManager: Unable to " "resolve the RootPOA\n"), 1); @@ -228,7 +230,7 @@ TAO_MonitorManager::ORBTask::svc (void) if (CORBA::is_nil (iortable.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "(%P|%t) TAO_MonitorManager: Unable to " "resolve the IORTable\n"), 1); @@ -252,7 +254,7 @@ TAO_MonitorManager::ORBTask::svc (void) if (fp == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_MonitorManager: " ACE_TEXT ("Unable to write to %s\n")), this->ior_output_.c_str ()), @@ -318,7 +320,7 @@ TAO_MonitorManager::ORBTask::svc (void) this->orb_ = CORBA::ORB::_nil (); } - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unexpected exception type caught " "in TAO_MonitorManager::ORBTask::svc")); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp index 2b3648468df..313c191771f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h" #include "tao/Monitor/Monitor_Impl.h" @@ -262,7 +264,7 @@ NotificationServiceMonitor_i::get_invalid_names ( { if (TAO_debug_level > 7) { - ACE_DEBUG((LM_INFO, + ORBSVCS_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) TAO_NotificationServiceMonitor: Client requested invalid statistic name: %s"), names[i].in ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp index 8ea167e6983..33b9f4ea744 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h" #include "tao/debug.h" @@ -38,7 +40,7 @@ TAO_MC_Notify_Service::init_i (CORBA::ORB_ptr orb) if (monitor == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "%s must be loaded via " + ORBSVCS_DEBUG ((LM_DEBUG, "%s must be loaded via " "the Service Configurator\n", TAO_NOTIFY_MONITOR_CONTROL_MANAGER)); } @@ -60,7 +62,7 @@ TAO_MC_Notify_Service::init_i2 (CORBA::ORB_ptr orb, if (monitor == 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "%s must be loaded via " + ORBSVCS_DEBUG ((LM_DEBUG, "%s must be loaded via " "the Service Configurator\n", TAO_NOTIFY_MONITOR_CONTROL_MANAGER)); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index b9e254acd89..3bd05a1898a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h" #include "ace/Monitor_Size.h" @@ -116,7 +118,7 @@ TAO_MonitorConsumerAdmin::register_stats_controls ( if (!cinstance->add (control)) { delete control; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", this->control_name_.c_str ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index 6af8a90efe3..741b58ce04b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h" #include "ace/Monitor_Point_Registry.h" @@ -401,7 +403,7 @@ TAO_MonitorEventChannel::map_supplier_proxy ( else { delete rcsc; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", full.c_str ())); } @@ -450,7 +452,7 @@ TAO_MonitorEventChannel::map_consumer_proxy ( else { delete rcsc; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", full.c_str ())); } @@ -545,7 +547,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, timestamp)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -565,7 +567,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, consumers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -585,7 +587,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, consumers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -605,7 +607,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, tconsumers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -626,7 +628,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, suppliers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -647,7 +649,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, suppliers)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -667,7 +669,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, conadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -687,7 +689,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, conadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -708,7 +710,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, supadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -729,7 +731,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, supadmins)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -748,7 +750,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, events)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -778,7 +780,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, oldest)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -797,7 +799,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, slowest)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } @@ -814,7 +816,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) if (!this->register_statistic (stat_name, overflows)) { delete overflows; - ACE_ERROR ((LM_ERROR, "Unable to add statistic: %s\n", + ORBSVCS_ERROR ((LM_ERROR, "Unable to add statistic: %s\n", stat_name.c_str ())); } @@ -835,7 +837,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) else { delete sd; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", this->name_.c_str ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp index 4c6c6e6dbac..49fd09ee747 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp @@ -3,6 +3,7 @@ #ifndef MONITORPROXYSUPPLIER_T_CPP #define MONITORPROXYSUPPLIER_T_CPP +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h" @@ -106,7 +107,7 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::configure( } else { - ACE_DEBUG ((LM_DEBUG, "Warning MC cannot enable statistics for buffering strategy.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Warning MC cannot enable statistics for buffering strategy.\n")); } this->base_stat_name_ = admin_->stat_name (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp index bc07e2eb328..79d2314656a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h" #include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h" #include "orbsvcs/Notify/MonitorControl/Control_Registry.h" @@ -74,7 +76,7 @@ TAO_MonitorSupplierAdmin::register_stats_controls ( if (!cinstance->add (control)) { delete control; - ACE_ERROR ((LM_ERROR, "Unable to add control: %s\n", + ORBSVCS_ERROR ((LM_ERROR, "Unable to add control: %s\n", this->control_name_.c_str ())); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index d731d5e7bb9..0b61d939e73 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Notify_Constraint_Interpreter.h" #include "orbsvcs/Notify/Notify_Constraint_Visitors.h" #include "orbsvcs/Notify/EventType.h" @@ -102,7 +103,7 @@ TAO_Notify_Constraint_Interpreter::build_tree ( if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Constraint: %C\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Constraint: %C\n"), exp_str.c_str ())); } this->build_tree (exp_str.c_str ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 1b00338642c..4dfef2b2520 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" #include "orbsvcs/Notify/Service.h" @@ -19,7 +20,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, if (notify_service == 0) { - ACE_DEBUG ((LM_DEBUG, "Service not found! check conf. file\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Service not found! check conf. file\n")); return notify_factory._retn (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index 8bedd6b771f..566d6e53a97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Object.h" #include "orbsvcs/Notify/POA_Helper.h" #include "orbsvcs/Notify/Worker_Task.h" @@ -27,13 +28,13 @@ TAO_Notify_Object::TAO_Notify_Object (void) , shutdown_ (false) { if (TAO_debug_level > 2 ) - ACE_DEBUG ((LM_DEBUG,"object:%x created\n", this )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x created\n", this )); } TAO_Notify_Object::~TAO_Notify_Object () { if (TAO_debug_level > 2 ) - ACE_DEBUG ((LM_DEBUG,"object:%x destroyed\n", this )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x destroyed\n", this )); this->destroy_proxy_poa (); this->destroy_object_poa (); @@ -95,7 +96,7 @@ TAO_Notify_Object::deactivate (void) if (TAO_debug_level > 2) { ex._tao_print_exception ("(%P|%t)\n"); - ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_)); + ORBSVCS_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_)); } } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index 12c6dfaa571..c288de9000f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/POA_Helper.h" #if ! defined (__ACE_INLINE__) @@ -107,7 +108,7 @@ TAO_Notify_POA_Helper::create_i ( if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, "Created POA : %C\n", the_name.in ())); + ORBSVCS_DEBUG ((LM_DEBUG, "Created POA : %C\n", the_name.in ())); } /* @@ -158,7 +159,7 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Activating object with ") ACE_TEXT ("id = %d in POA : %C\n"), id, the_name.in () @@ -179,7 +180,7 @@ TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA: if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Activating object with ") ACE_TEXT ("existing id = %d in POA : %C\n"), id, the_name.in () @@ -204,7 +205,7 @@ TAO_Notify_POA_Helper::deactivate (CORBA::Long id) const if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Deactivating object with") ACE_TEXT ("id = %d in POA : %C\n"), id, the_name.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 251350631ca..f6af479ef31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Persistent_File_Allocator.h" #include "tao/debug.h" @@ -168,7 +169,7 @@ Persistent_File_Allocator::allocate() // why not. What if the disk is full? Oh, I see we // allocate non-existent blocks. FIX this } - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate: %B\n"), block_number )); @@ -181,7 +182,7 @@ Persistent_File_Allocator::allocate_at(size_t block_number) { Persistent_Storage_Block* result = 0; this->used(block_number); - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate at : %B\n"), block_number )); @@ -208,7 +209,7 @@ void Persistent_File_Allocator::used(size_t block_number) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_); - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %B\n"), block_number )); @@ -219,7 +220,7 @@ Persistent_File_Allocator::used(size_t block_number) void Persistent_File_Allocator::free(size_t block_number) { - if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 0) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::free: %B\n"), block_number )); @@ -277,7 +278,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb) Persistent_Storage_Block* ourpsb = psb; if (!psb->get_allocator_owns()) { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Copy PSB %B\n") , psb->block_number () )); @@ -285,7 +286,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb) ourpsb->set_allocator_owns(true); } ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false); - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Queueing PSB to write block %B\n") , psb->block_number () )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 94efb2e50af..4cbe789d226 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Properties.h" #include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" @@ -32,7 +33,7 @@ TAO_Notify_Properties::TAO_Notify_Properties (void) this->ec_qos_[0].value <<= tp_params; if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, "in TAO_Properties ctos %x\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "in TAO_Properties ctos %x\n", this)); } TAO_Notify_Properties::~TAO_Notify_Properties () diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 5b3b6da7382..ba1cf392883 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ProxyConsumer.h" #if ! defined (__ACE_INLINE__) @@ -119,7 +120,7 @@ TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event) TAO_Notify::Routing_Slip_Ptr routing_slip = TAO_Notify::Routing_Slip::create (pevent); if (DEBUG_LEVEL > 0) - ACE_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n"))); + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n"))); routing_slip->route (this, true); routing_slip->wait_persist (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index 604d36d8a89..9fa8eb470a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/RT_Notify_Service.h" #include "ace/Dynamic_Service.h" #include "orbsvcs/Notify/Properties.h" @@ -20,7 +22,7 @@ TAO_RT_Notify_Service::~TAO_RT_Notify_Service () void TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb) { - ACE_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n")); this->init_i (orb); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 0a82670bc4f..ae95372a1c5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" @@ -36,7 +38,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* RTCORBA::CLIENT_PROPAGATED : RTCORBA::SERVER_DECLARED; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Priority Model = %d, Server prio = %d\n" + ORBSVCS_DEBUG ((LM_DEBUG, "Priority Model = %d, Server prio = %d\n" , tp_params.priority_model, tp_params.server_priority)); policy_list.length (3); @@ -45,7 +47,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* tp_params.server_priority); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n" + ORBSVCS_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n" , tp_params.static_threads, tp_params.default_priority)); // Create the thread-pool. @@ -100,7 +102,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, "Creating threadpool lane %d: priority = %d, static threads = %d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Creating threadpool lane %d: priority = %d, static threads = %d\n", index, tpl_params.lanes[index].lane_priority, tpl_params.lanes[index].static_threads)); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index e8790ae3e34..b18a023dc85 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Notify/Random_File.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_fcntl.h" #include "tao/debug.h" #include "ace/OS_NS_unistd.h" @@ -59,7 +59,7 @@ Random_File::open(const ACE_TCHAR* filename, size_t block_size) if (result) { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Opening file %s\n") , filename )); @@ -91,7 +91,7 @@ bool Random_File::write(const size_t block_number, void* buf, bool atomic) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Write block %B %c\n"), block_number, (atomic ? '*' : ' ') @@ -126,7 +126,7 @@ bool Random_File::read(const size_t block_number, void* buf) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Read block %B\n"), block_number )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index b6b936da109..b4c158640a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -7,6 +7,7 @@ * * @author Dale Wilson <wilson_d@ociweb.com> */ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Reconnection_Registry.h" #include "tao/debug.h" @@ -51,7 +52,7 @@ namespace TAO_Notify if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: registering %d\n"), static_cast<int> (next_id) )); @@ -75,7 +76,7 @@ namespace TAO_Notify { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: unregistering %d\n"), static_cast<int> (id) )); @@ -115,7 +116,7 @@ namespace TAO_Notify NVPList cattrs; if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: saving %d\n"), static_cast<int> (entry->ext_id_) )); @@ -153,7 +154,7 @@ namespace TAO_Notify if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: reloading %d\n"), static_cast<int> (id) )); @@ -166,7 +167,7 @@ namespace TAO_Notify } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Reconnect registry: missing attribute\n") )); } @@ -190,7 +191,7 @@ namespace TAO_Notify { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Sending reconnection to client %d\n"), static_cast<int> (entry->ext_id_) )); @@ -205,7 +206,7 @@ namespace TAO_Notify } else { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Can't resolve reconnection client's IOR %d\n"), static_cast<int> (entry->ext_id_) )); @@ -216,7 +217,7 @@ namespace TAO_Notify } catch (const CORBA::Exception&) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Exception sending reconnection to client -- discarding registry entry\n") )); //throw this entry away but you've got an iterator so be careful diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index c80e3402a6f..9abb4399a7d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Notify/Refcountable.h" #include "tao/debug.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Guard_T.h" #if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) @@ -74,12 +74,12 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable () TAO_Notify_Tracker::Entry e = TAO_Notify_Tracker::get_instance().find( this ); if ( e.obj != 0 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n", e.obj, e.class_name, e.obj->ref_id_, e.obj->refcount_.value() )); if ( e.obj != this || e.obj->ref_id_ != this->ref_id_ ) { - ACE_DEBUG ((LM_DEBUG, " with an ID mismatch %x->%d != %x->%d!\n", + ORBSVCS_DEBUG ((LM_DEBUG, " with an ID mismatch %x->%d != %x->%d!\n", this, ref_id_, e.obj, e.obj->ref_id_)); } TAO_Notify_Tracker::get_instance().remove( this ); @@ -97,7 +97,7 @@ TAO_Notify_Refcountable::_incr_refcnt (void) CORBA::Long refcount = ++this->refcount_; if (TAO_debug_level > 1 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, refcount )); } #if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 ) // Stack-instantiated-non-servants should never have _incr_refcnt called. @@ -118,7 +118,7 @@ TAO_Notify_Refcountable::_decr_refcnt (void) if (TAO_debug_level > 1 ) { - ACE_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount )); + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x decr refcount = %d\n", this, refcount )); } ACE_ASSERT(refcount >= 0); @@ -155,19 +155,19 @@ TAO_Notify_Tracker::dump( const char* title ) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - ACE_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump"))); + ORBSVCS_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump"))); EntityMap::const_iterator iter( map_.begin() ); while ( iter != map_.end() ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d.\n", iter->second.obj, iter->second.class_name, iter->first, iter->second.obj->refcount_.value() )); iter++; } EntityMap::size_type current_count = map_.size(); int diff = ( current_count - last_dump_count_ ); - ACE_DEBUG ((LM_DEBUG,"Count: %u\nDifference: %+d\n", current_count, diff )); + ORBSVCS_DEBUG ((LM_DEBUG,"Count: %u\nDifference: %+d\n", current_count, diff )); last_dump_count_ = current_count; } @@ -197,7 +197,7 @@ TAO_Notify_Tracker::add( TAO_Notify_Refcountable* p ) EntityMap::iterator& it = result.first; if ( result.second == false ) { - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) added twice.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) added twice.\n", it->second.obj, it->second.class_name.c_str(), it->first )); } else @@ -218,7 +218,7 @@ TAO_Notify_Tracker::remove( const TAO_Notify_Refcountable* p ) if ( iter == map_.end() ) { const char* class_name = typeid(*iter->second.obj).name(); - ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) not found.\n", + ORBSVCS_DEBUG ((LM_DEBUG,"object:%x %s(%d) not found.\n", p, class_name, ref_id )); } else diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 991f591e056..9a5180f0331 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Routing_Slip.h" #include "orbsvcs/Notify/Delivery_Request.h" @@ -64,7 +65,7 @@ Routing_Slip::create (const TAO_Notify_Event::Ptr& event) // note we don't care about ultra-precise stats, so no guard for these if (DEBUG_LEVEL > 8 && ((result->sequence_ % 100) == 0)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip_Statistics\n") ACE_TEXT (" enter_transient \t%B\n") ACE_TEXT (" continue_transient \t%B\n") @@ -128,7 +129,7 @@ Routing_Slip::create ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip::create: Unmarshalling failed for routing slip.\n") )); result.reset (); @@ -136,7 +137,7 @@ Routing_Slip::create ( } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip::create: Unmarshalling failed for event.\n") )); } @@ -144,7 +145,7 @@ Routing_Slip::create ( } catch (const CORBA::Exception&) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing_Slip::create: Exception reloading event.\n") )); } @@ -176,7 +177,7 @@ Routing_Slip::Routing_Slip( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, sequence_lock_); this->sequence_ = ++routing_slip_sequence_; - if (DEBUG_LEVEL > 1) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 1) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: constructor\n"), this->sequence_ )); @@ -184,7 +185,7 @@ Routing_Slip::Routing_Slip( Routing_Slip::~Routing_Slip () { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: destructor\n"), this->sequence_ )); @@ -236,7 +237,7 @@ Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel) size_t const request_id = delivery_requests_.size (); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%B: lookup, completed %B of %B\n"), this->sequence_, request_id, @@ -293,7 +294,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) guard.acquire(); size_t request_id = delivery_requests_.size (); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: Forward %s; completed %d of %d\n"), this->sequence_, static_cast<int> (request_id), @@ -310,7 +311,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) TAO_Notify_Method_Request_Dispatch_No_Copy method (request, ps, filter); guard.release (); if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %d to " "proxy supplier %d\n", this->sequence_, @@ -321,7 +322,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) else { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %d to " "proxy supplier %d; already shut down\n", this->sequence_, @@ -344,7 +345,7 @@ Routing_Slip::dispatch ( size_t request_id = delivery_requests_.size (); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%B: Dispatch %s; completed %B of %B\n"), this->sequence_, request_id, @@ -359,7 +360,7 @@ Routing_Slip::dispatch ( TAO_Notify_Method_Request_Dispatch_No_Copy method (request, ps, filter); guard.release (); if (DEBUG_LEVEL > 8) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %B to " "proxy supplier %d\n", this->sequence_, @@ -370,7 +371,7 @@ Routing_Slip::dispatch ( else { if (DEBUG_LEVEL > 5) - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %B to " "proxy supplier %d; already shut down\n", this->sequence_, @@ -391,7 +392,7 @@ Routing_Slip::delivery_request_complete (size_t request_id) this->delivery_requests_[request_id].reset (); this->complete_requests_ += 1; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: delivery_request_complete #%B: completed %B of %B\n"), this->sequence_, request_id, @@ -437,7 +438,7 @@ Routing_Slip::delivery_request_complete (size_t request_id) } default: { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notification Service Routing Slip: Unexpected delivery_request_complete in state %d\n"), static_cast<int> (this->state_) )); @@ -455,7 +456,7 @@ Routing_Slip::at_front_of_persist_queue () { case rssNEW: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: NEW Reached front of queue\n"), this->sequence_ )); @@ -464,7 +465,7 @@ Routing_Slip::at_front_of_persist_queue () } case rssCOMPLETE_WHILE_NEW: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: COMPLETE_WHILE_NEW Reached front of queue\n"), this->sequence_ )); @@ -475,7 +476,7 @@ Routing_Slip::at_front_of_persist_queue () } case rssCHANGED: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: CHANGED Reached front of queue\n"), this->sequence_ )); @@ -484,7 +485,7 @@ Routing_Slip::at_front_of_persist_queue () } case rssCOMPLETE: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: COMPLETE Reached front of queue\n"), this->sequence_ )); @@ -493,7 +494,7 @@ Routing_Slip::at_front_of_persist_queue () } default: { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing Slip %d: Unexpected at_front_of_persist_queue in state %d\n"), this->sequence_, static_cast<int> (this->state_) @@ -522,7 +523,7 @@ Routing_Slip::persist_complete () { case rssSAVING: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: SAVING persist complete\n"), this->sequence_ )); @@ -536,7 +537,7 @@ Routing_Slip::persist_complete () } case rssUPDATING: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: UPDATING persist complete\n"), this->sequence_ )); @@ -545,7 +546,7 @@ Routing_Slip::persist_complete () } case rssDELETING: { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: DELETING persist complete\n"), this->sequence_ )); @@ -554,7 +555,7 @@ Routing_Slip::persist_complete () } default: { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notification Service Routing Slip: Unexpected transition in state %d\n"), static_cast<int> (this->state_) )); @@ -588,7 +589,7 @@ void Routing_Slip::enter_state_new (Routing_Slip_Guard & guard) { ++count_enter_new_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state NEW\n"), this->sequence_ )); @@ -611,7 +612,7 @@ Routing_Slip::enter_state_complete_while_new (Routing_Slip_Guard & guard) { ++count_enter_complete_while_new_; ACE_UNUSED_ARG (guard); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state COMPLETE_WHILE_NEW\n"), this->sequence_ )); @@ -628,7 +629,7 @@ void Routing_Slip::enter_state_reloaded (Routing_Slip_Guard & guard) { ++count_enter_reloaded_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #&d: enter state RELOADED\n"), this->sequence_ )); @@ -640,7 +641,7 @@ void Routing_Slip::enter_state_transient (Routing_Slip_Guard & guard) { ++count_enter_transient_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state TRANSIENT\n"), this->sequence_ )); @@ -687,7 +688,7 @@ Routing_Slip::enter_state_saving (Routing_Slip_Guard & guard) } else { - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state SAVING\n"), this->sequence_ )); @@ -710,7 +711,7 @@ void Routing_Slip::enter_state_saved (Routing_Slip_Guard & guard) { ++count_enter_saved_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state SAVED\n"), this->sequence_ )); @@ -722,7 +723,7 @@ void Routing_Slip::enter_state_updating (Routing_Slip_Guard & guard) { ++count_enter_updating_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state UPDATING\n"), this->sequence_ )); @@ -742,7 +743,7 @@ void Routing_Slip::enter_state_changed_while_saving (Routing_Slip_Guard & guard) { ++count_enter_changed_while_saving_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state CHANGED_WHILE_SAVING\n"), this->sequence_ )); @@ -761,7 +762,7 @@ void Routing_Slip::enter_state_changed (Routing_Slip_Guard & guard) { ++count_enter_changed_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state CHANGED\n"), this->sequence_ )); @@ -793,7 +794,7 @@ void Routing_Slip::enter_state_complete (Routing_Slip_Guard & guard) { ++count_enter_complete_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state COMPLETE\n"), this->sequence_ )); @@ -805,7 +806,7 @@ void Routing_Slip::enter_state_deleting (Routing_Slip_Guard & guard) { ++count_enter_deleting_; - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state DELETING\n"), this->sequence_ )); @@ -819,7 +820,7 @@ Routing_Slip::enter_state_terminal (Routing_Slip_Guard & guard) { ++count_enter_terminal_; ACE_ASSERT( this->is_safe_); - if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL > 8) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: enter state TERMINAL\n"), this->sequence_ )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index baba1386099..4c652a3a8b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h" #include "orbsvcs/Notify/Standard_Event_Persistence.h" #include "orbsvcs/Notify/Persistent_File_Allocator.h" @@ -155,7 +156,7 @@ Routing_Slip_Persistence_Manager::load( } else { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT( "(%P|%t) Reloaded Persistent Event is missing event.\n") )); @@ -451,7 +452,7 @@ Routing_Slip_Persistence_Manager::store_i(const ACE_Message_Block& event, } else { - ACE_ERROR((LM_ERROR, + ORBSVCS_ERROR((LM_ERROR, ACE_TEXT( "(%P|%t) No Event is being stored with this routing slip.\n") )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 953bbbef2ff..203f967e984 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h" #include "tao/debug.h" #include "orbsvcs/Notify/Sequence/SequencePushSupplier.h" @@ -89,7 +90,7 @@ TAO_Notify_SequenceProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index 20eea7db03d..8e71cf47315 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h" #include "tao/debug.h" #include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" @@ -66,7 +67,7 @@ TAO_Notify_SequenceProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 040c6248479..2d68e2fa003 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Sequence/SequencePushConsumer.h" #include "ace/Truncate.h" #include "ace/Reactor.h" @@ -67,7 +68,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push init dispatching ORB id is %s.\n", obj->_stubobj()->orb_core()->orbid())); } @@ -77,7 +78,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p { ex._tao_print_exception ( "Got a TRANSIENT in NS_SequencePushConsumer::init"); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this)); } catch (const CORBA::Exception&) { @@ -101,7 +102,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A bool result = true; if (DEBUG_LEVEL > 0) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) SequencePushConsumer dispatch queued requests. queue size:%u\n"), requests.size ())); } @@ -130,7 +131,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) { - ACE_DEBUG ( (LM_DEBUG, + ORBSVCS_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Sequence Dispatch Method_Request_Dispatch @%@\n"), request)); } @@ -174,7 +175,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A if (request->should_retry ()) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast <int> (this->proxy ()->id ()), request->sequence ())); requests.enqueue_head (request); @@ -183,7 +184,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A else { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); request->complete (); @@ -195,7 +196,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A if (request->should_retry ()) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); requests.enqueue_head (request); @@ -204,7 +205,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A else { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); request->complete (); @@ -233,7 +234,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A if (request->should_retry ()) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); requests.enqueue_head (request); @@ -242,7 +243,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A else { if (DEBUG_LEVEL > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), static_cast<int> (this->proxy ()->id ()), request->sequence ())); request->complete (); @@ -266,7 +267,7 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary ( TAO_Notify_Method_Request_Event * request) { if (DEBUG_LEVEL > 0) - ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n")); + ORBSVCS_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n")); this->enqueue_request (request); size_t mbs = static_cast<size_t>(this->max_batch_size_.value()); @@ -301,7 +302,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_ { //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Sequence push dispatching ORB id is %s.\n", this->push_consumer_->_stubobj()->orb_core()->orbid())); } //--cj end diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 57fa3a8211c..34275c453e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Standard_Event_Persistence.h" #include "orbsvcs/Notify/Persistent_File_Allocator.h" #include "tao/debug.h" @@ -64,7 +65,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) if (ACE_OS::strcasecmp (av, ACE_TEXT ("-v")) == 0) { verbose = true; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n") )); } @@ -73,7 +74,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) this->filename_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: Setting -file_path: %s\n"), this->filename_.c_str () )); @@ -85,7 +86,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) this->block_size_ = ACE_OS::atoi(argv[narg + 1]); if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: Setting -block_size: %d\n"), this->block_size_ )); @@ -94,7 +95,7 @@ Standard_Event_Persistence::init (int argc, ACE_TCHAR *argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unknown parameter to Standard Event Persistence: %s\n"), argv[narg] )); @@ -144,7 +145,7 @@ Standard_Event_Persistence_Factory::~Standard_Event_Persistence_Factory() { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence_Factory::~Standard_Event_Persistence_Factory\n") )); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index 01f2d086736..bd26cb6f700 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredEvent.h" #include "orbsvcs/Notify/PropertySeq.h" #include "orbsvcs/Notify/Consumer.h" @@ -67,7 +68,7 @@ CORBA::Boolean TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_match ()\n")); return filter->match_structured (*this->notification_); @@ -83,7 +84,7 @@ void TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_push (" "CosNotifyComm::StructuredPushConsumer_ptr)\n")); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index f4ef5cee6fb..6d468c28193 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h" #include "ace/Bound_Ptr.h" #include "ace/Auto_Ptr.h" @@ -85,7 +86,7 @@ TAO_Notify_StructuredProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushConsumer::validate(%d)") ACE_TEXT("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 47c93c2d2a4..558bc94977c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h" #include "tao/PortableServer/Servant_Base.h" @@ -69,7 +70,7 @@ TAO_Notify_StructuredProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 4078536d4ab..331784106bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -1,4 +1,5 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/Structured/StructuredPushConsumer.h" #include "ace/Bound_Ptr.h" #include "tao/Stub.h" // For debug messages printing out ORBid. @@ -53,7 +54,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Structured push init dispatching ORB id is %s.\n", obj->_stubobj()->orb_core()->orbid())); } @@ -63,7 +64,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p { ex._tao_print_exception ( "Got a TRANSIENT in NS_StructuredPushConsumer::init"); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this)); } catch (const CORBA::Exception&) { @@ -98,7 +99,7 @@ TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event) // Expected exception when a bad connection is found if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); } } connection_valid = 1; @@ -114,7 +115,7 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& { //--cj verify dispatching ORB if (TAO_debug_level >= 10) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Structured push dispatching ORB id is %s.\n", + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Structured push dispatching ORB id is %s.\n", this->push_consumer_->_stubobj()->orb_core()->orbid())); } //--cj end @@ -131,7 +132,7 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& // Expected exception when a bad connection is found if (TAO_debug_level >= 1) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) Found bad connection.\n")); } } connection_valid = 1; diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 81fee5f301f..d74bb377bda 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/SupplierAdmin.h" #include "orbsvcs/Notify/Builder.h" #include "orbsvcs/Notify/ProxyConsumer.h" @@ -88,7 +89,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, TAO_Notify::Topology_Object* result = this; if (type == "proxy_push_consumer") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -96,7 +97,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, } else if (type == "structured_proxy_push_consumer") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); @@ -104,7 +105,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, } else if (type == "sequence_proxy_push_consumer") { - if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, + if (DEBUG_LEVEL) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") , static_cast<int> (id) )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index b973af826c4..2a4f6d88ad9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/ThreadPool_Task.h" #include "orbsvcs/Notify/Properties.h" #include "orbsvcs/Notify/Timer_Queue.h" @@ -85,10 +86,10 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, } if (ACE_OS::last_error () == EPERM) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Insufficient privilege.\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Insufficient privilege.\n"))); else if (ACE_OS::last_error () == EAGAIN) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) task activation at priority %d failed %p\n"), tp_params.default_priority, "activate")); throw CORBA::NO_RESOURCES (); @@ -110,7 +111,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request) ACE_Message_Block::release (request_copy); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "NS_ThreadPool_Task (%P|%t) - " + ORBSVCS_DEBUG ((LM_DEBUG, "NS_ThreadPool_Task (%P|%t) - " "failed to enqueue\n")); } } @@ -150,7 +151,7 @@ TAO_Notify_ThreadPool_Task::svc (void) else { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t)ThreadPool_Task dequeue failed\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t)ThreadPool_Task dequeue failed\n")); } } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp index 0f5338aaf05..0eb75f4721c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ +#include "orbsvcs/Log_Macros.h" #include "Validate_Client_Task.h" #include "EventChannelFactory.h" #include "tao/ORB_Core.h" @@ -20,7 +21,7 @@ TAO_Notify_validate_client_Task:: { if (this->activate (THR_NEW_LWP | THR_JOINABLE, 1) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t)TAO_Notify_validate_client_Task: %p\n"),"activate")); } } @@ -49,12 +50,12 @@ TAO_Notify_validate_client_Task::svc (void) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate start\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate start\n"))); } this->ecf_->validate (); if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate end\n"))); + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)%T TAO_Notify_validate_client_Task::svc validate end\n"))); } } catch (...) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp index b1090cd9b3f..d72f07bb5f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp @@ -5,7 +5,7 @@ #include "Validate_Worker_T.h" #include "tao/debug.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -28,7 +28,7 @@ namespace TAO_Notify { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t)Validate_Worker<TOPOOBJ>::work: obj is nil\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index adb507e2400..9b6accca631 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/XML_Loader.h" #include "orbsvcs/Notify/Topology_Object.h" @@ -100,14 +102,14 @@ namespace TAO_Notify catch (const ACEXML_Exception& ex) { // The only way to find out what it is, it to let it print itself, so... - ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n Will try backup file.\n", this->file_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Unable to load \"%s\".\n Will try backup file.\n", this->file_name_.c_str ())); ex.print (); result = false; } } else { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n Will try backup file.\n"), file_name_.c_str())); + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n Will try backup file.\n"), file_name_.c_str())); result = false; } } @@ -154,14 +156,14 @@ namespace TAO_Notify catch (const ACEXML_Exception& ex) { // The only way to find out what it is, it to let it print itself, so... - ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ())); + ORBSVCS_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ())); ex.print (); throw CORBA::INTERNAL(); } } else { - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n"), file_name_.c_str())); + ORBSVCS_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n"), file_name_.c_str())); throw CORBA::INTERNAL(); } } @@ -185,7 +187,7 @@ namespace TAO_Notify NVPList attrs; CORBA::Long id = makeNVPList (attrs, xml_attrs); - if (DEBUG_LEVEL > 5) ACE_DEBUG ((LM_INFO, + if (DEBUG_LEVEL > 5) ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("(%P|%t) XML_Loader: Element %s\n"), name )); @@ -214,7 +216,7 @@ namespace TAO_Notify ACE_ASSERT (object_stack_.size () > 0); if (DEBUG_LEVEL > 5) { - ACE_DEBUG ((LM_INFO, + ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT("(%P|%t) XML_Loader: End Element %s\n"), name)); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index 2e3f883571f..271b176a985 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/XML_Saver.h" #include "ACEXML/common/XML_Util.h" @@ -26,7 +28,7 @@ namespace TAO_Notify { if (this->output_ != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) XML_Saver warning close not called or failed\n") )); } @@ -102,7 +104,7 @@ namespace TAO_Notify if (this->output_) { this->close_out_ = true; } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) XML_Saver unable to open %s\n"), base_name.c_str())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index f3bead86487..a9f27bf4d1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Notify/XML_Topology_Factory.h" #include "orbsvcs/Notify/XML_Saver.h" #include "orbsvcs/Notify/XML_Loader.h" @@ -71,7 +73,7 @@ namespace TAO_Notify if (ACE_OS::strcasecmp (av, ACE_TEXT("-v")) == 0) { verbose = true; - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n") )); } @@ -81,7 +83,7 @@ namespace TAO_Notify this->load_base_path_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -base_path: %s\n"), this->save_base_path_.c_str () )); @@ -93,7 +95,7 @@ namespace TAO_Notify this->save_base_path_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -save_base_path: %s\n"), this->save_base_path_.c_str () )); @@ -105,7 +107,7 @@ namespace TAO_Notify this->load_base_path_ = argv[narg + 1]; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -load_base_path: %s\n"), this->load_base_path_.c_str () )); @@ -117,7 +119,7 @@ namespace TAO_Notify this->backup_count_ = ACE_OS::atoi(argv[narg + 1]); if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -file_count: %d\n"), this->backup_count_ )); @@ -129,14 +131,14 @@ namespace TAO_Notify this->timestamp_ = false; if (TAO_debug_level > 0 || verbose) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) XML_TopologyFactory: Setting -no_timestamp\n") )); } } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Unknown parameter to XML Topology Factory: %s\n"), argv[narg] )); |