httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/spmt_os2 spmt_os2.c
Date Wed, 07 Feb 2001 13:17:33 GMT
trawick     01/02/07 05:17:33

  Modified:    server/mpm/dexter dexter.c
               server/mpm/beos beos.c
               server/mpm/mpmt_beos mpmt_beos.c
               server/mpm/mpmt_pthread mpmt_pthread.c
               server/mpm/perchild perchild.c
               server/mpm/spmt_os2 spmt_os2.c
  Log:
  get rid of some cruft related to a now-unused parameter to
  make_child() and unnecessary calls to time()
  
  Revision  Changes    Path
  1.142     +4 -5      httpd-2.0/server/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/dexter/dexter.c,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- dexter.c	2001/02/05 15:04:31	1.141
  +++ dexter.c	2001/02/07 13:17:26	1.142
  @@ -767,7 +767,7 @@
       }
   }
   
  -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 @@
   	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 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 @@
   
       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 @@
   		    /* 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
  
  
  
  1.37      +4 -5      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- beos.c	2001/02/06 20:41:05	1.36
  +++ beos.c	2001/02/07 13:17:27	1.37
  @@ -436,7 +436,7 @@
       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 @@
   	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 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 @@
   
       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 @@
   		    /* 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
  
  
  
  1.63      +4 -5      httpd-2.0/server/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- mpmt_beos.c	2001/02/06 20:41:05	1.62
  +++ mpmt_beos.c	2001/02/07 13:17:28	1.63
  @@ -491,7 +491,7 @@
       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 @@
   	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 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 @@
   
       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 @@
   		    /* 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
  
  
  
  1.140     +4 -5      httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- mpmt_pthread.c	2001/02/06 20:41:06	1.139
  +++ mpmt_pthread.c	2001/02/07 13:17:29	1.140
  @@ -713,7 +713,7 @@
       }
   }
   
  -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 @@
   	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 @@
       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 @@
   			     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 @@
   		    /* 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
  
  
  
  1.39      +4 -5      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- perchild.c	2001/02/06 22:34:56	1.38
  +++ perchild.c	2001/02/07 13:17:31	1.39
  @@ -926,7 +926,7 @@
       }
   }
   
  -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 @@
   	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 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 @@
   
       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 @@
   		    /* 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
  
  
  
  1.79      +4 -6      httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- spmt_os2.c	2001/02/07 00:27:25	1.78
  +++ spmt_os2.c	2001/02/07 13:17:32	1.79
  @@ -833,7 +833,7 @@
   }
   
   
  -static int make_child(server_rec *s, int slot, time_t now)
  +static int make_child(server_rec *s, int slot)
   {
       TID tid;
   
  @@ -880,13 +880,12 @@
   static void startup_children(int number_to_start)
   {
       int i;
  -    time_t now = time(0);
   
       for (i = 0; number_to_start && i < ap_daemons_limit; ++i) {
   	if (ap_scoreboard_image->servers[0][i].status != SERVER_DEAD) {
   	    continue;
   	}
  -	if (make_child(ap_server_conf, i, now) < 0) {
  +	if (make_child(ap_server_conf, i) < 0) {
   	    break;
   	}
   	--number_to_start;
  @@ -912,7 +911,6 @@
       int to_kill;
       int idle_count;
       short_score *ss;
  -    time_t now = time(0);
       int free_length;
       int free_slots[MAX_SPAWN_RATE];
       int last_non_dead;
  @@ -995,7 +993,7 @@
   		    idle_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
  @@ -1109,7 +1107,7 @@
   		    /* we're still doing a 1-for-1 replacement of dead
   			* children with new children
   			*/
  -		    make_child(ap_server_conf, thread_slot, time(0));
  +		    make_child(ap_server_conf, thread_slot);
   		    --remaining_children_to_start;
   		}
   #if APR_HAS_OTHER_CHILD
  
  
  

Mime
View raw message