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/modules/generators mod_status.c
Date Mon, 07 May 2001 15:49:47 GMT
trawick     01/05/07 08:49:46

  Modified:    include  scoreboard.h
               modules/generators mod_status.c
  Log:
  Get rid of some Apache 1.x OPTIMIZE_TIMEOUTS cruft.  Other logic
  in 1.3 which used this stuff would send SIGALRM to children in
  certain circumstances.
  
  Revision  Changes    Path
  1.18      +0 -16     httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- scoreboard.h	2001/04/23 23:14:35	1.17
  +++ scoreboard.h	2001/05/07 15:49:35	1.18
  @@ -1,4 +1,3 @@
  -
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  @@ -74,11 +73,6 @@
   #include "apr_thread_proc.h"
   #include "apr_portable.h"
   
  -/* The optimized timeouts only work if we're not using a scoreboard file */
  -#if !APR_FILE_BASED_SHM
  -#define OPTIMIZE_TIMEOUTS
  -#endif
  -
   /* Scoreboard info on a process is, for now, kept very brief --- 
    * just status value and pid (the latter so that the caretaker process
    * can properly update the scoreboard when a process dies).  We may want
  @@ -155,10 +149,6 @@
   
   /* stuff which is thread/process specific */
   typedef struct {
  -#ifdef OPTIMIZE_TIMEOUTS
  -    vtime_t cur_vtime;		/* the child's current vtime */
  -    unsigned short timeout_len;	/* length of the timeout */
  -#endif
       int thread_num;
   #if APR_HAS_THREADS
       apr_os_thread_t tid;
  @@ -176,9 +166,7 @@
   #ifdef HAVE_TIMES
       struct tms times;
   #endif
  -#ifndef OPTIMIZE_TIMEOUTS
       time_t last_used;
  -#endif
       char client[32];		/* Keep 'em small... */
       char request[64];		/* We just want an idea... */
       server_rec *vhostrec;	/* What virtual host is being accessed? */
  @@ -196,10 +184,6 @@
       pid_t pid;
       ap_generation_t generation;	/* generation of this child */
       int worker_threads;
  -#ifdef OPTIMIZE_TIMEOUTS
  -    time_t last_rtime;		/* time(0) of the last change */
  -    vtime_t last_vtime;		/* the last vtime the parent has seen */
  -#endif
   } parent_score;
   
   typedef struct {
  
  
  
  1.35      +0 -9      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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_status.c	2001/04/06 20:12:02	1.34
  +++ mod_status.c	2001/05/07 15:49:42	1.35
  @@ -516,7 +516,6 @@
   		vhost = NULL;
   	    }
   
  -
   #if defined(NO_GETTIMEOFDAY)
   #ifdef HAVE_TIMES
   	    if (score_record.start_time == (clock_t) 0)
  @@ -605,11 +604,7 @@
   			    score_record.times.tms_cutime / tick,
   			    score_record.times.tms_cstime / tick,
   #endif
  -#ifdef OPTIMIZE_TIMEOUTS
  -			    difftime(nowtime, ps_record.last_rtime),
  -#else
   			    difftime(nowtime, score_record.last_used),
  -#endif
   			    (long) req_time);
   			format_byte_out(r, conn_bytes);
   			ap_rputs("|", r);
  @@ -678,11 +673,7 @@
   			     score_record.times.tms_cutime +
   			     score_record.times.tms_cstime) / tick,
   #endif
  -#ifdef OPTIMIZE_TIMEOUTS
  -			    difftime(nowtime, ps_record.last_rtime),
  -#else
   			    difftime(nowtime, score_record.last_used),
  -#endif
   			    (long) req_time);
   			ap_rprintf(r, "<td>%-1.1f<td>%-2.2f<td>%-2.2f\n",
   			   (float) conn_bytes / KBYTE, (float) my_bytes / MBYTE,
  
  
  

Mime
View raw message