Commit 6a0336ea authored by Jeff Trawick's avatar Jeff Trawick
Browse files

get rid of some cruft related to a now-unused parameter to 

make_child() and unnecessary calls to time()


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

server/mpm/beos/beos.c

+4 −5
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static int32 worker_thread(void * dummy) 
    return (0);

}



static int make_worker(server_rec *s, int slot, time_t now)

static int make_worker(server_rec *s, int slot)

{

    thread_id tid;

    proc_info *my_info = (proc_info *)malloc(sizeof(proc_info));
@@ -488,7 +488,7 @@ static void startup_threads(int number_to_start) 
	if (ap_child_table[i].pid) {

	    continue;

	}

	if (make_worker(ap_server_conf, i, 0) < 0) {

	if (make_worker(ap_server_conf, i) < 0) {

	    break;

	}

	--number_to_start;
@@ -511,7 +511,6 @@ static int hold_off_on_exponential_spawning; 
static void perform_idle_server_maintenance(void)

{

    int i;

    time_t now = 0;

    int free_length;

    int free_slots[MAX_SPAWN_RATE];

    int last_non_dead;
@@ -538,7 +537,7 @@ static void perform_idle_server_maintenance(void) 


    if (free_length > 0) {

    	for (i = 0; i < free_length; ++i) {

	        make_worker(ap_server_conf, free_slots[i], now);

	        make_worker(ap_server_conf, free_slots[i]);

	    }

	    /* the next time around we want to spawn twice as many if this

	     * wasn't good enough, but not if we've just done a graceful
@@ -586,7 +585,7 @@ static void server_main_loop(int remaining_threads_to_start) 
		    /* we're still doing a 1-for-1 replacement of dead

                     * children with new children

                     */

		    make_worker(ap_server_conf, child_slot, time(NULL));

		    make_worker(ap_server_conf, child_slot);

		    --remaining_threads_to_start;

		}

#if APR_HAS_OTHER_CHILD

server/mpm/dexter/dexter.c

+4 −5
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static void child_main(int child_num_arg) 
    }

}



static int make_child(server_rec *s, int slot, time_t now)

static int make_child(server_rec *s, int slot)

{

    int pid;
@@ -834,7 +834,7 @@ static int startup_children(int number_to_start) 
	if (ap_child_table[i].pid) {

	    continue;

	}

	if (make_child(ap_server_conf, i, 0) < 0) {

	if (make_child(ap_server_conf, i) < 0) {

	    break;

	}

	--number_to_start;
@@ -858,7 +858,6 @@ static int hold_off_on_exponential_spawning; 
static void perform_child_maintenance(void)

{

    int i;

    time_t now = 0;

    int free_length;

    int free_slots[MAX_SPAWN_RATE];

    int last_non_dead = -1;
@@ -885,7 +884,7 @@ static void perform_child_maintenance(void) 


    if (free_length > 0) {

	for (i = 0; i < free_length; ++i) {

	    make_child(ap_server_conf, free_slots[i], now);

	    make_child(ap_server_conf, free_slots[i]);

	}

	/* the next time around we want to spawn twice as many if this

	 * wasn't good enough, but not if we've just done a graceful
@@ -932,7 +931,7 @@ static void server_main_loop(int remaining_children_to_start) 
		    /* we're still doing a 1-for-1 replacement of dead

                     * children with new children

                     */

		    make_child(ap_server_conf, child_slot, time(NULL));

		    make_child(ap_server_conf, child_slot);

		    --remaining_children_to_start;

		}

#if APR_HAS_OTHER_CHILD

server/mpm/experimental/perchild/perchild.c

+4 −5
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static void child_main(int child_num_arg) 
    }

}



static int make_child(server_rec *s, int slot, time_t now)

static int make_child(server_rec *s, int slot)

{

    int pid;
@@ -990,7 +990,7 @@ static int startup_children(int number_to_start) 
	if (ap_child_table[i].pid) {

	    continue;

	}

	if (make_child(ap_server_conf, i, 0) < 0) {

	if (make_child(ap_server_conf, i) < 0) {

	    break;

	}

	--number_to_start;
@@ -1014,7 +1014,6 @@ static int hold_off_on_exponential_spawning; 
static void perform_child_maintenance(void)

{

    int i;

    time_t now = 0;

    int free_length;

    int free_slots[MAX_SPAWN_RATE];

    int last_non_dead = -1;
@@ -1041,7 +1040,7 @@ static void perform_child_maintenance(void) 


    if (free_length > 0) {

	for (i = 0; i < free_length; ++i) {

	    make_child(ap_server_conf, free_slots[i], now);

	    make_child(ap_server_conf, free_slots[i]);

	}

	/* the next time around we want to spawn twice as many if this

	 * wasn't good enough, but not if we've just done a graceful
@@ -1092,7 +1091,7 @@ static void server_main_loop(int remaining_children_to_start) 
		    /* we're still doing a 1-for-1 replacement of dead

                     * children with new children

                     */

		    make_child(ap_server_conf, child_slot, time(NULL));

		    make_child(ap_server_conf, child_slot);

		    --remaining_children_to_start;

		}

#if APR_HAS_OTHER_CHILD

server/mpm/mpmt_beos/mpmt_beos.c

+4 −5
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int32 child_main(void * data) 
    return (0);

}



static int make_child(server_rec *s, int slot, time_t now)

static int make_child(server_rec *s, int slot)

{

    thread_id tid;
@@ -533,7 +533,7 @@ static void startup_children(int number_to_start) 
	if (ap_child_table[i].pid) {

	    continue;

	}

	if (make_child(ap_server_conf, i, 0) < 0) {

	if (make_child(ap_server_conf, i) < 0) {

	    break;

	}

	--number_to_start;
@@ -556,7 +556,6 @@ static int hold_off_on_exponential_spawning; 
static void perform_idle_server_maintenance(void)

{

    int i;

    time_t now = 0;

    int free_length;

    int free_slots[MAX_SPAWN_RATE];

    int last_non_dead;
@@ -583,7 +582,7 @@ static void perform_idle_server_maintenance(void) 


    if (free_length > 0) {

    	for (i = 0; i < free_length; ++i) {

	        make_child(ap_server_conf, free_slots[i], now);

	        make_child(ap_server_conf, free_slots[i]);

	    }

	    /* the next time around we want to spawn twice as many if this

	     * wasn't good enough, but not if we've just done a graceful
@@ -631,7 +630,7 @@ static void server_main_loop(int remaining_children_to_start) 
		    /* we're still doing a 1-for-1 replacement of dead

                     * children with new children

                     */

		    make_child(ap_server_conf, child_slot, time(NULL));

		    make_child(ap_server_conf, child_slot);

		    --remaining_children_to_start;

		}

#if APR_HAS_OTHER_CHILD

server/mpm/mpmt_pthread/mpmt_pthread.c

+4 −5
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static void child_main(int child_num_arg) 
    }

}



static int make_child(server_rec *s, int slot, time_t now) 

static int make_child(server_rec *s, int slot) 

{

    int pid;
@@ -781,7 +781,7 @@ static void startup_children(int number_to_start) 
	if (ap_scoreboard_image->parent[i].pid != 0) {

	    continue;

	}

	if (make_child(ap_server_conf, i, 0) < 0) {

	if (make_child(ap_server_conf, i) < 0) {

	    break;

	}

	--number_to_start;
@@ -806,7 +806,6 @@ static void perform_idle_server_maintenance(void) 
    int i, j;

    int idle_thread_count;

    short_score *ss;

    time_t now = 0;

    int free_length;

    int free_slots[MAX_SPAWN_RATE];

    int last_non_dead;
@@ -898,7 +897,7 @@ static void perform_idle_server_maintenance(void) 
			     idle_thread_count, total_non_dead);

	    }

	    for (i = 0; i < free_length; ++i) {

	        make_child(ap_server_conf, free_slots[i], now);

	        make_child(ap_server_conf, free_slots[i]);

	    }

	    /* the next time around we want to spawn twice as many if this

	     * wasn't good enough, but not if we've just done a graceful
@@ -939,7 +938,7 @@ static void server_main_loop(int remaining_children_to_start) 
		    /* we're still doing a 1-for-1 replacement of dead

                     * children with new children

                     */

		    make_child(ap_server_conf, child_slot, time(NULL));

		    make_child(ap_server_conf, child_slot);

		    --remaining_children_to_start;

		}

#if APR_HAS_OTHER_CHILD