ChangeLogTag:Thu May 12 10:20:55 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>

10 files changed, 84 insertions, 43 deletions

diff --git a/COPYING b/COPYING
index 0cc3d9cca79..99c956dd4f2 100644
--- a/COPYING
+++ b/COPYING
@@ -16,15 +16,16 @@
    include this copyright statement along with code built using DOC
    software.
    
-   You can use DOC software in proprietary software and are under no
-   obligation to redistribute any of your source code that is built using
-   DOC software. Note, however, that you may not do anything to the DOC
-   software code, such as copyrighting it yourself or claiming authorship
-   of the DOC software code, that will prevent DOC software from being
-   distributed freely using an open-source development model. You needn't
-   inform anyone that you're using DOC software in your software, though
-   we encourage you to let [11]us know so we can promote your project in
-   the [12]DOC software success stories..
+   You can use DOC software in commercial and/or binary software releases
+   and are under no obligation to redistribute any of your source code
+   that is built using DOC software. Note, however, that you may not do
+   anything to the DOC software code, such as copyrighting it yourself or
+   claiming authorship of the DOC software code, that will prevent DOC
+   software from being distributed freely using an open-source
+   development model. You needn't inform anyone that you're using DOC
+   software in your software, though we encourage you to let [11]us know
+   so we can promote your project in the [12]DOC software success
+   stories.
    
    DOC software is provided as is with no warranties of any kind,
    including the warranties of design, merchantability, and fitness for a
diff --git a/ChangeLog b/ChangeLog
index 3ef38b4146b..84077e7899b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Thu May 12 10:20:55 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+	* Updated the COPYING file to clarify some ambiguity about
+ 	  proprietary usage of ACE.
+
+Tue May 10 08:34:16 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+	* ace/Token.h (ACE_Token): Improved the documentation to emphasize
+	  that the semantics aren't truly readers/writer.  Thanks to
+	  Altaf Aali <altafaali@comcast.net> for motivating this.
+
+	* ace/OS_NS_Thread.cpp (thr_create): Fixed a bug that wasn't
+	  allowing the stack size to be size if the stack address wasn't
+ 	  also being set.  Thanks to Andreas Schuler
+ 	  <Andreas.Schuler@med.ge.com> for reporting this.
+
 Fri May  6 13:50:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * ace/OS_NS_time.inl:
diff --git a/TAO/CIAO/COPYING b/TAO/CIAO/COPYING
index 0cc3d9cca79..99c956dd4f2 100644
--- a/TAO/CIAO/COPYING
+++ b/TAO/CIAO/COPYING
@@ -16,15 +16,16 @@
    include this copyright statement along with code built using DOC
    software.
    
-   You can use DOC software in proprietary software and are under no
-   obligation to redistribute any of your source code that is built using
-   DOC software. Note, however, that you may not do anything to the DOC
-   software code, such as copyrighting it yourself or claiming authorship
-   of the DOC software code, that will prevent DOC software from being
-   distributed freely using an open-source development model. You needn't
-   inform anyone that you're using DOC software in your software, though
-   we encourage you to let [11]us know so we can promote your project in
-   the [12]DOC software success stories..
+   You can use DOC software in commercial and/or binary software releases
+   and are under no obligation to redistribute any of your source code
+   that is built using DOC software. Note, however, that you may not do
+   anything to the DOC software code, such as copyrighting it yourself or
+   claiming authorship of the DOC software code, that will prevent DOC
+   software from being distributed freely using an open-source
+   development model. You needn't inform anyone that you're using DOC
+   software in your software, though we encourage you to let [11]us know
+   so we can promote your project in the [12]DOC software success
+   stories.
    
    DOC software is provided as is with no warranties of any kind,
    including the warranties of design, merchantability, and fitness for a
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index ab3529bed64..055d52db880 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 12 10:20:55 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+	* Updated the COPYING file to clarify some ambiguity about
+ 	  proprietary usage of CIAO.
+  
 Tue May 10 21:12:47 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
 	* docs/releasenotes/dance.html: Updated this page to clearly
diff --git a/TAO/COPYING b/TAO/COPYING
index 0cc3d9cca79..99c956dd4f2 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -16,15 +16,16 @@
    include this copyright statement along with code built using DOC
    software.
    
-   You can use DOC software in proprietary software and are under no
-   obligation to redistribute any of your source code that is built using
-   DOC software. Note, however, that you may not do anything to the DOC
-   software code, such as copyrighting it yourself or claiming authorship
-   of the DOC software code, that will prevent DOC software from being
-   distributed freely using an open-source development model. You needn't
-   inform anyone that you're using DOC software in your software, though
-   we encourage you to let [11]us know so we can promote your project in
-   the [12]DOC software success stories..
+   You can use DOC software in commercial and/or binary software releases
+   and are under no obligation to redistribute any of your source code
+   that is built using DOC software. Note, however, that you may not do
+   anything to the DOC software code, such as copyrighting it yourself or
+   claiming authorship of the DOC software code, that will prevent DOC
+   software from being distributed freely using an open-source
+   development model. You needn't inform anyone that you're using DOC
+   software in your software, though we encourage you to let [11]us know
+   so we can promote your project in the [12]DOC software success
+   stories.
    
    DOC software is provided as is with no warranties of any kind,
    including the warranties of design, merchantability, and fitness for a
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5b55456df74..782c70e51a2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 12 10:20:55 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+	* Updated the COPYING file to clarify some ambiguity about
+ 	  proprietary usage of TAO.
+  
 Thu May 12 09:07:34 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Var_Array_Argument_T.cpp:
@@ -624,7 +629,7 @@ Mon May  2 10:36:43 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 	* tao/PortableServer/PortableServer_WFunctions.cpp (PortableServer):
 	  Remove the "+ 1" from the string length so things will work
  	  better for wstrings.  Thanks to Wolfgang Fischer <fiw@arcor.de>
- 	  for reporting this.
+ 	  for reporting this.  This fixes bugid 2095.
 
 Mon May  2 13:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/THANKS b/THANKS
index 9ef8718dca5..4904ddb7644 100644
--- a/THANKS
+++ b/THANKS
@@ -1975,6 +1975,9 @@ Alex Ott <ott at jet dot msk dot su>
 D. J. Stachniak <djstachniak at yahoo dot com> 
 Slava Gorelik <slava dot gorelik at sap dot com>
 Wolfgang Fischer <fiw at arcor dot de>
+Arno Wilhelm <arno.wilhelm at profile dot co dot at>
+Andreas Schuler <Andreas dot Schuler at med dot ge dot com>
+Altaf Aali <altafaali at comcast dot net>
 
 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/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index 843a97352ab..a0c7a678cb6 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -2423,11 +2423,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
     stacksize = ACE_CHORUS_DEFAULT_MIN_STACK_SIZE;
 #   endif /*CHORUS */
 
-#   if defined (ACE_HAS_PTHREAD_SETSTACK)
-  if ((stacksize != 0) && (stack != 0))
-#   else
   if (stacksize != 0)
-#   endif /* ACE_HAS_PTHREAD_SETSTACK */
     {
       size_t size = stacksize;
 
@@ -2441,9 +2437,14 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (::pthread_attr_setstacksize (&attr, size) != 0)
 #     else
 #       if defined (ACE_HAS_PTHREAD_SETSTACK)
-        if (ACE_ADAPT_RETVAL(pthread_attr_setstack (&attr, stack, size), result) == -1)
+        int result;
+        if (stack != 0)
+          result = ACE_ADAPT_RETVAL (pthread_attr_setstack (&attr, stack, size), result);
+        else
+          result = ACE_ADAPT_RETVAL (pthread_attr_setstacksize (&attr, size), result);
+        if (result == -1)
 #       else
-        if (ACE_ADAPT_RETVAL(pthread_attr_setstacksize (&attr, size), result) == -1)
+        if (ACE_ADAPT_RETVAL (pthread_attr_setstacksize (&attr, size), result) == -1)
 #       endif /* ACE_HAS_PTHREAD_SETSTACK */
 #     endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
           {
@@ -2921,7 +2922,8 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
           // Set the priority of the new thread and then let it
           // continue, but only if the user didn't start it suspended
           // in the first place!
-          if ((result = ACE_OS::thr_setprio (*thr_id, priority)) != 0)
+          result = ACE_OS::thr_setprio (*thr_id, priority);
+          if (result != 0)
             {
               errno = result;
               return -1;
@@ -2929,7 +2931,8 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
           if (start_suspended == 0)
             {
-              if ((result = ACE_OS::thr_continue (*thr_id)) != 0)
+              result = ACE_OS::thr_continue (*thr_id);
+              if (result != 0)
                 {
                   errno = result;
                   return -1;
diff --git a/ace/Token.h b/ace/Token.h
index c9774e760d3..0295133e542 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -169,24 +169,29 @@ public:
   /// in line gets it.
   int release (void);
 
-  /// Behave like acquire but in a lower priority.  It should probably
-  /// be called acquire_yield.
+  /// Behaves like acquire() but at a lower priority.  It should probably
+  /// be called acquire_yield() since the semantics aren't really
+  /// what's commonly expected for readers/writer locks.  See the class
+  /// documentation above for more details.
   int acquire_read (void);
 
-  /// More sophisticate version of acquire_read.
+  /// Behaves like acquire() but at a lower priority.  It should probably
+  /// be called acquire_yield() since the semantics aren't really
+  /// what's commonly expected for readers/writer locks.  See the class
+  /// documentation above for more details.
   int acquire_read (void (*sleep_hook)(void *),
                     void *arg = 0,
                     ACE_Time_Value *timeout = 0);
 
-  /// Just calls <acquire>.
+  /// Calls acquire().
   int acquire_write (void);
 
-  /// More sophisticate version of acquire_write.
+  /// Calls acquire().
   int acquire_write (void (*sleep_hook)(void *),
                      void *arg = 0,
                      ACE_Time_Value *timeout = 0);
 
-  /// Lower priority try_acquire.
+  /// Lower priority try_acquire().
   int tryacquire_read (void);
 
   /// Just calls <tryacquire>.
diff --git a/tests/test_config.h b/tests/test_config.h
index 50c0a23f9d0..a4ce5eb0b2c 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -7,7 +7,8 @@
  *  $Id$
  *
  *   This file factors out common macros and other utilities used by the
- *   ACE automated regression tests.
+ *   ACE automated regression tests.  It also shows how to redirect ACE_DEBUG/ACE_ERROR
+ *   output to a file.
  *
  *  @author Prashant Jain <pjain@cs.wustl.edu>
  *  @author Tim Harrison <harrison@cs.wustl.edu>