httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_status.c
Date Tue, 31 Jul 2001 06:22:32 GMT
gregames    01/07/30 23:22:32

  Modified:    .        CHANGES
               server/mpm/worker worker.c
               server/mpm/threaded threaded.c
               modules/generators mod_status.c
  Log:
  don't count workers in processes which aren't actively serving requests.
  
  it is necessary to check for the generation as well as "quiescing", in the
  case of a restart where no workers have seen the PoD yet.
  
  Revision  Changes    Path
  1.266     +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.265
  retrieving revision 1.266
  diff -u -r1.265 -r1.266
  --- CHANGES	2001/07/30 15:11:40	1.265
  +++ CHANGES	2001/07/31 06:22:31	1.266
  @@ -1,4 +1,10 @@
   Changes with Apache 2.0.23-dev
  +
  +  *) More stall fixes for the threaded & worker mpm's.
  +     Make mod_status output more accurate.  Don't
  +     count workers in processes which aren't actively
  +     serving requests. [Greg Ames]
  +     
     *) Win32: Get SSI exec cgi tag working. [Bill Stoddard]
   
     *) Add a single listener/multiple worker MPM.  This MPM is
  
  
  
  1.3       +1 -0      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- worker.c	2001/07/31 03:08:42	1.2
  +++ worker.c	2001/07/31 06:22:32	1.3
  @@ -1058,6 +1058,7 @@
   	     */
   	    if (status <= SERVER_READY && status != SERVER_DEAD &&
                       !ps->quiescing &&
  +                    ps->generation == ap_my_generation &&
                    /* XXX the following shouldn't be necessary if we clean up 
                     *     properly after seg faults, but we're not yet    GLA 
                     */     
  
  
  
  1.53      +1 -0      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- threaded.c	2001/07/31 03:08:42	1.52
  +++ threaded.c	2001/07/31 06:22:32	1.53
  @@ -1010,6 +1010,7 @@
   	     */
   	    if (status <= SERVER_READY && status != SERVER_DEAD &&
                       !ps->quiescing &&
  +                    ps->generation == ap_my_generation &&
                    /* XXX the following shouldn't be necessary if we clean up 
                     *     properly after seg faults, but we're not yet    GLA 
                     */     
  
  
  
  1.45      +3 -1      httpd-2.0/modules/generators/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- mod_status.c	2001/07/31 05:35:06	1.44
  +++ mod_status.c	2001/07/31 06:22:32	1.45
  @@ -321,7 +321,9 @@
   	    ps_record = ap_scoreboard_image->parent[i];
   	    res = ws_record.status;
   	    stat_buffer[indx] = status_flags[res];
  -            if (!ps_record.quiescing && ps_record.pid) {
  +            if (!ps_record.quiescing && 
  +                    ps_record.generation == ap_my_generation &&
  +                    ps_record.pid) {
   	        if (res == SERVER_READY)
   	            ready++;
   	        else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)
  
  
  

Mime
View raw message