rbb 99/03/15 07:34:52
Modified: pthreads/src/include http_conf_globals.h
pthreads/src/main http_core.c http_main.c
Log:
Remove the overflow logic. This code made the server harder to configure
properly, and the code was ugly. It also didn't add the performance
benefits we thought it would, so it is going away now.
Revision Changes Path
1.8 +0 -1 apache-apr/pthreads/src/include/http_conf_globals.h
Index: http_conf_globals.h
===================================================================
RCS file: /home/cvs/apache-apr/pthreads/src/include/http_conf_globals.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- http_conf_globals.h 1999/02/23 19:11:19 1.7
+++ http_conf_globals.h 1999/03/15 15:34:49 1.8
@@ -75,7 +75,6 @@
#endif
extern int ap_threads_per_child;
extern int ap_acceptors_per_child;
-extern int ap_overflow;
extern int ap_idle_thread_threshold;
extern int ap_busy_thread_threshold;
extern int ap_max_requests_per_child;
1.10 +0 -13 apache-apr/pthreads/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-apr/pthreads/src/main/http_core.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_core.c 1999/03/15 14:26:49 1.9
+++ http_core.c 1999/03/15 15:34:50 1.10
@@ -2205,17 +2205,6 @@
return NULL;
}
-static const char *set_overflow(cmd_parms *cmd, void * dummy, char *arg)
-{
- const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
- if (err != NULL) {
- return err;
- }
- ap_overflow = atoi(arg);
-
- return NULL;
-}
-
static const char *set_max_requests(cmd_parms *cmd, void *dummy, char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -2849,8 +2838,6 @@
"Maximum number of idle children" },
{ "MaxServers", set_max_free_servers, NULL, RSRC_CONF, TAKE1,
"Deprecated equivalent to MaxSpareServers" },
-{ "ExcessWorkers", set_overflow, NULL, RSRC_CONF, TAKE1,
- "Number of connections to accept beyond the number of threads per child."},
{ "IdleThreadThreshold", set_idle_threshold, NULL, RSRC_CONF, TAKE1,
"Minimum number of idle threads, below which process is considered ready
for reaping." },
{ "BusyThreadThreshold", set_busy_threshold, NULL, RSRC_CONF, TAKE1,
1.58 +1 -9 apache-apr/pthreads/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- http_main.c 1999/03/05 16:45:55 1.57
+++ http_main.c 1999/03/15 15:34:50 1.58
@@ -159,7 +159,6 @@
#endif
int ap_threads_per_child;
int ap_acceptors_per_child;
-int ap_overflow = 0;
int ap_max_requests_per_child;
int ap_idle_thread_threshold;
int ap_busy_thread_threshold;
@@ -2092,14 +2091,7 @@
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
"pthread_sigmask");
}
- if (ap_overflow < ap_acceptors_per_child)
- ap_overflow = ap_acceptors_per_child;
- else if (ap_overflow > ap_acceptors_per_child) {
- temp = ap_overflow - ap_acceptors_per_child;
- ap_overflow -= ap_acceptors_per_child;
- }
-
- queue_init(&csd_queue, ap_threads_per_child + temp, ap_overflow, pchild);
+ queue_init(&csd_queue, ap_threads_per_child, ap_acceptors_per_child,
pchild);
if (pthread_create(&thread, NULL, thread_starter_thread,
&child_num_arg)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
