* University of Illinois, Urbana-Champaign.
*/
-#define CORE_PRIVATE
-
+#include "apr.h"
#include "apr_portable.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 "ap_iol.h"
#include "ap_listen.h"
#include "scoreboard.h"
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
+
#include <pthread.h>
#include <signal.h>
int ap_threads_per_child=0; /* Worker threads per child */
int ap_max_requests_per_child=0;
static const char *ap_pid_fname=NULL;
-API_VAR_EXPORT const char *ap_scoreboard_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 pthread_mutex_t worker_thread_count_mutex;
/* Locks for accept serialization */
-static pthread_mutex_t thread_accept_mutex = PTHREAD_MUTEX_INITIALIZER;
-static apr_lock_t *process_accept_mutex;
+static apr_lock_t *accept_mutex;
static const char *lock_fname;
#ifdef NO_SERIALIZED_ACCEPT
#define SAFE_ACCEPT(stmt) (stmt)
#endif
-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) {
- apr_destroy_pool(pchild);
+ apr_pool_destroy(pchild);
}
exit(code);
}
* 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
restart_pending = 1;
is_graceful = graceful;
if (is_graceful) {
- apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);
+ apr_pool_cleanup_kill(pconf, NULL, ap_cleanup_scoreboard);
}
}
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) apr_get_os_sock(&csd, sock);
+ (void) apr_os_sock_get(&csd, sock);
if (csd >= FD_SETSIZE) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,
"to rebuild Apache with a larger FD_SETSIZE "
"(currently %d)",
csd, FD_SETSIZE);
- apr_close_socket(sock);
+ apr_socket_close(sock);
return;
}
- ap_sock_disable_nagle(csd);
-
- iol = ap_iol_attach_socket(p, sock);
+ 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)
if (!workers_may_exit) {
apr_status_t ret;
char pipe_read_char;
- apr_ssize_t n = 1;
+ apr_size_t n = 1;
ret = apr_recv(listensocks[0], &pipe_read_char, &n);
- if (apr_canonical_error(ret) == APR_EAGAIN) {
+ if (APR_STATUS_IS_EAGAIN(ret)) {
/* It lost the lottery. It must continue to suffer
* through a life of servitude. */
}
free(ti);
- apr_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);
- apr_setup_poll(&pollset, num_listensocks+1, tpool);
+ apr_poll_setup(&pollset, num_listensocks+1, tpool);
for(n=0 ; n <= num_listensocks ; ++n)
- apr_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(apr_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,
- "apr_lock failed. Attempting to shutdown "
+ "apr_lock_aquire failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
ret = apr_poll(pollset, &n, -1);
if (ret != APR_SUCCESS) {
- if (apr_canonical_error(ret) == APR_EINTR) {
+ if (APR_STATUS_IS_EINTR(ret)) {
continue;
}
if (workers_may_exit) break;
- apr_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? */
- apr_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];
ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
"apr_accept");
}
- if ((rv = SAFE_ACCEPT(apr_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,
- "apr_unlock failed. Attempting to shutdown "
+ "apr_lock_release failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
- pthread_mutex_unlock(&thread_accept_mutex);
if (csd != NULL) {
process_socket(ptrans, csd, process_slot, thread_slot);
requests_this_child--;
}
}
else {
- if ((rv = SAFE_ACCEPT(apr_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,
- "apr_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;
}
apr_clear_pool(ptrans);
}
- apr_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);
ap_my_pid = getpid();
- apr_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(apr_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,
my_info->pid = my_child_num;
my_info->tid = i;
my_info->sd = 0;
- apr_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,
}
}
-static int make_child(server_rec *s, int slot, time_t now)
+static int make_child(server_rec *s, int slot)
{
int pid;
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_ssize_t one = 1;
+ apr_size_t one = 1;
apr_status_t rv;
/* initialize the free_list */
if (idle_thread_count > max_spare_threads) {
/* Kill off one child */
char char_of_death = '!';
- if ((rv = apr_write(pipe_of_death_out, &char_of_death, &one)) != APR_SUCCESS) {
+ 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;
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;
+ apr_wait_t status;
apr_proc_t pid;
int i;
/* 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;
}
#if APR_HAS_OTHER_CHILD
}
- else if (apr_reap_other_child(&pid, status) == 0) {
+ else if (apr_proc_other_child_read(&pid, status) == 0) {
/* handled */
#endif
}
{
int remaining_children_to_start;
apr_status_t rv;
- apr_ssize_t one = 1;
+ apr_size_t one = 1;
pconf = _pconf;
ap_server_conf = s;
- rv = apr_create_pipe(&pipe_of_death_in, &pipe_of_death_out, pconf);
+ 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,
- "apr_create_pipe (pipe_of_death)");
+ "apr_file_pipe_create (pipe_of_death)");
exit(1);
}
- if ((rv = apr_set_pipe_timeout(pipe_of_death_in, 0)) != APR_SUCCESS) {
+ 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,
- "apr_set_pipe_timeout (pipe_of_death)");
+ "apr_file_pipe_timeout_set (pipe_of_death)");
exit(1);
}
ap_server_conf = s;
lock_fname = apr_psprintf(_pconf, "%s.%u",
ap_server_root_relative(_pconf, lock_fname),
ap_my_pid);
- rv = apr_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();
/* give the children the signal to die */
for (i = 0; i < ap_daemons_limit;) {
- if ((rv = apr_write(pipe_of_death_in, &char_of_death, &one)) != APR_SUCCESS) {
- if (apr_canonical_error(rv) == APR_EINTR) continue;
+ 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 int restart_num = 0;
int no_detach = 0;
- one_process = !!getenv("ONE_PROCESS");
- no_detach = !!getenv("NO_DETACH");
+ 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 && !no_detach) {
- apr_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;
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);
}
}
fname = ap_server_root_relative(cmd->pool, arg);
- if ((apr_stat(&finfo, fname, cmd->pool) != APR_SUCCESS) ||
- (finfo.filetype != APR_DIR)) {
+ 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);
}
{ 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, /* create per-server config structure */
NULL, /* merge per-server config structures */
mpmt_pthread_cmds, /* command apr_table_t */
- NULL, /* handlers */
mpmt_pthread_hooks /* register_hooks */
};
projects / apache / blobdiff