From dbdd4721c96b85496e583eb76b6e36f4eb93b53c Mon Sep 17 00:00:00 2001 From: Brian Havard Date: Sun, 30 Dec 2001 13:39:42 +0000 Subject: [PATCH] Update OS/2 MPM to allow for run-time configurable scoreboard size. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92662 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/mpmt_os2/mpmt_os2.c | 5 +++-- server/mpm/mpmt_os2/mpmt_os2_child.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 6bb83b97da..af01a5b9a7 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -298,7 +298,8 @@ static char master_main() /* 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 @@ static char master_main() 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, diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c index a16c5528b6..455cbb49dd 100644 --- a/server/mpm/mpmt_os2/mpmt_os2_child.c +++ b/server/mpm/mpmt_os2/mpmt_os2_child.c @@ -426,7 +426,7 @@ static void worker_main(void *vpArg) 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); -- 2.50.1