Commit fecf121f authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent a721f42e

include/scoreboard.h

+0 −4
Original line number Diff line number Diff line
@@ -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 {

server/mpm/prefork/prefork.c

+0 −6
Original line number Diff line number Diff line
@@ -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");

server/scoreboard.c

+0 −1
Original line number Diff line number Diff line
@@ -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) {