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 2001/12/30 14:39:43 UTC
cvs commit: httpd-2.0/server/mpm/mpmt_os2 mpmt_os2_child.c mpmt_os2.c
bjh 01/12/30 05:39:43
Modified: server/mpm/mpmt_os2 mpmt_os2_child.c mpmt_os2.c
Log:
Update OS/2 MPM to allow for run-time configurable scoreboard size.
Revision Changes Path
1.10 +1 -1 httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c
Index: mpmt_os2_child.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mpmt_os2_child.c 29 Dec 2001 09:42:44 -0000 1.9
+++ mpmt_os2_child.c 30 Dec 2001 13:39:42 -0000 1.10
@@ -426,7 +426,7 @@
rc == 0 && rd.ulData != WORKTYPE_EXIT) {
pconn = worker_args->pconn;
ap_create_sb_handle(&sbh, pconn, child_slot, thread_slot);
- current_conn = ap_run_create_connection(pconn, ap_server_conf, worker_args->conn_sd, conn_id);
+ current_conn = ap_run_create_connection(pconn, ap_server_conf, worker_args->conn_sd, conn_id, sbh);
if (current_conn) {
ap_process_connection(current_conn);
1.10 +3 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mpmt_os2.c 18 Dec 2001 13:48:53 -0000 1.9
+++ mpmt_os2.c 30 Dec 2001 13:39:42 -0000 1.10
@@ -298,7 +298,8 @@
/* Allocate shared memory for scoreboard */
if (ap_scoreboard_image == NULL) {
rc = DosAllocSharedMem((PPVOID)&ap_scoreboard_image, ap_scoreboard_fname,
- sizeof(scoreboard), PAG_COMMIT|PAG_READ|PAG_WRITE);
+ ap_calc_scoreboard_size(),
+ PAG_COMMIT|PAG_READ|PAG_WRITE);
if (rc) {
ap_log_error(APLOG_MARK, APLOG_ERR, APR_FROM_OS_ERROR(rc), ap_server_conf,
@@ -306,7 +307,7 @@
return FALSE;
}
- memset(ap_scoreboard_image, 0, sizeof(scoreboard));
+ ap_init_scoreboard();
}
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,