trawick 01/02/22 13:35:39
Modified: server/mpm/threaded threaded.c
Log:
get the last worker in a given child initialized properly
by getting a new pool for its own proc_info structure instead
of overlaying the pool in the proc_info structure for the
prior thread
we also move through the SERVER_STARTING scoreboard state for this
worker, though this isn't as important as with the other workers,
for which a new thread must be created (potentially time consuming)
Revision Changes Path
1.7 +3 -1 httpd-2.0/server/mpm/threaded/threaded.c
Index: threaded.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- threaded.c 2001/02/21 01:18:39 1.6
+++ threaded.c 2001/02/22 21:35:38 1.7
@@ -678,7 +678,6 @@
* because it let's us deal with tid better.
*/
}
- apr_pool_create(&my_info->tpool, pchild);
my_info = (proc_info *)malloc(sizeof(proc_info));
if (my_info == NULL) {
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf,
@@ -688,6 +687,9 @@
my_info->pid = my_child_num;
my_info->tid = i;
my_info->sd = 0;
+ apr_pool_create(&my_info->tpool, pchild);
+ ap_update_child_status(my_child_num, i, SERVER_STARTING,
+ (request_rec *) NULL);
worker_thread(my_info);
}
|