Add support for the BeOS mpm. Also change some things to make it easier

for future additions.

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

diff --git a/server/mpm_common.c b/server/mpm_common.c
index e69e442e0d35652a9e107f5e56fa16a72611a6eb..ecb82aeee6fdc4f77d12ab0046a29e41d09c0050 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -74,9 +74,11 @@
 #include "mpm.h"
 #include "mpm_common.h"
 
-#ifdef DEXTER_MPM
+#if defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM)
+#define CHILD_TABLE 1
 #define CHILD_INFO_TABLE     ap_child_table
 #elif defined(MPMT_PTHREAD_MPM) || defined (PREFORK_MPM)
+#define SCOREBOARD 1
 #define CHILD_INFO_TABLE     ap_scoreboard_image->parent
 #endif 
 
@@ -90,7 +92,7 @@ void ap_reclaim_child_processes(int terminate)
     int waitret, tries;
     int not_dead_yet;
 
-#ifndef DEXTER_MPM
+#ifdef SCOREBOARD
     ap_sync_scoreboard_image();
 #endif
 
@@ -109,18 +111,18 @@ void ap_reclaim_child_processes(int terminate)
         for (i = 0; i < ap_max_daemons_limit; ++i) {
             pid_t pid = CHILD_INFO_TABLE[i].pid;
 
-#ifdef DEXTER_MPM
+#ifdef CHILD_TABLE
             if (ap_child_table[i].status == SERVER_DEAD)
-#elif defined(MPMT_PTHREAD_MPM) || defined (PREFORK_MPM)
+#elif defined(SCOREBOARD)
             if (pid == ap_my_pid || pid == 0)
 #endif
                 continue;
 
             waitret = waitpid(pid, &status, WNOHANG);
             if (waitret == pid || waitret == -1) {
-#ifdef DEXTER_MPM
+#ifdef CHILD_TABLE
                 ap_child_table[i].status = SERVER_DEAD;
-#elif defined(MPMT_PTHREAD_MPM) || defined(PREFORK_MPM)
+#elif defined(SCOREBOARD)
                 ap_scoreboard_image->parent[i].pid = 0;
 #endif
                 continue;