From: Jeff Trawick Date: Wed, 20 Mar 2002 20:30:46 +0000 (+0000) Subject: ap_create_scoreboard() now initializes the scoreboard if it already exists, X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11c9cd9fdc1f408fbf4a0a34cdf121e4df2495e8;p=apache ap_create_scoreboard() now initializes the scoreboard if it already exists, so MPMs shouldn't call it for a graceful restart git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94060 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/scoreboard.c b/server/scoreboard.c index 8e866f6975..0e8b692472 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -289,12 +289,20 @@ apr_status_t ap_cleanup_scoreboard(void *d) int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) { int running_gen = 0; + int i; #if APR_HAS_SHARED_MEMORY apr_status_t rv; #endif if (ap_scoreboard_image) { running_gen = ap_scoreboard_image->global->running_generation; + ap_scoreboard_image->global->restart_time = apr_time_now(); + memset(ap_scoreboard_image->parent, 0, + sizeof(process_score) * server_limit); + for (i = 0; i < server_limit; i++) { + memset(ap_scoreboard_image->servers[i], 0, + sizeof(worker_score) * thread_limit); + } return OK; }