]> granicus.if.org Git - apache/commitdiff
no ap_my_generation
authorJeff Trawick <trawick@apache.org>
Wed, 25 Mar 2009 18:39:19 +0000 (18:39 +0000)
committerJeff Trawick <trawick@apache.org>
Wed, 25 Mar 2009 18:39:19 +0000 (18:39 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758396 13f79535-47bb-0310-9956-ffa450edef68

modules/cluster/mod_heartbeat.c

index 2e8955bde2a90e9dab65344ab634abbe65c10de0..35cb442a8d997d8dbf27784050be22cecb6eb45a 100644 (file)
@@ -55,6 +55,9 @@ static int hb_monitor(hb_ctx_t *ctx, apr_pool_t *p)
     int i, j;
     apr_uint32_t ready = 0;
     apr_uint32_t busy = 0;
+    ap_generation_t mpm_generation;
+
+    ap_mpm_query(AP_MPMQ_GENERATION, &mpm_generation);
 
     for (i = 0; i < ctx->server_limit; i++) {
         process_score *ps;
@@ -69,12 +72,12 @@ static int hb_monitor(hb_ctx_t *ctx, apr_pool_t *p)
 
             res = ws->status;
 
-            if (res == SERVER_READY && ps->generation == ap_my_generation) {
+            if (res == SERVER_READY && ps->generation == mpm_generation) {
                 ready++;
             }
             else if (res != SERVER_DEAD &&
                      res != SERVER_STARTING && res != SERVER_IDLE_KILL &&
-                     ps->generation == ap_my_generation) {
+                     ps->generation == mpm_generation) {
                 busy++;
             }
         }