www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-10-28 20:34:59 +03:00
Code Activity

the mpm_get_child_pid hook is unnecessary, as was the per-MPM MPM_CHILD_PID() macro which it replaced

Browse Source 
axe this new hook, and use ap_get_scoreboard_process() instead


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759757 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2009-03-29 19:30:17 +00:00
parent 2103ba72a1
commit 35e3599b25
6 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/mpm_unix.c
View File

@@ -42,6 +42,7 @@
#include "mpm_common.h"
#include "ap_mpm.h"
#include "ap_listen.h"
#include "scoreboard.h"
#include "util_mutex.h"
#ifdef HAVE_PWD_H
@@ -217,7 +218,8 @@ void ap_reclaim_child_processes(int terminate)
/* now see who is done */
not_dead_yet = 0;
for (i = 0; i < max_daemons; ++i) {
pid_t pid = ap_mpm_get_child_pid(i);
process_score *ps = ap_get_scoreboard_process(i);
pid_t pid = ps->pid;
if (pid == 0) {
continue; /* not every scoreboard entry is in use */
@@ -261,7 +263,8 @@ void ap_relieve_child_processes(void)
/* now see who is done */
for (i = 0; i < max_daemons; ++i) {
pid_t pid = ap_mpm_get_child_pid(i);
process_score *ps = ap_get_scoreboard_process(i);
pid_t pid = ps->pid;
if (pid == 0) {
continue; /* not every scoreboard entry is in use */