diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-04 08:22:59 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-04 08:22:59 +0000 |
commit | b818e19903ba56cdf5ef1c01e49e225fe5f33561 (patch) | |
tree | 46a2f588037f54ff6ccc0536d528f06df6c80ff7 /ace/Select_Reactor.cpp | |
parent | 73aef9c7ffb97b8a952b2bf3c5865ad00e16360b (diff) | |
download | ATCD-b818e19903ba56cdf5ef1c01e49e225fe5f33561.tar.gz |
*** empty log message ***
Diffstat (limited to 'ace/Select_Reactor.cpp')
-rw-r--r-- | ace/Select_Reactor.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp index 6c2934ae2e1..99cb7327d60 100644 --- a/ace/Select_Reactor.cpp +++ b/ace/Select_Reactor.cpp @@ -1234,8 +1234,10 @@ ACE_Select_Reactor::bit_ops (ACE_HANDLE handle, // a ACE_Reactor::ADD_MASK we just carry out the operations // specified by the mask. + // READ, ACCEPT, and CONNECT flag will place the handle in the read set if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK) - || ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK)) + || ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK) + || ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)) { (handle_set.rd_mask_.*ptmf) (handle); ACE_SET_BITS (omask, ACE_Event_Handler::READ_MASK); @@ -1243,7 +1245,9 @@ ACE_Select_Reactor::bit_ops (ACE_HANDLE handle, else if (ops == ACE_Reactor::SET_MASK) handle_set.rd_mask_.clr_bit (handle); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK)) + // WRITE and CONNECT flag will place the handle in the write set + if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK) + || ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)) { (handle_set.wr_mask_.*ptmf) (handle); ACE_SET_BITS (omask, ACE_Event_Handler::WRITE_MASK); @@ -1251,7 +1255,12 @@ ACE_Select_Reactor::bit_ops (ACE_HANDLE handle, else if (ops == ACE_Reactor::SET_MASK) handle_set.wr_mask_.clr_bit (handle); - if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK)) + // EXCEPT (and CONNECT on Win32) flag will place the handle in the except set + if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK) +#if defined (ACE_WIN32) + || ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK) +#endif /* ACE_WIN32 */ + ) { (handle_set.ex_mask_.*ptmf) (handle); ACE_SET_BITS (omask, ACE_Event_Handler::EXCEPT_MASK); |