You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@apache.org on 2002/02/23 12:25:58 UTC
cvs commit: httpd-2.0/server/mpm/mpmt_os2 mpmt_os2.c
bjh 02/02/23 03:25:58
Modified: server/mpm/mpmt_os2 mpmt_os2.c
Log:
Handle shift of restart_time into scoreboard.
Revision Changes Path
1.15 +1 -4 httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c
Index: mpmt_os2.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mpmt_os2.c 28 Jan 2002 23:49:40 -0000 1.14
+++ mpmt_os2.c 23 Feb 2002 11:25:57 -0000 1.15
@@ -143,7 +143,6 @@
} listen_socket_t;
typedef struct {
- apr_time_t restart_time;
HMTX accept_mutex;
listen_socket_t listeners[1];
} parent_info_t;
@@ -174,7 +173,6 @@
ap_listen_rec *lr;
int num_listeners = 0;
- ap_restart_time = parent_info->restart_time;
ap_mpm_accept_mutex = parent_info->accept_mutex;
/* Set up a default listener if necessary */
@@ -291,8 +289,6 @@
return FALSE;
}
- ap_restart_time = apr_time_now();
- parent_info->restart_time = ap_restart_time;
parent_info->accept_mutex = ap_mpm_accept_mutex;
/* Allocate shared memory for scoreboard */
@@ -311,6 +307,7 @@
ap_init_scoreboard(sb_mem);
}
+ ap_scoreboard_image->global->restart_time = apr_time_now();
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,
"%s configured -- resuming normal operations",
ap_get_server_version());