1 files changed, 20 insertions, 144 deletions

diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 8801109ffef..2d261e550bd 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -34,9 +34,6 @@ int ACE_Proactor::delete_proactor_ = 0;
 // Terminate the eventloop.
 sig_atomic_t ACE_Proactor::end_event_loop_ = 0;
 
-// Number of threads in the event loop.
-sig_atomic_t ACE_Proactor::event_loop_thread_count_ = 0;
-
 class ACE_Export ACE_Proactor_Timer_Handler : public ACE_Task <ACE_NULL_SYNCH>
 {
   // = TITLE
@@ -59,14 +56,9 @@ public:
   ACE_Proactor_Timer_Handler (ACE_Proactor &proactor);
   // Constructor.
 
-  virtual ~ACE_Proactor_Timer_Handler (void);
+  ~ACE_Proactor_Timer_Handler (void);
   // Destructor.
 
-  int destroy (void);
-  // Proactor calls this to shut down the timer handler
-  // gracefully. Just calling the destructor alone doesnt do what
-  // <destroy> does. <destroy> make sure the thread exits properly. 
-
 protected:
   virtual int svc (void);
   // Run by a daemon thread to handle deferred processing. In other
@@ -97,9 +89,6 @@ ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler (void)
 
   // Signal timer event.
   this->timer_event_.signal ();
-  
-  // Wait for the Timer Handler thread to exit. 
-  this->thr_mgr ()->wait ();
 }
 
 int
@@ -253,7 +242,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
       ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor);
   #elif defined (ACE_POSIX_SIG_PROACTOR)
       ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
-  #else /* Default is to use the SIG one */
+#else /* Default is to use the SIG one */
       ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
   #endif
 #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
@@ -342,60 +331,20 @@ ACE_Proactor::close_singleton (void)
 int
 ACE_Proactor::run_event_loop (void)
 {
-  int result = 0;
+  ACE_TRACE ("ACE_Proactor::run_event_loop");
 
-  // Declaring the lock variable.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-    (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
-#endif /* ACE_MT_SAFE */
-
-  // Early check. It is ok to do this without lock, since we care just
-  // whether it is zero or non-zero.
-  if (ACE_Proactor::end_event_loop_ != 0)
-    return 0;
-   
-  // First time you are in. Increment the thread count.
-  {
-    // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-
-    // Increment the thread count.
-    ACE_Proactor::event_loop_thread_count_ ++;
-  }
-    
-  // Run the event loop.
-  while (1)
+  while (ACE_Proactor::end_event_loop_ == 0)
     {
-      // Check the end loop flag. It is ok to do this without lock,
-      // since we care just whether it is zero or non-zero. 
-      if (ACE_Proactor::end_event_loop_ != 0)
-          break;
-      
-      // <end_event_loop> is not set. Ready to do <handle_events>.
-      result = ACE_Proactor::instance ()->handle_events ();
+      int result = ACE_Proactor::instance ()->handle_events ();
 
       if (ACE_Service_Config::reconfig_occurred ())
 	ACE_Service_Config::reconfigure ();
-      
+
       else if (result == -1)
-	break;
+	return -1;
     }
-  
-  // Leaving the event loop. Decrement the thread count.
 
-  // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-  
-  // Decrement the thread count.
-  ACE_Proactor::event_loop_thread_count_ --;
-
-  return result;
+  return 0;
 }
 
 // Handle events for -tv- time.  handle_events updates -tv- to reflect
@@ -405,93 +354,29 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Proactor::run_event_loop");
 
-  int result = 0;
-
-  // Declaring the lock variable.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-    (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
-#endif /* ACE_MT_SAFE */
-
-  // Early check. It is ok to do this without lock, since we care just 
-  // whether it is zero or non-zero.
-  if (ACE_Proactor::end_event_loop_ != 0 ||
-      tv == ACE_Time_Value::zero)
-    return 0;
-  
-  // First time you are in. Increment the thread count.
-  {
-    // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-    
-    // Increment the thread count.
-    ACE_Proactor::event_loop_thread_count_ ++;
-  }
-
-  // Run the event loop.
-  while (1)
+  while (ACE_Proactor::end_event_loop_ == 0
+         && tv != ACE_Time_Value::zero)
     {
-      // Check for end of loop. It is ok to do this without lock,
-      // since we care just whether it is zero or non-zero.
-      if (ACE_Proactor::end_event_loop_ != 0 ||
-          tv == ACE_Time_Value::zero)
-        break;
-
-      // <end_event_loop> is not set. Ready to do <handle_events>.
-      result = ACE_Proactor::instance ()->handle_events (tv);
+      int result = ACE_Proactor::instance ()->handle_events (tv);
 
       if (ACE_Service_Config::reconfig_occurred ())
 	ACE_Service_Config::reconfigure ();
-      
+
       // An error has occurred.
       else if (result == -1)
-	break;
+	return result;
     }
 
-  // Leaving the event loop. Decrement the thread count.
-
-  // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-  
-  // Decrement the thread count.
-  ACE_Proactor::event_loop_thread_count_ --;
-
-  return result;
+  return 0;
 }
 
 int
 ACE_Proactor::end_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::end_event_loop");
-  
-  // Obtain the lock, set the end flag and post the wakeup
-  // completions. 
-  
-  // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-    (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-  
-  // Set the end flag.
   ACE_Proactor::end_event_loop_ = 1;
-    
-  // Number of completions to post.
-  int how_many = ACE_Proactor::event_loop_thread_count_;
-  
-  // Reset the thread count.
-  ACE_Proactor::event_loop_thread_count_ = 0;
-
-  // Post completions to all the threads so that they will all wake
-  // up. 
-  return ACE_Proactor::post_wakeup_completions (how_many);
+  //  ACE_Proactor::instance()->notify ();
+  return 0;
 }
 
 int
@@ -517,15 +402,15 @@ ACE_Proactor::close (void)
       delete this->implementation ();
       this->implementation_ = 0;
     }
-
-  // Delete the timer handler.
+  
+  // Take care of the timer handler
   if (this->timer_handler_)
     {
       delete this->timer_handler_;
       this->timer_handler_ = 0;
     }
   
-  // Delete the timer queue.
+  // Take care of the timer queue
   if (this->delete_timer_queue_)
     {
       delete this->timer_queue_;
@@ -577,10 +462,7 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
     this->timer_queue_->gettimeofday () + time;
   
   // Only one guy goes in here at a time
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
-                    ace_mon,
-                    this->timer_queue_->mutex (),
-                    -1);  
+  ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->timer_queue_->mutex (), -1);
 
   // Schedule the timer
   long result = this->timer_queue_->schedule (&handler,
@@ -909,12 +791,6 @@ ACE_Proactor::create_asynch_timer (ACE_Handler &handler,
                                                        signal_number);
 }
 
-int
-ACE_Proactor::post_wakeup_completions (int how_many)
-{
-  return ACE_Proactor::instance ()->implementation ()->post_wakeup_completions (how_many);
-}
-
 void
 ACE_Proactor::implementation (ACE_Proactor_Impl *implementation)
 {