ChangeLogTag:Thu Dec 5 20:30:56 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

10 files changed, 86 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 93916f3bc42..c4cdd59da3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Dec  5 20:30:56 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Event_Handler.cpp: Updated the implementation of ACE_Event_Handler::read_adapter()
+	  so that the code is consistent with the stated semantics.  Thanks to
+	  Ron Muck <rlm@sdiusa.com> for the fix.
+
+	* ace/OS_Dirent.inl (readdir_r): Enhanced the ACE_OS_Directn::readdir_r() 
+	  wrapper facade so that it returns 1 (i.e., "done") when an error
+ 	  occurs.  Thanks to Abhay Kulkarni <Abhay.Kulkarni@veritas.com>
+ 	  for reporting this.
+
 Sat Dec  7 19:54:12 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: For WinCE, define S_IFDIR and S_IFREG file mode masks.
@@ -57,6 +68,11 @@ Thu Dec  5 14:35:50 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 	* netsvcs/clients/Naming/Client/Makefile: Do not build in static
 	  builds.
 
+Thu Dec  5 09:45:25 2002  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp: Fixed some typos.  Thanks to
+	  Andy King <andyking@vernon.com> for reporting this.
+
 Thu Dec  5 07:39:45 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* bin/auto_run_tests.lst: Removed Bug_1020_Regression from the
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 93916f3bc42..c4cdd59da3d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,14 @@
+Thu Dec  5 20:30:56 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Event_Handler.cpp: Updated the implementation of ACE_Event_Handler::read_adapter()
+	  so that the code is consistent with the stated semantics.  Thanks to
+	  Ron Muck <rlm@sdiusa.com> for the fix.
+
+	* ace/OS_Dirent.inl (readdir_r): Enhanced the ACE_OS_Directn::readdir_r() 
+	  wrapper facade so that it returns 1 (i.e., "done") when an error
+ 	  occurs.  Thanks to Abhay Kulkarni <Abhay.Kulkarni@veritas.com>
+ 	  for reporting this.
+
 Sat Dec  7 19:54:12 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: For WinCE, define S_IFDIR and S_IFREG file mode masks.
@@ -57,6 +68,11 @@ Thu Dec  5 14:35:50 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 	* netsvcs/clients/Naming/Client/Makefile: Do not build in static
 	  builds.
 
+Thu Dec  5 09:45:25 2002  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* examples/Synch/proc_sema.cpp: Fixed some typos.  Thanks to
+	  Andy King <andyking@vernon.com> for reporting this.
+
 Thu Dec  5 07:39:45 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* bin/auto_run_tests.lst: Removed Bug_1020_Regression from the
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e0468bad406..4e46ecce0c4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec  5 20:45:49 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Event_Utilities.cpp (event_debug): Print out the 
+	  debugging info in hex as well as decimal.  Thanks to Oliver Kellog
+	  <oliver.kellogg@sysde.eads.net> for reporting this.
+
 Sat Dec  7 09:44:33 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/CosTime.dsp:
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index a712cfa287e..70fddbfb717 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -124,10 +124,10 @@ void event_debug (const char* p,
 {
   int l = ACE_OS::strlen (p);
   ACE_DEBUG ((LM_DEBUG,
-              "%*.*s - event.source: %d\n"
-              "%*.*s   event.type: %d\n",
-              l, l, p, event.header.source,
-              l, l, p, event.header.type));
+              "%*.*s - event.source: %d (0x%x)\n"
+              "%*.*s   event.type: %d (0x%x)\n",
+              l, l, p, event.header.source, event.header.source,
+              l, l, p, event.header.type, event.header.type));
 }
 
 void
diff --git a/THANKS b/THANKS
index 560166ce9a4..4436ebbe01e 100644
--- a/THANKS
+++ b/THANKS
@@ -1630,6 +1630,11 @@ Mathias Waack <mathias.waack@schlund.de>
 Mike Nordell <tamlin@algonet.se>
 Tufan Oruk <toruk@usa.net>
 Tim Smith <timsmith_s@hotmail.com>
+Andy King <andyking@vernon.com>
+Eric Strennen <estrennen@imago.com>
+Abhay Kulkarni <Abhay.Kulkarni@veritas.com>
+Ron Muck <rlm@sdiusa.com>
+Ma Weida <weida@flyingdonkey.com>
 Terry <terry@ec-tone.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index afc21d15522..41e173e9aba 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -174,20 +174,14 @@ ACE_Event_Handler::reactor (void) const
 
 #if !defined (ACE_HAS_WINCE)
 
-// Used to read from non-socket ACE_HANDLEs in our own thread to work
-// around Win32 limitations that don't allow us to select() on
-// non-sockets (such as ACE_STDIN).  This is commonly used in
-// situations where the Reactor is used to demultiplex read events on
-// ACE_STDIN on UNIX.  Note that <event_handler> must be a subclass of
-// <ACE_Event_Handler>.  If the <get_handle> method of this event
-// handler returns <ACE_INVALID_HANDLE> we default to reading from
-// ACE_STDIN.
-
 ACE_THR_FUNC_RETURN
 ACE_Event_Handler::read_adapter (void *args)
 {
   ACE_Event_Handler *this_ptr = (ACE_Event_Handler *) args;
-  ACE_HANDLE handle = ACE_STDIN;
+
+  ACE_HANLDE handle = this_ptr->get_handle ();
+  if (handle == ACE_INVALID_HANDLE)
+    handle = ACE_STDIN;
 
   while (this_ptr->handle_input (handle) != -1)
     continue;
diff --git a/ace/OS_Dirent.inl b/ace/OS_Dirent.inl
index 1fede13caaf..c1f227fbb78 100644
--- a/ace/OS_Dirent.inl
+++ b/ace/OS_Dirent.inl
@@ -99,7 +99,10 @@ ACE_OS_Dirent::readdir_r (ACE_DIR *dirp,
   ACE_UNUSED_ARG (entry);
   // <result> has better not be 0!
   *result = ACE_OS_Dirent::readdir (dirp);
-  return 0;
+  if (*result)
+    return 0; // Keep iterating
+  else
+    return 1; // Oops, some type of error!
 #elif defined (ACE_HAS_DIRENT)  &&  !defined (ACE_LACKS_READDIR_R)
 #  if (defined (sun) && (defined (_POSIX_PTHREAD_SEMANTICS) || \
                         (_FILE_OFFSET_BITS == 64))) || \
diff --git a/docs/index.html b/docs/index.html
index 9f32381ad98..e1f0191a3c5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,19 +16,22 @@ ask. <P>
 
 <hr>
 
-<h2>Bug Reports</h2>
+<h3>ACE Documentation</h3>
 
 <ul>
-  <li><a href="ACE-bug-process.html">ACE+TAO Bug Fixing Policies</a> - Our policies for
-      handling bug reports.
-  <li><a href="usage-bugzilla.html">Bug Tracking System</a> - Short description of our
-      Bugzilla bug tracking system.
+  <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Overview of ACE</a> -
+      The top level view.
+  <li><A
+      HREF="http://www.cs.wustl.edu/~schmidt/ACE-documentation.html">ACE online documentation</a>.
+  <li><A
+      HREF="http://www.flyingdonkey.com/ace/">Chinese translation for
+      much ACE documentation</a>.
+  <LI><A HREF="http://www.cs.wustl.edu/~schmidt/ACE/">Books on ACE</A>.
 </ul>
 
-
 <hr>
 
-<h2>Structure</h2>
+<h3>ACE Structure</h3>
 
 <ul>
   <li><a href="ACE-categories.html">Class Categories</a> - Listing of some of the classes
@@ -37,16 +40,13 @@ ask. <P>
       "ACE-inheritance.ps.gz">[ps.gz]</a>
   <li><a href="ACE-subsets.html">ACE Subsets</a> - Outline of some of our ideas
       for subsetting the ACE library.
-
 </ul>
 
 <hr>
 
-<h2>Tutorials</h2>
+<h3>Tutorials</h3>
 
 <ul>
-  <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Overview of ACE</a> -
-      The top level view.
   <li>ACE programmers guide <a href="http://www.cs.wustl.edu/~schmidt/PDF/ACE-tutorial.pdf">[pdf.gz]</a>
       <a href="http://www.cs.wustl.edu/~schmidt/ACE-tutorial.ps.gz">[ps.gz]</a>
   <li><a href="tutorials/guide-tutorials.html">Online examples from the ACE programmers guide</a>
@@ -61,21 +61,33 @@ ask. <P>
 
 <hr>
 
-<h2>ACE Development</h2>
+<h3>Bug Reports</h3>
+
+<ul>
+  <li><a href="ACE-bug-process.html">ACE+TAO Bug Fixing Policies</a> - Our policies for
+      handling bug reports.
+  <li><a href="usage-bugzilla.html">Bug Tracking System</a> - Short description of our
+      Bugzilla bug tracking system.
+</ul>
+
+
+<hr>
+
+<h3>ACE Development</h3>
 
 <ul>
   <li><a href="ACE-development-process.html">Development and Release Process</a> - The process we use
       to develop and release the ACE library.
   <li><a href="ACE-guidelines.html">Style Guide</a> - How to write compliant ACE code.
   <li><a href="ACE-porting.html">Porting</a> - What to do to port to a new platform.
-  <li><a href="exceptions.html">Exception Macros</a> - How to properly use the ACE TRY
-      macros.
+  <li><a href="exceptions.html">Exception Macros</a> - How to use the ACE TRY
+      macros properly.
 
 </ul>
 
 <hr>
 
-<h2>Other stuff</h2>
+<h3>Other Stuff</h3>
 
 <ul>
   <li><a href="ACE-lessons.html">Lessons</a> - Lessons we have learned while
diff --git a/examples/Synch/README b/examples/Synch/README
index 51dd14ce4ae..526120f2744 100644
--- a/examples/Synch/README
+++ b/examples/Synch/README
@@ -16,6 +16,6 @@ consumer process.  The available options are:
   You can use this test to see how process semaphores work.  For
 example, run the program as:
 
-   proc_sema -c -n 10
-   proc_sema -s -n 3
-   proc_sema -s -n 7
+   proc_sema -c -i 10
+   proc_sema -s -i 3
+   proc_sema -s -i 7
diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp
index 4ee81f6f9c0..3666b552cd8 100644
--- a/examples/Synch/proc_sema.cpp
+++ b/examples/Synch/proc_sema.cpp
@@ -11,7 +11,7 @@ int producer (ACE_SYNCH_PROCESS_SEMAPHORE &sema,
   for (int i = iter; i > 0; --i)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Try acquiring the semaphore (%d): ",
+                  "Try releasing the semaphore (%d): ",
                   i));
 
       int result = sema.release ();