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 756ab187ac8b50be7a5f6d0723a5676bec910d48..07a612403dd7859a5358d2773e9c5d804925f9d8 100644 (file)
--- 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++;
+                }   
             }
         }
     }