From: Victor J. Orlikowski <orlikowski@apache.org>
Date: Mon, 11 Jun 2001 21:41:56 +0000 (+0000)
Subject: Make the processor unbinding/re-binding stuff on AIX work again.
X-Git-Tag: 2.0.19~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8e50ad56dbb56a0645e5f2964bb34a8359b2363;p=thirdparty%2Fapache%2Fhttpd.git

Make the processor unbinding/re-binding stuff on AIX work again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89341 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index bff9fe24740..d46cea22200 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 Changes with Apache 2.0.19-dev
+  *) httpd children now re-bind themselves to a random CPU on
+     multiprocessor systems on AIX via bindprocessor() in 2.0.
+     [Victor J. Orlikowski]
 
   *) Fix htdigest. It would go into a loop in getline when adding 
      a second user. [Bill Stoddard]
diff --git a/configure.in b/configure.in
index ac69a1f46e8..52afc34d149 100644
--- a/configure.in
+++ b/configure.in
@@ -183,7 +183,8 @@ unistd.h \
 sys/socket.h \
 pwd.h \
 grp.h \
-strings.h
+strings.h \
+sys/processor.h
 )
 AC_HEADER_SYS_WAIT
 
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index a27ba5ecce4..865d9cf8fde 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -967,7 +967,7 @@ static int make_child(server_rec *s, int slot)
     }
 
     if (!pid) {
-#ifdef AIX_BIND_PROCESSOR
+#ifdef HAVE_SYS_PROCESSOR_H
       /* By default, AIX binds to a single processor.  This bit unbinds
 	 children which will then bind to another CPU.
       */
diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index a27ba5ecce4..865d9cf8fde 100644
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -967,7 +967,7 @@ static int make_child(server_rec *s, int slot)
     }
 
     if (!pid) {
-#ifdef AIX_BIND_PROCESSOR
+#ifdef HAVE_SYS_PROCESSOR_H
       /* By default, AIX binds to a single processor.  This bit unbinds
 	 children which will then bind to another CPU.
       */
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index f76d2e568f1..a845012bd73 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -868,7 +868,7 @@ static int make_child(server_rec *s, int slot)
     }
 
     if (!pid) {
-#ifdef AIX_BIND_PROCESSOR
+#ifdef HAVE_SYS_PROCESSOR_H
 /* by default AIX binds to a single processor
  * this bit unbinds children which will then bind to another cpu
  */
diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 226c52a5a2d..c33113ba0ab 100644
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -803,7 +803,7 @@ static int make_child(server_rec *s, int slot)
     }
 
     if (!pid) {
-#ifdef AIX_BIND_PROCESSOR
+#ifdef HAVE_SYS_PROCESSOR_H
       /* By default, AIX binds to a single processor.  This bit unbinds
 	 children which will then bind to another CPU.
       */