ChangeLogTag:Tue Jun 26 16:22:24 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

8 files changed, 53 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index bdfb8046bde..d862106d19a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jun 26 16:22:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Proactor.h: Added a static reset_event_loop() to the ACE_Proactor
+	  class.  Thanks to Rich Newman <RNewman@directv.com> for
+ 	  reporting this.
+
+	* ace/config-sunos5.7.h: Removed an errant #endif.  Thanks to
+	  Craig Ching <cching@mqsoftware.com> for reporting this.
+
 Mon Jun 25 15:36:55 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/config-sunos5.7.h: Added support for GCC 3.0.  Thanks to
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bdfb8046bde..d862106d19a 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Tue Jun 26 16:22:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Proactor.h: Added a static reset_event_loop() to the ACE_Proactor
+	  class.  Thanks to Rich Newman <RNewman@directv.com> for
+ 	  reporting this.
+
+	* ace/config-sunos5.7.h: Removed an errant #endif.  Thanks to
+	  Craig Ching <cching@mqsoftware.com> for reporting this.
+
 Mon Jun 25 15:36:55 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/config-sunos5.7.h: Added support for GCC 3.0.  Thanks to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bdfb8046bde..d862106d19a 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Tue Jun 26 16:22:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/Proactor.h: Added a static reset_event_loop() to the ACE_Proactor
+	  class.  Thanks to Rich Newman <RNewman@directv.com> for
+ 	  reporting this.
+
+	* ace/config-sunos5.7.h: Removed an errant #endif.  Thanks to
+	  Craig Ching <cching@mqsoftware.com> for reporting this.
+
 Mon Jun 25 15:36:55 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/config-sunos5.7.h: Added support for GCC 3.0.  Thanks to
diff --git a/THANKS b/THANKS
index b872d37be15..26064bd1f9a 100644
--- a/THANKS
+++ b/THANKS
@@ -1271,6 +1271,7 @@ Benn Howard <Benn_Howard@raytheon.com>
 Steffen Hieber <Steffen.Hieber@erl9.siemens.de>
 Craig L. Ching <cching@mqsoftware.com>
 Ben Howard <Ben_Howard@raytheon.com>
+Rich Newman <RNewman@directv.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 21b7b7392c7..eacba22b486 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -508,6 +508,22 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 }
 
 int
+ACE_Proactor::reset_event_loop(void)
+{
+  ACE_TRACE ("ACE_Proactor::reset_event_loop");
+
+  // Obtain the lock in 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_Proactor::end_event_loop_ = 0;
+  return 0;
+}
+
+int
 ACE_Proactor::end_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::end_event_loop");
diff --git a/ace/Proactor.h b/ace/Proactor.h
index ddf7b622283..d577ccdde47 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -192,6 +192,12 @@ public:
    */
   static int end_event_loop (void);
 
+  /**
+   * Resets the <ACE_Proactor::end_event_loop_> static so that the
+   * <run_event_loop> method can be restarted.
+   */
+  static int void reset_event_loop (void);
+
   /// Report if the <ACE_Proactor::instance> event loop is finished.
   static int event_loop_done (void);
 
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index f8b65761cc9..312f6d92aa1 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -224,7 +224,7 @@ ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv,
 {
   ACE_TRACE ("ACE_Reactor::run_alertable_reactor_event_loop");
 
-  while (1)
+  for (;;)
     {
       int result = this->implementation_->alertable_handle_events (tv);
 
@@ -255,7 +255,6 @@ ACE_Reactor::reactor_event_loop_done (void)
   ACE_TRACE ("ACE_Reactor::reactor_event_loop_done");
   return this->implementation_->deactivated ();
 }
-  // Report if the <ACE_Reactor::instance>'s event loop is finished.
 
 void
 ACE_Reactor::reset_reactor_event_loop (void)
@@ -264,8 +263,6 @@ ACE_Reactor::reset_reactor_event_loop (void)
 
   this->implementation_->deactivate (0);
 }
-  // Resets the <ACE_Reactor::end_event_loop_> static so that the
-  // <run_event_loop> method can be restarted.
 
 void
 ACE_Reactor::dump (void) const
diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h
index af9ec98a5ea..42d88066760 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -32,6 +32,8 @@
 #   define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #   define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 
+# endif /* __GNUC__ <= 2  &&  __GNUC_MINOR__ < 8 */
+
 #elif defined (ghs)
   // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t,
   // but /usr/include/sys/int_types.h doesn't #define it because