From d96c82b6be75f255dc4e6914c3a2e59fb35deb96 Mon Sep 17 00:00:00 2001
From: jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 14 Jun 2004 21:16:40 +0000
Subject: * configure.in: Don't use POSIX semaphores or cross-process pthread
 mutexes as the default inter-process locking mechanism.

* build/apr_hints.m4: Force default inter-process locking mechanism to
fcntl for Solaris, as per 1.3.

Reviewed by: Jeff Trawick


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65198 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES            |  8 ++++++++
 build/apr_hints.m4 |  1 +
 configure.in       | 14 ++++----------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 011924ffa..23499f347 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,14 @@ Changes for APR 1.1 [Deferring these features when 1.0 is rolled out.]
 
 Changes with APR 1.0
 
+  *) Change default inter-process locking mechanisms: POSIX semaphores
+     and pthread cross-process mutexes are not used by default; on 
+     Solaris, fcntl locks are used by default.  [Joe Orton]
+
+  *) Add apr_threadattr_guardsize_set() for overriding the default stack
+     guard area size for created created by apr_thread_create().
+     [Joe Orton]
+
   *) Add apr_shm_remove() function for removing a named shared
      memory segment.  [Amit Athavale <amit_athavale persistent.co.in>]
 
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4
index e6e7a9c86..00316d00b 100644
--- a/build/apr_hints.m4
+++ b/build/apr_hints.m4
@@ -198,6 +198,7 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
     *-solaris2*)
     	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
 	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
+        APR_SETIFNULL(apr_lock_method, [USE_FCNTL_SERIALIZE])
 	;;
     *-sunos4*)
 	APR_ADDTO(CPPFLAGS, [-DSUNOS4])
diff --git a/configure.in b/configure.in
index 01871721c..493669abf 100644
--- a/configure.in
+++ b/configure.in
@@ -1597,8 +1597,10 @@ APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl
 # See which lock mechanism we'll select by default on this system.
 # The last APR_DECIDE to execute sets the default.
 # At this stage, we match the ordering in Apache 1.3
-# which is (highest to lowest): pthread -> posixsem -> sysvsem -> fcntl -> flock
-#
+# which is (highest to lowest): sysvsem -> fcntl -> flock.
+# POSIX semaphores and cross-process pthread mutexes are not
+# used by default since they have less desirable behaviour when
+# e.g. a process holding the mutex segfaults.
 APR_BEGIN_DECISION([apr_lock implementation method])
 APR_IFALLYES(func:flock define:LOCK_EX,
             APR_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
@@ -1606,14 +1608,6 @@ APR_IFALLYES(header:fcntl.h define:F_SETLK,
             APR_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()]))
 APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
             APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
-APR_IFALLYES(header:semaphore.h func:sem_open func_sem_close dnl
-             func_sem_unlink func:sem_post func_sem_wait,
-             APR_DECIDE(USE_POSIXSEM_SERIALIZE, [POSIX sem_open()]))
-# note: the current APR use of shared mutex requires /dev/zero
-APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl
-            func:pthread_mutexattr_setpshared dnl
-            file:/dev/zero,
-            APR_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [pthread mutex]))
 if test "x$apr_lock_method" != "x"; then
     APR_DECISION_FORCE($apr_lock_method)
 fi
-- 
cgit v1.2.1