summaryrefslogtreecommitdiffstats
path: root/server/mpm_common.c
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2018-08-07 15:04:05 +0200
committerRainer Jung <rjung@apache.org>2018-08-07 15:04:05 +0200
commited521579496724570446484fa524a023518cdcb5 (patch)
tree60d8c4bf6a142afe947748aa8fd0377a4aaa5bd2 /server/mpm_common.c
parentmod_status: Add cumulated response duration time (diff)
downloadapache2-ed521579496724570446484fa524a023518cdcb5.tar.xz
apache2-ed521579496724570446484fa524a023518cdcb5.zip
mod_status: Cumulate CPU time of exited child
processes in the "cu" and "cs" values. Add CPU time of the parent process to the "c" and "s" values. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1837595 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm_common.c')
-rw-r--r--server/mpm_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 43194e7ba0..6a7a3a8b37 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -211,6 +211,8 @@ AP_DECLARE(void) ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode,
}
rv = apr_proc_wait_all_procs(ret, exitcode, status, APR_NOWAIT, p);
+ ap_update_global_status();
+
if (APR_STATUS_IS_EINTR(rv)) {
ret->pid = -1;
return;
@@ -534,6 +536,7 @@ void ap_core_child_status(server_rec *s, pid_t pid,
++cur->active;
break;
case MPM_CHILD_EXITED:
+ ap_update_global_status();
status_msg = "exited";
if (cur == APR_RING_SENTINEL(geninfo, mpm_gen_info_t, link)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00546)