jim 02/03/27 06:18:12
Modified: . CHANGES configure.in
Log:
Change the ordering of the lock method to what's been "standard"
for Apache 1.3. This change will affect Apache2.0 so an entry
in its CHANGES file will be added as well.
Revision Changes Path
1.248 +5 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- CHANGES 26 Mar 2002 19:54:56 -0000 1.247
+++ CHANGES 27 Mar 2002 14:18:12 -0000 1.248
@@ -1,5 +1,10 @@
Changes with APR b1
+ *) Change the ordering of the apr_lock implementation method to
+ better match what's done in Apache 1.3. The ordering is
+ now (highest to lowest): pthread -> sysvsem -> fcntl -> flock.
+ [Jim Jagielski]
+
*) Improve detection of the INT64_C macro to prevent problems
with HP-UX's ANSI C compiler. PR 8932. [Justin Erenkrantz]
1.422 +11 -8 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- configure.in 26 Mar 2002 19:54:56 -0000 1.421
+++ configure.in 27 Mar 2002 14:18:12 -0000 1.422
@@ -1328,19 +1328,22 @@
APR_IFALLYES(struct:pthread_rw, hasrwlockser="1", hasrwlockser="0")
# See which lock mechanism we'll select by default on this system.
-# The last APR_DECIDE to execute sets the default
+# 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 -> sysvsem -> fcntl -> flock
+#
APR_BEGIN_DECISION([apr_lock implementation method])
-APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
- APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
APR_IFALLYES(func:flock define:LOCK_EX,
APR_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
+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()]))
# 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]))
-APR_IFALLYES(header:fcntl.h define:F_SETLK,
- APR_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()]))
if test "x$apr_lock_method" != "x"; then
APR_DECISION_FORCE($apr_lock_method)
fi
@@ -1355,11 +1358,11 @@
USE_FLOCK_SERIALIZE )
flockser="1"
;;
- USE_SYSVSEM_SERIALIZE )
- sysvser="1"
- ;;
USE_FCNTL_SERIALIZE )
fcntlser="1"
+ ;;
+ USE_SYSVSEM_SERIALIZE )
+ sysvser="1"
;;
USE_PROC_PTHREAD_SERIALIZE )
procpthreadser="1"
