From 0cfb869cb78c4c5b2f038425ff7822906e4bbd32 Mon Sep 17 00:00:00 2001 From: bala Date: Fri, 24 Aug 2001 20:00:29 +0000 Subject: ChangeLogTag: Fri Aug 24 14:59:52 2001 Balachandran Natarajan --- ChangeLog_Reactor_Deadlock | 4 ++++ ace/TP_Reactor.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog_Reactor_Deadlock b/ChangeLog_Reactor_Deadlock index 08811795204..fd41d971573 100644 --- a/ChangeLog_Reactor_Deadlock +++ b/ChangeLog_Reactor_Deadlock @@ -1,3 +1,7 @@ +Fri Aug 24 14:59:52 2001 Balachandran Natarajan + + * ace/TP_Reactor.cpp (dispatch_socket_events): Cosmetic changes. + Fri Aug 24 14:19:02 2001 Balachandran Natarajan * ace/Timer_Queue_T.i: diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index e0741287eb5..d7b38157e07 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -140,6 +140,7 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) // a later point of time, we decide to handle signals we have to // release the lock before we make any upcalls.. What is here // now is not the right thing... + // @@ We need to do better.. return this->handle_signals (event_count, guard); } @@ -158,7 +159,6 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) return retval; // Else just fall through for further handling - } @@ -265,6 +265,7 @@ ACE_TP_Reactor::owner (ACE_thread_t *t_id) int ACE_TP_Reactor::get_event_for_dispatching (ACE_Time_Value *max_wait_time) { + ACE_TRACE ("ACE_TP_Reactor::get_event_for_dispatching"); // If the reactor handler state has changed, clear any remembered // ready bits and re-scan from the master wait_set. if (this->state_changed_) @@ -346,10 +347,8 @@ ACE_TP_Reactor::handle_timer_events (int &event_count, // time. ACE_Timer_Node_Dispatch_Info info; - int result = this->timer_queue_->dispatch_info (cur_time, - info); - - if (result) + if (this->timer_queue_->dispatch_info (cur_time, + info)) { // Decrement the number of events that needs handling yet. event_count--; -- cgit v1.2.1