From: Jim Jagielski <jim@apache.org>
Date: Wed, 26 Sep 2012 15:24:23 +0000 (+0000)
Subject: More accurate counts of busy and ready/idle
X-Git-Tag: 2.5.0-alpha~6266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b633191c6d26191159757c71c3592cbbd1f150e4;p=thirdparty%2Fapache%2Fhttpd.git

More accurate counts of busy and ready/idle


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

diff --git a/server/util.c b/server/util.c
index 756ab187ac8..07a612403dd 100644
--- a/server/util.c
+++ b/server/util.c
@@ -2817,13 +2817,15 @@ AP_DECLARE(void) ap_get_sload(ap_sload_t *ld)
             ws = &ap_scoreboard_image->servers[i][j];
             res = ws->status;
 
-            if (res == SERVER_READY && ps->generation == mpm_generation) {
-                ready++;
-            }
-            else if (res != SERVER_DEAD &&
-                     res != SERVER_STARTING && res != SERVER_IDLE_KILL &&
-                     ps->generation == mpm_generation) {
-                busy++;
+            if (!ps->quiescing && ps->pid) {
+                if (res == SERVER_READY && ps->generation == mpm_generation) {
+                    ready++;
+                }
+                else if (res != SERVER_DEAD &&
+                         res != SERVER_STARTING && res != SERVER_IDLE_KILL &&
+                         ps->generation == mpm_generation) {
+                    busy++;
+                }   
             }
         }
     }