diff options
Diffstat (limited to 'ACE/ace/Message_Queue_T.cpp')
| -rw-r--r-- | ACE/ace/Message_Queue_T.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index ffb66781a45..cc526cd72a9 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -7,7 +7,7 @@ // circular include problems. #include "ace/Message_Queue.h" #include "ace/Message_Queue_Vx.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_time.h" #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) @@ -69,7 +69,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_ ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue_Ex"); if (this->queue_.open (high_water_mark, low_water_mark, ns) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Queue_Ex"))); } @@ -984,23 +984,23 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); switch (this->state_) { case ACE_Message_Queue_Base::ACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = PULSED\n"))); break; } - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("low_water_mark = %d\n") ACE_TEXT ("high_water_mark = %d\n") ACE_TEXT ("cur_bytes = %d\n") @@ -1015,11 +1015,11 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n"))); not_empty_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1056,7 +1056,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue (size_t hwm, ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue"); if (this->open (hwm, lwm, ns) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("open"))); #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) @@ -1087,7 +1087,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue"); if (this->head_ != 0 && this->close () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("close"))); #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) @@ -1478,7 +1478,7 @@ template <ACE_SYNCH_DECL, class TIME_POLICY> int ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i (ACE_Message_Block *&first_item) { if (this->head_ ==0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i"); @@ -1604,7 +1604,7 @@ template <ACE_SYNCH_DECL, class TIME_POLICY> int ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i (ACE_Message_Block *&dequeued) { if (this->head_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i"); @@ -1654,7 +1654,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline_i (ACE_Message_B { #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) if (this->head_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline_i"); @@ -2267,12 +2267,12 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> (base class):\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> (base class):\n"))); this->ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("pending_head_ = %u\n") ACE_TEXT ("pending_tail_ = %u\n") ACE_TEXT ("late_head_ = %u\n") @@ -2286,10 +2286,10 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const this->beyond_late_head_, this->beyond_late_tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n"))); message_strategy_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } // dump the state of the queue @@ -2712,7 +2712,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co else if (current_status != ACE_Dynamic_Message_Strategy::LATE) { // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); @@ -2754,7 +2754,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co { if (current_status != ACE_Dynamic_Message_Strategy::PENDING) // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN((LM_ERROR, + ACELIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("Unexpected message priority status [%d] (expected PENDING)"), (int) current_status), -1); @@ -2776,7 +2776,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co break; // switch default: // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN((LM_ERROR, + ACELIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); @@ -2832,7 +2832,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_late_queue (const } else if (current_status != ACE_Dynamic_Message_Strategy::LATE) // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); @@ -2853,14 +2853,14 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_late_queue (const case ACE_Dynamic_Message_Strategy::PENDING: // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unexpected message priority status ") ACE_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), (int) current_status), -1); default: // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); |