ChangeLogTag:Sat Sep 22 08:59:24 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

27 files changed, 332 insertions, 88 deletions

diff --git a/ChangeLog b/ChangeLog
index 56de9c140cd..d62e0b1a4df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Sat Sep 22 08:59:24 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/High_Res_Timer.{h,i,cpp}: Added comments to explain how
+	  to configure the timers properly on various platforms.  Thanks
+ 	  to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting this.
+
+	* ace/OS.i (ACE_Flow_Spec): Added a check for ACE_HAS_WINSOCK2_GQOS
+	  so that things will compile properly on MinGW32.  Thanks to Jeff
+ 	  McNiel <JMcNiel@datacrit.com> for reporting this.
+
+Fri Sep 21 15:54:55 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS_Dirent.cpp: Fixed all the allocations so they work properly
+	  when used with ACE_TCHAR!  Thanks to Olof Lindfors
+ 	  <olof.lindfors@protegrity.com>.
+
+Tue Sep 18 06:25:22 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/*Reactor*: Changed all uses of "delta_time" to "delay_time".
+	  Thanks to Johnny Willemsen for reporting this.
+
+Sun Sep 16 11:53:38 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Connector.cpp (handle_output): Fixed the comment to be
+	  ACE_WIN32.  Thanks to Kobi Cohen-Arazi <kobi@mivzak.com> for
+ 	  reporting this.
+
 Fri Sep 21 17:11:52 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Message_Block.h: Tried rewording some comments in the
@@ -155,22 +182,21 @@ Mon Sep 17 13:49:07 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Mon Sep 17 11:36:54 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * tests/run_tests.lst: This is the script used by the shell
-          script in that directory. As the name is confusing this is being
-          moved as a new file.
-
-        * tests/run_tests_remote.lst: Renamed the run_tests.lst as
-          run_tests_shell.lst. This is invoked by run_tests.sh
-
-        * tests/run_tests.sh: Renamed as a new file.
-
-        * tests/run_tests_remote.sh: Renamed the file run_tests.sh as this
-          one. This script can be used to run tests remotely on a
-          CHORUS/ClassiX/MVME targets. Further this can also be used to
-          run tests on platforms that dont support perl or do not have
-          perl.
-
-
+	* tests/run_tests.lst: This is the script used by the shell
+	  script in that directory. As the name is confusing this is being
+	  moved as a new file.
+
+	* tests/run_tests_remote.lst: Renamed the run_tests.lst as
+	  run_tests_shell.lst. This is invoked by run_tests.sh 
+
+	* tests/run_tests.sh: Renamed as a new file.
+	
+	* tests/run_tests_remote.sh: Renamed the file run_tests.sh as this
+	  one. This script can be used to run tests remotely on a
+	  CHORUS/ClassiX/MVME targets. Further this can also be used to
+	  run tests on platforms that dont support perl or do not have
+	  perl. 
+  
 Sun Sep 16 11:19:01 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.1.20 released.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 56de9c140cd..d62e0b1a4df 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,30 @@
+Sat Sep 22 08:59:24 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/High_Res_Timer.{h,i,cpp}: Added comments to explain how
+	  to configure the timers properly on various platforms.  Thanks
+ 	  to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting this.
+
+	* ace/OS.i (ACE_Flow_Spec): Added a check for ACE_HAS_WINSOCK2_GQOS
+	  so that things will compile properly on MinGW32.  Thanks to Jeff
+ 	  McNiel <JMcNiel@datacrit.com> for reporting this.
+
+Fri Sep 21 15:54:55 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS_Dirent.cpp: Fixed all the allocations so they work properly
+	  when used with ACE_TCHAR!  Thanks to Olof Lindfors
+ 	  <olof.lindfors@protegrity.com>.
+
+Tue Sep 18 06:25:22 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/*Reactor*: Changed all uses of "delta_time" to "delay_time".
+	  Thanks to Johnny Willemsen for reporting this.
+
+Sun Sep 16 11:53:38 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Connector.cpp (handle_output): Fixed the comment to be
+	  ACE_WIN32.  Thanks to Kobi Cohen-Arazi <kobi@mivzak.com> for
+ 	  reporting this.
+
 Fri Sep 21 17:11:52 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Message_Block.h: Tried rewording some comments in the
@@ -155,22 +182,21 @@ Mon Sep 17 13:49:07 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Mon Sep 17 11:36:54 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * tests/run_tests.lst: This is the script used by the shell
-          script in that directory. As the name is confusing this is being
-          moved as a new file.
-
-        * tests/run_tests_remote.lst: Renamed the run_tests.lst as
-          run_tests_shell.lst. This is invoked by run_tests.sh
-
-        * tests/run_tests.sh: Renamed as a new file.
-
-        * tests/run_tests_remote.sh: Renamed the file run_tests.sh as this
-          one. This script can be used to run tests remotely on a
-          CHORUS/ClassiX/MVME targets. Further this can also be used to
-          run tests on platforms that dont support perl or do not have
-          perl.
-
-
+	* tests/run_tests.lst: This is the script used by the shell
+	  script in that directory. As the name is confusing this is being
+	  moved as a new file.
+
+	* tests/run_tests_remote.lst: Renamed the run_tests.lst as
+	  run_tests_shell.lst. This is invoked by run_tests.sh 
+
+	* tests/run_tests.sh: Renamed as a new file.
+	
+	* tests/run_tests_remote.sh: Renamed the file run_tests.sh as this
+	  one. This script can be used to run tests remotely on a
+	  CHORUS/ClassiX/MVME targets. Further this can also be used to
+	  run tests on platforms that dont support perl or do not have
+	  perl. 
+  
 Sun Sep 16 11:19:01 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.1.20 released.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 56de9c140cd..d62e0b1a4df 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,30 @@
+Sat Sep 22 08:59:24 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/High_Res_Timer.{h,i,cpp}: Added comments to explain how
+	  to configure the timers properly on various platforms.  Thanks
+ 	  to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting this.
+
+	* ace/OS.i (ACE_Flow_Spec): Added a check for ACE_HAS_WINSOCK2_GQOS
+	  so that things will compile properly on MinGW32.  Thanks to Jeff
+ 	  McNiel <JMcNiel@datacrit.com> for reporting this.
+
+Fri Sep 21 15:54:55 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS_Dirent.cpp: Fixed all the allocations so they work properly
+	  when used with ACE_TCHAR!  Thanks to Olof Lindfors
+ 	  <olof.lindfors@protegrity.com>.
+
+Tue Sep 18 06:25:22 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/*Reactor*: Changed all uses of "delta_time" to "delay_time".
+	  Thanks to Johnny Willemsen for reporting this.
+
+Sun Sep 16 11:53:38 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Connector.cpp (handle_output): Fixed the comment to be
+	  ACE_WIN32.  Thanks to Kobi Cohen-Arazi <kobi@mivzak.com> for
+ 	  reporting this.
+
 Fri Sep 21 17:11:52 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Message_Block.h: Tried rewording some comments in the
@@ -155,22 +182,21 @@ Mon Sep 17 13:49:07 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Mon Sep 17 11:36:54 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * tests/run_tests.lst: This is the script used by the shell
-          script in that directory. As the name is confusing this is being
-          moved as a new file.
-
-        * tests/run_tests_remote.lst: Renamed the run_tests.lst as
-          run_tests_shell.lst. This is invoked by run_tests.sh
-
-        * tests/run_tests.sh: Renamed as a new file.
-
-        * tests/run_tests_remote.sh: Renamed the file run_tests.sh as this
-          one. This script can be used to run tests remotely on a
-          CHORUS/ClassiX/MVME targets. Further this can also be used to
-          run tests on platforms that dont support perl or do not have
-          perl.
-
-
+	* tests/run_tests.lst: This is the script used by the shell
+	  script in that directory. As the name is confusing this is being
+	  moved as a new file.
+
+	* tests/run_tests_remote.lst: Renamed the run_tests.lst as
+	  run_tests_shell.lst. This is invoked by run_tests.sh 
+
+	* tests/run_tests.sh: Renamed as a new file.
+	
+	* tests/run_tests_remote.sh: Renamed the file run_tests.sh as this
+	  one. This script can be used to run tests remotely on a
+	  CHORUS/ClassiX/MVME targets. Further this can also be used to
+	  run tests on platforms that dont support perl or do not have
+	  perl. 
+  
 Sun Sep 16 11:19:01 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.1.20 released.
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 5aed5d1328d..012e45ac584 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1463,7 +1463,7 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
       // XXX there should be a simple way to reuse this code in other
       // ORB implementations ...
 
-#if defined(ACE_HAS_PURIFY)
+#if defined (ACE_HAS_PURIFY)
       char buf [ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
 #else
       // Avoid the initialization overhead if not compiling with
diff --git a/THANKS b/THANKS
index 34ee8de3e63..4cbcf9967a0 100644
--- a/THANKS
+++ b/THANKS
@@ -1243,7 +1243,7 @@ Wayne Erchak <wayne@stentor.com>
 Yew Khong See <seeyk@yahoo.com>
 Greg Thompson <gregt@ot.com.au>
 Mike Pyle <mike.pyle@burning-glass.com>
-Kobi Cohen-Arazi <kobic@bvr.co.il>
+Kobi Cohen-Arazi <kobi@mivzak.com>
 Israel Illescas Gomez <illescas@dycsa.es>
 Brodie Thiesfield <brodie.thiesfield@activesky.com>
 Erik Toubro Nielsen <enielsen@mdsproteomics.dk>
@@ -1330,6 +1330,7 @@ Giulio Agostini <giulio.agostini@db.com>
 Werner Buchert <w.buchert@medat.de>
 Kevin Cline <krc@one.com>
 Mahesh Varadarajan <mahesh.varadarajan@divatv.com>
+Olof Lindfors <olof.lindfors@protegrity.com>
 Tom Wagner <TomW@CoManage.net>
 
 I would particularly like to thank Paul Stephenson, who worked with me
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 8aba2c5bb05..2debc2b48b1 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -354,7 +354,7 @@ ACE_Connector<SVH, PR_CO_2>::handle_output (ACE_HANDLE handle)
       if (ast->svc_handler ()->peer ().get_remote_addr (raddr) != -1)
         this->activate_svc_handler (ast->svc_handler ());
       else // do the svc handler close below...
-#endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
+#endif /* ACE_WIN32 */
        ast->svc_handler ()->close (0);
     }
   delete ast;
diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp
index 60fcc5ca380..c9a64145ce7 100644
--- a/ace/FlReactor.cpp
+++ b/ace/FlReactor.cpp
@@ -275,7 +275,7 @@ ACE_FlReactor::reset_timer_interval
 long
 ACE_FlReactor::schedule_timer (ACE_Event_Handler *handler,
 			       const void *arg,
-			       const ACE_Time_Value &delta_time,
+			       const ACE_Time_Value &delay_time,
 			       const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_FlReactor::schedule_timer");
@@ -283,7 +283,7 @@ ACE_FlReactor::schedule_timer (ACE_Event_Handler *handler,
 
   long result = ACE_Select_Reactor::schedule_timer (handler,
                                                     arg,
-                                                    delta_time,
+                                                    delay_time,
                                                     interval);
   if (result == -1)
     return -1;
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index 20d2ad5e34d..c9cb7670b0d 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -53,7 +53,7 @@ public:
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *handler,
                                const void *arg,
-                               const ACE_Time_Value &delta_time,
+                               const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval);
   virtual int reset_timer_interval (long timer_id,
                                     const ACE_Time_Value &interval);
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index 1a59afb2241..3bf9954cc37 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -1,5 +1,12 @@
 // $Id$
 
+// Be very carefull before changing the calculations inside
+// ACE_High_Res_Timer.  The precision matters and we are using integer
+// calculations not floating point.  Also look good at the emulated 64
+// bit int class (inside Basic_Types{h,i,cpp} before changing
+// anything.  It's operator/ only returns 32 bits not 64 bits, among
+// other things.
+
 #include "ace/High_Res_Timer.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 84d64f70bc8..4cf332b50f3 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -41,12 +41,29 @@
  * factor.  They divide the "time" that they get from
  * <ACE_OS::gethrtime> by global_scale_factor_ to obtain the
  * time in microseconds.  Its units are therefore 1/microsecond.
+ * On Windows the global_scale_factor_ units are 1/millisecond.
+ * There's a macro <ACE_HR_SCALE_CONVERSION> which gives the
+ * units/second.  Because it's possible that the units/second
+ * changes in the future, it's recommended to use it instead
+ * of a "hard coded" solution.
+ * Dependend on the platform and used class members, there's a
+ * maximum elapsed period before overflow (which is not checked).
+ * Look at the documentation with some members functions.
+ * On some (most?) implementations it's not recommended to measure
+ * "long" timeperiods, because the error's can accumulate fast.
+ * This is probably not a problem profiling code, but could be
+ * on if the high resolution timer class is used to initiate
+ * actions after a "long" timeout.
  * On Solaris, a scale factor of 1000 should be used because its
  * high-resolution timer returns nanoseconds.  However, on Intel
  * platforms, we use RDTSC which returns the number of clock
  * ticks since system boot.  For a 200MHz cpu, each clock tick
  * is 1/200 of a microsecond; the global_scale_factor_ should
- * therefore be 200.
+ * therefore be 200 or 200000 if it's in unit/millisecond.
+ * On Windows ::QueryPerformanceCounter() is used, which can be a 
+ * different implementation depending on the used windows HAL
+ * (Hardware Abstraction Layer).  On some it uses the PC "timer chip"
+ * while it uses RDTSC on others.   
  * NOTE:  the elapsed time calculations in the print methods use
  * ACE_hrtime_t values.  Those methods do _not_ check for overflow!
  * NOTE: Gabe <begeddov@proaxis.com> raises this issue regarding
@@ -56,6 +73,23 @@
  * divergence there would be, if any.
  * This issue is not mentioned in the Solaris 2.5.1 gethrtime
  * man page.
+ * A RDTSC NOTE: RDTSC is the Intel Pentium read-time stamp counter
+ * and is actualy a 64 bit clock cycle counter, which is increased 
+ * with every cycle.  It has a low overhead and can be read within
+ * 16 (pentium) or 32 (pentium II,III,...) cycles, but it doesn't
+ * serialize the processor, which could give wrong timings when
+ * profiling very short code fragments.  
+ * Problematic is that some power sensitive devices
+ * (laptops for example, but probably also embeded devices),
+ * do change the cycle rate while running.  
+ * Some pentiums can run on (at least) two clock frequency's.
+ * Another problem arises with multiprocessor computers, there
+ * are reports that the different RDTSC's are not always kept
+ * in sync.
+ * A windows "timer chip" NOTE: (8254-compatible real-time clock)
+ * When ::QueryPerformanceCounter() uses the 8254 it has a 
+ * frequency off about 1.193 Mhz (or sometimes 3.579 Mhz??) and
+ * reading it requires some time (several thousand cycles).
  */
 class ACE_Export ACE_High_Res_Timer
 {
@@ -71,6 +105,9 @@ public:
    * global_scale_factor_ is set to 1000 so that <scale_factor> need
    * not be set.  Careful, a <scale_factor> of 0 will cause division
    * by zero exceptions.
+   * Depending on the platform its units are 1/microsecond or
+   * 1/millisecond. Use <ACE_HR_SCALE_CONVERSION> inside calculations
+   * instead a hardcoded value.
    */
   static void global_scale_factor (ACE_UINT32 gsf);
 
@@ -107,6 +144,7 @@ public:
    * values.  An application can override that by calling calibrate
    * with any desired parameter values _prior_ to constructing the
    * first ACE_High_Res_Timer instance.
+   * Beware for platforms that can change the cycle rate on the fly.
    */
   static ACE_UINT32 calibrate (const ACE_UINT32 usec = 500000,
                                const u_int iterations = 10);
@@ -127,9 +165,17 @@ public:
   void stop (const ACE_OS::ACE_HRTimer_Op = ACE_OS::ACE_HRTIMER_GETTIME);
 
   /// Set <tv> to the number of microseconds elapsed.
+  /**
+   *  Could overflow within hours on windows with emulated 64 bit int's
+   *  and a fast counter. VC++ and Borland normaly use __int64 and
+   *  so normaly don't have this problem.
+   */
   void elapsed_time (ACE_Time_Value &tv) const;
 
   /// Set <nanoseconds> to the number of nanoseconds elapsed.
+  /**
+   *  Will overflow when measuring more than 194 day's. 
+   */
   void elapsed_time (ACE_hrtime_t &nanoseconds) const;
 
 #if defined (ACE_HAS_POSIX_TIME)
@@ -139,6 +185,10 @@ public:
 #endif /* ACE_HAS_POSIX_TIME */
 
   /// Sets <usecs> to the elapsed (stop - start) time in microseconds.
+  /**
+   *  Will overflow on windows when measuring more than appox. 2^^54 ticks.
+   *  Is still more than 48 days with a 4 Ghz counter. 
+   */
   void elapsed_microseconds (ACE_hrtime_t &usecs) const;
 
   /// Start incremental timing.
diff --git a/ace/High_Res_Timer.i b/ace/High_Res_Timer.i
index 56d1e8dba60..dd1ac373154 100644
--- a/ace/High_Res_Timer.i
+++ b/ace/High_Res_Timer.i
@@ -1,6 +1,13 @@
 /* -*- C++ -*- */
 // $Id$
 
+// Be very carefull before changing the calculations inside
+// ACE_High_Res_Timer.  The precision matters and we are using integer
+// calculations not floating point.  Also look good at the emulated 64
+// bit int class (inside Basic_Types{h,i,cpp} before changing
+// anything.  It's operator/ only returns 32 bits not 64 bits, among
+// other things.
+
 ACE_INLINE void
 ACE_High_Res_Timer::hrtime_to_tv (ACE_Time_Value &tv,
                                   const ACE_hrtime_t hrt)
diff --git a/ace/OS.i b/ace/OS.i
index 5604c5a6bda..e5cb728aeae 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -5127,7 +5127,8 @@ ACE_Flow_Spec::ACE_Flow_Spec (u_long token_rate,
 ACE_INLINE
 ACE_Flow_Spec::ACE_Flow_Spec (void)
 {
-#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
+#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && \
+    defined (ACE_HAS_WINSOCK2_GQOS)
   this->TokenRate = 0;
   this->TokenBucketSize = 0;
   this->PeakBandwidth = 0;
diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp
index 7da84d715b5..7f6954a44fc 100644
--- a/ace/OS_Dirent.cpp
+++ b/ace/OS_Dirent.cpp
@@ -119,9 +119,12 @@ ACE_OS_Dirent::readdir_emulation (ACE_DIR *d)
   if (d->current_handle_ != INVALID_HANDLE_VALUE)
     {
       d->dirent_ = (dirent *) ACE_OS_Memory::malloc (sizeof (dirent) +
-                                                     ACE_OS_String::strlen (d->fdata_.cFileName)); 
+                                                     (ACE_OS_String::strlen (d->fdata_.cFileName)
+                                                      * sizeof (ACE_TCHAR)));
       ACE_OS_String::strcpy (d->dirent_->d_name, d->fdata_.cFileName); 
-      d->dirent_->d_reclen = sizeof (dirent) + ACE_OS_String::strlen (d->dirent_->d_name); 
+      d->dirent_->d_reclen =
+        sizeof (dirent) + 
+        (ACE_OS_String::strlen (d->dirent_->d_name) * sizeof (ACE_TCHAR));
       return d->dirent_; 
     }
   else
@@ -186,7 +189,9 @@ ACE_OS_Dirent::scandir_emulation (const ACE_TCHAR *dirname,
           vector = newv; 
         } 
 
-      int dsize = sizeof (dirent) + ACE_OS_String::strlen (dp->d_name) + 1;
+      int dsize = 
+        sizeof (dirent) + 
+        ((ACE_OS_String::strlen (dp->d_name) + 1) * sizeof (ACE_TCHAR));
       dirent *newdp = (dirent *) ACE_OS_Memory::malloc (dsize); 
                
       if (newdp == 0) 
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index 1753b35fd51..62f69422fb5 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -363,7 +363,7 @@ ACE_QtReactor::reset_timeout (void)
 long 
 ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
                                const void *arg,
-                               const ACE_Time_Value &delta_time,
+                               const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_QtReactor::schedule_timer");
@@ -375,7 +375,7 @@ ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
   long result;
   if ((result = ACE_Select_Reactor::schedule_timer(handler, 
                                                    arg, 
-                                                   delta_time, 
+                                                   delay_time, 
                                                    interval)) == -1 ) 
     return -1;
   else
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index 7be109e6b4f..7b6cb0684cb 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -61,7 +61,7 @@ class ACE_Export ACE_QtReactor : public QObject, public ACE_Select_Reactor
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *handler,
                                const void *arg,
-                               const ACE_Time_Value &delta_time,
+                               const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval);
 
   virtual int  cancel_timer (ACE_Event_Handler *handler,
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 5572ee705a7..ce9afcc66a5 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -417,8 +417,8 @@ public:
    * @see reset_timer_interval()
    *
    * @param event_handler  event handler to schedule on reactor
-   * @param arg   argument passed to the handle_timeout() method of  event_handler
-   * @param delta  time interval after which the timer will expire
+   * @param arg  argument passed to the handle_timeout() method of  event_handler
+   * @param delay  time interval after which the timer will expire
    * @param interval  time interval after which the timer will be automatically rescheduled
    * @return -1 on failure, a timer_id value on success
    */
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 0d5e5a6f318..10fd6f997e5 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -723,7 +723,7 @@ template <class ACE_SELECT_REACTOR_TOKEN> long
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_timer
   (ACE_Event_Handler *handler,
    const void *arg,
-   const ACE_Time_Value &delta_time,
+   const ACE_Time_Value &delay_time,
    const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::schedule_timer");
@@ -732,7 +732,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::schedule_timer
   return this->timer_queue_->schedule
     (handler,
      arg,
-     timer_queue_->gettimeofday () + delta_time,
+     timer_queue_->gettimeofday () + delay_time,
      interval);
 }
 
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 6537effca36..7c0b141dbfa 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_SELECT_REACTOR_T_H
 #define ACE_SELECT_REACTOR_T_H
 #include "ace/pre.h"
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index 6240bf5879b..78ca60e2741 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -383,7 +383,7 @@ ACE_TkReactor::reset_timer_interval
 long
 ACE_TkReactor::schedule_timer (ACE_Event_Handler *handler,
 			       const void *arg,
-			       const ACE_Time_Value &delta_time,
+			       const ACE_Time_Value &delay_time,
 			       const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_TkReactor::schedule_timer");
@@ -391,7 +391,7 @@ ACE_TkReactor::schedule_timer (ACE_Event_Handler *handler,
 
   long result = ACE_Select_Reactor::schedule_timer (handler,
                                                     arg,
-                                                    delta_time,
+                                                    delay_time,
                                                     interval);
   if (result == -1)
     return -1;
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index a7834f80661..7aca8465274 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -66,7 +66,7 @@ public:
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *handler,
                                const void *arg,
-                               const ACE_Time_Value &delta_time,
+                               const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval);
   virtual int reset_timer_interval (long timer_id,
                                     const ACE_Time_Value &interval);
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index 22d35cbe1be..79da670dde1 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -451,7 +451,7 @@ ACE_WFMO_Reactor::reset_timer_interval
 ACE_INLINE long
 ACE_WFMO_Reactor::schedule_timer (ACE_Event_Handler *handler,
                                   const void *arg,
-                                  const ACE_Time_Value &delta_time,
+                                  const ACE_Time_Value &delay_time,
                                   const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_WFMO_Reactor::schedule_timer");
@@ -459,7 +459,7 @@ ACE_WFMO_Reactor::schedule_timer (ACE_Event_Handler *handler,
   long result = this->timer_queue_->schedule
     (handler,
      arg,
-     timer_queue_->gettimeofday () + delta_time,
+     timer_queue_->gettimeofday () + delay_time,
      interval);
 
   // Wakeup the owner thread so that it gets the latest timer values
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 5808026d872..9b86329eb0e 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -394,7 +394,7 @@ ACE_XtReactor::reset_timer_interval
 long
 ACE_XtReactor::schedule_timer (ACE_Event_Handler *handler,
 			       const void *arg,
-			       const ACE_Time_Value &delta_time,
+			       const ACE_Time_Value &delay_time,
 			       const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_XtReactor::schedule_timer");
@@ -402,7 +402,7 @@ ACE_XtReactor::schedule_timer (ACE_Event_Handler *handler,
 
   long result = ACE_Select_Reactor::schedule_timer (handler,
                                                     arg,
-                                                    delta_time,
+                                                    delay_time,
                                                     interval);
   if (result == -1)
     return -1;
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index d2d4d81c307..0104e946952 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -70,7 +70,7 @@ public:
   // = Timer operations.
   virtual long schedule_timer (ACE_Event_Handler *handler,
                                const void *arg,
-                               const ACE_Time_Value &delta_time,
+                               const ACE_Time_Value &delay_time,
                                const ACE_Time_Value &interval);
   virtual int reset_timer_interval (long timer_id,
                                     const ACE_Time_Value &interval);
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index 0c8978427c7..52b4c5175cb 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 22 09:06:10 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* src/Makefile: Removed the rules.lib.GNU file since it didn't
+	  seem to be needed and was causing problems for MinGW.  Thanks to
+ 	  Jeff McNiel <JMcNiel@datacrit.com> for reporting this.
+
 Wed Sep 19 02:29:37 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * tests/Makefile:
diff --git a/apps/gperf/src/Makefile b/apps/gperf/src/Makefile
index d672400b02e..1db8e315b85 100644
--- a/apps/gperf/src/Makefile
+++ b/apps/gperf/src/Makefile
@@ -32,7 +32,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
diff --git a/examples/C++NPv1/README b/examples/C++NPv1/README
index 2219ea6664c..eb115cc6360 100644
--- a/examples/C++NPv1/README
+++ b/examples/C++NPv1/README
@@ -1,9 +1,9 @@
 (This is file $Id$)
 
 The files in this directory contain the source code from the book
-``C++ Network Programming: Mastering Complexity Using Patterns and ACE''
-by Dr. Douglas C. Schmidt and Stephen D. Huston (Addison-Wesley 2001,
-ISBN X-XXX-XXXXX-X).
+``C++ Network Programming: Mastering Complexity Using Patterns and
+ACE'' by Dr. Douglas C. Schmidt and Stephen D. Huston (Addison-Wesley
+2001, ISBN 0201604647).
 
 We have compiled and run these files on the following platforms:
 
@@ -13,10 +13,12 @@ We have compiled and run these files on the following platforms:
 
 You must have the ACE_ROOT environment variable set correctly to build
 these examples. ACE_ROOT must refer to the top-level ACE_wrappers
-directory.
+directory.  Please see $ACE_ROOT/ACE-INSTALL.html for instructions on
+how to build the ACE toolkit.
 
 Microsoft Visual C++ users:
 ---------------------------
+
 The examples.dsw file is a Microsoft Visual C++ workspace file that
 contains projects for the individual programs. You can either build
 them separately, or use the Batch Build command to build multiple
@@ -24,14 +26,15 @@ projects at once.
 
 All other users:
 ----------------
+
 Assuming that your system is configured correctly, you should be able
 to type
 
-	make
+% make
 
 to compile all of the programs, and
 
-	make clean
+% make clean
 
 to remove all the files that were generated during compilation.
 
@@ -39,9 +42,7 @@ There are also individual Makefiles for each separate example program.
 These makefiles have a ".mak" suffix. For example, Logging_Client.mak
 is the makefile for the Logging_Client program.
 
-
-
-All of the files in these directories are copyright Addison
-Wesley, and they come with absolutely no warranty whatsoever.
-Permission is hereby granted to use these programs for educational
+All of the files in these directories are copyright Addison Wesley,
+and they come with absolutely no warranty whatsoever.  Permission is
+hereby granted to use these programs for educational or commercial
 purposes.
diff --git a/tests/run_tests.lst b/tests/run_tests.lst
new file mode 100644
index 00000000000..cc304f80bda
--- /dev/null
+++ b/tests/run_tests.lst
@@ -0,0 +1,90 @@
+ARGV_Test
+Basic_Types_Test
+Bound_Ptr_Test
+chorus/Env_Value_Test
+Capabilities_Test
+Config_Test
+Atomic_Op_Test
+Auto_IncDec_Test
+Object_Manager_Test
+CDR_Array_Test
+CDR_File_Test
+CDR_Test
+Dirent_Test
+Semaphore_Test
+TSS_Test
+Log_Msg_Test
+Timeprobe_Test
+Time_Value_Test
+High_Res_Timer_Test
+SString_Test
+Collection_Test
+Unicos/libDLL_Test/DLL_Test
+OTHER/chorus/LynxOS/Unicos/Naming_Test
+Handle_Set_Test
+OrdMultiSet_Test
+chorus/Unicos/Mem_Map_Test
+MEM_Stream_Test
+Malloc_Test
+Unicos/SV_Shared_Memory_Test
+chorus/Unicos/MM_Shared_Memory_Test
+DISABLED/Signal_Test
+Sigset_Ops_Test
+Timer_Queue_Test
+DISABLED/MT_Reactor_Timer_Test
+SOCK_Connector_Test
+LynxOS/SOCK_Send_Recv_Test
+Task_Test
+Unicos/Thread_Manager_Test
+DISABLED/Process_Manager_Test
+LynxOS/Thread_Pool_Test
+Future_Test
+Future_Set_Test
+RB_Tree_Test
+Reactors_Test
+Reactor_Exceptions_Test
+Reactor_Notify_Test
+Reactor_Timer_Test
+chorus/Reactor_Performance_Test
+Notify_Performance_Test
+Reader_Writer_Test
+chorus/Priority_Reactor_Test
+chorus/SOCK_Test
+chorus/MT_SOCK_Test
+SPIPE_Test
+UPIPE_SAP_Test
+Barrier_Test
+Svc_Handler_Test
+Buffer_Stream_Test
+Priority_Buffer_Test
+Dynamic_Priority_Test
+Recursive_Mutex_Test
+Reverse_Lock_Test
+DISABLED/netsvcs_main/TOKEN/chorus/Unicos/Time_Service_Test
+DISABLED/TOKEN/chorus/Unicos/Tokens_Test
+Cache_Map_Manager_Test
+LynxOS/Cached_Conn_Test
+Cached_Accept_Conn_Test
+Map_Manager_Test
+Hash_Map_Manager_Test
+Lazy_Map_Manager_Test
+Hash_Map_Bucket_Iterator_Test
+Map_Test
+Message_Queue_Notifications_Test
+chorus/Message_Queue_Test
+chorus/Message_Queue_Test_Ex
+chorus/Simple_Message_Block_Test
+chorus/Message_Block_Test
+chorus/Pipe_Test
+chorus/Process_Mutex_Test
+chorus/Thread_Mutex_Test
+chorus/LynxOS/Process_Strategy_Test
+Service_Config_Test
+Unicos/Priority_Task_Test
+IOStream_Test
+Enum_Interfaces_Test
+chorus/Upgradable_RW_Test
+chorus/Conn_Test
+DISABLED/New_Fail_Test
+OS_Test
+Refcounted_Auto_Ptr_Test