diff options
Diffstat (limited to 'ACE/ace/Timer_Wheel_T.cpp')
-rw-r--r-- | ACE/ace/Timer_Wheel_T.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index cf0f957edd5..efe3b1317f2 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/Guard_T.h" #include "ace/Timer_Wheel_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -241,7 +241,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i if (n != 0) return n; - //ACE_ERROR((LM_ERROR, "Node not found in original spoke.\n")); + //ACELIB_ERROR((LM_ERROR, "Node not found in original spoke.\n")); // Search the rest of the spokes for (u_int i = 0; i < this->spoke_count_; ++i) @@ -254,7 +254,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i } } - //ACE_ERROR((LM_ERROR, "Node not found.\n")); + //ACELIB_ERROR((LM_ERROR, "Node not found.\n")); return 0; } @@ -349,7 +349,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in return (cnt << this->spoke_bits_) | spoke; } - //ACE_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n")); + //ACELIB_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n")); // We've run out of consecutive id numbers so now we have to search // for a unique id. @@ -416,7 +416,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule_i (const TYPE& u_int spoke = calculate_spoke (future_time); long id = generate_timer_id (spoke); - //ACE_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id)); + //ACELIB_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id)); if (id != -1) { @@ -699,7 +699,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::recalc_earliest } this->earliest_spoke_ = es; - //ACE_ERROR((LM_ERROR, "We had to search the whole wheel.\n")); + //ACELIB_ERROR((LM_ERROR, "We had to search the whole wheel.\n")); } /** @@ -711,18 +711,18 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Wheel_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nspoke_count_ = %d"), this->spoke_count_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwheel_ =\n"))); for (u_int i = 0; i < this->spoke_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); ACE_Timer_Node_T<TYPE>* root = this->spokes_[i]; for (ACE_Timer_Node_T<TYPE>* n = root->get_next (); n != root; @@ -732,7 +732,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const } } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -842,7 +842,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (const ACE_Time_ { ++expcount; - //ACE_ERROR((LM_ERROR, "Expiring %x\n", (long) n)); + //ACELIB_ERROR((LM_ERROR, "Expiring %x\n", (long) n)); ACE_Timer_Node_Dispatch_Info_T<TYPE> info; |