You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@hyperreal.org on 1999/07/21 22:44:43 UTC

cvs commit: apache-2.0/mpm/src/modules/mpm/dexter dexter.c

manoj       99/07/21 13:44:43

  Modified:    mpm/src/modules/mpm/dexter dexter.c
  Log:
  Some fixing for startup of children after a graceful restart, so that the
  processes can start faster.
  
  Revision  Changes    Path
  1.2       +6 -5      apache-2.0/mpm/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -u -r1.1 -r1.2
  --- dexter.c	1999/07/21 19:07:06	1.1
  +++ dexter.c	1999/07/21 20:44:41	1.2
  @@ -1113,7 +1113,7 @@
   }
   
   /* start up a bunch of children */
  -static void startup_children(int number_to_start)
  +static int startup_children(int number_to_start)
   {
       int i;
   
  @@ -1126,6 +1126,7 @@
   	}
   	--number_to_start;
       }
  +    return number_to_start;
   }
   
   
  @@ -1238,8 +1239,8 @@
   	     * generation of children needed to be reaped... so assume
   	     * they're all done, and pick up the slack if any is left.
   	     */
  -	    startup_children(remaining_children_to_start);
  -	    remaining_children_to_start = 0;
  +	    remaining_children_to_start = \
  +	    	startup_children(remaining_children_to_start);
   	    /* In any event we really shouldn't do the code below because
   	     * few of the servers we just started are in the IDLE state
   	     * yet, so we'd mistakenly create an extra server.
  @@ -1298,8 +1299,8 @@
        */
       remaining_children_to_start = ap_num_daemons;
       if (!is_graceful) {
  -	startup_children(remaining_children_to_start);
  -	remaining_children_to_start = 0;
  +	remaining_children_to_start = \
  +	    startup_children(remaining_children_to_start);
       }
       else {
   	/* give the system some time to recover before kicking into