*** empty log message ***

19 files changed, 146 insertions, 41 deletions

diff --git a/ace/ACE_Library.mak b/ace/ACE_Library.mak
index 6222c05865b..759fc4e4121 100644
--- a/ace/ACE_Library.mak
+++ b/ace/ACE_Library.mak
@@ -7100,6 +7100,8 @@ DEP_CPP_SERVICE=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

@@ -13837,6 +13839,8 @@ DEP_CPP_WFMO_=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Heap.h"\

 	{$(INCLUDE)}"\.\Timer_Heap_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Heap_T.h"\

@@ -18316,6 +18320,8 @@ DEP_CPP_SERVICE=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Time_Value.h"\

 	{$(INCLUDE)}"\.\Timer_Queue.h"\

 	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

@@ -24628,6 +24634,8 @@ DEP_CPP_WFMO_=\
 	{$(INCLUDE)}"\.\Synch_T.i"\

 	{$(INCLUDE)}"\.\Thread.h"\

 	{$(INCLUDE)}"\.\Thread.i"\

+	{$(INCLUDE)}"\.\Thread_Manager.h"\

+	{$(INCLUDE)}"\.\Thread_Manager.i"\

 	{$(INCLUDE)}"\.\Timer_Heap.h"\

 	{$(INCLUDE)}"\.\Timer_Heap_T.cpp"\

 	{$(INCLUDE)}"\.\Timer_Heap_T.h"\

diff --git a/ace/ACE_Library.mdp b/ace/ACE_Library.mdp
index c88cdb00eb5..5c35309a86e 100644
--- a/ace/ACE_Library.mdp
+++ b/ace/ACE_Library.mdp
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index cc583f0cc69..a64c193ce1b 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -297,6 +297,12 @@ ACE_Connector<SH, PR_CO_2>::handle_output (ACE_HANDLE handle)
 
   ACE_ASSERT (ast != 0);   // This shouldn't happen!
 
+  // Try to find out if the reactor uses event associations for the
+  // handles it waits on. If so we need to reset it.
+  int reset_new_handle = this->reactor ()->uses_event_associations ();
+  if (reset_new_handle)
+    this->connector_.reset_new_handle (handle);
+
   // Transfer ownership of the ACE_HANDLE to the SVC_HANDLER.
   ast->svc_handler ()->set_handle (handle);
 
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index 2639dc2005a..c122bae8efa 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -73,6 +73,9 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
+  int reset_new_handle (ACE_HANDLE handle);
+  // Resets any event associations on this handle
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i
index bc3b10f0f08..d8e695b0ba1 100644
--- a/ace/DEV_Connector.i
+++ b/ace/DEV_Connector.i
@@ -21,3 +21,12 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
     ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       remote_sap.get_path_name (), "ACE_DEV_IO"));
 }
+
+inline int 
+ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle)
+{
+  ACE_UNUSED_ARG (handle);
+  // Nothing to do here since the handle is not a socket
+  return 0;
+}
+
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index c63e781d6cd..f770e5971c6 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -46,23 +46,29 @@ public:
     WRITE_MASK = POLLOUT,
     EXCEPT_MASK = POLLPRI,
 #else /* USE SELECT */
-    READ_MASK = 0x1,
-    WRITE_MASK = 0x4,
-    EXCEPT_MASK = 0x2,
+    READ_MASK = (1 << 0),
+    WRITE_MASK = (1 << 1),
+    EXCEPT_MASK = (1 << 2),
 #endif /* ACE_USE_POLL */
-    ACCEPT_MASK = 0x8,
-    CONNECT_MASK = READ_MASK | WRITE_MASK
-#if defined (ACE_WIN32)
-    | EXCEPT_MASK
-#endif /* ACE_WIN32 */
-    ,
-    TIMER_MASK = 0x10,
-    QOS_MASK = 0x20,
-    GROUP_QOS_MASK = 0x40,
-    CLOSE_MASK = 0x80,
-    ALL_EVENTS_MASK = READ_MASK | WRITE_MASK | EXCEPT_MASK | ACCEPT_MASK | QOS_MASK | GROUP_QOS_MASK | CLOSE_MASK,
-    RWE_MASK = READ_MASK | WRITE_MASK | EXCEPT_MASK,
-    DONT_CALL = 0x100
+    ACCEPT_MASK = (1 << 3),
+    CONNECT_MASK = (1 << 4),
+    TIMER_MASK = (1 << 5),
+    QOS_MASK = (1 << 6),
+    GROUP_QOS_MASK = (1 << 7),
+    CLOSE_MASK = (1 << 8),
+    ALL_EVENTS_MASK = READ_MASK | 
+                      WRITE_MASK | 
+                      EXCEPT_MASK | 
+                      ACCEPT_MASK | 
+                      CONNECT_MASK | 
+                      TIMER_MASK | 
+                      QOS_MASK | 
+                      GROUP_QOS_MASK | 
+                      CLOSE_MASK,
+    RWE_MASK = READ_MASK | 
+               WRITE_MASK | 
+               EXCEPT_MASK,
+    DONT_CALL = (1 << 9)
   };
 
   virtual ~ACE_Event_Handler (void);
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index 252d5718774..b7c871d3637 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -75,6 +75,9 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
+  int reset_new_handle (ACE_HANDLE handle);
+  // Resets any event associations on this handle
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i
index b8b0cf0e3be..04928eaa591 100644
--- a/ace/FILE_Connector.i
+++ b/ace/FILE_Connector.i
@@ -21,3 +21,12 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
     ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       remote_sap.get_path_name (), "ACE_FILE_IO"));
 }
+
+inline int
+ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle)
+{
+  ACE_UNUSED_ARG (handle);
+  // Nothing to do here since the handle is not a socket
+  return 0;
+}
+
diff --git a/ace/OS.h b/ace/OS.h
index 45a41ddf80c..b925b9ba7df 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -329,7 +329,6 @@ private:
 #define ACE_ODD(NUM) (((NUM) & 1) == 1)
 #define ACE_BIT_ENABLED(WORD, BIT) (((WORD) & (BIT)) != 0)
 #define ACE_BIT_DISABLED(WORD, BIT) (((WORD) & (BIT)) == 0)
-#define ACE_BIT_STRICTLY_ENABLED(WORD, BIT) (((WORD) & (BIT)) == BIT)
 #define ACE_BIT_CMP_MASK(WORD, BIT, MASK) (((WORD) & (BIT)) == MASK)
 #define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS))
 #define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS))
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index 226e862cb44..661af59c8c3 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -85,6 +85,9 @@ public:
   // the connected ACE_SOCK_Stream.  If <remote_sap> is non-NULL then it
   // will contain the address of the connected peer.
 
+  int reset_new_handle (ACE_HANDLE handle);
+  // Resets any event associations on this handle
+
   // = Meta-type info
   typedef ACE_INET_Addr PEER_ADDR;
   typedef ACE_SOCK_Stream PEER_STREAM;
diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.i
index 93618bf464d..8c24fae6988 100644
--- a/ace/SOCK_Connector.i
+++ b/ace/SOCK_Connector.i
@@ -31,3 +31,18 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (void)
 {
   ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
 }
+
+inline int 
+ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle)
+{
+  ACE_UNUSED_ARG (handle);
+#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+  // Reset the event association 
+  return ::WSAEventSelect ((SOCKET) handle,
+                           NULL,
+                           0);    
+#else /* !defined ACE_HAS_WINSOCK2 */
+  return 0;
+#endif /* ACE_WIN32 */
+}
+
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 282836552a9..35dab9bcf43 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -76,6 +76,9 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
+  int reset_new_handle (ACE_HANDLE handle);
+  // Resets any event associations on this handle
+
   // = Meta-type info
   typedef ACE_SPIPE_Addr PEER_ADDR;
   typedef ACE_SPIPE_Stream PEER_STREAM;
diff --git a/ace/SPIPE_Connector.i b/ace/SPIPE_Connector.i
index 33eeed7bc93..49562933214 100644
--- a/ace/SPIPE_Connector.i
+++ b/ace/SPIPE_Connector.i
@@ -3,4 +3,11 @@
 
 // SPIPE_Connector.i
 
+inline int
+ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
+{
+  ACE_UNUSED_ARG (handle);
+  // Nothing to do here since the handle is not a socket
+  return 0;
+}
 
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);
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 4120cccd58d..5714450e380 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -91,6 +91,9 @@ public:
   // the connected ACE_SOCK_Stream.  If <remote_sap> is non-NULL then it
   // will contain the address of the connected peer.
 
+  int reset_new_handle (ACE_HANDLE handle);
+  // Resets any event associations on this handle
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/TLI_Connector.i b/ace/TLI_Connector.i
index 28d12e3952d..1ad9d12e9f2 100644
--- a/ace/TLI_Connector.i
+++ b/ace/TLI_Connector.i
@@ -25,3 +25,12 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream,
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIMEDOUT))
     ACE_ERROR ((LM_ERROR, "%p\n", "ACE_TLI_Stream::ACE_TLI_Stream"));
 }
+
+inline int
+ACE_TLI_Connector::reset_new_handle (ACE_HANDLE handle)
+{
+  ACE_UNUSED_ARG (handle);
+  // Nothing to do here since the handle is not a socket
+  return 0;
+}
+
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index 1e29b83270c..32e72c6bebb 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -79,6 +79,9 @@ public:
   // The <flags> and <perms> arguments are passed down to the open()
   // method.
 
+  int reset_new_handle (ACE_HANDLE handle);
+  // Resets any event associations on this handle
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i
index 77d7bb3f61e..480305b61da 100644
--- a/ace/UPIPE_Connector.i
+++ b/ace/UPIPE_Connector.i
@@ -22,7 +22,11 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
 	       addr.get_path_name (), "ACE_UPIPE_Connector"));
 }
 
-
-
-
+inline int
+ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
+{
+  ACE_UNUSED_ARG (handle);
+  // Nothing to do here since the handle is not a socket
+  return 0;
+}
 
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 3fd9616c6aa..3af2789e045 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -58,28 +58,28 @@ void
 ACE_WFMO_Reactor_Handler_Repository::remove_network_events_i (long &existing_masks,
 							      ACE_Reactor_Mask to_be_removed_masks)
 {
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::READ_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::READ_MASK))
     ACE_CLR_BITS (existing_masks, FD_READ);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::WRITE_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::WRITE_MASK))
     ACE_CLR_BITS (existing_masks, FD_WRITE);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::EXCEPT_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::EXCEPT_MASK))
     ACE_CLR_BITS (existing_masks, FD_OOB);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::ACCEPT_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::ACCEPT_MASK))
     ACE_CLR_BITS (existing_masks, FD_ACCEPT);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::CONNECT_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::CONNECT_MASK))
     ACE_CLR_BITS (existing_masks, FD_CONNECT);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::QOS_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::QOS_MASK))
     ACE_CLR_BITS (existing_masks, FD_QOS);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::GROUP_QOS_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::GROUP_QOS_MASK))
     ACE_CLR_BITS (existing_masks, FD_GROUP_QOS);
   
-  if (ACE_BIT_STRICTLY_ENABLED (to_be_removed_masks, ACE_Event_Handler::CLOSE_MASK))
+  if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::CLOSE_MASK))
     ACE_CLR_BITS (existing_masks, FD_CLOSE);
 }
 
@@ -818,8 +818,11 @@ ACE_WFMO_Reactor_Handler_Repository::add_network_events_i (ACE_Reactor_Mask mask
   // First go through the current entries
   size_t total_entries = this->max_handlep1_;
 
+  // Look for all entries in the current handles for matching handle
+  // (except those that have been scheduled for deletion)
   for (i = 0; i < total_entries && !found; i++)
-    if (io_handle == this->current_info_[i].io_handle_)
+    if (io_handle == this->current_info_[i].io_handle_ &&
+        !this->current_info_[i].delete_entry_)
       {
 	found = 1;
 	modified_masks = &this->current_info_[i].network_events_;
@@ -830,8 +833,11 @@ ACE_WFMO_Reactor_Handler_Repository::add_network_events_i (ACE_Reactor_Mask mask
   // Then pass through the suspended handles
   total_entries = this->suspended_handles_;
 
+  // Look for all entries in the suspended handles for matching handle
+  // (except those that have been scheduled for deletion)
   for (i = 0; i < total_entries && !found; i++)
-    if (io_handle == this->current_suspended_info_[i].io_handle_)
+    if (io_handle == this->current_suspended_info_[i].io_handle_ &&
+        !this->current_suspended_info_[i].delete_entry_)      
       {
 	found = 1;
 	modified_masks = &this->current_suspended_info_[i].network_events_;
@@ -839,28 +845,28 @@ ACE_WFMO_Reactor_Handler_Repository::add_network_events_i (ACE_Reactor_Mask mask
 	event_handle = this->current_suspended_info_[i].event_handle_;
       }
 
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
     ACE_SET_BITS (*modified_masks, FD_READ);
   
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
     ACE_SET_BITS (*modified_masks, FD_WRITE);
   
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
     ACE_SET_BITS (*modified_masks, FD_OOB);
 
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
     ACE_SET_BITS (*modified_masks, FD_ACCEPT);
 
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
     ACE_SET_BITS (*modified_masks, FD_CONNECT);
 
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::QOS_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::QOS_MASK))
     ACE_SET_BITS (*modified_masks, FD_QOS);
 
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::GROUP_QOS_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::GROUP_QOS_MASK))
     ACE_SET_BITS (*modified_masks, FD_GROUP_QOS);
 
-  if (ACE_BIT_STRICTLY_ENABLED (mask, ACE_Event_Handler::CLOSE_MASK))
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CLOSE_MASK))
     ACE_SET_BITS (*modified_masks, FD_CLOSE);
 
   new_masks = *modified_masks;