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 05:35:06 GMT
gregames    01/07/30 22:35:06

  Modified:    modules/generators mod_status.c
  Log:
  mod_status:  don't include workers from dead or quiescing processes in the
  "requests currently being processed" or "idle" counts
  
  also, change term from "servers" to "workers" - servers sounds like what
  you call the whole thing
  
  Revision  Changes    Path
  1.44      +11 -6     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.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- mod_status.c	2001/07/28 01:25:24	1.43
  +++ mod_status.c	2001/07/31 05:35:06	1.44
  @@ -321,10 +321,15 @@
   	    ps_record = ap_scoreboard_image->parent[i];
   	    res = ws_record.status;
   	    stat_buffer[indx] = status_flags[res];
  -	    if (res == SERVER_READY)
  -	        ready++;
  -	    else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)
  -	        busy++;
  +            if (!ps_record.quiescing && ps_record.pid) {
  +	        if (res == SERVER_READY)
  +	            ready++;
  +	        else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)
  +	            busy++;
  +            }
  +            /* XXX what about the counters for quiescing/seg faulted
  +             * processes?  should they be counted or not?  GLA
  +             */
   	    if (ap_extended_status) {
   	        lres = ws_record.access_count;
   	        bytes = ws_record.bytes_served;
  @@ -432,10 +437,10 @@
       }					/* ap_extended_status */
   
       if (!short_report)
  -	ap_rprintf(r, "<dt>%d requests currently being processed, %d idle servers</dt>\n"
  +	ap_rprintf(r, "<dt>%d requests currently being processed, %d idle workers</dt>\n"
   		,busy, ready);
       else
  -	ap_rprintf(r, "BusyServers: %d\nIdleServers: %d\n", busy, ready);
  +	ap_rprintf(r, "BusyWorkers: %d\nIdleWorkers: %d\n", busy, ready);
   
       /* send the scoreboard 'table' out */
   
  
  
  

Mime
View raw message