Adding changes for pthread_setstack

5 files changed, 40 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a5204b062da..710bf66d9e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jan 16 19:06:19 2003  Stephen Torri <storri@cse.wustl.edu>
+
+        * ace/OS.cpp:
+        * ace/config-linux-common.h:
+        * ace/config-freebsd.h:
+        * ace/README:
+
+          Added a new macro called ACE_HAS_PTHREAD_SETSTACK for
+          systems that use the newer glibc (2.3+). Eliminates
+          linker warning about not using the pthread function
+          called pthread_setstack.
+
 Thu Jan 16 16:25:45 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* bin/auto_run_tests.lst: Added a TAO/orbsvcs/tests/EC_MT_Mcast
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a5204b062da..710bf66d9e5 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Thu Jan 16 19:06:19 2003  Stephen Torri <storri@cse.wustl.edu>
+
+        * ace/OS.cpp:
+        * ace/config-linux-common.h:
+        * ace/config-freebsd.h:
+        * ace/README:
+
+          Added a new macro called ACE_HAS_PTHREAD_SETSTACK for
+          systems that use the newer glibc (2.3+). Eliminates
+          linker warning about not using the pthread function
+          called pthread_setstack.
+
 Thu Jan 16 16:25:45 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* bin/auto_run_tests.lst: Added a TAO/orbsvcs/tests/EC_MT_Mcast
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 1146dc46091..bd51e9eb87f 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -2581,7 +2581,11 @@ 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;
 
@@ -2592,7 +2596,11 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
 #     if !defined (ACE_LACKS_THREAD_STACK_SIZE)      // JCEJ 12/17/96
 #       if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
+#         if !defined (ACE_HAS_PTHREAD_SETSTACK)
+      if (::pthread_attr_setstack (&attr, stack, size) != 0)
+#         else
       if (::pthread_attr_setstacksize (&attr, size) != 0)
+#         endif /* ACE_HAS_PTHREAD_SETSTACK */
 #       else
         if (ACE_ADAPT_RETVAL(pthread_attr_setstacksize (&attr, size), result) == -1)
 #       endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
@@ -2610,6 +2618,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
     }
 
   // *** Set Stack Address
+#     if !defined (ACE_HAS_PTHREAD_SETSTACK)
 #     if !defined (ACE_LACKS_THREAD_STACK_ADDR)
   if (stack != 0)
     {
@@ -2626,6 +2635,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #     else
   ACE_UNUSED_ARG (stack);
 #     endif /* !ACE_LACKS_THREAD_STACK_ADDR */
+#     endif /* ACE_HAS_PTHREAD_SETSTACK */
 
   // *** Deal with various attributes
   if (flags != 0)
diff --git a/ace/README b/ace/README
index 26236743a11..4a9483d0763 100644
--- a/ace/README
+++ b/ace/README
@@ -477,6 +477,7 @@ ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP    Platform has
 ACE_HAS_PTHREAD_PROCESS_ENUM            pthread.h declares an enum with
                                         PTHREAD_PROCESS_PRIVATE and
                                         PTHREAD_PROCESS_SHARED values.
+ACE_HAS_PTHREAD_SETSTACK                Platform has pthread_attr_setstack().       
 ACE_HAS_PURIFY                          Purify'ing.  Set by wrapper_macros.GNU.
 ACE_HAS_QUANTIFY                        Quantify'ing.  Set by wrapper_macros.GNU.
 ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS    Platform will recurse
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 8c942cbc86d..a2388a0063c 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -324,4 +324,9 @@
 // Enables use of POSIX termios struct
 #define ACE_USES_NEW_TERMIOS
 
+// Use new pthread_attr_setstack
+#if defined (__USE_XOPEN2K) && (__GLIBC__ > 2 || ( __GLIBC__ == 2 && __GLIBC_MINOR__ >=2))
+#define ACE_HAS_PTHREAD_SETSTACK
+#endif /* __USE_XOPEN2K && glibc >2.2 */
+
 #endif /* ACE_LINUX_COMMON_H */