Replace reinit_scoreboard with ap_create_scoreboard.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88037 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/scoreboard.h b/include/scoreboard.h
index 659d9ab71429c7c80fc9cc26ddfe38ac0e702edf..3e70fb96fbe27241b140c5bb3650eb58119e7eaa 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -225,7 +225,6 @@ typedef struct {
 
 AP_DECLARE(int) ap_exists_scoreboard_image(void);
 AP_DECLARE(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);
-void reinit_scoreboard(apr_pool_t *p);
 apr_status_t ap_cleanup_scoreboard(void *d);
 
 AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 61543ab2158436cb4a3724402dcefd9ea013c6bc..359532ae46156b290b653f60ba15304c9f404019 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -677,7 +677,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
      */
     
     if (!is_graceful)
-        reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
 
     set_signals();
     /* Sanity cehcks to avoid thrashing... */

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 36ef64bd979f6c20c8b89a3ae0f8498ea57e4736..810cb63ce8834208ebbd3a086faf65c456634f44 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1019,7 +1019,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     }
 
     if (!is_graceful) {
-        reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
     }
     /* Initialize the child table */
     if (!is_graceful) {

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index c3dd7231bd49131a89687acd4fc06ff3b09cdc34..b31333018c937597ca9c2d359444f11df6157308 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1179,7 +1179,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     }
 
     if (!is_graceful) {
-        reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
     }
     /* Initialize the child table */
     if (!is_graceful) {

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 431561675e6e6066aa83055255df5d36d775803e..f23b28f1385cfb66cb1c29372449a4aeb165ce77 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -700,7 +700,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     }
 
     if (!is_graceful) {
-       reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
     }
 
     set_signals();

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index fba44e769fe13118dcbbd540c1d9e43c95590d91..0211ad46eb408732786e50b7b8e63b4e658cd6ce 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1026,7 +1026,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 
 
     if (!is_graceful) {
-       reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
     }
 
     set_signals();

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index c3dd7231bd49131a89687acd4fc06ff3b09cdc34..b31333018c937597ca9c2d359444f11df6157308 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -1179,7 +1179,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     }
 
     if (!is_graceful) {
-        reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
     }
     /* Initialize the child table */
     if (!is_graceful) {

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ccb18c369db69ae52dc6fa8917adf1b1bc3a171d..739bc58380be38014e923f860cb087ef7e83e98a 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1088,7 +1088,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 
     SAFE_ACCEPT(accept_mutex_init(pconf));
     if (!is_graceful) {
-       reinit_scoreboard(pconf);
+        ap_create_scoreboard(pconf, SB_SHARED);
     }
 #ifdef SCOREBOARD_FILE
     else {

diff --git a/server/scoreboard.c b/server/scoreboard.c
index bf1a32a8d950dcce4a01dd1ab5e16315876f9ec7..ba5a913d4af1e3147bb76f7fa5e51859f0814da0 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -188,15 +188,6 @@ AP_DECLARE(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
     apr_pool_cleanup_register(p, NULL, ap_cleanup_scoreboard, apr_pool_cleanup_null);
 }
 
-/* ToDo:
- * reinit_scoreboard should be eliminated when all MPMs migrate to
- * ap_create_scoreboard()
- */
-void reinit_scoreboard(apr_pool_t *p)
-{
-    ap_create_scoreboard(p, SB_SHARED);
-}
-
 /* Routines called to deal with the scoreboard image
  * --- note that we do *not* need write locks, since update_child_status
  * only updates a *single* record in place, and only one process writes to