httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1390562 - /httpd/httpd/trunk/server/util.c
Date Wed, 26 Sep 2012 15:24:24 GMT
Author: jim
Date: Wed Sep 26 15:24:23 2012
New Revision: 1390562

URL: http://svn.apache.org/viewvc?rev=1390562&view=rev
Log:
More accurate counts of busy and ready/idle

Modified:
    httpd/httpd/trunk/server/util.c

Modified: httpd/httpd/trunk/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=1390562&r1=1390561&r2=1390562&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util.c (original)
+++ httpd/httpd/trunk/server/util.c Wed Sep 26 15:24:23 2012
@@ -2817,13 +2817,15 @@ AP_DECLARE(void) ap_get_sload(ap_sload_t
             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++;
+                }   
             }
         }
     }



Mime
View raw message