diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-01-02 09:05:39 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-01-02 09:05:39 +0000 |
| commit | 1c44106287219a05ddbff09df4574b90777040ae (patch) | |
| tree | 1d371fe6828480e7cecdcb75a8887a2b4bb83f53 /ace/Reactor.cpp | |
| parent | fbcfcdb6ff9975a9e2152be0a5dc7e28a32635fc (diff) | |
| download | ATCD-1c44106287219a05ddbff09df4574b90777040ae.tar.gz | |
foo
Diffstat (limited to 'ace/Reactor.cpp')
| -rw-r--r-- | ace/Reactor.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index c7a629d028b..335f8879edc 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -625,6 +625,7 @@ ACE_Reactor_Notify::handle_input (ACE_HANDLE handle) switch (buffer.mask_) { case ACE_Event_Handler::READ_MASK: + case ACE_Event_Handler::ACCEPT_MASK: result = buffer.eh_->handle_input (ACE_INVALID_HANDLE); break; case ACE_Event_Handler::WRITE_MASK: @@ -1093,7 +1094,7 @@ ACE_Reactor::bit_ops (ACE_HANDLE handle, ACE_Sig_Guard sb; // Block out all signals until method returns. ACE_FDS_PTMF ptmf = &ACE_Handle_Set::set_bit; - u_long omask = ACE_Event_Handler::NULL_MASK; + u_long omask = ACE_Event_Handler::NULL_MASK; switch (ops) { @@ -1116,11 +1117,12 @@ ACE_Reactor::bit_ops (ACE_HANDLE handle, // The following code is rather subtle... Note that if we are // doing a ACE_Reactor::SET_MASK then if the bit is not enabled // in the mask we need to clear the bit from the ACE_Handle_Set. - // On the other hand, f we are doing a ACE_Reactor::CLR_MASK or + // On the other hand, if we are doing a ACE_Reactor::CLR_MASK or // a ACE_Reactor::ADD_MASK we just carry out the operations // specified by the mask. - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK)) + if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) + || ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) { (rd.*ptmf) (handle); ACE_SET_BITS (omask, ACE_Event_Handler::READ_MASK); @@ -1189,7 +1191,8 @@ ACE_Reactor::handler_i (ACE_HANDLE handle, return -1; else { - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) + if ((ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) + || ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) && this->rd_handle_mask_.is_set (handle) == 0) return -1; if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK) |