diff options
| -rw-r--r-- | ace/Timer_Hash_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_Heap_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_List_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.cpp | 8 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.h | 4 | ||||
| -rw-r--r-- | ace/Timer_Wheel_T.cpp | 74 | ||||
| -rw-r--r-- | ace/Timer_Wheel_T.h | 2 |
7 files changed, 50 insertions, 50 deletions
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 36efdb169d5..33a9dc4419d 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -169,7 +169,7 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; /** - * Schedule <type> that will expire after <delay> amount of time, + * Schedule <type> that will expire at <future_time>, * which is specified in absolute time. If it expires then <act> is * passed in as the value to the <functor>. If <interval> is != to * <ACE_Time_Value::zero> then it is used to reschedule the <type> @@ -181,7 +181,7 @@ public: */ virtual long schedule (const TYPE &type, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); /** diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index 6039225e797..5400d89524c 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -129,7 +129,7 @@ public: /** * Schedule a timer that may optionally auto-reset. - * Schedule <type> that will expire after <delay> amount of time, + * Schedule <type> that will expire at <future_time>, * which is specified in absolute time. If it expires then <act> is * passed in as the value to the <functor>. If <interval> is != to * <ACE_Time_Value::zero> then it is used to reschedule the <type> @@ -145,7 +145,7 @@ public: */ virtual long schedule (const TYPE &type, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); /** diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h index a863ce39a3c..a15eb2ad0c4 100644 --- a/ace/Timer_List_T.h +++ b/ace/Timer_List_T.h @@ -112,7 +112,7 @@ public: virtual const ACE_Time_Value &earliest_time (void) const; /** - * Schedule <type> that will expire after <delay> amount of time, + * Schedule <type> that will expire at <future_time>, * which is specified in absolute time. If it expires then <act> is * passed in as the value to the <functor>. If <interval> is != to * <ACE_Time_Value::zero> then it is used to reschedule the <type> @@ -128,7 +128,7 @@ public: */ virtual long schedule (const TYPE &type, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); /** diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp index 237e7349cbc..709137bdb70 100644 --- a/ace/Timer_Queue_Adapters.cpp +++ b/ace/Timer_Queue_Adapters.cpp @@ -63,7 +63,7 @@ ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm (void) template <class TQ> long ACE_Async_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler *eh, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval) { ACE_UNUSED_ARG (act); @@ -74,7 +74,7 @@ ACE_Async_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler *eh, ACE_UNUSED_ARG (sg); // @@ We still need to implement interval timers... - long tid = this->timer_queue_.schedule (eh, act, delay); + long tid = this->timer_queue_.schedule (eh, act, future_time); if (tid == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -165,12 +165,12 @@ template<class TQ> long ACE_Thread_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler* handler, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); - long result = this->timer_queue_.schedule (handler, act, delay, interval); + long result = this->timer_queue_.schedule (handler, act, future_time, interval); this->condition_.signal (); return result; } diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index 7920df9ec61..d5272731a07 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -54,7 +54,7 @@ public: */ long schedule (ACE_Event_Handler *type, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); /// Cancel the <timer_id> and pass back the <act> if an address is @@ -124,7 +124,7 @@ public: /// up the dispatching thread. long schedule (ACE_Event_Handler *handler, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); /// Cancel the <timer_id> and return the <act> parameter if an diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp index dc7ffe7e01e..b51620fdd5e 100644 --- a/ace/Timer_Wheel_T.cpp +++ b/ace/Timer_Wheel_T.cpp @@ -258,7 +258,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Wheel_T (void) delete [] this->wheel_; } - + /** * Checks to see if <earliest_pos> points to a empty list (then it is empty). * @@ -269,7 +269,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const { ACE_TRACE ("ACE_Timer_Wheel_T::is_empty"); - return this->wheel_[this->earliest_pos_]->get_next () + return this->wheel_[this->earliest_pos_]->get_next () == this->wheel_[this->earliest_pos_]; } @@ -290,11 +290,11 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const * the node into the wheel using reschedule (). Then returns a timer_id * (which is actually a pointer to the actual timer_node). * - * @param type The data of the timer node - * @param act Asynchronous Completion Token (AKA magic cookie) - * @param delay The time the timer is scheduled for (in absolute time) - * @param interval If not ACE_Time_Value::zero, then this is a periodic - * timer and interval is the time period + * @param type The data of the timer node + * @param act Asynchronous Completion Token (AKA magic cookie) + * @param future_time The time the timer is scheduled for (in absolute time) + * @param interval If not ACE_Time_Value::zero, then this is a periodic + * timer and interval is the time period * * @return Unique identifier (can be used to cancel the timer. * -1 on failure. @@ -303,7 +303,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> long ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule ( const TYPE &type, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval ) { @@ -319,7 +319,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule ( // Set the details of the node tempnode->set (type, act, - delay, + future_time, interval, 0, 0, @@ -340,15 +340,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule ( /** * Find the timer node by using the id as a pointer. Then use set_interval () * on the node to update the interval. - * + * * @param timer_id The timer identifier * @param interval The new interval - * + * * @return 0 if successful, -1 if no. */ -template <class TYPE, class FUNCTOR, class ACE_LOCK> int +template <class TYPE, class FUNCTOR, class ACE_LOCK> int ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reset_interval ( - long timer_id, + long timer_id, const ACE_Time_Value &interval ) { @@ -430,7 +430,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, // Look for a new earliest time // Defaults to zero. - ACE_Time_Value earliest_time; + ACE_Time_Value earliest_time; // Check every entry in the table for (i = 0; i < this->wheel_size_; i++) @@ -459,7 +459,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, /** * Cancels the single timer that is specified by the timer_id. In this * case the timer_id is actually a pointer to the node, so we cast it - * to the node. This can be dangerous if the timer_id is made up + * to the node. This can be dangerous if the timer_id is made up * (or deleted twice) so we do a little sanity check. Finally we update * the earliest time in case the earliest timer was removed. * @@ -469,7 +469,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type, * the cancelled timer here. * @param skip_close If this non-zero, the cancellation method of the * functor will not be called. - * + * * @return 1 for sucess and 0 if the timer_id wasn't found (or was * found to be invalid) */ @@ -504,7 +504,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id, node->get_type ()); // Find out what position it is in. - size_t pos = (node->get_timer_value ().usec () / this->resolution_) + size_t pos = (node->get_timer_value ().usec () / this->resolution_) % this->wheel_size_; this->free_node (node); @@ -551,11 +551,11 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_TRACE ("ACE_Timer_Wheel_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwheel_size_ = %d"), this->wheel_size_)); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nresolution_ = %d"), this->resolution_)); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwheel_ = \n"))); for (size_t i = 0; i < this->wheel_size_; i++) @@ -616,12 +616,12 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::remove_first (void) /** * Returns the earliest node without removing it - * + * * @return The earliest timer node. */ template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Node_T<TYPE> * ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::get_first (void) -{ +{ ACE_TRACE ("ACE_Timer_Wheel_T::get_first"); return this->wheel_[this->earliest_pos_]->get_next (); @@ -640,7 +640,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule ( { ACE_TRACE ("ACE_Timer_Wheel_T::reschedule"); - size_t pos = (expired->get_timer_value ().usec () / this->resolution_) + size_t pos = (expired->get_timer_value ().usec () / this->resolution_) % this->wheel_size_; // See if we need to update the earliest time @@ -667,7 +667,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule ( /** * @return The iterator */ -template <class TYPE, class FUNCTOR, class ACE_LOCK> +template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> & ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void) { @@ -687,9 +687,9 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire () /** * This is a specialized version of expire that is more suited for the - * internal data representation. Notice that we are still expiring - * timers in order, even though this can be really speeded up if we - * didn't worry about this. + * internal data representation. Notice that we are still expiring + * timers in order, even though this can be really speeded up if we + * didn't worry about this. * * @param cur_time The time to expire timers up to. * @@ -708,7 +708,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ( size_t earliest_pos = this->wheel_size_; ACE_Time_Value earliest_time = cur_time; - + size_t next_earliest_pos = this->wheel_size_; ACE_Time_Value next_earliest_time; @@ -716,7 +716,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ( for (i = 0; i < this->wheel_size_; i++) { if (this->wheel_[i]->get_next () != this->wheel_[i] - && this->wheel_[i]->get_next ()->get_timer_value () + && this->wheel_[i]->get_next ()->get_timer_value () <= earliest_time) { earliest_pos = i; @@ -728,7 +728,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ( if (earliest_pos == this->wheel_size_) return 0; - do + do { next_earliest_time = cur_time; next_earliest_pos = this->wheel_size_; @@ -738,19 +738,19 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ( { if (i != earliest_pos && this->wheel_[i]->get_next () != this->wheel_[i] - && this->wheel_[i]->get_next ()->get_timer_value () + && this->wheel_[i]->get_next ()->get_timer_value () <= next_earliest_time) { next_earliest_pos = i; - next_earliest_time = + next_earliest_time = this->wheel_[i]->get_next ()->get_timer_value (); } } // Keep expiring timers until we need to move to the next list - while (this->wheel_[earliest_pos]->get_next () + while (this->wheel_[earliest_pos]->get_next () != this->wheel_[earliest_pos] - && this->wheel_[earliest_pos]->get_next ()->get_timer_value () + && this->wheel_[earliest_pos]->get_next ()->get_timer_value () <= next_earliest_time) { // Remove the first node in the earliest position @@ -769,7 +769,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ( // Make sure that we skip past values that have already // "expired". do - expired->set_timer_value (expired->get_timer_value () + expired->set_timer_value (expired->get_timer_value () + expired->get_interval ()); while (expired->get_timer_value () <= cur_time); @@ -790,12 +790,12 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire ( } earliest_pos = next_earliest_pos; - } + } while (earliest_pos != this->wheel_size_); // Look for a new earliest time - earliest_time = ACE_Time_Value::zero; + earliest_time = ACE_Time_Value::zero; // Check every entry in the table for (i = 0; i < this->wheel_size_; i++) diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h index 8548374433a..2b1141dfe91 100644 --- a/ace/Timer_Wheel_T.h +++ b/ace/Timer_Wheel_T.h @@ -121,7 +121,7 @@ public: /// Schedules a timer. virtual long schedule (const TYPE &type, const void *act, - const ACE_Time_Value &delay, + const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); |