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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89047 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/scoreboard.h b/include/scoreboard.h
index 81238495f242f1233f3440929d69070361f7ba77..090b1bb5c7aee1cfd2402528eab72bda80466f48 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -1,4 +1,3 @@
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -74,11 +73,6 @@ extern "C" {
 #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 @@ typedef enum {
 
 /* 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 @@ typedef struct {
 #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 @@ typedef struct {
     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 {

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 17f07e888fe1a36fb0180c8bd1d19146ef8d5ef6..e7668b827b1a64aee7efa510f1b14ecfb055d24e 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -516,7 +516,6 @@ static int status_handler(request_rec *r)
                vhost = NULL;
            }
 
-
 #if defined(NO_GETTIMEOFDAY)
 #ifdef HAVE_TIMES
            if (score_record.start_time == (clock_t) 0)
@@ -605,11 +604,7 @@ static int status_handler(request_rec *r)
                            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 @@ static int status_handler(request_rec *r)
                             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,