Remove a couple fields from the scoreboard that aren't currently used.

If we need these, they should be added when we begin to use them.

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

diff --git a/include/scoreboard.h b/include/scoreboard.h
index d8acd84c6bf1ed0e52dcf11beff540eaaa5582a6..2eadbf1d345909a75e3efc62dd7ad42bec6f1a43 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -176,10 +176,6 @@ struct process_score{
     pid_t pid;
     ap_generation_t generation;        /* generation of this child */
     ap_scoreboard_e sb_type;
-    unsigned short process_status;    /* Either SB_WORKING or SB_IDLE_DIE */
-    int worker_threads;
-    worker_score *worker_head;
-    process_score *next;
 };
 
 typedef struct {

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 54699070e96cc6cf1fe9f557a65b4874aeb24a28..3a9102d3df4e9eebd4400fe51df773dc9ee33286 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -844,7 +844,6 @@ static int make_child(server_rec *s, int slot)
        apr_signal(SIGQUIT, SIG_DFL);
 #endif
        apr_signal(SIGTERM, just_die);
-        ap_scoreboard_image->parent[slot].process_status = SB_WORKING;
        child_main(slot);
     }
 
@@ -896,7 +895,6 @@ static int make_child(server_rec *s, int slot)
          * pod is used for signalling graceful restart.
          */
         apr_signal(SIGWINCH, SIG_IGN);
-        ap_scoreboard_image->parent[slot].process_status = SB_WORKING;
        child_main(slot);
     }
 
@@ -1263,10 +1261,6 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     ap_scoreboard_image->global.running_generation = ap_my_generation;
     update_scoreboard_global();
     
-    for (index = 0; index < ap_daemons_limit; ++index) {
-        ap_scoreboard_image->parent[index].process_status = SB_IDLE_DIE;
-    }
-
     if (is_graceful) {
        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,
                    "Graceful restart requested, doing restart");

diff --git a/server/scoreboard.c b/server/scoreboard.c
index d9398a4a4f3d3d0672c2e1e4887dc0c9d0b25654..1d4216fec74cb14414de16c6858343408f8bb23b 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -283,7 +283,6 @@ int ap_update_child_status(int child_num, int thread_num, int status, request_re
        && old_status == SERVER_STARTING) {
         ws->thread_num = child_num * HARD_SERVER_LIMIT + thread_num;
         ps->generation = ap_my_generation;
-        ps->worker_threads = ap_threads_per_child;
     }
 
     if (ap_extended_status) {