ChangeLogTag:Fri Dec 7 07:57:12 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

15 files changed, 129 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 7531b170315..6bcb40e8953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Fri Dec  7 07:57:12 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS.cpp (cond_timedwait): Fixed a bug in the WinCE semaphore
+	  simulation version of ACE_OS::cond_timedwait().  Thanks to
+ 	  Michael Graf <mg@leutek.de> for helping to find this.
+
+Thu Dec  6 18:48:07 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Lib_Find.cpp: Fixed the ldfind() method so that it
+	  does a case-insensitive comparison on Windows platforms.  Thanks
+ 	  to Kevin Burge <kevin.burge@systemware.com> for reporting this.
+
+Thu Dec  6 09:02:06 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Sock_Connect.cpp: Added MACOSX support.  Thanks to 
+	  John Michael Zorko <j.zorko@att.net> for contributing this.
+
+	* tests/Logging_Strategy_Test.cpp: Add a "wait()" at the 
+	  end of the main function to avoid problems when the main thread
+ 	  exits before the reactor thread.  Thanks to Michael Searles
+ 	  <msearles@base16.com> for reporting this.
+
 Fri Dec 07 14:28:33 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* tests/ACE_Init_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 7531b170315..6bcb40e8953 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,25 @@
+Fri Dec  7 07:57:12 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS.cpp (cond_timedwait): Fixed a bug in the WinCE semaphore
+	  simulation version of ACE_OS::cond_timedwait().  Thanks to
+ 	  Michael Graf <mg@leutek.de> for helping to find this.
+
+Thu Dec  6 18:48:07 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Lib_Find.cpp: Fixed the ldfind() method so that it
+	  does a case-insensitive comparison on Windows platforms.  Thanks
+ 	  to Kevin Burge <kevin.burge@systemware.com> for reporting this.
+
+Thu Dec  6 09:02:06 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Sock_Connect.cpp: Added MACOSX support.  Thanks to 
+	  John Michael Zorko <j.zorko@att.net> for contributing this.
+
+	* tests/Logging_Strategy_Test.cpp: Add a "wait()" at the 
+	  end of the main function to avoid problems when the main thread
+ 	  exits before the reactor thread.  Thanks to Michael Searles
+ 	  <msearles@base16.com> for reporting this.
+
 Fri Dec 07 14:28:33 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* tests/ACE_Init_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 7531b170315..6bcb40e8953 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,25 @@
+Fri Dec  7 07:57:12 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/OS.cpp (cond_timedwait): Fixed a bug in the WinCE semaphore
+	  simulation version of ACE_OS::cond_timedwait().  Thanks to
+ 	  Michael Graf <mg@leutek.de> for helping to find this.
+
+Thu Dec  6 18:48:07 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Lib_Find.cpp: Fixed the ldfind() method so that it
+	  does a case-insensitive comparison on Windows platforms.  Thanks
+ 	  to Kevin Burge <kevin.burge@systemware.com> for reporting this.
+
+Thu Dec  6 09:02:06 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Sock_Connect.cpp: Added MACOSX support.  Thanks to 
+	  John Michael Zorko <j.zorko@att.net> for contributing this.
+
+	* tests/Logging_Strategy_Test.cpp: Add a "wait()" at the 
+	  end of the main function to avoid problems when the main thread
+ 	  exits before the reactor thread.  Thanks to Michael Searles
+ 	  <msearles@base16.com> for reporting this.
+
 Fri Dec 07 14:28:33 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* tests/ACE_Init_Test.cpp:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1943872b3c7..7f7f60894aa 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -44,7 +44,7 @@ Fri Dec 07 11:44:24 2001  Carlos O'Ryan  <coryan@uci.edu>
 	  Add missing MSVC6 projects and workspaces.
 
 Fri Dec 07 09:58:43 2001  Carlos O'Ryan  <coryan@uci.edu>
-
+  
 	* orbsvcs/performance-tests/EC_Federated_Latency/EC_Federated_Latency.dsw:
 	* orbsvcs/performance-tests/EC_Federated_Latency/client.dsp:
 	* orbsvcs/performance-tests/EC_Federated_Latency/server.dsp:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 8cc2cb61c6c..6955036110f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -78,9 +78,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
       ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
-          //
           // Try to find an existing Naming Service.
-          //
           CORBA::Object_var naming_obj =
             orb->resolve_initial_references ("NameService",
                                              timeout,
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 1972fc50747..10b92fd26c5 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -943,16 +943,14 @@ CORBA_ORB::resolve_policy_current (CORBA::Environment &)
   return CORBA_Object::_nil ();
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
 }
 
-
 CORBA_Object_ptr
 CORBA_ORB::resolve_service (MCAST_SERVICEID mcast_service_id,
                             ACE_Time_Value * /*timeout*/,
                             CORBA::Environment& ACE_TRY_ENV)
 {
-  const char * env_service_ior [] =
+  const char *env_service_ior [] =
   {
     "NameServiceIOR",
     "TradingServiceIOR",
@@ -1026,15 +1024,13 @@ CORBA_ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
     return this->orb_core ()->resolve_typecodefactory (ACE_TRY_ENV);
 
-
   // -----------------------------------------------------------------
 
   // Search the object reference table.  This search must occur before
   // the InitRef table search, since it may contain local objects.
   CORBA::Object_var result =
-    this->orb_core ()->object_ref_table ().resolve_initial_references (
-      name,
-      ACE_TRY_ENV);
+    this->orb_core ()->object_ref_table ().resolve_initial_references (name,
+                                                                       ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (!CORBA::is_nil (result.in ()))
@@ -1091,9 +1087,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
     return result._retn ();
   // -----------------------------------------------------------------
   
-  
   ACE_THROW_RETURN (CORBA::ORB::InvalidName (), CORBA::Object::_nil ());
-
 }
 
 CORBA_ORB_ObjectIdList_ptr
diff --git a/THANKS b/THANKS
index 3f79f207c93..c7bee7abe1a 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Shawn Atkins <sma1@cs.wustl.edu>
 Matt Braun <mjb2@cs.wustl.edu>
 Darrell Brunsch <brunsch@uci.edu>
 Chris Cleeland <cleeland@cs.wustl.edu>
+Angelo Corsaro <corsaro@cs.wustl.edu>
 Mayur Deshpande <mayur@ics.uci.edu>
 Eric Ding <qnd1@cs.wustl.edu>
 Sergio Flores-Gaitan <sergio@cs.wustl.edu>
@@ -38,11 +39,11 @@ Ossama Othman <ossama@uci.edu>
 Jeff Parsons <parsons@cs.wustl.edu>
 Irfan Pyarali <irfan@cs.wustl.edu>
 Marina Spivak <marina@cs.wustl.edu>
+Venkita Subramonian  <venkita@cs.wustl.edu>
 Nagarajan Surendran <naga@cs.wustl.edu>
 Nanbor Wang <nanbor@cs.wustl.edu>
 Seth Widoff <sbw1@cs.wustl.edu>
 Torben Worm <tworm@cs.wustl.edu>
-Angelo Corsaro <corsaro@cs.wustl.edu>
 
 I would also like to thank all the following people who have also
 contributed to ACE and TAO over the years:
@@ -1379,7 +1380,9 @@ Jim Connelly <jim.connelly@neustar.com>
 Eyal Lubetzky <eyall@BANDWIZ.COM>
 Gaoyan Xie <gxie@eecs.wsu.edu>
 Michael Brinkmann <michael.brinkmann@materna.de>
-Chatchai Khunboa <ckhumboa@gmu.edu>
+Chatchai Khumboa <ckhumboa@gmu.edu>
+Andrey Shkinev <andreyshkinev@rogers.com>
+Michael Graf <mg@leutek.de>
 
 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/Configuration.h b/ace/Configuration.h
index 95eba681a12..a4e30d1b43c 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -594,8 +594,9 @@ public:
 
   SUBSECTION_MAP* section_hash_map_;
 };
+
 typedef ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId,
-        ACE_Configuration_Section_IntId>
+                                    ACE_Configuration_Section_IntId>
         SECTION_MAP;
 typedef ACE_Hash_Map_Manager_Ex<ACE_Configuration_ExtId,
                                 ACE_Configuration_Section_IntId,
diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp
index 3d735359e75..4d63eb430c5 100644
--- a/ace/Lib_Find.cpp
+++ b/ace/Lib_Find.cpp
@@ -83,7 +83,13 @@ ACE_Lib_Find::ldfind (const ACE_TCHAR filename[],
 
       // Check whether this matches the appropriate platform-specific
       // suffix.
+#if defined (ACE_WIN32)
+      // Use <ACE_OS::strcasecmp> on any platform with
+      // case-insensitive filenames.
+      if (ACE_OS::strcasecmp (s, dll_suffix) != 0)
+#else
       if (ACE_OS::strcmp (s, dll_suffix) != 0)
+#endif /* ACE_WIN32 */
         {
           ACE_ERROR ((LM_WARNING,
                       ACE_LIB_TEXT ("Warning: improper suffix for a ")
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 1a99710343e..7a2ce2b44dc 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -6456,16 +6456,15 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
     return -1;
 
   // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast().
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
-  result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#     else
+#     if defined (ACE_USES_WINCE_SEMA_SIMULATION)
   // Can't use Win32 API on simulated semaphores.
   result = ACE_OS::sema_wait (&cv->sema_,
                               ACE_Time_Value (0, msec_timeout * 1000));
 
-  if (result != WAIT_OBJECT_0 && errno == ETIME)
+  if (result == -1 && errno == ETIME)
     result = WAIT_TIMEOUT;
-
+#     else
+  result = ::WaitForSingleObject (cv->sema_, msec_timeout);
 #     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 
   // Reacquire lock to avoid race conditions.
diff --git a/ace/OS_Errno.h b/ace/OS_Errno.h
index 0fced2d8a6e..fefd9f14571 100644
--- a/ace/OS_Errno.h
+++ b/ace/OS_Errno.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file   OS_Errno.h
@@ -6,12 +7,9 @@
  *  $Id$
  *
  *  @author (Originally in OS.h)Doug Schmidt <schmidt@cs.wustl.edu>
- *  @author Jesper S. M|ller<stophph@diku.dk>
- *  @author and a cast of thousands...
  */
 //=============================================================================
 
-
 #ifndef ACE_OS_ERRNO_H
 #define ACE_OS_ERRNO_H
 #include "ace/pre.h"
@@ -43,7 +41,6 @@ extern int t_errno;
 # define ENOTSUP ENOSYS  /* Operation not supported. */
 #endif /* !ENOTSUP */
 
-
 #if defined (ACE_HAS_WINCE_BROKEN_ERRNO)
 /**
  * @class ACE_CE_Errno
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index ec52f6db9e3..f4d9cd38359 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -790,7 +790,7 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
 #  endif /* ACE_HAS_PHARLAP */
 # endif /* Winsock 2 && MSVC 5 or later */
 
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__MACOSX__)
   // COMMON (SVR4 and BSD) UNIX CODE
 
   size_t num_ifs;
@@ -835,6 +835,8 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
 
 #if defined (AIX)
   int cmd = CSIOCGIFCONF;
+#elif defined (__MACOSX__)
+  int cmd = OSIOCGIFCONF;
 #else
   int cmd = SIOCGIFCONF;
 #endif /* AIX */
@@ -990,7 +992,7 @@ ACE_Sock_Connect::count_interfaces (ACE_HANDLE handle, size_t &how_many)
                       -1);
   how_many = (size_t) tmp_how_many;
   return 0;
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__MACOSX__)
   // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
   // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
   // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan
@@ -1081,7 +1083,7 @@ ACE_Sock_Connect::get_handle (void)
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc) && ! defined (CHORUS)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__MACOSX__)
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
   // AIX, SunOS 4.x
 
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index ea1590cf3de..e75cc59c33e 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec  6 09:00:31 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* clients/Caching/http_client.cpp (main): Make sure to remove the
+	  trailing '\n' so the example works properly.  Thanks to Andrey
+ 	  Shkinev <andreyshkinev@rogers.com> for reporting this.
+
 Wed Nov 14 16:21:46 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
 	* clients/Blobby/Blob.{h,cpp},
diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp
index 9238ace3194..6022cb289f2 100644
--- a/apps/JAWS/clients/Caching/http_client.cpp
+++ b/apps/JAWS/clients/Caching/http_client.cpp
@@ -39,6 +39,12 @@ main (int, char *[])
     {
       char *s = buf;
 
+      // get rid of trailing '\n'
+      int len = ACE_OS::strlen (s);
+
+      if (len > 0 && s[len - 1] == '\n')
+        s[len - 1] = 0;
+
       while (isspace (*s))
         s++;
 
diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp
index 689d5432efc..804e2abe3b8 100644
--- a/tests/Logging_Strategy_Test.cpp
+++ b/tests/Logging_Strategy_Test.cpp
@@ -89,12 +89,15 @@ static int order_state = 0;
 static int num_files = 0;
 static int wipeout_logfile = 0;
 
-void
+// This adapter function runs the Reactor's event loop in a separate
+// thread of control.
+
+static void *
 run_reactor (void *)
 {
   ACE_Reactor::instance ()->owner 
     (ACE_Thread_Manager::instance ()->thr_self ());
-  ACE_Reactor::instance ()->run_event_loop ();
+  ACE_Reactor::instance ()->run_reactor_event_loop ();
 }
 
 // Initiate the cycle of messages.
@@ -118,14 +121,18 @@ void print_till_death (void)
                     " (%t) %d message\n",
                     i));
     }
-  ACE_Reactor::instance ()->end_event_loop ();
+
+  if (ACE_Reactor::instance ()->end_reactor_event_loop () == -1)
+    ACE_ERROR ((LM_ERROR,
+                "Error ending reactor.\n"));
 
   ACE_DEBUG ((LM_DEBUG,
               "-< generating messages finished \n\n"));
 }
 
-// count the generated files
-void
+// Count the generated files.
+
+static void
 count_files (void)
 {
   int i = 0;
@@ -186,8 +193,9 @@ count_files (void)
 }
 
 // get the file statistics
+
 static int
-get_statistic (ACE_TCHAR *f_name)
+get_statistics (ACE_TCHAR *f_name)
 {
   ACE_stat buf;
   int result;
@@ -224,7 +232,7 @@ order (void)
   if (num_files <= 2)
     {
       if (num_files == 1)
-        get_statistic (file_name);
+        get_statistics (file_name);
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("      Ordering...OK! - ")
                   ACE_TEXT (" Only %d file (s) was (were) generated"),
@@ -244,10 +252,10 @@ order (void)
                        file_name,
                        num_files - 1);
 
-      tm_bk_1 = get_statistic (backup_1);
-      tm_bk_2 = get_statistic (backup_2);
+      tm_bk_1 = get_statistics (backup_1);
+      tm_bk_2 = get_statistics (backup_2);
 
-      if ((tm_bk_1 > tm_bk_2) && !order_state)
+      if (tm_bk_1 > tm_bk_2 && !order_state)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("      %s (newest) ; %s (oldest)\n"),
@@ -258,7 +266,7 @@ order (void)
         }
       else
         {
-          if ((tm_bk_1 < tm_bk_2) && order_state)
+          if (tm_bk_1 < tm_bk_2 && order_state)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("      %s (newest);")
@@ -280,6 +288,7 @@ order (void)
 }
 
 // remove log_files
+
 static void
 remove_files (void)
 {
@@ -412,7 +421,7 @@ int main (int argc, ACE_TCHAR *argv [])
       argc = 3;
     }
 
-  // Remove the existent files
+  // Remove existing files.
   remove_files ();
 
   // This is necessary only if the provided logfile name is the same
@@ -466,7 +475,7 @@ int main (int argc, ACE_TCHAR *argv [])
 
   // launch a new Thread
   if (ACE_Thread_Manager::instance ()->spawn 
-      (ACE_THR_FUNC (run_reactor)) < 0)
+      (ACE_THR_FUNC (run_reactor)) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Spawning Reactor.\n"),
                       1);
@@ -480,11 +489,8 @@ int main (int argc, ACE_TCHAR *argv [])
   // Get the file order
   order ();
 
-  if (ACE_Reactor::instance ()->end_event_loop ())
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error ending reactor.\n"),
-                      1);
-
+  // Wait for the thread to exit before we exit.
+  ACE_Thread_Manager::instance ()->wait ();
   ACE_END_TEST;
   return 0;
 }