rbb 99/01/26 08:59:02
Modified: pthreads/src/main http_main.c
Log:
Removed printf debugging logic
Revision Changes Path
1.3 +0 -18 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- http_main.c 1999/01/22 16:10:55 1.2
+++ http_main.c 1999/01/26 16:59:01 1.3
@@ -914,8 +914,6 @@
else
ap_snprintf(addr, sizeof(addr), "port %d", ntohs(server->sin_port));
- printf("make_sock: addr = %s\n", addr);
-
/* note that because we're about to slack we don't use psocket */
if ((s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
ap_log_error(APLOG_MARK, APLOG_CRIT, server_conf,
@@ -1097,9 +1095,7 @@
static int find_listener(listen_rec *lr)
{
listen_rec *or;
- printf("find_listener: in find_listener...\n");
for (or = old_listeners; or; or = or->next) {
- printf("find_listener: or->fd = %d\n", or->fd);
if (!memcmp(&or->local_addr, &lr->local_addr, sizeof(or->local_addr))) {
or->index = 1;
return or->fd;
@@ -1134,7 +1130,6 @@
num_listenfds = 0;
for (;;) {
fd = find_listener(lr);
- printf("setup_listeners: fd = %d\n", fd);
if (fd == NULL) {
fd = make_sock(p, &lr->local_addr);
}
@@ -1143,7 +1138,6 @@
}
if (fd) {
++num_listenfds;
- printf("fd = %d\n", fd);
}
lr->fd = fd;
if (lr->next == NULL)
@@ -1161,7 +1155,6 @@
listenfds[i].events = POLLIN;
listenfds[i].revents = 0;
}
- printf ("leaving setup_listeners\n");
#ifdef NO_SERIALIZED_ACCEPT
/* warn them about the starvation problem if they're using multiple
* sockets
@@ -1343,11 +1336,8 @@
int csd = 0; /* filedesc */
ulong len = sizeof(struct sockaddr);
-printf("in accept_loop\n");
-
pthread_mutex_lock(&accept_loop_lock);
for(;;) {
- printf("num_listenfds = %d\n", num_listenfds);
if (num_listenfds > 1) {
/* more than one socket */
@@ -1381,7 +1371,6 @@
else {
/* only one socket, just pretent we did the other stuff */
sd = ap_listeners->fd;
- printf("ap_listeners->fd = %d\n", ap_listeners->fd);
}
csd = accept(sd, sa_client, &len);
@@ -1814,21 +1803,16 @@
server_conf = ap_read_config(pconf, ptemp, ap_server_confname);
setup_listeners(pconf);
- printf("out of setup_listeners in one_config_cycle\n");
ap_open_logs(server_conf, pconf);
ap_log_pid(pconf, ap_pid_fname);
ap_set_version();
- printf ("set the version\n");
ap_init_modules(pconf, server_conf);
- printf ("init'ed modules\n");
-
version_locked++;
if (!is_graceful) {
reinit_scoreboard(pconf);
}
- printf ("about to setup signals\n");
set_signals();
@@ -1870,8 +1854,6 @@
/* XXX: we child_init once per process... */
ap_child_init_modules(pconf, server_conf);
-
-printf("HEading into server main loop\n");
server_main_loop(remaining_children_to_start);
