Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 54762 invoked by uid 500); 6 Feb 2001 20:41:10 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 54749 invoked by uid 500); 6 Feb 2001 20:41:08 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 6 Feb 2001 20:41:08 -0000 Message-ID: <20010206204108.54736.qmail@apache.org> From: rbb@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c rbb 01/02/06 12:41:08 Modified: . CHANGES server scoreboard.c server/mpm/beos beos.c server/mpm/mpmt_beos mpmt_beos.c server/mpm/mpmt_pthread mpmt_pthread.c server/mpm/prefork prefork.c server/mpm/winnt mpm_winnt.c Log: Setup the server start time correctly. This also gets the server uptime to be reported correctly. I have also moved this code into a common location, so that individual MPMs do not need to worry about setting up the start time. Revision Changes Path 1.76 +3 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -b -w -u -r1.75 -r1.76 --- CHANGES 2001/02/05 22:57:20 1.75 +++ CHANGES 2001/02/06 20:41:03 1.76 @@ -1,5 +1,8 @@ Changes with Apache 2.0b1 + *) Make the server status page show the correct restart time, and + thus the proper uptime. [Ryan Bloom] + *) Move the CGI creation logic from mod_include to mod_cgi(d). This should reduce the amount of duplicate code that is required to create CGI processes. 1.6 +1 -0 httpd-2.0/server/scoreboard.c Index: scoreboard.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -b -w -u -r1.5 -r1.6 --- scoreboard.c 2001/02/06 15:16:04 1.5 +++ scoreboard.c 2001/02/06 20:41:04 1.6 @@ -185,6 +185,7 @@ } memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE); ap_scoreboard_image->global.running_generation = running_gen; + ap_restart_time = apr_now(); apr_register_cleanup(p, NULL, ap_cleanup_scoreboard, apr_null_cleanup); } 1.36 +0 -5 httpd-2.0/server/mpm/beos/beos.c Index: beos.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -b -w -u -r1.35 -r1.36 --- beos.c 2001/02/05 15:04:31 1.35 +++ beos.c 2001/02/06 20:41:05 1.36 @@ -97,7 +97,6 @@ static int min_spare_threads=0; static int max_spare_threads=0; static int ap_thread_limit=0; -static apr_time_t ap_restart_time=0; AP_DECLARE_DATA int ap_extended_status = 0; static int num_listening_sockets = 0; /* set by open_listeners in ap_mpm_run */ static apr_socket_t ** listening_sockets; @@ -797,10 +796,6 @@ "SIGHUP received. Attempting to restart"); } - if (!is_graceful) { - ap_restart_time = apr_now(); - } - /* just before we go, tidy up the locks we've created to prevent a * potential leak of semaphores... */ apr_destroy_lock(worker_thread_count_mutex); 1.62 +0 -4 httpd-2.0/server/mpm/mpmt_beos/mpmt_beos.c Index: mpmt_beos.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_beos/mpmt_beos.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -b -w -u -r1.61 -r1.62 --- mpmt_beos.c 2001/02/05 15:04:31 1.61 +++ mpmt_beos.c 2001/02/06 20:41:05 1.62 @@ -91,7 +91,6 @@ static int min_spare_threads=0; static int max_spare_threads=0; static int ap_daemons_limit=0; -static apr_time_t ap_restart_time=0; AP_DECLARE_DATA int ap_extended_status = 0; static int workers_may_exit = 0; static int requests_this_child; @@ -808,9 +807,6 @@ ap_reclaim_child_processes(1); /* Start with SIGTERM */ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, errno, ap_server_conf, "SIGHUP received. Attempting to restart"); - } - if (!is_graceful) { - ap_restart_time = apr_now(); } delete_port(port_of_death); return 0; 1.139 +0 -3 httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c Index: mpmt_pthread.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -b -w -u -r1.138 -r1.139 --- mpmt_pthread.c 2001/02/05 15:04:31 1.138 +++ mpmt_pthread.c 2001/02/06 20:41:06 1.139 @@ -1148,9 +1148,6 @@ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf, "SIGHUP received. Attempting to restart"); } - if (!is_graceful) { - ap_restart_time = apr_now(); - } return 0; } 1.154 +0 -4 httpd-2.0/server/mpm/prefork/prefork.c Index: prefork.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v retrieving revision 1.153 retrieving revision 1.154 diff -u -d -b -w -u -r1.153 -r1.154 --- prefork.c 2001/02/06 15:52:27 1.153 +++ prefork.c 2001/02/06 20:41:06 1.154 @@ -1280,10 +1280,6 @@ "SIGHUP received. Attempting to restart"); } - if (!is_graceful) { - ap_restart_time = apr_now(); - } - return 0; } 1.135 +0 -1 httpd-2.0/server/mpm/winnt/mpm_winnt.c Index: mpm_winnt.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -b -w -u -r1.134 -r1.135 --- mpm_winnt.c 2001/02/04 03:12:49 1.134 +++ mpm_winnt.c 2001/02/06 20:41:07 1.135 @@ -1240,7 +1240,6 @@ /* Set up the scoreboard. The scoreboard in this MPM only applies to the * child process and is not shared across processes */ - ap_restart_time = apr_now(); ap_create_scoreboard(pconf, SB_NOT_SHARED); /* This is the child process or we are running in single process