You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/03/25 19:39:26 UTC
svn commit: r758396 - /httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
Author: trawick
Date: Wed Mar 25 18:39:19 2009
New Revision: 758396
URL: http://svn.apache.org/viewvc?rev=758396&view=rev
Log:
no ap_my_generation
Modified:
httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
Modified: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartbeat.c?rev=758396&r1=758395&r2=758396&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartbeat.c Wed Mar 25 18:39:19 2009
@@ -55,6 +55,9 @@
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 @@
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++;
}
}