summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-12-15 13:13:17 +0000
committermsmit <msmit@remedy.nl>2011-12-15 13:13:17 +0000
commit54d39f8fb2eac639326ddabab329deed5d91b7e0 (patch)
tree13944ae28e6ab8c02f0430ee080b78a9c6b943de
parentcabd7174b6a07d357b8ee5f02ca155b6624f88f8 (diff)
downloadATCD-54d39f8fb2eac639326ddabab329deed5d91b7e0.tar.gz
Thu Dec 15 13:12:39 UTC 2011 Marcel Smit <msmit@remedy.nl>
* ace/Event_Handler_Handle_Timeout_Upcall.inl: * ace/Event_Handler_Handle_Timeout_Upcall.cpp: * ace/Proactor.cpp: * ace/Timer_Hash.h: * ace/Timer_Hash_T.h: * ace/Timer_Hash_T.cpp: * ace/Timer_Heap.h: * ace/Timer_Heap_T.h: * ace/Timer_Heap_T.cpp: * ace/Timer_List.h: * ace/Timer_List_T.h: * ace/Timer_List_T.cpp: * ace/Timer_Queue_Adapters.cpp: * ace/Timer_Queue_T.h: * ace/Timer_Queue_T.cpp: * ace/Timer_Wheel.h: * ace/Timer_Wheel_T.h: Fuzz. Removed tab character
-rw-r--r--ACE/ChangeLog21
-rw-r--r--ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp18
-rw-r--r--ACE/ace/Event_Handler_Handle_Timeout_Upcall.inl26
-rw-r--r--ACE/ace/Proactor.cpp8
-rw-r--r--ACE/ace/Timer_Hash.h2
-rw-r--r--ACE/ace/Timer_Hash_T.cpp8
-rw-r--r--ACE/ace/Timer_Hash_T.h6
-rw-r--r--ACE/ace/Timer_Heap.h2
-rw-r--r--ACE/ace/Timer_Heap_T.cpp8
-rw-r--r--ACE/ace/Timer_Heap_T.h4
-rw-r--r--ACE/ace/Timer_List.h2
-rw-r--r--ACE/ace/Timer_List_T.cpp4
-rw-r--r--ACE/ace/Timer_List_T.h2
-rw-r--r--ACE/ace/Timer_Queue_Adapters.cpp4
-rw-r--r--ACE/ace/Timer_Queue_T.cpp6
-rw-r--r--ACE/ace/Timer_Queue_T.h4
-rw-r--r--ACE/ace/Timer_Wheel.h2
-rw-r--r--ACE/ace/Timer_Wheel_T.h4
18 files changed, 77 insertions, 54 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c55ed464c1d..622a9cb5ade 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,24 @@
+Thu Dec 15 13:12:39 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * ace/Event_Handler_Handle_Timeout_Upcall.inl:
+ * ace/Event_Handler_Handle_Timeout_Upcall.cpp:
+ * ace/Proactor.cpp:
+ * ace/Timer_Hash.h:
+ * ace/Timer_Hash_T.h:
+ * ace/Timer_Hash_T.cpp:
+ * ace/Timer_Heap.h:
+ * ace/Timer_Heap_T.h:
+ * ace/Timer_Heap_T.cpp:
+ * ace/Timer_List.h:
+ * ace/Timer_List_T.h:
+ * ace/Timer_List_T.cpp:
+ * ace/Timer_Queue_Adapters.cpp:
+ * ace/Timer_Queue_T.h:
+ * ace/Timer_Queue_T.cpp:
+ * ace/Timer_Wheel.h:
+ * ace/Timer_Wheel_T.h:
+ Fuzz. Removed tab character
+
Thu Dec 15 12:52:18 UTC 2011 Marcel Smit <msmit@remedy.nl>
* ace/Abstract_Timer_Queue.h:
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp
index 17ab1e04da2..4739c1d3cd2 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.cpp
@@ -23,10 +23,10 @@ ACE_Event_Handler_Handle_Timeout_Upcall::
int
ACE_Event_Handler_Handle_Timeout_Upcall::
timeout (ACE_Timer_Queue &timer_queue,
- ACE_Event_Handler *event_handler,
- const void *act,
- int recurring_timer,
- const ACE_Time_Value &cur_time)
+ ACE_Event_Handler *event_handler,
+ const void *act,
+ int recurring_timer,
+ const ACE_Time_Value &cur_time)
{
int requires_reference_counting = 0;
@@ -58,9 +58,9 @@ timeout (ACE_Timer_Queue &timer_queue,
int
ACE_Event_Handler_Handle_Timeout_Upcall::
cancel_type (ACE_Timer_Queue &,
- ACE_Event_Handler *event_handler,
- int dont_call,
- int &requires_reference_counting)
+ ACE_Event_Handler *event_handler,
+ int dont_call,
+ int &requires_reference_counting)
{
requires_reference_counting =
event_handler->reference_counting_policy ().value () ==
@@ -77,8 +77,8 @@ cancel_type (ACE_Timer_Queue &,
int
ACE_Event_Handler_Handle_Timeout_Upcall::
deletion (ACE_Timer_Queue &timer_queue,
- ACE_Event_Handler *event_handler,
- const void *)
+ ACE_Event_Handler *event_handler,
+ const void *)
{
int requires_reference_counting = 0;
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.inl b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.inl
index a2dc51cc453..1ab52aef345 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.inl
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.inl
@@ -17,11 +17,11 @@ registration (ACE_Timer_Queue &,
ACE_INLINE int
ACE_Event_Handler_Handle_Timeout_Upcall::
preinvoke (ACE_Timer_Queue &,
- ACE_Event_Handler *event_handler,
- const void *,
- int,
- const ACE_Time_Value &,
- const void * & upcall_act)
+ ACE_Event_Handler *event_handler,
+ const void *,
+ int,
+ const ACE_Time_Value &,
+ const void * & upcall_act)
{
bool const requires_reference_counting =
event_handler->reference_counting_policy ().value () ==
@@ -40,11 +40,11 @@ preinvoke (ACE_Timer_Queue &,
ACE_INLINE int
ACE_Event_Handler_Handle_Timeout_Upcall::
postinvoke (ACE_Timer_Queue & /* timer_queue */,
- ACE_Event_Handler *event_handler,
- const void * /* timer_act */,
- int /* recurring_timer */,
- const ACE_Time_Value & /* cur_time */,
- const void *upcall_act)
+ ACE_Event_Handler *event_handler,
+ const void * /* timer_act */,
+ int /* recurring_timer */,
+ const ACE_Time_Value & /* cur_time */,
+ const void *upcall_act)
{
if (upcall_act == &this->requires_reference_counting_)
{
@@ -57,9 +57,9 @@ postinvoke (ACE_Timer_Queue & /* timer_queue */,
ACE_INLINE int
ACE_Event_Handler_Handle_Timeout_Upcall::
cancel_timer (ACE_Timer_Queue &,
- ACE_Event_Handler *event_handler,
- int,
- int requires_reference_counting)
+ ACE_Event_Handler *event_handler,
+ int,
+ int requires_reference_counting)
{
if (requires_reference_counting)
event_handler->remove_reference ();
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index aa10f34c669..9606917872d 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -141,7 +141,7 @@ ACE_Proactor_Timer_Handler::svc (void)
// Get current time from timer queue since we don't know
// which <gettimeofday> was used.
ACE_Time_Value cur_time =
- this->proactor_.timer_queue ()->gettimeofday ();
+ this->proactor_.timer_queue ()->gettimeofday ();
// Compare absolute time with curent time received from the
// timer queue.
@@ -681,8 +681,10 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
// absolute time.
ACE_Time_Value absolute_time =
this->timer_queue_->gettimeofday () + time;
- long result = this->timer_queue_->schedule(&handler, act,
- absolute_time, interval);
+ long result = this->timer_queue_->schedule (&handler,
+ act,
+ absolute_time,
+ interval);
if (result != -1)
{
// Signal the timer thread to make sure that new events are
diff --git a/ACE/ace/Timer_Hash.h b/ACE/ace/Timer_Hash.h
index 5a2bb32e421..726f87d79d5 100644
--- a/ACE/ace/Timer_Hash.h
+++ b/ACE/ace/Timer_Hash.h
@@ -56,7 +56,7 @@ typedef ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *,
ACE_Event_Handler_Handle_Timeout_Upcall,
ACE_SYNCH_RECURSIVE_MUTEX,
ACE_Hash_Timer_List,
- ACE_Default_Time_Policy>
+ ACE_Default_Time_Policy>
ACE_Timer_Hash_Iterator;
typedef ACE_Timer_Hash_T<ACE_Event_Handler *,
diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp
index 44f658979d5..9b9767f13ff 100644
--- a/ACE/ace/Timer_Hash_T.cpp
+++ b/ACE/ace/Timer_Hash_T.cpp
@@ -296,8 +296,8 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::ACE_Timer_Hash_T
{
ACE_NEW (this->table_[i],
BUCKET (&this->table_functor_,
- this->free_list_,
- time_policy));
+ this->free_list_,
+ time_policy));
}
ACE_NEW (iterator_,
@@ -331,8 +331,8 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::ACE_Timer_Hash_T
{
ACE_NEW (this->table_[i],
BUCKET (&this->table_functor_,
- this->free_list_,
- time_policy));
+ this->free_list_,
+ time_policy));
}
ACE_NEW (iterator_,
diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h
index 8d9dbae6784..486508e24f0 100644
--- a/ACE/ace/Timer_Hash_T.h
+++ b/ACE/ace/Timer_Hash_T.h
@@ -184,7 +184,7 @@ public:
ACE_Timer_Hash_T (size_t table_size,
FUNCTOR *upcall_functor = 0,
ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ TIME_POLICY const & time_policy = TIME_POLICY());
/**
* Default constructor. @a upcall_functor is the instance of the
@@ -194,8 +194,8 @@ public:
* size will be ACE_DEFAULT_TIMERS and there will be no preallocation.
*/
ACE_Timer_Hash_T (FUNCTOR *upcall_functor = 0,
- ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
+ TIME_POLICY const & time_policy = TIME_POLICY());
/// Destructor
virtual ~ACE_Timer_Hash_T (void);
diff --git a/ACE/ace/Timer_Heap.h b/ACE/ace/Timer_Heap.h
index 6ac385c4f11..205cdccf0b2 100644
--- a/ACE/ace/Timer_Heap.h
+++ b/ACE/ace/Timer_Heap.h
@@ -39,7 +39,7 @@ typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
typedef ACE_Timer_Heap_T<ACE_Event_Handler *,
ACE_Event_Handler_Handle_Timeout_Upcall,
ACE_SYNCH_RECURSIVE_MUTEX,
- ACE_FPointer_Time_Policy>
+ ACE_FPointer_Time_Policy>
ACE_Timer_Heap_Variable_Time_Source;
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp
index c4395294b6d..47ad9994b98 100644
--- a/ACE/ace/Timer_Heap_T.cpp
+++ b/ACE/ace/Timer_Heap_T.cpp
@@ -103,8 +103,8 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_T (
ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist,
TIME_POLICY const & time_policy)
: Base_Time_Policy (upcall_functor,
- freelist,
- time_policy),
+ freelist,
+ time_policy),
max_size_ (size),
cur_size_ (0),
cur_limbo_ (0),
@@ -171,8 +171,8 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_T (
ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist,
TIME_POLICY const & time_policy)
: Base_Time_Policy (upcall_functor,
- freelist,
- time_policy),
+ freelist,
+ time_policy),
max_size_ (ACE_DEFAULT_TIMERS),
cur_size_ (0),
cur_limbo_ (0),
diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h
index c1e4e83d368..5fd55f9b603 100644
--- a/ACE/ace/Timer_Heap_T.h
+++ b/ACE/ace/Timer_Heap_T.h
@@ -111,7 +111,7 @@ public:
bool preallocated = false,
FUNCTOR *upcall_functor = 0,
ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ TIME_POLICY const & time_policy = TIME_POLICY());
/**
* Default constructor. @c upcall_functor is the instance of the
@@ -122,7 +122,7 @@ public:
*/
ACE_Timer_Heap_T (FUNCTOR *upcall_functor = 0,
ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ TIME_POLICY const & time_policy = TIME_POLICY());
/// Destructor.
virtual ~ACE_Timer_Heap_T (void);
diff --git a/ACE/ace/Timer_List.h b/ACE/ace/Timer_List.h
index 0173b2ed2f8..bd6c81daccc 100644
--- a/ACE/ace/Timer_List.h
+++ b/ACE/ace/Timer_List.h
@@ -34,7 +34,7 @@ typedef ACE_Timer_List_T<ACE_Event_Handler *,
typedef ACE_Timer_List_Iterator_T<ACE_Event_Handler *,
ACE_Event_Handler_Handle_Timeout_Upcall,
ACE_SYNCH_RECURSIVE_MUTEX,
- ACE_Default_Time_Policy>
+ ACE_Default_Time_Policy>
ACE_Timer_List_Iterator;
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp
index a6fa64601c7..fe0af558479 100644
--- a/ACE/ace/Timer_List_T.cpp
+++ b/ACE/ace/Timer_List_T.cpp
@@ -81,8 +81,8 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_List_T (FUNCTOR* uf,
- FreeList* fl,
- TIME_POLICY const & time_policy)
+ FreeList* fl,
+ TIME_POLICY const & time_policy)
: Base_Timer_Queue (uf, fl, time_policy)
, head_ (new ACE_Timer_Node_T<TYPE>)
, id_counter_ (0)
diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h
index 8b387c04725..2e020e94cd2 100644
--- a/ACE/ace/Timer_List_T.h
+++ b/ACE/ace/Timer_List_T.h
@@ -104,7 +104,7 @@ public:
* timer nodes. If 0, then a default freelist will be created.
*/
ACE_Timer_List_T (FUNCTOR* upcall_functor = 0, FreeList* freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ TIME_POLICY const & time_policy = TIME_POLICY());
/// Destructor
virtual ~ACE_Timer_List_T (void);
diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp
index 6c887c0ed03..55f539b23a3 100644
--- a/ACE/ace/Timer_Queue_Adapters.cpp
+++ b/ACE/ace/Timer_Queue_Adapters.cpp
@@ -265,9 +265,9 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void)
// Compute the remaining time, being careful not to sleep
// for "negative" amounts of time.
ACE_Time_Value const tv_curr =
- this->timer_queue_->gettimeofday ();
+ this->timer_queue_->gettimeofday ();
ACE_Time_Value const tv_earl =
- this->timer_queue_->earliest_time ();
+ this->timer_queue_->earliest_time ();
if (tv_earl > tv_curr)
{
diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp
index d0de6d0c68a..e538def8841 100644
--- a/ACE/ace/Timer_Queue_T.cpp
+++ b/ACE/ace/Timer_Queue_T.cpp
@@ -176,8 +176,8 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Queue_T (FUNCTOR *upcall_functor,
- ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist,
- TIME_POLICY const & time_policy)
+ ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist,
+ TIME_POLICY const & time_policy)
: ACE_Timer_Queue_Upcall_Base<TYPE,FUNCTOR>(upcall_functor),
time_policy_ (time_policy),
delete_free_list_ (freelist == 0),
@@ -369,7 +369,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire_single (
// time.
if (!this->dispatch_info_i (cur_time, info))
{
- return 0;
+ return 0;
}
}
// We do not need the lock anymore, all these operations take place
diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h
index 609093e3450..0c719e70048 100644
--- a/ACE/ace/Timer_Queue_T.h
+++ b/ACE/ace/Timer_Queue_T.h
@@ -82,8 +82,8 @@ public:
* timer nodes. If 0, then a default freelist will be created.
*/
ACE_Timer_Queue_T (FUNCTOR *upcall_functor = 0,
- ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ ACE_Free_List<ACE_Timer_Node_T <TYPE> > *freelist = 0,
+ TIME_POLICY const & time_policy = TIME_POLICY());
/// Destructor - make virtual for proper destruction of inherited
/// classes.
diff --git a/ACE/ace/Timer_Wheel.h b/ACE/ace/Timer_Wheel.h
index 02ca7b020ba..5251e1b5df9 100644
--- a/ACE/ace/Timer_Wheel.h
+++ b/ACE/ace/Timer_Wheel.h
@@ -35,7 +35,7 @@ typedef ACE_Timer_Wheel_T<ACE_Event_Handler *,
typedef ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *,
ACE_Event_Handler_Handle_Timeout_Upcall,
ACE_SYNCH_RECURSIVE_MUTEX,
- ACE_Default_Time_Policy>
+ ACE_Default_Time_Policy>
ACE_Timer_Wheel_Iterator;
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h
index ee758daa00f..83d293b9470 100644
--- a/ACE/ace/Timer_Wheel_T.h
+++ b/ACE/ace/Timer_Wheel_T.h
@@ -105,7 +105,7 @@ public:
/// Default constructor
ACE_Timer_Wheel_T (FUNCTOR* upcall_functor = 0, FreeList* freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ TIME_POLICY const & time_policy = TIME_POLICY());
/// Constructor with opportunities to set the wheelsize and resolution
ACE_Timer_Wheel_T (u_int spoke_count,
@@ -113,7 +113,7 @@ public:
size_t prealloc = 0,
FUNCTOR* upcall_functor = 0,
FreeList* freelist = 0,
- TIME_POLICY const & time_policy = TIME_POLICY());
+ TIME_POLICY const & time_policy = TIME_POLICY());
/// Destructor
virtual ~ACE_Timer_Wheel_T (void);