You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@locus.apache.org on 2000/06/01 20:42:04 UTC
cvs commit: apache-2.0/src/main mpm_common.c
dreid 00/06/01 11:42:04
Modified: src/main mpm_common.c
Log:
Add support for the BeOS mpm. Also change some things to make it easier
for future additions.
Revision Changes Path
1.10 +8 -6 apache-2.0/src/main/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mpm_common.c 2000/05/28 12:20:04 1.9
+++ mpm_common.c 2000/06/01 18:42:04 1.10
@@ -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 @@
int waitret, tries;
int not_dead_yet;
-#ifndef DEXTER_MPM
+#ifdef SCOREBOARD
ap_sync_scoreboard_image();
#endif
@@ -109,18 +111,18 @@
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;