diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp | 53 |
1 files changed, 27 insertions, 26 deletions
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 ()) )); |