You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2002/04/04 20:36:03 UTC
cvs commit: httpd-2.0/server main.c mpm_common.c
jim 02/04/04 10:36:03
Modified: . CHANGES
server main.c mpm_common.c
Log:
Added support for Posix semaphore-based mutex locking (AcceptMutex posixsem).
It's between pthread and sysvsem in the DEFAULT priority ranking. This
makes it the new default for Darwin, and adds support for it for other
platforms as well (like Solaris).
Revision Changes Path
1.682 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -r1.681 -r1.682
--- CHANGES 4 Apr 2002 12:51:58 -0000 1.681
+++ CHANGES 4 Apr 2002 18:36:02 -0000 1.682
@@ -1,5 +1,10 @@
Changes with Apache 2.0.35
+ *) Added support for Posix semaphore mutex locking (AcceptMutex posixsem)
+ for those platforms that support it. If using the default
+ implementation, this is between pthread and sysvsem in priority.
+ This implies it's the new default for Darwin. [Jim Jagielski]
+
*) AIX: Fix the syntax for setting the LDR_CNTRL and AIXTHREAD_SCOPE
environment variables in the envvars file. [Jeff Trawick]
1.125 +4 -0 httpd-2.0/server/main.c
Index: main.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/main.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- main.c 25 Mar 2002 19:04:28 -0000 1.124
+++ main.c 4 Apr 2002 18:36:03 -0000 1.125
@@ -145,6 +145,10 @@
printf(" -D APR_USE_SYSVSEM_SERIALIZE\n");
#endif
+#if APR_USE_POSIXSEM_SERIALIZE
+ printf(" -D APR_USE_POSIXSEM_SERIALIZE\n");
+#endif
+
#if APR_USE_FCNTL_SERIALIZE
printf(" -D APR_USE_FCNTL_SERIALIZE\n");
#endif
1.92 +8 -0 httpd-2.0/server/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- mpm_common.c 29 Mar 2002 16:15:32 -0000 1.91
+++ mpm_common.c 4 Apr 2002 18:36:03 -0000 1.92
@@ -672,6 +672,9 @@
#if APR_HAS_SYSVSEM_SERIALIZE && !defined(PERCHILD_MPM)
", sysvsem"
#endif
+#if APR_HAS_POSIXSEM_SERIALIZE
+ ", posixsem"
+#endif
#if APR_HAS_PROC_PTHREAD_SERIALIZE
", pthread"
#endif
@@ -708,6 +711,11 @@
#if APR_HAS_SYSVSEM_SERIALIZE && !defined(PERCHILD_MPM)
else if (!strcasecmp(arg, "sysvsem")) {
ap_accept_lock_mech = APR_LOCK_SYSVSEM;
+ }
+#endif
+#if APR_HAS_POSIXSEM_SERIALIZE
+ else if (!strcasecmp(arg, "posixsem")) {
+ ap_accept_lock_mech = APR_LOCK_POSIXSEM;
}
#endif
#if APR_HAS_PROC_PTHREAD_SERIALIZE