ChangeLogTag:Tue Mar 13 06:04:03 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

7 files changed, 48 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 52e02e4cc5d..2d317e6b328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Mar 13 06:04:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Service_Manager.cpp (list_services): Add an indication of whether
+	  a service is active or paused.  Thanks to Mike Curtis for this
+ 	  improvement.
+
+	* ace/Reactor.h: Clarified that the remove_handler (handle, mask)
+	  method also removes the event handle.  Thanks to Pierre Fayolle
+ 	  <fayolle@enseirb.fr> for reporting this.
+
+	* tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat
+	  with ACE_stat.  Thanks to Johnny Willemsen for reporting this.
+
 Tue Mar 13 00:35:35 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Select_Reactor_T.i (deactivated): Reverted this change
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 52e02e4cc5d..2d317e6b328 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Tue Mar 13 06:04:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Service_Manager.cpp (list_services): Add an indication of whether
+	  a service is active or paused.  Thanks to Mike Curtis for this
+ 	  improvement.
+
+	* ace/Reactor.h: Clarified that the remove_handler (handle, mask)
+	  method also removes the event handle.  Thanks to Pierre Fayolle
+ 	  <fayolle@enseirb.fr> for reporting this.
+
+	* tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat
+	  with ACE_stat.  Thanks to Johnny Willemsen for reporting this.
+
 Tue Mar 13 00:35:35 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Select_Reactor_T.i (deactivated): Reverted this change
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 52e02e4cc5d..2d317e6b328 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Tue Mar 13 06:04:03 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Service_Manager.cpp (list_services): Add an indication of whether
+	  a service is active or paused.  Thanks to Mike Curtis for this
+ 	  improvement.
+
+	* ace/Reactor.h: Clarified that the remove_handler (handle, mask)
+	  method also removes the event handle.  Thanks to Pierre Fayolle
+ 	  <fayolle@enseirb.fr> for reporting this.
+
+	* tests/Logging_Strategy_Test.cpp (get_statistic): Replace struct stat
+	  with ACE_stat.  Thanks to Johnny Willemsen for reporting this.
+
 Tue Mar 13 00:35:35 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* ace/Select_Reactor_T.i (deactivated): Reverted this change
diff --git a/THANKS b/THANKS
index d092dfb2592..623f2794304 100644
--- a/THANKS
+++ b/THANKS
@@ -1175,6 +1175,7 @@ Dipti Jain <dijain@hss.hns.com>
 Eric Zuur <Eric.Zuur@meco.nl>
 Jeffrey J. Persch <hyperslug@yahoo.com>
 Rahul Shukla <rshukla@ggn.aithent.com> 
+Pierre Fayolle <fayolle@enseirb.fr> 
 
 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/Reactor.h b/ace/Reactor.h
index e3fc4cdc0fe..a80c98b6289 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -340,9 +340,10 @@ public:
                               ACE_Reactor_Mask mask);
 
   /**
-   * Removes <handle>.  If <mask> includes <ACE_Event_Handler::DONT_CALL>
-   * then the <handle_close> method of the associated <event_handler>
-   * is not invoked.
+   * Removes the <ACE_Event_Handler> associated with <handle>.  If
+   * <mask> includes <ACE_Event_Handler::DONT_CALL> then the
+   * <handle_close> method of the associated <event_handler> is not
+   * invoked.
    */
   virtual int remove_handler (ACE_HANDLE handle,
                               ACE_Reactor_Mask mask);
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index f3f8d83d99f..cfd7c305c9b 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -161,17 +161,18 @@ int
 ACE_Service_Manager::list_services (void)
 {
   ACE_TRACE ("ACE_Service_Manager::list_services");
-  ACE_Service_Repository_Iterator sri (*ACE_Service_Repository::instance ());
+  ACE_Service_Repository_Iterator sri (*ACE_Service_Repository::instance (), 0);
 
   for (const ACE_Service_Type *sr;
        sri.next (sr) != 0;
        sri.advance ())
     {
-      int len = ACE_OS::strlen (sr->name ()) + 1;
+      int len = ACE_OS::strlen (sr->name ()) + 11;
       ACE_TCHAR buf[BUFSIZ];
       ACE_TCHAR *p = buf + len;
 
       ACE_OS::strcpy (buf, sr->name ());
+      ACE_OS::strcat (buf, (sr->active ()) ? " (active) " : " (paused) ");
 
       p[-1] = ' ';
       p[0]  = '\0';
diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp
index 6943b65e36a..e721b39746e 100644
--- a/tests/Logging_Strategy_Test.cpp
+++ b/tests/Logging_Strategy_Test.cpp
@@ -169,7 +169,7 @@ count_files (void)
 static int
 get_statistic (char *f_name)
 {
-  struct stat buf;
+  ACE_stat buf;
   int result;
 
   // Get data associated with "file_name":