From da63739daa7edf2592aade4233d9c42495145ace Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Sat, 4 Aug 2001 11:40:16 +0000 Subject: [PATCH] cosmetic changes only for a clean build; no serialization problems addressed; I presume those are waiting for an APR-ization of the queue/condition mechanism git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89921 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/worker/fdqueue.h | 1 + server/mpm/worker/worker.c | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/mpm/worker/fdqueue.h b/server/mpm/worker/fdqueue.h index b1cab2d018..669e4f4309 100644 --- a/server/mpm/worker/fdqueue.h +++ b/server/mpm/worker/fdqueue.h @@ -91,5 +91,6 @@ apr_status_t ap_queue_pop(FDQueue *queue, apr_socket_t **sd, apr_pool_t **p, int int ap_queue_size(FDQueue *queue); int ap_queue_full(FDQueue *queue); int ap_block_on_queue(FDQueue *queue); +void ap_queue_signal_all_wakeup(FDQueue *queue); #endif /* FDQUEUE_H */ diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 059c2ec407..668a6c61ee 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -191,7 +191,7 @@ static const char *lock_fname; #define SAFE_ACCEPT(stmt) (stmt) #endif -static signal_workers(void) +static void signal_workers(void) { workers_may_exit = 1; ap_queue_signal_all_wakeup(worker_queue); @@ -680,11 +680,6 @@ static void *worker_thread(apr_thread_t *thd, void * dummy) apr_pool_t *tpool = ti->tpool; apr_socket_t *csd = NULL; apr_pool_t *ptrans; /* Pool for per-transaction stuff */ - apr_socket_t *sd = NULL; - int n; - int curr_pollfd, last_pollfd = 0; - apr_pollfd_t *pollset; - apr_status_t rv; free(ti); -- 2.40.0