* University of Illinois, Urbana-Champaign.
*/
-#define CORE_PRIVATE
-
+#include "apr.h"
#include "apr_portable.h"
-#include "apr_thread_proc.h"
+#include "apr_strings.h"
#include "apr_file_io.h"
+#include "apr_thread_proc.h"
+
+#if APR_HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if APR_HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#define CORE_PRIVATE
+
#include "ap_config.h"
#include "httpd.h"
#include "http_main.h"
#include "ap_mpm.h"
#include "unixd.h"
#include "mpm_common.h"
-#include "iol_socket.h"
#include "ap_listen.h"
#include "scoreboard.h"
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-#include <sys/wait.h>
+
#include <pthread.h>
#include <signal.h>
int ap_threads_per_child=0; /* Worker threads per child */
int ap_max_requests_per_child=0;
-static char *ap_pid_fname=NULL;
-API_VAR_EXPORT char *ap_scoreboard_fname=NULL;
+static const char *ap_pid_fname=NULL;
static int ap_daemons_to_start=0;
static int min_spare_threads=0;
static int max_spare_threads=0;
static int ap_daemons_limit=0;
-static time_t ap_restart_time=0;
-API_VAR_EXPORT int ap_extended_status = 0;
static int workers_may_exit = 0;
static int requests_this_child;
static int num_listensocks = 0;
-static ap_socket_t **listensocks;
+static apr_socket_t **listensocks;
/* The structure used to pass unique initialization info to each thread */
typedef struct {
int pid;
int tid;
int sd;
- ap_pool_t *tpool; /* "pthread" would be confusing */
+ apr_pool_t *tpool; /* "pthread" would be confusing */
} proc_info;
/*
*/
int ap_max_daemons_limit = -1;
-static char ap_coredump_dir[MAX_STRING_LEN];
+char ap_coredump_dir[MAX_STRING_LEN];
-int pipe_of_death[2];
+static apr_file_t *pipe_of_death_in = NULL;
+static apr_file_t *pipe_of_death_out = NULL;
static pthread_mutex_t pipe_of_death_mutex;
/* *Non*-shared http_main globals... */
int raise_sigstop_flags;
#endif
-static ap_pool_t *pconf; /* Pool for config stuff */
-static ap_pool_t *pchild; /* Pool for httpd child stuff */
+static apr_pool_t *pconf; /* Pool for config stuff */
+static apr_pool_t *pchild; /* Pool for httpd child stuff */
-int ap_my_pid; /* Linux getpid() doesn't work except in main thread. Use
- this instead */
+unsigned int ap_my_pid; /* Linux getpid() doesn't work except in main
+ thread. Use this instead */
/* Keep track of the number of worker threads currently active */
static int worker_thread_count;
static pthread_mutex_t worker_thread_count_mutex;
/* Locks for accept serialization */
-static pthread_mutex_t thread_accept_mutex = PTHREAD_MUTEX_INITIALIZER;
-static ap_lock_t *process_accept_mutex;
-static char *lock_fname;
+static apr_lock_t *accept_mutex;
+static const char *lock_fname;
#ifdef NO_SERIALIZED_ACCEPT
#define SAFE_ACCEPT(stmt) APR_SUCCESS
#define SAFE_ACCEPT(stmt) (stmt)
#endif
-API_EXPORT(const server_rec *) ap_get_server_conf(void)
-{
- return (ap_server_conf);
-}
-
-API_EXPORT(int) ap_get_max_daemons(void)
+AP_DECLARE(int) ap_get_max_daemons(void)
{
return ap_max_daemons_limit;
}
void clean_child_exit(int code)
{
if (pchild) {
- ap_destroy_pool(pchild);
+ apr_pool_destroy(pchild);
}
exit(code);
}
static void sig_coredump(int sig)
{
chdir(ap_coredump_dir);
- ap_signal(sig, SIG_DFL);
+ apr_signal(sig, SIG_DFL);
kill(ap_my_pid, sig);
/* At this point we've got sig blocked, because we're still inside
* the signal handler. When we leave the signal handler it will
* child to force an exit) and so do an exit anyway.
*/
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
{
if (shutdown_pending == 1) {
/* Um, is this _probably_ not an error, if the user has
}
/* do a graceful restart if graceful == 1 */
-void ap_start_restart(int graceful)
+static void ap_start_restart(int graceful)
{
if (restart_pending == 1) {
}
restart_pending = 1;
is_graceful = graceful;
+ if (is_graceful) {
+ apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
+ }
}
static void sig_term(int sig)
ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "sigaction(SIGWINCH)");
#else
if (!one_process) {
- ap_signal(SIGSEGV, sig_coredump);
+ apr_signal(SIGSEGV, sig_coredump);
#ifdef SIGBUS
- ap_signal(SIGBUS, sig_coredump);
+ apr_signal(SIGBUS, sig_coredump);
#endif /* SIGBUS */
#ifdef SIGABORT
- ap_signal(SIGABORT, sig_coredump);
+ apr_signal(SIGABORT, sig_coredump);
#endif /* SIGABORT */
#ifdef SIGABRT
- ap_signal(SIGABRT, sig_coredump);
+ apr_signal(SIGABRT, sig_coredump);
#endif /* SIGABRT */
#ifdef SIGILL
- ap_signal(SIGILL, sig_coredump);
+ apr_signal(SIGILL, sig_coredump);
#endif /* SIGILL */
#ifdef SIGXCPU
- ap_signal(SIGXCPU, SIG_DFL);
+ apr_signal(SIGXCPU, SIG_DFL);
#endif /* SIGXCPU */
#ifdef SIGXFSZ
- ap_signal(SIGXFSZ, SIG_DFL);
+ apr_signal(SIGXFSZ, SIG_DFL);
#endif /* SIGXFSZ */
}
- ap_signal(SIGTERM, sig_term);
+ apr_signal(SIGTERM, sig_term);
#ifdef SIGHUP
- ap_signal(SIGHUP, restart);
+ apr_signal(SIGHUP, restart);
#endif /* SIGHUP */
#ifdef SIGWINCH
- ap_signal(SIGWINCH, restart);
+ apr_signal(SIGWINCH, restart);
#endif /* SIGWINCH */
#ifdef SIGPIPE
- ap_signal(SIGPIPE, SIG_IGN);
+ apr_signal(SIGPIPE, SIG_IGN);
#endif /* SIGPIPE */
#endif
}
-static void process_child_status(ap_proc_t *pid, ap_wait_t status)
-{
- /* Child died... if it died due to a fatal error,
- * we should simply bail out.
- */
- if ((WIFEXITED(status)) &&
- WEXITSTATUS(status) == APEXIT_CHILDFATAL) {
- ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, 0, ap_server_conf,
- "Child %ld returned a Fatal error... \n"
- "Apache is exiting!",
- (long)pid->pid);
- exit(APEXIT_CHILDFATAL);
- }
- if (WIFSIGNALED(status)) {
- switch (WTERMSIG(status)) {
- case SIGTERM:
- case SIGHUP:
- case SIGUSR1:
- case SIGKILL:
- break;
- default:
-#ifdef SYS_SIGLIST
-#ifdef WCOREDUMP
- if (WCOREDUMP(status)) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
- 0, ap_server_conf,
- "child pid %ld exit signal %s (%d), "
- "possible coredump in %s",
- (long)pid->pid, (WTERMSIG(status) >= NumSIG) ? "" :
- SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status),
- ap_coredump_dir);
- }
- else {
-#endif
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
- 0, ap_server_conf,
- "child pid %ld exit signal %s (%d)",
- (long)pid->pid,
- SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status));
-#ifdef WCOREDUMP
- }
-#endif
-#else
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
- ap_server_conf,
- "child pid %ld exit signal %d",
- (long)pid->pid, WTERMSIG(status));
-#endif
- }
- }
-}
-
-static int setup_listeners(server_rec *s)
-{
- ap_listen_rec *lr;
- int num_listeners = 0;
- if (ap_listen_open(s->process, s->port)) {
- return 0;
- }
- for (lr = ap_listeners; lr; lr = lr->next) {
- num_listeners++;
- }
- return num_listeners;
-}
-
/*****************************************************************
* Here follows a long bunch of generic server bookkeeping stuff...
*/
-#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
-static void sock_disable_nagle(int s)
-{
- /* The Nagle algorithm says that we should delay sending partial
- * packets in hopes of getting more data. We don't want to do
- * this; we are not telnet. There are bad interactions between
- * persistent connections and Nagle's algorithm that have very severe
- * performance penalties. (Failing to disable Nagle is not much of a
- * problem with simple HTTP.)
- *
- * In spite of these problems, failure here is not a shooting offense.
- */
- int just_say_no = 1;
-
- if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &just_say_no,
- sizeof(int)) < 0) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
- "setsockopt: (TCP_NODELAY)");
- }
-}
-
-#else
-#define sock_disable_nagle(s) /* NOOP */
-#endif
-
int ap_graceful_stop_signalled(void)
{
/* XXX - Does this really work? - Manoj */
* Child process main loop.
*/
-static void process_socket(ap_pool_t *p, ap_socket_t *sock, int my_child_num, int my_thread_num)
+static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num, int my_thread_num)
{
- BUFF *conn_io;
conn_rec *current_conn;
- ap_iol *iol;
- long conn_id = my_child_num * HARD_THREAD_LIMIT + my_thread_num;
+ long conn_id = AP_ID_FROM_CHILD_THREAD(my_child_num, my_thread_num);
int csd;
- (void) ap_get_os_sock(&csd, sock);
+ (void) apr_os_sock_get(&csd, sock);
- sock_disable_nagle(csd);
-
- iol = unix_attach_socket(sock);
- if (iol == NULL) {
- if (errno == EBADF) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,
- "filedescriptor (%u) larger than FD_SETSIZE (%u) "
- "found, you probably need to rebuild Apache with a "
- "larger FD_SETSIZE", csd, FD_SETSIZE);
- }
- else {
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, NULL,
- "error attaching to socket");
- }
- ap_close_socket(sock);
- return;
+ if (csd >= FD_SETSIZE) {
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,
+ "new file descriptor %d is too large; you probably need "
+ "to rebuild Apache with a larger FD_SETSIZE "
+ "(currently %d)",
+ csd, FD_SETSIZE);
+ apr_socket_close(sock);
+ return;
}
+ ap_sock_disable_nagle(sock);
+
(void) ap_update_child_status(my_child_num, my_thread_num,
SERVER_BUSY_READ, (request_rec *) NULL);
- conn_io = ap_bcreate(p, B_RDWR);
- ap_bpush_iol(conn_io, iol);
- current_conn = ap_new_apr_connection(p, ap_server_conf, conn_io, sock,
- conn_id);
-
- ap_process_connection(current_conn);
- ap_lingering_close(current_conn);
+ current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
+ if (current_conn) {
+ ap_process_connection(current_conn);
+ ap_lingering_close(current_conn);
+ }
}
/* Sets workers_may_exit if we received a character on the pipe_of_death */
static void check_pipe_of_death(void)
{
pthread_mutex_lock(&pipe_of_death_mutex);
if (!workers_may_exit) {
- ap_status_t ret;
+ apr_status_t ret;
char pipe_read_char;
- int n=1;
+ apr_size_t n = 1;
- ret = ap_recv(listensocks[0], &pipe_read_char, &n);
- if (ap_canonical_error(ret) == APR_EAGAIN) {
+ ret = apr_recv(listensocks[0], &pipe_read_char, &n);
+ if (APR_STATUS_IS_EAGAIN(ret)) {
/* It lost the lottery. It must continue to suffer
* through a life of servitude. */
}
proc_info * ti = dummy;
int process_slot = ti->pid;
int thread_slot = ti->tid;
- ap_pool_t *tpool = ti->tpool;
- ap_socket_t *csd = NULL;
- ap_pool_t *ptrans; /* Pool for per-transaction stuff */
- ap_socket_t *sd = NULL;
+ 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;
- ap_pollfd_t *pollset;
- ap_status_t rv;
+ apr_pollfd_t *pollset;
+ apr_status_t rv;
free(ti);
- ap_create_pool(&ptrans, tpool);
+ apr_pool_create(&ptrans, tpool);
pthread_mutex_lock(&worker_thread_count_mutex);
worker_thread_count++;
pthread_mutex_unlock(&worker_thread_count_mutex);
- ap_setup_poll(&pollset, num_listensocks+1, tpool);
+ apr_poll_setup(&pollset, num_listensocks+1, tpool);
for(n=0 ; n <= num_listensocks ; ++n)
- ap_add_poll_socket(pollset, listensocks[n], APR_POLLIN);
+ apr_poll_socket_add(pollset, listensocks[n], APR_POLLIN);
/* TODO: Switch to a system where threads reuse the results from earlier
poll calls - manoj */
- while (!workers_may_exit) {
+ while (1) {
workers_may_exit |= (ap_max_requests_per_child != 0) && (requests_this_child <= 0);
if (workers_may_exit) break;
(void) ap_update_child_status(process_slot, thread_slot, SERVER_READY,
(request_rec *) NULL);
- pthread_mutex_lock(&thread_accept_mutex);
- if (workers_may_exit) {
- pthread_mutex_unlock(&thread_accept_mutex);
- break;
- }
- if ((rv = SAFE_ACCEPT(ap_lock(process_accept_mutex)))
+ if ((rv = SAFE_ACCEPT(apr_lock_aquire(accept_mutex)))
!= APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
- "ap_lock failed. Attempting to shutdown "
+ "apr_lock_aquire failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
while (!workers_may_exit) {
- ap_status_t ret;
- ap_int16_t event;
+ apr_status_t ret;
+ apr_int16_t event;
- ret = ap_poll(pollset, &n, -1);
+ ret = apr_poll(pollset, &n, -1);
if (ret != APR_SUCCESS) {
- if (ret == APR_EINTR) {
+ if (APR_STATUS_IS_EINTR(ret)) {
continue;
}
- /* poll() will only return errors in catastrophic
+ /* apr_poll() will only return errors in catastrophic
* circumstances. Let's try exiting gracefully, for now. */
- ap_log_error(APLOG_MARK, APLOG_ERR, errno, (const server_rec *)
- ap_get_server_conf(), "poll: (listen)");
+ ap_log_error(APLOG_MARK, APLOG_ERR, ret, (const server_rec *)
+ ap_server_conf, "apr_poll: (listen)");
workers_may_exit = 1;
}
if (workers_may_exit) break;
- ap_get_revents(&event, listensocks[0], pollset);
+ apr_poll_revents_get(&event, listensocks[0], pollset);
if (event & APR_POLLIN) {
/* A process got a signal on the shutdown pipe. Check if we're
* the lucky process to die. */
curr_pollfd = 1;
}
/* XXX: Should we check for POLLERR? */
- ap_get_revents(&event, listensocks[curr_pollfd], pollset);
+ apr_poll_revents_get(&event, listensocks[curr_pollfd], pollset);
if (event & APR_POLLIN) {
last_pollfd = curr_pollfd;
sd=listensocks[curr_pollfd];
}
got_fd:
if (!workers_may_exit) {
- ap_accept(&csd, sd, ptrans);
- if ((rv = SAFE_ACCEPT(ap_unlock(process_accept_mutex)))
+ if ((rv = apr_accept(&csd, sd, ptrans)) != APR_SUCCESS) {
+ csd = NULL;
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
+ "apr_accept");
+ }
+ if ((rv = SAFE_ACCEPT(apr_lock_release(accept_mutex)))
!= APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
- "ap_unlock failed. Attempting to shutdown "
+ "apr_lock_release failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
- pthread_mutex_unlock(&thread_accept_mutex);
- process_socket(ptrans, csd, process_slot, thread_slot);
- requests_this_child--;
+ if (csd != NULL) {
+ process_socket(ptrans, csd, process_slot, thread_slot);
+ requests_this_child--;
+ }
}
else {
- if ((rv = SAFE_ACCEPT(ap_unlock(process_accept_mutex)))
+ if ((rv = SAFE_ACCEPT(apr_lock_release(accept_mutex)))
!= APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
- "ap_unlock failed. Attempting to shutdown "
+ "apr_lock_release failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
- pthread_mutex_unlock(&thread_accept_mutex);
break;
}
- ap_clear_pool(ptrans);
+ apr_clear_pool(ptrans);
}
- ap_destroy_pool(tpool);
+ apr_pool_destroy(tpool);
ap_update_child_status(process_slot, thread_slot, SERVER_DEAD,
(request_rec *) NULL);
pthread_mutex_lock(&worker_thread_count_mutex);
int my_child_num = child_num_arg;
proc_info *my_info = NULL;
ap_listen_rec *lr;
- ap_status_t rv;
+ apr_status_t rv;
ap_my_pid = getpid();
- ap_create_pool(&pchild, pconf);
+ apr_pool_create(&pchild, pconf);
/*stuff to do before we switch id's, so we have permissions.*/
reopen_scoreboard(pchild);
- rv = SAFE_ACCEPT(ap_child_init_lock(&process_accept_mutex, lock_fname,
+ rv = SAFE_ACCEPT(apr_lock_child_init(&accept_mutex, lock_fname,
pchild));
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf, "sigprocmask");
}
#else
- if (pthread_sigmask(SIG_SETMASK, &sig_mask, NULL) != 0) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf, "pthread_sigmask");
+ if ((rv = pthread_sigmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
+#ifdef PTHREAD_SETS_ERRNO
+ rv = errno;
+#endif
+ ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "pthread_sigmask");
}
#endif
requests_this_child = ap_max_requests_per_child;
/* Set up the pollfd array */
- listensocks = ap_palloc(pchild,
+ listensocks = apr_pcalloc(pchild,
sizeof(*listensocks) * (num_listensocks + 1));
- ap_create_tcp_socket(&listensocks[0], pchild);
- ap_put_os_sock(&listensocks[0], &pipe_of_death[0], pchild);
+#if APR_FILES_AS_SOCKETS
+ apr_socket_from_file(&listensocks[0], pipe_of_death_in);
+#endif
for (lr = ap_listeners, i = 1; i <= num_listensocks; lr = lr->next, ++i)
listensocks[i]=lr->sd;
my_info->pid = my_child_num;
my_info->tid = i;
my_info->sd = 0;
- ap_create_pool(&my_info->tpool, pchild);
+ apr_pool_create(&my_info->tpool, pchild);
/* We are creating threads right now */
(void) ap_update_child_status(my_child_num, i, SERVER_STARTING,
(request_rec *) NULL);
#ifndef NO_THREADS
- if (pthread_create(&thread, &thread_attr, worker_thread, my_info)) {
- ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf,
+ if ((rv = pthread_create(&thread, &thread_attr, worker_thread, my_info))) {
+#ifdef PTHREAD_SETS_ERRNO
+ rv = errno;
+#endif
+ ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf,
"pthread_create: unable to create worker thread");
/* In case system resources are maxxed out, we don't want
Apache running away with the CPU trying to fork over and
}
}
-static int make_child(server_rec *s, int slot, time_t now)
+static int make_child(server_rec *s, int slot)
{
int pid;
int status = bindprocessor(BINDPROCESS, (int)getpid(),
PROCESSOR_CLASS_ANY);
if (status != OK)
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, ap_server_conf,
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, errno, ap_server_conf,
"processor unbind failed %d", status);
#endif
RAISE_SIGSTOP(MAKE_CHILD);
- ap_signal(SIGTERM, just_die);
+ apr_signal(SIGTERM, just_die);
child_main(slot);
return 0;
if (ap_scoreboard_image->parent[i].pid != 0) {
continue;
}
- if (make_child(ap_server_conf, i, 0) < 0) {
+ if (make_child(ap_server_conf, i) < 0) {
break;
}
--number_to_start;
{
int i, j;
int idle_thread_count;
- thread_score *ss;
- time_t now = 0;
+ short_score *ss;
int free_length;
int free_slots[MAX_SPAWN_RATE];
int last_non_dead;
int total_non_dead;
+ apr_size_t one = 1;
+ apr_status_t rv;
/* initialize the free_list */
free_length = 0;
if (idle_thread_count > max_spare_threads) {
/* Kill off one child */
char char_of_death = '!';
- if (write(pipe_of_death[1], &char_of_death, 1) == -1) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "write pipe_of_death");
+ if ((rv = apr_file_write(pipe_of_death_out, &char_of_death, &one)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, "write pipe_of_death");
}
idle_spawn_rate = 1;
}
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, ap_server_conf,
"server seems busy, (you may need "
"to increase StartServers, ThreadsPerChild "
- "or Min/MaxSparetThreads), "
+ "or Min/MaxSpareThreads), "
"spawning %d children, there are around %d idle "
"threads, and %d total children", idle_spawn_rate,
idle_thread_count, total_non_dead);
}
for (i = 0; i < free_length; ++i) {
- make_child(ap_server_conf, free_slots[i], now);
+ make_child(ap_server_conf, free_slots[i]);
}
/* the next time around we want to spawn twice as many if this
* wasn't good enough, but not if we've just done a graceful
static void server_main_loop(int remaining_children_to_start)
{
int child_slot;
- ap_wait_t status;
- ap_proc_t pid;
+ apr_wait_t status;
+ apr_proc_t pid;
int i;
while (!restart_pending && !shutdown_pending) {
ap_wait_or_timeout(&status, &pid, pconf);
if (pid.pid != -1) {
- process_child_status(&pid, status);
+ ap_process_child_status(&pid, status);
/* non-fatal death... note that it's gone in the scoreboard. */
child_slot = find_child_by_pid(&pid);
if (child_slot >= 0) {
- ap_mpmt_pthread_force_reset_connection_status(child_slot);
for (i = 0; i < ap_threads_per_child; i++)
ap_update_child_status(child_slot, i, SERVER_DEAD, (request_rec *) NULL);
/* we're still doing a 1-for-1 replacement of dead
* children with new children
*/
- make_child(ap_server_conf, child_slot, time(NULL));
+ make_child(ap_server_conf, child_slot);
--remaining_children_to_start;
}
-#ifdef APR_HAS_OTHER_CHILD
+#if APR_HAS_OTHER_CHILD
}
- else if (ap_reap_other_child(&pid, status) == 0) {
+ else if (apr_proc_other_child_read(&pid, status) == 0) {
/* handled */
#endif
}
}
}
-int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
+int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
{
int remaining_children_to_start;
- ap_status_t rv;
+ apr_status_t rv;
+ apr_size_t one = 1;
pconf = _pconf;
ap_server_conf = s;
- if (pipe(pipe_of_death) == -1) {
- ap_log_error(APLOG_MARK, APLOG_ERR, errno,
+ rv = apr_file_pipe_create(&pipe_of_death_in, &pipe_of_death_out, pconf);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv,
(const server_rec*) ap_server_conf,
- "pipe: (pipe_of_death)");
+ "apr_file_pipe_create (pipe_of_death)");
exit(1);
}
- if (fcntl(pipe_of_death[0], F_SETFL, O_NONBLOCK) == -1) {
- ap_log_error(APLOG_MARK, APLOG_ERR, errno,
+ if ((rv = apr_file_pipe_timeout_set(pipe_of_death_in, 0)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv,
(const server_rec*) ap_server_conf,
- "fcntl: O_NONBLOCKing (pipe_of_death)");
+ "apr_file_pipe_timeout_set (pipe_of_death)");
exit(1);
}
ap_server_conf = s;
- if ((num_listensocks = setup_listeners(ap_server_conf)) < 1) {
+ if ((num_listensocks = ap_setup_listeners(ap_server_conf)) < 1) {
/* XXX: hey, what's the right way for the mpm to indicate a fatal error? */
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, 0, s,
"no listening sockets available, shutting down");
ap_log_pid(pconf, ap_pid_fname);
/* Initialize cross-process accept lock */
- lock_fname = ap_psprintf(_pconf, "%s.%lu",
+ lock_fname = apr_psprintf(_pconf, "%s.%u",
ap_server_root_relative(_pconf, lock_fname),
ap_my_pid);
- rv = ap_create_lock(&process_accept_mutex, APR_MUTEX, APR_CROSS_PROCESS,
+ rv = apr_lock_create(&accept_mutex, APR_MUTEX, APR_LOCKALL,
lock_fname, _pconf);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
- "Couldn't create cross-process lock");
+ "Couldn't create accept lock");
return 1;
}
if (!is_graceful) {
- reinit_scoreboard(pconf);
+ ap_create_scoreboard(pconf, SB_SHARED);
}
set_signals();
}
/* we've been told to restart */
- ap_signal(SIGHUP, SIG_IGN);
+ apr_signal(SIGHUP, SIG_IGN);
if (one_process) {
/* not worth thinking about */
/* give the children the signal to die */
for (i = 0; i < ap_daemons_limit;) {
- if (write(pipe_of_death[1], &char_of_death, 1) == -1) {
- if (errno == EINTR) continue;
- ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, "write pipe_of_death");
+ if ((rv = apr_file_write(pipe_of_death_in, &char_of_death, &one)) != APR_SUCCESS) {
+ if (APR_STATUS_IS_EINTR(rv)) continue;
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, "write pipe_of_death");
}
i++;
}
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,
"SIGHUP received. Attempting to restart");
}
- if (!is_graceful) {
- ap_restart_time = time(NULL);
- }
return 0;
}
-static void mpmt_pthread_pre_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp)
+static void mpmt_pthread_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
{
static int restart_num = 0;
+ int no_detach = 0;
- one_process = !!getenv("ONE_PROCESS");
+ one_process = !!ap_exists_config_define("ONE_PROCESS");
+ no_detach = !!ap_exists_config_define("NO_DETACH");
/* sigh, want this only the second time around */
if (restart_num++ == 1) {
is_graceful = 0;
- if (!one_process) {
- unixd_detach();
+ if (!one_process && !no_detach) {
+ apr_proc_detach();
}
ap_my_pid = getpid();
}
- unixd_pre_config();
+ unixd_pre_config(ptemp);
ap_listen_pre_config();
ap_daemons_to_start = DEFAULT_START_DAEMON;
min_spare_threads = DEFAULT_MIN_FREE_DAEMON * DEFAULT_THREADS_PER_CHILD;
ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
ap_extended_status = 0;
- ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
+ apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
}
-static void mpmt_pthread_hooks(void)
+static void mpmt_pthread_hooks(apr_pool_t *p)
{
INIT_SIGLIST()
one_process = 0;
- ap_hook_pre_config(mpmt_pthread_pre_config, NULL, NULL, AP_HOOK_MIDDLE);
+ ap_hook_pre_config(mpmt_pthread_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
}
-static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_pidfile(cmd_parms *cmd, void *dummy, const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_scoreboard(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_scoreboard(cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_lockfile(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_lockfile(cmd_parms *cmd, void *dummy, const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_daemons_to_start(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_daemons_to_start(cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_min_spare_threads(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_min_spare_threads(cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_max_spare_threads(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_max_spare_threads(cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_server_limit (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_server_limit (cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
" lowering MaxClients to %d. To increase, please "
"see the", HARD_SERVER_LIMIT);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
- " HARD_SERVER_LIMIT define in src/include/httpd.h.");
+ " HARD_SERVER_LIMIT define in %s.",
+ AP_MPM_HARD_LIMITS_FILE);
ap_daemons_limit = HARD_SERVER_LIMIT;
}
else if (ap_daemons_limit < 1) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "WARNING: Require MaxClients > 0, setting to 1\n");
+ ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "WARNING: Require MaxClients > 0, setting to 1");
ap_daemons_limit = 1;
}
return NULL;
}
-static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_threads_per_child (cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
HARD_THREAD_LIMIT);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
" lowering ThreadsPerChild to %d. To increase, please"
- "see the", HARD_THREAD_LIMIT);
+ " see the", HARD_THREAD_LIMIT);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
- " HARD_THREAD_LIMIT define in src/include/httpd.h.");
+ " HARD_THREAD_LIMIT define in %s.",
+ AP_MPM_HARD_LIMITS_FILE);
}
else if (ap_threads_per_child < 1) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
return NULL;
}
-static const char *set_max_requests(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_max_requests(cmd_parms *cmd, void *dummy,
+ const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return NULL;
}
-static const char *set_coredumpdir (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_coredumpdir (cmd_parms *cmd, void *dummy,
+ const char *arg)
{
- struct ap_finfo_t finfo;
+ apr_finfo_t finfo;
const char *fname;
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
}
fname = ap_server_root_relative(cmd->pool, arg);
- if ((ap_stat(&finfo, fname, cmd->pool) != APR_SUCCESS) ||
- (finfo.filetype != APR_DIR)) {
- return ap_pstrcat(cmd->pool, "CoreDumpDirectory ", fname,
+ if ((apr_stat(&finfo, fname, APR_FINFO_TYPE, cmd->pool) != APR_SUCCESS)
+ || (finfo.filetype != APR_DIR)) {
+ return apr_pstrcat(cmd->pool, "CoreDumpDirectory ", fname,
" does not exist or is not a directory", NULL);
}
- ap_cpystrn(ap_coredump_dir, fname, sizeof(ap_coredump_dir));
+ apr_cpystrn(ap_coredump_dir, fname, sizeof(ap_coredump_dir));
return NULL;
}
static const command_rec mpmt_pthread_cmds[] = {
UNIX_DAEMON_COMMANDS
LISTEN_COMMANDS
-{ "PidFile", set_pidfile, NULL, RSRC_CONF, TAKE1,
- "A file for logging the server process ID"},
-{ "ScoreBoardFile", set_scoreboard, NULL, RSRC_CONF, TAKE1,
- "A file for Apache to maintain runtime process management information"},
-{ "LockFile", set_lockfile, NULL, RSRC_CONF, TAKE1,
- "The lockfile used when Apache needs to lock the accept() call"},
-{ "StartServers", set_daemons_to_start, NULL, RSRC_CONF, TAKE1,
- "Number of child processes launched at server startup" },
-{ "MinSpareThreads", set_min_spare_threads, NULL, RSRC_CONF, TAKE1,
- "Minimum number of idle children, to handle request spikes" },
-{ "MaxSpareThreads", set_max_spare_threads, NULL, RSRC_CONF, TAKE1,
- "Maximum number of idle children" },
-{ "MaxClients", set_server_limit, NULL, RSRC_CONF, TAKE1,
- "Maximum number of children alive at the same time" },
-{ "ThreadsPerChild", set_threads_per_child, NULL, RSRC_CONF, TAKE1,
- "Number of threads each child creates" },
-{ "MaxRequestsPerChild", set_max_requests, NULL, RSRC_CONF, TAKE1,
- "Maximum number of requests a particular child serves before dying." },
-{ "CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF, TAKE1,
- "The location of the directory Apache changes to before dumping core" },
+AP_INIT_TAKE1("PidFile", set_pidfile, NULL, RSRC_CONF,
+ "A file for logging the server process ID"),
+AP_INIT_TAKE1("ScoreBoardFile", set_scoreboard, NULL, RSRC_CONF,
+ "A file for Apache to maintain runtime process management information"),
+AP_INIT_TAKE1("LockFile", set_lockfile, NULL, RSRC_CONF,
+ "The lockfile used when Apache needs to lock the accept() call"),
+AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF,
+ "Number of child processes launched at server startup"),
+AP_INIT_TAKE1("MinSpareThreads", set_min_spare_threads, NULL, RSRC_CONF,
+ "Minimum number of idle children, to handle request spikes"),
+AP_INIT_TAKE1("MaxSpareThreads", set_max_spare_threads, NULL, RSRC_CONF,
+ "Maximum number of idle children"),
+AP_INIT_TAKE1("MaxClients", set_server_limit, NULL, RSRC_CONF,
+ "Maximum number of children alive at the same time"),
+AP_INIT_TAKE1("ThreadsPerChild", set_threads_per_child, NULL, RSRC_CONF,
+ "Number of threads each child creates"),
+AP_INIT_TAKE1("MaxRequestsPerChild", set_max_requests, NULL, RSRC_CONF,
+ "Maximum number of requests a particular child serves before dying."),
+AP_INIT_TAKE1("CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF,
+ "The location of the directory Apache changes to before dumping core"),
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
+module AP_MODULE_DECLARE_DATA mpm_mpmt_pthread_module = {
MPM20_MODULE_STUFF,
NULL, /* hook to run before apache parses args */
NULL, /* create per-directory config structure */
NULL, /* merge per-directory config structures */
NULL, /* create per-server config structure */
NULL, /* merge per-server config structures */
- mpmt_pthread_cmds, /* command ap_table_t */
- NULL, /* handlers */
+ mpmt_pthread_cmds, /* command apr_table_t */
mpmt_pthread_hooks /* register_hooks */
};
projects / apache / blobdiff