diff options
Diffstat (limited to 'ace/XtReactor.cpp')
| -rw-r--r-- | ace/XtReactor.cpp | 87 |
1 files changed, 42 insertions, 45 deletions
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp index d1ed38af310..6fb2c898ba3 100644 --- a/ace/XtReactor.cpp +++ b/ace/XtReactor.cpp @@ -7,15 +7,13 @@ ACE_RCSID(ace, XtReactor, "$Id$") -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor) // Must be called with lock held ACE_XtReactor::ACE_XtReactor (XtAppContext context, - size_t size, - int restart, - ACE_Sig_Handler *h) + size_t size, + int restart, + ACE_Sig_Handler *h) : ACE_Select_Reactor (size, restart, h), context_ (context), ids_ (0), @@ -55,7 +53,7 @@ ACE_XtReactor::~ACE_XtReactor (void) int ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set, - ACE_Time_Value *max_wait_time) + ACE_Time_Value *max_wait_time) { ACE_TRACE ("ACE_XtReactor::wait_for_multiple_events"); int nfound; @@ -69,8 +67,8 @@ ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s handle_set.wr_mask_ = this->wait_set_.wr_mask_; handle_set.ex_mask_ = this->wait_set_.ex_mask_; nfound = XtWaitForMultipleEvents (width, - handle_set, - max_wait_time); + handle_set, + max_wait_time); } while (nfound == -1 && this->handle_error () > 0); @@ -103,8 +101,8 @@ ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId * /* id */) void ACE_XtReactor::InputCallbackProc (XtPointer closure, - int *source, - XtInputId *) + int *source, + XtInputId *) { ACE_XtReactor *self = (ACE_XtReactor *) closure; ACE_HANDLE handle = (ACE_HANDLE) *source; @@ -125,9 +123,9 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure, wait_set.ex_mask_.set_bit (handle); int result = ACE_OS::select (*source + 1, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, &zero); + wait_set.rd_mask_, + wait_set.wr_mask_, + wait_set.ex_mask_, &zero); ACE_Select_Reactor_Handle_Set dispatch_set; @@ -135,11 +133,11 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure, if (result > 0) { if (wait_set.rd_mask_.is_set (handle)) - dispatch_set.rd_mask_.set_bit (handle); + dispatch_set.rd_mask_.set_bit (handle); if (wait_set.wr_mask_.is_set (handle)) - dispatch_set.wr_mask_.set_bit (handle); + dispatch_set.wr_mask_.set_bit (handle); if (wait_set.ex_mask_.is_set (handle)) - dispatch_set.ex_mask_.set_bit (handle); + dispatch_set.ex_mask_.set_bit (handle); self->dispatch (1, dispatch_set); } @@ -147,8 +145,8 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure, int ACE_XtReactor::XtWaitForMultipleEvents (int width, - ACE_Select_Reactor_Handle_Set &wait_set, - ACE_Time_Value *) + ACE_Select_Reactor_Handle_Set &wait_set, + ACE_Time_Value *) { // Make sure we have a valid context ACE_ASSERT (this->context_ != 0); @@ -157,10 +155,10 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width, ACE_Select_Reactor_Handle_Set temp_set = wait_set; if (ACE_OS::select (width, - temp_set.rd_mask_, - temp_set.wr_mask_, - temp_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) + temp_set.rd_mask_, + temp_set.wr_mask_, + temp_set.ex_mask_, + (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) return -1; // Bad file arguments... // Instead of waiting using <select>, just use the Xt mechanism to @@ -175,10 +173,10 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width, // Now actually read the result needed by the <Select_Reactor> using // <select>. return ACE_OS::select (width, - wait_set.rd_mask_, - wait_set.wr_mask_, - wait_set.ex_mask_, - (ACE_Time_Value *) &ACE_Time_Value::zero); + wait_set.rd_mask_, + wait_set.wr_mask_, + wait_set.ex_mask_, + (ACE_Time_Value *) &ACE_Time_Value::zero); } XtAppContext @@ -195,8 +193,8 @@ ACE_XtReactor::context (XtAppContext context) int ACE_XtReactor::register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_XtReactor::register_handler_i"); @@ -265,10 +263,10 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle, XtID->next_ = this->ids_; XtID->handle_ = handle; XtID->id_ = ::XtAppAddInput (this->context_, - (int) handle, - (XtPointer) condition, - InputCallbackProc, - (XtPointer) this); + (int) handle, + (XtPointer) condition, + InputCallbackProc, + (XtPointer) this); this->ids_ = XtID; } return 0; @@ -276,8 +274,8 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle, int ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask) { return ACE_Select_Reactor::register_handler_i (handles, handler, @@ -286,7 +284,7 @@ ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles, int ACE_XtReactor::remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask) + ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_XtReactor::remove_handler_i"); @@ -341,10 +339,10 @@ ACE_XtReactor::remove_XtInput (ACE_HANDLE handle) int ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles, - ACE_Reactor_Mask mask) + ACE_Reactor_Mask mask) { return ACE_Select_Reactor::remove_handler_i (handles, - mask); + mask); } // The following functions ensure that there is an Xt timeout for the @@ -395,7 +393,7 @@ long ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler, const void *arg, const ACE_Time_Value &delay, - const ACE_Time_Value &interval) + const ACE_Time_Value &interval) { ACE_TRACE ("ACE_XtReactor::schedule_timer"); ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1)); @@ -415,12 +413,12 @@ ACE_XtReactor::schedule_timer (ACE_Event_Handler *event_handler, int ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler, - int dont_call_handle_close) + int dont_call_handle_close) { ACE_TRACE ("ACE_XtReactor::cancel_timer"); if (ACE_Select_Reactor::cancel_timer (handler, - dont_call_handle_close) == -1) + dont_call_handle_close) == -1) return -1; else { @@ -431,14 +429,14 @@ ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler, int ACE_XtReactor::cancel_timer (long timer_id, - const void **arg, - int dont_call_handle_close) + const void **arg, + int dont_call_handle_close) { ACE_TRACE ("ACE_XtReactor::cancel_timer"); if (ACE_Select_Reactor::cancel_timer (timer_id, - arg, - dont_call_handle_close) == -1) + arg, + dont_call_handle_close) == -1) return -1; else { @@ -447,4 +445,3 @@ ACE_XtReactor::cancel_timer (long timer_id, } } -ACE_END_VERSIONED_NAMESPACE_DECL |