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 bff9fe2474065f4cb4ababfebf5ff030f70f07cd..d46cea222008a0c932b3ab44adaff6ae34bf070f 100644 (file)
--- 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 ac69a1f46e855d15fac050f269f8a5211bf8bc57..52afc34d14932836e0ebbf9726a69c2542572546 100644 (file)
--- 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 a27ba5ecce497a10954c4fe1541d3430bfed4bbf..865d9cf8fdeb9faf4f42e9b479f663fc934f0dc1 100644 (file)
--- 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 a27ba5ecce497a10954c4fe1541d3430bfed4bbf..865d9cf8fdeb9faf4f42e9b479f663fc934f0dc1 100644 (file)
--- 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 f76d2e568f1b0272e41440fe022b1855127d8365..a845012bd731f588813ecfcd0961761bab95d553 100644 (file)
--- 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 226c52a5a2de9a1ec5af632e9b2bb8d2521f11a0..c33113ba0ab2b0dfd2858160fc8ed902ef58648b 100644 (file)
--- 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.
       */