You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2015/03/04 18:17:53 UTC
svn commit: r1664077 - in /httpd/httpd/trunk/server/mpm: config2.m4
eventopt/ motorz/ motorz/MOTORZ.README motorz/Makefile.in motorz/config.m4
motorz/config3.m4 motorz/modules.mk motorz/motorz.c motorz/mpm_default.h
Author: jim
Date: Wed Mar 4 17:17:53 2015
New Revision: 1664077
URL: http://svn.apache.org/r1664077
Log:
We no longer need eventopt.
And might as well be a good time to add motorz in to trunk
Added:
httpd/httpd/trunk/server/mpm/motorz/
httpd/httpd/trunk/server/mpm/motorz/MOTORZ.README
httpd/httpd/trunk/server/mpm/motorz/Makefile.in
httpd/httpd/trunk/server/mpm/motorz/config.m4
httpd/httpd/trunk/server/mpm/motorz/config3.m4
httpd/httpd/trunk/server/mpm/motorz/modules.mk
httpd/httpd/trunk/server/mpm/motorz/motorz.c
httpd/httpd/trunk/server/mpm/motorz/mpm_default.h
Removed:
httpd/httpd/trunk/server/mpm/eventopt/
Modified:
httpd/httpd/trunk/server/mpm/config2.m4
Modified: httpd/httpd/trunk/server/mpm/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/config2.m4?rev=1664077&r1=1664076&r2=1664077&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/config2.m4 (original)
+++ httpd/httpd/trunk/server/mpm/config2.m4 Wed Mar 4 17:17:53 2015
@@ -1,7 +1,7 @@
AC_MSG_CHECKING(which MPM to use by default)
AC_ARG_WITH(mpm,
APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use by default.
- MPM={simple|eventopt|event|worker|prefork|winnt}
+ MPM={simple|motorz|event|worker|prefork|winnt}
This will be statically linked as the only available MPM unless
--enable-mpms-shared is also specified.
),[
Added: httpd/httpd/trunk/server/mpm/motorz/MOTORZ.README
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/MOTORZ.README?rev=1664077&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/MOTORZ.README (added)
+++ httpd/httpd/trunk/server/mpm/motorz/MOTORZ.README Wed Mar 4 17:17:53 2015
@@ -0,0 +1,10 @@
+The MotorZ MPM aims to create a single MPM, that runs on all modern
+Unix and Win32 platforms, by levering APR as much as possible.
+
+The MoteZ MPM uses an APR Poll CB event system, with timers being
+built in. When an event, either an I/O or Timer is ready to run, it
+is pushed to any available thread in the current process. A simple
+APR Thread pool is used.
+
+MotorZ uses Prefork as the framework and Simple for the actual event
+structure.
Added: httpd/httpd/trunk/server/mpm/motorz/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/Makefile.in?rev=1664077&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/Makefile.in (added)
+++ httpd/httpd/trunk/server/mpm/motorz/Makefile.in Wed Mar 4 17:17:53 2015
@@ -0,0 +1 @@
+include $(top_srcdir)/build/special.mk
Added: httpd/httpd/trunk/server/mpm/motorz/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/config.m4?rev=1664077&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/config.m4 (added)
+++ httpd/httpd/trunk/server/mpm/motorz/config.m4 Wed Mar 4 17:17:53 2015
@@ -0,0 +1,11 @@
+AC_MSG_CHECKING(if motorz MPM supports this platform)
+if test $forking_mpms_supported != yes; then
+ AC_MSG_RESULT(no - This is not a forking platform)
+elif test $ac_cv_define_APR_HAS_THREADS != yes; then
+ AC_MSG_RESULT(no - APR does not support threads)
+elif test $have_threaded_sig_graceful != yes; then
+ AC_MSG_RESULT(no - SIG_GRACEFUL cannot be used with a threaded MPM)
+else
+ AC_MSG_RESULT(yes)
+ APACHE_MPM_SUPPORTED(motorz, yes, yes)
+fi
Added: httpd/httpd/trunk/server/mpm/motorz/config3.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/config3.m4?rev=1664077&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/config3.m4 (added)
+++ httpd/httpd/trunk/server/mpm/motorz/config3.m4 Wed Mar 4 17:17:53 2015
@@ -0,0 +1,11 @@
+APACHE_MPMPATH_INIT(motorz)
+
+dnl ## XXX - Need a more thorough check of the proper flags to use
+
+APACHE_SUBST(MOD_MPM_MOTORZ_LDADD)
+
+APACHE_MPM_MODULE(motorz, $enable_mpm_motorz, motorz.lo,[
+ AC_CHECK_FUNCS(pthread_kill)
+], , [\$(MOD_MPM_MOTORZ_LDADD)])
+
+APACHE_MPMPATH_FINISH
Added: httpd/httpd/trunk/server/mpm/motorz/modules.mk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/modules.mk?rev=1664077&view=auto
==============================================================================
(empty)
Added: httpd/httpd/trunk/server/mpm/motorz/motorz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/motorz.c?rev=1664077&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/motorz.c (added)
+++ httpd/httpd/trunk/server/mpm/motorz/motorz.c Wed Mar 4 17:17:53 2015
@@ -0,0 +1,1941 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr.h"
+#include "apr_portable.h"
+#include "apr_strings.h"
+#include "apr_thread_proc.h"
+#include "apr_signal.h"
+
+#define APR_WANT_STDIO
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include "ap_config.h"
+#include "httpd.h"
+#include "mpm_default.h"
+#include "http_main.h"
+#include "http_log.h"
+#include "http_config.h"
+#include "http_core.h" /* for get_remote_host */
+#include "http_connection.h"
+#include "scoreboard.h"
+#include "ap_mpm.h"
+#include "util_mutex.h"
+#include "unixd.h"
+#include "http_vhost.h"
+#include "mpm_common.h"
+#include "ap_listen.h"
+#include "ap_mmn.h"
+#include "apr_poll.h"
+#include "apr_skiplist.h"
+#include "apr_thread_pool.h"
+#include "util_time.h"
+
+#include <stdlib.h>
+
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#ifdef HAVE_SYS_PROCESSOR_H
+#include <sys/processor.h> /* for bindprocessor() */
+#endif
+
+#include <signal.h>
+#include <sys/times.h>
+
+/* Limit on the total --- clients will be locked out if more servers than
+ * this are needed. It is intended solely to keep the server from crashing
+ * when things get out of hand.
+ *
+ * We keep a hard maximum number of servers, for two reasons --- first off,
+ * in case something goes seriously wrong, we want to stop the fork bomb
+ * short of actually crashing the machine we're running on by filling some
+ * kernel table. Secondly, it keeps the size of the scoreboard file small
+ * enough that we can read the whole thing without worrying too much about
+ * the overhead.
+ */
+#ifndef DEFAULT_SERVER_LIMIT
+#define DEFAULT_SERVER_LIMIT 256
+#endif
+
+/* Admin can't tune ServerLimit beyond MAX_SERVER_LIMIT. We want
+ * some sort of compile-time limit to help catch typos.
+ */
+#ifndef MAX_SERVER_LIMIT
+#define MAX_SERVER_LIMIT 200000
+#endif
+
+/* Limit on the threads per process. Clients will be locked out if more than
+ * this are needed.
+ *
+ * We keep this for one reason it keeps the size of the scoreboard file small
+ * enough that we can read the whole thing without worrying too much about
+ * the overhead.
+ */
+#ifndef DEFAULT_THREAD_LIMIT
+#define DEFAULT_THREAD_LIMIT 64
+#endif
+
+/* Admin can't tune ThreadLimit beyond MAX_THREAD_LIMIT. We want
+ * some sort of compile-time limit to help catch typos.
+ */
+#ifndef MAX_THREAD_LIMIT
+#define MAX_THREAD_LIMIT 100000
+#endif
+
+/* config globals */
+
+static int threads_per_child = 0;
+static int ap_num_kids=0;
+static int ap_daemons_min_free=0;
+static int ap_daemons_max_free=0;
+static int ap_daemons_limit=0; /* MaxRequestWorkers */
+static int server_limit = 0;
+static int mpm_state = AP_MPMQ_STARTING;
+
+/* data retained by prefork across load/unload of the module
+ * allocated on first call to pre-config hook; located on
+ * subsequent calls to pre-config hook
+ */
+typedef struct motorz_core_t {
+ int first_server_limit;
+ int module_loads;
+ ap_generation_t my_generation;
+ int volatile is_graceful; /* set from signal handler */
+ int maxclients_reported;
+ /*
+ * The max child slot ever assigned, preserved across restarts. Necessary
+ * to deal with MaxRequestWorkers changes across AP_SIG_GRACEFUL restarts. We
+ * use this value to optimize routines that have to scan the entire scoreboard.
+ */
+ int max_daemons_limit;
+ apr_pool_t *pool;
+ apr_thread_mutex_t *mtx;
+ apr_pollcb_t *pollcb;
+ apr_skiplist *timer_ring;
+ apr_thread_pool_t *workers;
+} motorz_core_t;
+static motorz_core_t *g_motorz_core;
+
+typedef struct motorz_child_bucket {
+ ap_pod_t *pod;
+ ap_listen_rec *listeners;
+ apr_proc_mutex_t *mutex;
+} motorz_child_bucket;
+static int num_buckets; /* Number of listeners buckets */
+static motorz_child_bucket *all_buckets, /* All listeners buckets */
+ *my_bucket; /* Current child bucket */
+
+typedef enum
+{
+ PT_CSD,
+ PT_ACCEPT,
+ PT_USER
+} motorz_poll_type_e;
+
+typedef struct motorz_sb_t motorz_sb_t;
+struct motorz_sb_t
+{
+ motorz_poll_type_e type;
+ void *baton;
+};
+
+typedef void (*motorz_timer_cb) (motorz_core_t *mz, void *baton);
+typedef void (*motorz_io_sock_cb) (motorz_core_t *mz, apr_socket_t *sock,
+ int flags, void *baton);
+typedef void (*motorz_io_file_cb) (motorz_core_t *mz, apr_socket_t *sock,
+ int flags, void *baton);
+
+
+typedef struct motorz_timer_t motorz_timer_t;
+struct motorz_timer_t
+{
+ apr_time_t expires;
+ motorz_timer_cb cb;
+ void *baton;
+ apr_pool_t *pool;
+ motorz_core_t *mz;
+};
+
+typedef struct motorz_conn_t motorz_conn_t;
+struct motorz_conn_t
+{
+ apr_pool_t *pool;
+ motorz_core_t *mz;
+ apr_socket_t *sock;
+ apr_bucket_alloc_t *ba;
+ conn_rec *c;
+ /** poll file descriptor information */
+ apr_pollfd_t pfd;
+ /** public parts of the connection state */
+ conn_state_t cs;
+};
+
+static apr_status_t motorz_io_process(motorz_conn_t *scon);
+
+#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
+
+/* one_process --- debugging mode variable; can be set from the command line
+ * with the -X flag. If set, this gets you the child_main loop running
+ * in the process which originally started up (no detach, no make_child),
+ * which is a pretty nice debugging environment. (You'll get a SIGHUP
+ * early in standalone_main; just continue through. This is the server
+ * trying to kill off any child processes which it might have lying
+ * around --- Apache doesn't keep track of their pids, it just sends
+ * SIGHUP to the process group, ignoring it in the root process.
+ * Continue through and you'll be fine.).
+ */
+
+static int one_process = 0;
+
+static apr_pool_t *pconf; /* Pool for config stuff */
+static apr_pool_t *pchild; /* Pool for httpd child stuff */
+
+static pid_t ap_my_pid; /* it seems silly to call getpid all the time */
+static pid_t parent_pid;
+static int my_child_num;
+
+static void clean_child_exit(int code) __attribute__ ((noreturn));
+
+static motorz_core_t *motorz_core_get()
+{
+ return g_motorz_core;
+}
+
+static int indexing_comp(void *a, void *b)
+{
+ apr_time_t t1 = (apr_time_t) (((motorz_timer_t *) a)->expires);
+ apr_time_t t2 = (apr_time_t) (((motorz_timer_t *) b)->expires);
+ AP_DEBUG_ASSERT(t1);
+ AP_DEBUG_ASSERT(t2);
+ return ((t1 < t2) ? -1 : ((t1 > t2) ? 1 : 0));
+}
+
+static int indexing_compk(void *ac, void *b)
+{
+ apr_time_t *t1 = (apr_time_t *) ac;
+ apr_time_t t2 = (apr_time_t) (((motorz_timer_t *) b)->expires);
+ AP_DEBUG_ASSERT(t2);
+ return ((*t1 < t2) ? -1 : ((*t1 > t2) ? 1 : 0));
+}
+
+static apr_status_t motorz_timer_pool_cleanup(void *baton)
+{
+ motorz_timer_t *elem = (motorz_timer_t *)baton;
+ motorz_core_t *mz = elem->mz;
+
+ apr_thread_mutex_lock(mz->mtx);
+ apr_skiplist_remove(mz->timer_ring, elem, NULL);
+ apr_thread_mutex_unlock(mz->mtx);
+
+ return APR_SUCCESS;
+}
+
+static void motorz_io_timeout_cb(motorz_core_t * sc, void *baton)
+{
+ /* Code disabled because it does nothing yet but causes a compiler warning */
+#if 0
+ motorz_conn_t *mzon = (motorz_conn_t *) baton;
+ /* pqXXXXX: handle timeouts. */
+ conn_rec *c = scon->c;
+
+ cs = NULL;
+#endif
+
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO(00247)
+ "io timeout hit (?)");
+}
+
+static void *motorz_io_setup_conn(apr_thread_t * thread, void *baton)
+{
+ apr_status_t status;
+ ap_sb_handle_t *sbh;
+ long conn_id = 0;
+ motorz_sb_t *sb;
+ motorz_conn_t *scon = (motorz_conn_t *) baton;
+
+ ap_create_sb_handle(&sbh, scon->pool, 0, 0);
+
+ scon->ba = apr_bucket_alloc_create(scon->pool);
+
+ scon->c = ap_run_create_connection(scon->pool, ap_server_conf, scon->sock,
+ conn_id, sbh, scon->ba);
+ /* XXX: handle failure */
+
+ scon->c->cs = &scon->cs;
+ sb = apr_pcalloc(scon->pool, sizeof(motorz_sb_t));
+
+ scon->c->current_thread = thread;
+
+ scon->pfd.p = scon->pool;
+ scon->pfd.desc_type = APR_POLL_SOCKET;
+ scon->pfd.desc.s = scon->sock;
+ scon->pfd.reqevents = APR_POLLIN;
+
+ sb->type = PT_CSD;
+ sb->baton = scon;
+ scon->pfd.client_data = sb;
+
+ ap_update_vhost_given_ip(scon->c);
+
+ status = ap_run_pre_connection(scon->c, scon->sock);
+ if (status != OK && status != DONE) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO()
+ "motorz_io_setup_conn: connection aborted");
+ scon->c->aborted = 1;
+ }
+
+ scon->cs.state = CONN_STATE_READ_REQUEST_LINE;
+ scon->cs.sense = CONN_SENSE_DEFAULT;
+
+ status = motorz_io_process(scon);
+
+ if (status) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf, APLOGNO()
+ "motorz_io_setup_conn: motorz_io_process failed (?)");
+ }
+
+ return NULL;
+}
+
+static apr_status_t motorz_io_user(motorz_core_t *mz, motorz_sb_t *sb)
+{
+ return APR_SUCCESS;
+}
+
+static apr_status_t motorz_io_accept(motorz_core_t *mz, motorz_sb_t *sb)
+{
+ apr_status_t rv;
+ apr_pool_t *ptrans;
+ apr_socket_t *socket;
+ ap_listen_rec *lr = (ap_listen_rec *) sb->baton;
+
+ apr_pool_create(&ptrans, NULL);
+
+ apr_pool_tag(ptrans, "transaction");
+
+ rv = lr->accept_func((void *)&socket, lr, ptrans);
+ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO()
+ "motorz_io_accept failed");
+ clean_child_exit(APEXIT_CHILDSICK);
+ }
+ else {
+ motorz_conn_t *scon = apr_pcalloc(ptrans, sizeof(motorz_conn_t));
+ scon->pool = ptrans;
+ scon->sock = socket;
+ scon->mz = mz;
+
+ return apr_thread_pool_push(mz->workers,
+ motorz_io_setup_conn,
+ scon,
+ APR_THREAD_TASK_PRIORITY_NORMAL, NULL);
+ }
+
+ return APR_SUCCESS;
+}
+
+static void motorz_timer_run(motorz_timer_t *ep)
+{
+ apr_pool_cleanup_kill(ep->pool, ep, motorz_timer_pool_cleanup);
+
+ ep->cb(ep->mz, ep->baton);
+}
+
+static void *motorz_timer_invoke(apr_thread_t *thread, void *baton)
+{
+ motorz_timer_t *ep = (motorz_timer_t *)baton;
+
+ motorz_timer_run(ep);
+
+ return NULL;
+}
+
+static void *motorz_io_invoke(apr_thread_t * thread, void *baton)
+{
+ motorz_sb_t *sb = (motorz_sb_t *) baton;
+ motorz_conn_t *scon = (motorz_conn_t *) sb->baton;
+ apr_status_t rv;
+
+ scon->c->current_thread = thread;
+
+ rv = motorz_io_process(scon);
+
+ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO()
+ "motorz_io_invoke: motorz_io_process failed (?)");
+ }
+
+ return NULL;
+}
+
+static apr_status_t motorz_io_event_process(motorz_core_t *mz, motorz_sb_t *sb)
+{
+ return apr_thread_pool_push(mz->workers,
+ motorz_io_invoke,
+ sb, APR_THREAD_TASK_PRIORITY_NORMAL, NULL);
+}
+
+static apr_status_t motorz_io_callback(void *baton, apr_pollfd_t *pfd)
+{
+ apr_status_t status = APR_SUCCESS;
+ motorz_core_t *mz = (motorz_core_t *) baton;
+ motorz_sb_t *sb = pfd->client_data;
+
+
+ if (sb->type == PT_ACCEPT) {
+ status = motorz_io_accept(mz, sb);
+ }
+ else if (sb->type == PT_CSD) {
+ status = motorz_io_event_process(mz, sb);
+ }
+ else if (sb->type == PT_USER) {
+ status = motorz_io_user(mz, sb);
+ }
+ return status;
+}
+
+static void motorz_register_timer(motorz_core_t *mz,
+ motorz_timer_cb cb,
+ void *baton, apr_time_t relative_time,
+ apr_pool_t *shutdown_pool)
+{
+ motorz_timer_t *elem = NULL;
+ apr_time_t t = apr_time_now() + relative_time;
+
+ apr_thread_mutex_lock(mz->mtx);
+
+ elem = (motorz_timer_t *) apr_pcalloc(shutdown_pool, sizeof(motorz_timer_t));
+
+ elem->expires = t;
+ elem->cb = cb;
+ elem->baton = baton;
+ elem->pool = shutdown_pool;
+ elem->mz = mz;
+ apr_pool_cleanup_register(elem->pool, elem, motorz_timer_pool_cleanup, apr_pool_cleanup_null);
+ apr_skiplist_insert(mz->timer_ring, (void *)elem);
+ apr_thread_mutex_unlock(mz->mtx);
+}
+
+static apr_status_t motorz_io_process(motorz_conn_t *scon)
+{
+ apr_status_t rv;
+ motorz_core_t *mz;
+ conn_rec *c;
+
+ if (scon->c->clogging_input_filters && !scon->c->aborted) {
+ /* Since we have an input filter which 'clogs' the input stream,
+ * like mod_ssl used to, lets just do the normal read from input
+ * filters, like the Worker MPM does. Filters that need to write
+ * where they would otherwise read, or read where they would
+ * otherwise write, should set the sense appropriately.
+ */
+ ap_run_process_connection(scon->c);
+ if (scon->cs.state != CONN_STATE_SUSPENDED) {
+ scon->cs.state = CONN_STATE_LINGER;
+ }
+ }
+
+ mz = scon->mz;
+ c = scon->c;
+
+ while (!c->aborted) {
+
+ if (scon->pfd.reqevents != 0) {
+ rv = apr_pollcb_remove(mz->pollcb, &scon->pfd);
+ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(00248)
+ "motorz_io_process: apr_pollcb_remove failure");
+ /*AP_DEBUG_ASSERT(rv == APR_SUCCESS);*/
+ }
+ scon->pfd.reqevents = 0;
+ }
+
+ if (scon->cs.state == CONN_STATE_READ_REQUEST_LINE) {
+ if (!c->aborted) {
+ ap_run_process_connection(c);
+ /* state will be updated upon return
+ * fall thru to either wait for readability/timeout or
+ * do lingering close
+ */
+ }
+ else {
+ scon->cs.state = CONN_STATE_LINGER;
+ }
+ }
+
+ if (scon->cs.state == CONN_STATE_WRITE_COMPLETION) {
+ ap_filter_t *output_filter = c->output_filters;
+ while (output_filter->next != NULL) {
+ output_filter = output_filter->next;
+ }
+
+ rv = output_filter->frec->filter_func.out_func(output_filter,
+ NULL);
+
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, APLOGNO(00249)
+ "network write failure in core output filter");
+ scon->cs.state = CONN_STATE_LINGER;
+ }
+ else if (c->data_in_output_filters) {
+ /* Still in WRITE_COMPLETION_STATE:
+ * Set a write timeout for this connection, and let the
+ * event thread poll for writeability.
+ */
+
+ motorz_register_timer(scon->mz,
+ motorz_io_timeout_cb,
+ scon,
+ scon->c->base_server !=
+ NULL ? scon->c->base_server->
+ timeout : ap_server_conf->timeout,
+ scon->pool);
+
+ scon->pfd.reqevents = (
+ scon->cs.sense == CONN_SENSE_WANT_READ ? APR_POLLIN :
+ APR_POLLOUT) | APR_POLLHUP | APR_POLLERR;
+ scon->cs.sense = CONN_SENSE_DEFAULT;
+
+ rv = apr_pollcb_add(mz->pollcb, &scon->pfd);
+
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv,
+ ap_server_conf, APLOGNO(00250)
+ "apr_pollcb_add: failed in write completion");
+ AP_DEBUG_ASSERT(rv == APR_SUCCESS);
+ }
+ return APR_SUCCESS;
+ }
+ else if (c->keepalive != AP_CONN_KEEPALIVE || c->aborted) {
+ scon->cs.state = CONN_STATE_LINGER;
+ }
+ else if (c->data_in_input_filters) {
+ scon->cs.state = CONN_STATE_READ_REQUEST_LINE;
+ }
+ else {
+ scon->cs.state = CONN_STATE_CHECK_REQUEST_LINE_READABLE;
+ }
+ }
+
+ if (scon->cs.state == CONN_STATE_LINGER) {
+ ap_lingering_close(c);
+ apr_pool_destroy(scon->pool);
+ return APR_SUCCESS;
+ }
+
+ if (scon->cs.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) {
+ motorz_register_timer(scon->mz,
+ motorz_io_timeout_cb,
+ scon,
+ scon->c->base_server !=
+ NULL ? scon->c->base_server->
+ timeout : ap_server_conf->timeout,
+ scon->pool);
+
+ scon->pfd.reqevents = (
+ scon->cs.sense == CONN_SENSE_WANT_WRITE ? APR_POLLOUT :
+ APR_POLLIN);
+ scon->cs.sense = CONN_SENSE_DEFAULT;
+
+ rv = apr_pollcb_add(mz->pollcb, &scon->pfd);
+
+ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(00251)
+ "process_socket: apr_pollcb_add failure in read request line");
+ AP_DEBUG_ASSERT(rv == APR_SUCCESS);
+ }
+
+ return APR_SUCCESS;
+ }
+ }
+
+ ap_lingering_close(c);
+ apr_pool_destroy(scon->pool);
+ return APR_SUCCESS;
+}
+
+/**
+ * Create worker thread pool.
+ */
+static apr_status_t motorz_setup_workers(motorz_core_t *mz)
+{
+ apr_status_t rv;
+
+ rv = apr_thread_pool_create(&mz->workers,
+ threads_per_child,
+ threads_per_child, mz->pool);
+
+ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO()
+ "motorz_setup_workers: apr_thread_pool_create with %d threads failed",
+ threads_per_child);
+ return rv;
+ }
+
+ return APR_SUCCESS;
+}
+
+static int motorz_setup_pollcb(motorz_core_t *mz)
+{
+ int i;
+ apr_status_t rv;
+ int good_methods[] = {APR_POLLSET_KQUEUE, APR_POLLSET_PORT, APR_POLLSET_EPOLL};
+
+ for (i = 0; i < sizeof(good_methods) / sizeof(void*); i++) {
+ rv = apr_pollcb_create_ex(&mz->pollcb, 512,
+ mz->pool, APR_POLLSET_NODEFAULT, good_methods[i]);
+ if (!rv) {
+ break;
+ }
+ }
+ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO()
+ "motorz_setup_pollcb: apr_pollcb_create failed for all possible backends!");
+ return rv;
+ }
+ return rv;
+}
+
+static void motorz_note_child_killed(int childnum, pid_t pid,
+ ap_generation_t gen)
+{
+ AP_DEBUG_ASSERT(childnum != -1); /* no scoreboard squatting with this MPM */
+ ap_run_child_status(ap_server_conf,
+ ap_scoreboard_image->parent[childnum].pid,
+ ap_scoreboard_image->parent[childnum].generation,
+ childnum, MPM_CHILD_EXITED);
+ ap_scoreboard_image->parent[childnum].pid = 0;
+}
+
+static void motorz_note_child_started(motorz_core_t *mz, int slot, pid_t pid)
+{
+ ap_scoreboard_image->parent[slot].pid = pid;
+ ap_run_child_status(ap_server_conf,
+ ap_scoreboard_image->parent[slot].pid,
+ mz->my_generation, slot, MPM_CHILD_STARTED);
+}
+
+/* a clean exit from a child with proper cleanup */
+static void clean_child_exit(int code)
+{
+ mpm_state = AP_MPMQ_STOPPING;
+
+ apr_signal(SIGHUP, SIG_IGN);
+ apr_signal(SIGTERM, SIG_IGN);
+
+ if (pchild) {
+ apr_pool_destroy(pchild);
+ }
+
+ if (one_process) {
+ motorz_note_child_killed(/* slot */ 0, 0, 0);
+ }
+
+ ap_mpm_pod_close(my_bucket->pod);
+ exit(code);
+}
+
+static apr_status_t accept_mutex_on(void)
+{
+ motorz_core_t *mz = motorz_core_get();
+ apr_status_t rv = apr_proc_mutex_lock(my_bucket->mutex);
+ if (rv != APR_SUCCESS) {
+ const char *msg = "couldn't grab the accept mutex";
+
+ if (mz->my_generation !=
+ ap_scoreboard_image->global->running_generation) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO() "%s", msg);
+ clean_child_exit(0);
+ }
+ else {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, APLOGNO() "%s", msg);
+ exit(APEXIT_CHILDFATAL);
+ }
+ }
+ return APR_SUCCESS;
+}
+
+static apr_status_t accept_mutex_off(void)
+{
+ motorz_core_t *mz = motorz_core_get();
+ apr_status_t rv = apr_proc_mutex_unlock(my_bucket->mutex);
+ if (rv != APR_SUCCESS) {
+ const char *msg = "couldn't release the accept mutex";
+
+ if (mz->my_generation !=
+ ap_scoreboard_image->global->running_generation) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, APLOGNO() "%s", msg);
+ /* don't exit here... we have a connection to
+ * process, after which point we'll see that the
+ * generation changed and we'll exit cleanly
+ */
+ }
+ else {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, APLOGNO() "%s", msg);
+ exit(APEXIT_CHILDFATAL);
+ }
+ }
+ return APR_SUCCESS;
+}
+
+/* On some architectures it's safe to do unserialized accept()s in the single
+ * Listen case. But it's never safe to do it in the case where there's
+ * multiple Listen statements. Define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
+ * when it's safe in the single Listen case.
+ */
+#ifdef SINGLE_LISTEN_UNSERIALIZED_ACCEPT
+#define SAFE_ACCEPT(stmt) (ap_listeners->next ? (stmt) : APR_SUCCESS)
+#else
+#define SAFE_ACCEPT(stmt) (stmt)
+#endif
+
+static int motorz_query(int query_code, int *result, apr_status_t *rv)
+{
+ motorz_core_t *mz = motorz_core_get();
+ *rv = APR_SUCCESS;
+ switch(query_code){
+ case AP_MPMQ_IS_ASYNC:
+ *result = 1;
+ break;
+ case AP_MPMQ_MAX_DAEMON_USED:
+ *result = ap_daemons_limit;
+ break;
+ case AP_MPMQ_IS_THREADED:
+ *result = AP_MPMQ_STATIC;
+ break;
+ case AP_MPMQ_IS_FORKED:
+ *result = AP_MPMQ_DYNAMIC;
+ break;
+ case AP_MPMQ_HARD_LIMIT_DAEMONS:
+ *result = server_limit;
+ break;
+ case AP_MPMQ_HARD_LIMIT_THREADS:
+ *result = MAX_THREAD_LIMIT;
+ break;
+ case AP_MPMQ_MAX_THREADS:
+ *result = 1;
+ break;
+ case AP_MPMQ_MIN_SPARE_DAEMONS:
+ *result = 0;
+ break;
+ case AP_MPMQ_MIN_SPARE_THREADS:
+ *result = 0;
+ break;
+ case AP_MPMQ_MAX_SPARE_DAEMONS:
+ *result = ap_daemons_max_free;
+ break;
+ case AP_MPMQ_MAX_SPARE_THREADS:
+ *result = 0;
+ break;
+ case AP_MPMQ_MAX_REQUESTS_DAEMON:
+ *result = 0;
+ break;
+ case AP_MPMQ_MAX_DAEMONS:
+ *result = ap_daemons_limit;
+ break;
+ case AP_MPMQ_MPM_STATE:
+ *result = mpm_state;
+ break;
+ case AP_MPMQ_GENERATION:
+ *result = mz->my_generation;
+ break;
+ default:
+ *rv = APR_ENOTIMPL;
+ break;
+ }
+ return OK;
+}
+
+static const char *motorz_get_name(void)
+{
+ return "motorz";
+}
+
+/*****************************************************************
+ * Connection structures and accounting...
+ */
+
+static void just_die(int sig)
+{
+ clean_child_exit(0);
+}
+
+/* volatile because they're updated from a signal handler */
+static int volatile shutdown_pending;
+static int volatile restart_pending;
+static int volatile die_now = 0;
+
+static void stop_listening(int sig)
+{
+ mpm_state = AP_MPMQ_STOPPING;
+ ap_close_listeners_ex(my_bucket->listeners);
+
+ /* For a graceful stop, we want the child to exit when done */
+ die_now = 1;
+}
+
+static void sig_term(int sig)
+{
+ motorz_core_t *mz = motorz_core_get();
+ if (shutdown_pending == 1) {
+ /* Um, is this _probably_ not an error, if the user has
+ * tried to do a shutdown twice quickly, so we won't
+ * worry about reporting it.
+ */
+ return;
+ }
+ mpm_state = AP_MPMQ_STOPPING;
+ shutdown_pending = 1;
+ mz->is_graceful = (sig == AP_SIG_GRACEFUL_STOP);
+}
+
+/* restart() is the signal handler for SIGHUP and AP_SIG_GRACEFUL
+ * in the parent process, unless running in ONE_PROCESS mode
+ */
+static void restart(int sig)
+{
+ motorz_core_t *mz = motorz_core_get();
+ if (restart_pending == 1) {
+ /* Probably not an error - don't bother reporting it */
+ return;
+ }
+ mpm_state = AP_MPMQ_STOPPING;
+ restart_pending = 1;
+ mz->is_graceful = (sig == AP_SIG_GRACEFUL);
+}
+
+static void set_signals(void)
+{
+#ifndef NO_USE_SIGACTION
+ struct sigaction sa;
+#endif
+
+ if (!one_process) {
+ ap_fatal_signal_setup(ap_server_conf, pconf);
+ }
+
+#ifndef NO_USE_SIGACTION
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+
+ sa.sa_handler = sig_term;
+ if (sigaction(SIGTERM, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(SIGTERM)");
+#ifdef AP_SIG_GRACEFUL_STOP
+ if (sigaction(AP_SIG_GRACEFUL_STOP, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO()
+ "sigaction(" AP_SIG_GRACEFUL_STOP_STRING ")");
+#endif
+#ifdef SIGINT
+ if (sigaction(SIGINT, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(SIGINT)");
+#endif
+#ifdef SIGXCPU
+ sa.sa_handler = SIG_DFL;
+ if (sigaction(SIGXCPU, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(SIGXCPU)");
+#endif
+#ifdef SIGXFSZ
+ /* For systems following the LFS standard, ignoring SIGXFSZ allows
+ * a write() beyond the 2GB limit to fail gracefully with E2BIG
+ * rather than terminate the process. */
+ sa.sa_handler = SIG_IGN;
+ if (sigaction(SIGXFSZ, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(SIGXFSZ)");
+#endif
+#ifdef SIGPIPE
+ sa.sa_handler = SIG_IGN;
+ if (sigaction(SIGPIPE, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(SIGPIPE)");
+#endif
+
+ /* we want to ignore HUPs and AP_SIG_GRACEFUL while we're busy
+ * processing one
+ */
+ sigaddset(&sa.sa_mask, SIGHUP);
+ sigaddset(&sa.sa_mask, AP_SIG_GRACEFUL);
+ sa.sa_handler = restart;
+ if (sigaction(SIGHUP, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(SIGHUP)");
+ if (sigaction(AP_SIG_GRACEFUL, &sa, NULL) < 0)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "sigaction(" AP_SIG_GRACEFUL_STRING ")");
+#else
+ if (!one_process) {
+#ifdef SIGXCPU
+ apr_signal(SIGXCPU, SIG_DFL);
+#endif /* SIGXCPU */
+#ifdef SIGXFSZ
+ apr_signal(SIGXFSZ, SIG_IGN);
+#endif /* SIGXFSZ */
+ }
+
+ apr_signal(SIGTERM, sig_term);
+#ifdef SIGHUP
+ apr_signal(SIGHUP, restart);
+#endif /* SIGHUP */
+#ifdef AP_SIG_GRACEFUL
+ apr_signal(AP_SIG_GRACEFUL, restart);
+#endif /* AP_SIG_GRACEFUL */
+#ifdef AP_SIG_GRACEFUL_STOP
+ apr_signal(AP_SIG_GRACEFUL_STOP, sig_term);
+#endif /* AP_SIG_GRACEFUL */
+#ifdef SIGPIPE
+ apr_signal(SIGPIPE, SIG_IGN);
+#endif /* SIGPIPE */
+
+#endif
+}
+
+/*****************************************************************
+ * Child process main loop.
+ * The following vars are static to avoid getting clobbered by longjmp();
+ * they are really private to child_main.
+ */
+
+static int requests_this_child;
+static int num_listensocks = 0;
+
+static void child_main(motorz_core_t *mz, int child_num_arg, int child_bucket)
+{
+#if APR_HAS_THREADS
+ apr_thread_t *thd = NULL;
+ apr_os_thread_t osthd;
+#endif
+ apr_pool_t *ptrans;
+ apr_allocator_t *allocator;
+ apr_status_t status;
+ int i;
+ ap_listen_rec *lr;
+ ap_sb_handle_t *sbh;
+ apr_bucket_alloc_t *bucket_alloc;
+ const char *lockfile;
+
+ mpm_state = AP_MPMQ_STARTING; /* for benefit of any hooks that run as this
+ * child initializes
+ */
+
+ my_child_num = child_num_arg;
+ ap_my_pid = getpid();
+ requests_this_child = 0;
+
+ ap_fatal_signal_child_setup(ap_server_conf);
+
+ /* Get a sub context for global allocations in this child, so that
+ * we can have cleanups occur when the child exits.
+ */
+ apr_allocator_create(&allocator);
+ apr_allocator_max_free_set(allocator, ap_max_mem_free);
+ apr_pool_create_ex(&pchild, pconf, NULL, allocator);
+ apr_allocator_owner_set(allocator, pchild);
+ apr_pool_tag(pchild, "pchild");
+
+#if APR_HAS_THREADS
+ osthd = apr_os_thread_current();
+ apr_os_thread_put(&thd, &osthd, pchild);
+#endif
+
+ apr_pool_create(&ptrans, pchild);
+ apr_pool_tag(ptrans, "transaction");
+
+ /* close unused listeners and pods */
+ for (i = 0; i < num_buckets; i++) {
+ if (i != child_bucket) {
+ ap_close_listeners_ex(all_buckets[i].listeners);
+ ap_mpm_pod_close(all_buckets[i].pod);
+ }
+ }
+
+ /* needs to be done before we switch UIDs so we have permissions */
+ ap_reopen_scoreboard(pchild, NULL, 0);
+ status = SAFE_ACCEPT(apr_proc_mutex_child_init(&my_bucket->mutex,
+ apr_proc_mutex_lockfile(my_bucket->mutex),
+ pchild));
+ if (status != APR_SUCCESS) {
+ lockfile = apr_proc_mutex_lockfile(my_bucket->mutex);
+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO()
+ "Couldn't initialize cross-process lock in child "
+ "(%s) (%s)",
+ lockfile ? lockfile : "none",
+ apr_proc_mutex_name(my_bucket->mutex));
+ clean_child_exit(APEXIT_CHILDFATAL);
+ }
+
+ if (ap_run_drop_privileges(pchild, ap_server_conf)) {
+ clean_child_exit(APEXIT_CHILDFATAL);
+ }
+
+ ap_run_child_init(pchild, ap_server_conf);
+
+ ap_create_sb_handle(&sbh, pchild, my_child_num, 0);
+
+ (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
+
+ apr_skiplist_init(&mz->timer_ring, mz->pool);
+ apr_skiplist_set_compare(mz->timer_ring, indexing_comp, indexing_compk);
+
+ status = motorz_setup_workers(mz);
+ if (status != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL, APLOGNO()
+ "child_main: motorz_setup_workers failed");
+ clean_child_exit(APEXIT_CHILDSICK);
+ }
+
+ status = motorz_setup_pollcb(mz);
+ if (status != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO()
+ "Couldn't setup pollcb in child; check system or user limits");
+ clean_child_exit(APEXIT_CHILDSICK); /* assume temporary resource issue */
+ }
+
+ for (lr = my_bucket->listeners, i = num_listensocks; i--; lr = lr->next) {
+ apr_pollfd_t *pfd = apr_pcalloc(mz->pool, sizeof *pfd);
+ motorz_sb_t *sb = apr_pcalloc(mz->pool, sizeof(motorz_sb_t));
+
+ pfd->desc_type = APR_POLL_SOCKET;
+ pfd->desc.s = lr->sd;
+ pfd->reqevents = APR_POLLIN;
+ pfd->p = mz->pool;
+ pfd->client_data = sb;
+
+ sb->type = PT_ACCEPT;
+ sb->baton = lr;
+
+ status = apr_socket_opt_set(pfd->desc.s, APR_SO_NONBLOCK, 1);
+ if (status != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL, APLOGNO()
+ "apr_socket_opt_set(APR_SO_NONBLOCK = 1) failed on %pI",
+ lr->bind_addr);
+ clean_child_exit(0);
+ }
+
+ status = apr_pollcb_add(mz->pollcb, pfd);
+ if (status != APR_SUCCESS) {
+ /* If the child processed a SIGWINCH before setting up the
+ * pollset, this error path is expected and harmless,
+ * since the listener fd was already closed; so don't
+ * pollute the logs in that case. */
+ if (!die_now) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO()
+ "Couldn't add listener to pollcb; check system or user limits");
+ clean_child_exit(APEXIT_CHILDSICK);
+ }
+ clean_child_exit(0);
+ }
+
+ lr->accept_func = ap_unixd_accept;
+ }
+
+ mpm_state = AP_MPMQ_RUNNING;
+
+ bucket_alloc = apr_bucket_alloc_create(pchild);
+
+ /* die_now is set when AP_SIG_GRACEFUL is received in the child;
+ * shutdown_pending is set when SIGTERM is received when running
+ * in single process mode. */
+ while (!die_now && !shutdown_pending) {
+ /*
+ * (Re)initialize this child to a pre-connection state.
+ */
+
+ apr_pool_clear(ptrans);
+
+ if ((ap_max_requests_per_child > 0
+ && requests_this_child++ >= ap_max_requests_per_child)) {
+ clean_child_exit(0);
+ }
+
+ (void) ap_update_child_status(sbh, SERVER_READY, (request_rec *) NULL);
+ {
+ apr_time_t tnow = apr_time_now();
+ motorz_timer_t *te;
+ apr_interval_time_t timeout = apr_time_from_msec(500);
+
+ apr_thread_mutex_lock(mz->mtx);
+ te = apr_skiplist_peek(mz->timer_ring);
+
+ if (te) {
+ if (tnow < te->expires) {
+ timeout = (te->expires - tnow);
+ if (timeout > apr_time_from_msec(500)) {
+ timeout = apr_time_from_msec(500);
+ }
+ }
+ else {
+ timeout = 0;
+ }
+ }
+ apr_thread_mutex_unlock(mz->mtx);
+
+ status = apr_pollcb_poll(mz->pollcb, timeout, motorz_io_callback, mz);
+
+ tnow = apr_time_now();
+
+ if (status) {
+ if (!APR_STATUS_IS_EINTR(status) && !APR_STATUS_IS_TIMEUP(status)) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL,
+ "motorz_main_loop: apr_pollcb_poll failed");
+ clean_child_exit(0);
+ }
+ }
+
+ apr_thread_mutex_lock(mz->mtx);
+
+ /* now iterate any timers and push to worker pool */
+ while (te) {
+ if (te->expires < tnow) {
+ apr_skiplist_pop(mz->timer_ring, NULL);
+ apr_thread_pool_push(mz->workers,
+ motorz_timer_invoke,
+ te,
+ APR_THREAD_TASK_PRIORITY_NORMAL, NULL);
+ } else {
+ break;
+ }
+ te = apr_skiplist_peek(mz->timer_ring);
+ }
+
+ apr_thread_mutex_unlock(mz->mtx);
+ }
+ if (ap_mpm_pod_check(my_bucket->pod) == APR_SUCCESS) { /* selected as idle? */
+ die_now = 1;
+ }
+ else if (mz->my_generation !=
+ ap_scoreboard_image->global->running_generation) { /* restart? */
+ /* yeah, this could be non-graceful restart, in which case the
+ * parent will kill us soon enough, but why bother checking?
+ */
+ die_now = 1;
+ }
+ }
+ apr_pool_clear(ptrans); /* kludge to avoid crash in APR reslist cleanup code */
+ clean_child_exit(0);
+}
+
+
+static int make_child(motorz_core_t *mz, server_rec *s, int slot, int bucket)
+{
+ int pid;
+
+ if (slot + 1 > mz->max_daemons_limit) {
+ mz->max_daemons_limit = slot + 1;
+ }
+
+ if (one_process) {
+ my_bucket = &all_buckets[0];
+
+ apr_signal(SIGHUP, sig_term);
+ /* Don't catch AP_SIG_GRACEFUL in ONE_PROCESS mode :) */
+ apr_signal(SIGINT, sig_term);
+#ifdef SIGQUIT
+ apr_signal(SIGQUIT, SIG_DFL);
+#endif
+ apr_signal(SIGTERM, sig_term);
+ motorz_note_child_started(mz, slot, getpid());
+ child_main(mz, slot, 0);
+ /* NOTREACHED */
+ ap_assert(0);
+ return -1;
+ }
+
+ (void) ap_update_child_status_from_indexes(slot, 0, SERVER_STARTING,
+ (request_rec *) NULL);
+
+ if ((pid = fork()) == -1) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, s, APLOGNO() "fork: Unable to fork new process");
+
+ /* fork didn't succeed. Fix the scoreboard or else
+ * it will say SERVER_STARTING forever and ever
+ */
+ (void) ap_update_child_status_from_indexes(slot, 0, SERVER_DEAD,
+ (request_rec *) NULL);
+
+ /* In case system resources are maxxed out, we don't want
+ * Apache running away with the CPU trying to fork over and
+ * over and over again.
+ */
+ sleep(10);
+
+ return -1;
+ }
+
+ if (!pid) {
+ my_bucket = &all_buckets[bucket];
+
+#ifdef HAVE_BINDPROCESSOR
+ /* by default AIX binds to a single processor
+ * this bit unbinds children which will then bind to another cpu
+ */
+ int status = bindprocessor(BINDPROCESS, (int)getpid(),
+ PROCESSOR_CLASS_ANY);
+ if (status != OK) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, errno,
+ ap_server_conf, APLOGNO() "processor unbind failed");
+ }
+#endif
+ RAISE_SIGSTOP(MAKE_CHILD);
+ AP_MONCONTROL(1);
+ /* Disable the parent's signal handlers and set up proper handling in
+ * the child.
+ */
+ apr_signal(SIGHUP, just_die);
+ apr_signal(SIGTERM, just_die);
+ /* Ignore SIGINT in child. This fixes race-condition in signals
+ * handling when httpd is runnning on foreground and user hits ctrl+c.
+ * In this case, SIGINT is sent to all children followed by SIGTERM
+ * from the main process, which interrupts the SIGINT handler and
+ * leads to inconsistency.
+ */
+ apr_signal(SIGINT, SIG_IGN);
+ /* The child process just closes listeners on AP_SIG_GRACEFUL.
+ * The pod is used for signalling the graceful restart.
+ */
+ apr_signal(AP_SIG_GRACEFUL, stop_listening);
+ child_main(mz, slot, bucket);
+ }
+
+ ap_scoreboard_image->parent[slot].bucket = bucket;
+ motorz_note_child_started(mz, slot, pid);
+
+ return 0;
+}
+
+
+/* start up a bunch of children */
+static void startup_children(motorz_core_t *mz, int number_to_start)
+{
+ int i;
+
+ for (i = 0; number_to_start && i < ap_daemons_limit; ++i) {
+ if (ap_scoreboard_image->servers[i][0].status != SERVER_DEAD) {
+ continue;
+ }
+ if (make_child(mz, ap_server_conf, i, i % num_buckets) < 0) {
+ break;
+ }
+ --number_to_start;
+ }
+}
+
+static void perform_idle_server_maintenance(motorz_core_t *mz, apr_pool_t *p)
+{
+ static int bucket_make_child_record = -1;
+ static int bucket_kill_child_record = -1;
+ int free_length;
+ int free_slots[1];
+
+ int i;
+ worker_score *ws;
+
+ int active = 0;
+ free_length = 0;
+
+ for (i = 0; i < ap_daemons_limit; ++i) {
+ int status;
+ ws = &ap_scoreboard_image->servers[i][0];
+ status = ws->status;
+ if (status == SERVER_DEAD && !free_length) {
+ free_slots[free_length] = i;
+ free_length++;
+ }
+ if (status >= SERVER_READY) {
+ active++;
+ }
+ }
+ if (active > ap_num_kids) {
+ /* kill off one child... we use the pod because that'll cause it to
+ * shut down gracefully, in case it happened to pick up a request
+ * while we were counting
+ */
+ bucket_kill_child_record = (bucket_kill_child_record + 1) % num_buckets;
+ ap_mpm_pod_signal(all_buckets[bucket_kill_child_record].pod);
+ }
+ else if (active < ap_num_kids) {
+ bucket_make_child_record++;
+ bucket_make_child_record %= num_buckets;
+ make_child(mz, ap_server_conf, free_slots[0],
+ bucket_make_child_record);
+ }
+}
+
+/*****************************************************************
+ * Executive routines.
+ */
+
+static int motorz_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
+{
+ int index;
+ int remaining_children_to_start;
+ int i;
+
+ ap_log_pid(pconf, ap_pid_fname);
+ motorz_core_t *mz = motorz_core_get();
+
+ if (!mz->is_graceful) {
+ if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
+ mpm_state = AP_MPMQ_STOPPING;
+ return !OK;
+ }
+ /* fix the generation number in the global score; we just got a new,
+ * cleared scoreboard
+ */
+ ap_scoreboard_image->global->running_generation = mz->my_generation;
+ }
+
+ restart_pending = shutdown_pending = 0;
+ set_signals();
+
+ if (one_process) {
+ AP_MONCONTROL(1);
+ make_child(mz, ap_server_conf, 0, 0);
+ /* NOTREACHED */
+ ap_assert(0);
+ return !OK;
+ }
+
+ /* Don't thrash since num_buckets depends on the
+ * system and the number of online CPU cores...
+ */
+ if (ap_daemons_limit < num_buckets)
+ ap_daemons_limit = num_buckets;
+ if (ap_num_kids < num_buckets)
+ ap_num_kids = num_buckets;
+ if (ap_daemons_min_free < num_buckets)
+ ap_daemons_min_free = num_buckets;
+ if (ap_daemons_max_free < ap_daemons_min_free + num_buckets)
+ ap_daemons_max_free = ap_daemons_min_free + num_buckets;
+
+ /* If we're doing a graceful_restart then we're going to see a lot
+ * of children exiting immediately when we get into the main loop
+ * below (because we just sent them AP_SIG_GRACEFUL). This happens pretty
+ * rapidly... and for each one that exits we'll start a new one until
+ * we reach at least daemons_min_free. But we may be permitted to
+ * start more than that, so we'll just keep track of how many we're
+ * supposed to start up without the 1 second penalty between each fork.
+ */
+ remaining_children_to_start = ap_num_kids;
+ if (remaining_children_to_start > ap_daemons_limit) {
+ remaining_children_to_start = ap_daemons_limit;
+ }
+ if (!mz->is_graceful) {
+ startup_children(mz, remaining_children_to_start);
+ remaining_children_to_start = 0;
+ }
+
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO()
+ "%s configured -- resuming normal operations",
+ ap_get_server_description());
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO()
+ "Server built: %s", ap_get_server_built());
+ ap_log_command_line(plog, s);
+ ap_log_common(s);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO()
+ "Accept mutex: %s (default: %s)",
+ (all_buckets[0].mutex)
+ ? apr_proc_mutex_name(all_buckets[0].mutex)
+ : "none",
+ apr_proc_mutex_defname());
+
+ mpm_state = AP_MPMQ_RUNNING;
+
+ while (!restart_pending && !shutdown_pending) {
+ int child_slot;
+ apr_exit_why_e exitwhy;
+ int status, processed_status;
+ /* this is a memory leak, but I'll fix it later. */
+ apr_proc_t pid;
+
+ ap_wait_or_timeout(&exitwhy, &status, &pid, pconf, ap_server_conf);
+
+ /* XXX: if it takes longer than 1 second for all our children
+ * to start up and get into IDLE state then we may spawn an
+ * extra child
+ */
+ if (pid.pid != -1) {
+ processed_status = ap_process_child_status(&pid, exitwhy, status);
+ child_slot = ap_find_child_by_pid(&pid);
+ if (processed_status == APEXIT_CHILDFATAL) {
+ /* fix race condition found in PR 39311
+ * A child created at the same time as a graceful happens
+ * can find the lock missing and create a fatal error.
+ * It is not fatal for the last generation to be in this state.
+ */
+ if (child_slot < 0
+ || ap_get_scoreboard_process(child_slot)->generation
+ == mz->my_generation) {
+ mpm_state = AP_MPMQ_STOPPING;
+ return !OK;
+ }
+ else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO()
+ "Ignoring fatal error in child of previous "
+ "generation (pid %ld).",
+ (long)pid.pid);
+ }
+ }
+
+ /* non-fatal death... note that it's gone in the scoreboard. */
+ if (child_slot >= 0) {
+ (void) ap_update_child_status_from_indexes(child_slot, 0, SERVER_DEAD,
+ (request_rec *) NULL);
+ motorz_note_child_killed(child_slot, 0, 0);
+ if (remaining_children_to_start
+ && child_slot < ap_daemons_limit) {
+ /* we're still doing a 1-for-1 replacement of dead
+ * children with new children
+ */
+ make_child(mz, ap_server_conf, child_slot,
+ ap_get_scoreboard_process(child_slot)->bucket);
+ --remaining_children_to_start;
+ }
+#if APR_HAS_OTHER_CHILD
+ }
+ else if (apr_proc_other_child_alert(&pid, APR_OC_REASON_DEATH, status) == APR_SUCCESS) {
+ /* handled */
+#endif
+ }
+ else if (mz->is_graceful) {
+ /* Great, we've probably just lost a slot in the
+ * scoreboard. Somehow we don't know about this
+ * child.
+ */
+ ap_log_error(APLOG_MARK, APLOG_WARNING,
+ 0, ap_server_conf, APLOGNO()
+ "long lost child came home! (pid %ld)", (long)pid.pid);
+ }
+ /* Don't perform idle maintenance when a child dies,
+ * only do it when there's a timeout. Remember only a
+ * finite number of children can die, and it's pretty
+ * pathological for a lot to die suddenly.
+ */
+ continue;
+ }
+ else if (remaining_children_to_start) {
+ /* we hit a 1 second timeout in which none of the previous
+ * generation of children needed to be reaped... so assume
+ * they're all done, and pick up the slack if any is left.
+ */
+ startup_children(mz, remaining_children_to_start);
+ remaining_children_to_start = 0;
+ /* In any event we really shouldn't do the code below because
+ * few of the servers we just started are in the IDLE state
+ * yet, so we'd mistakenly create an extra server.
+ */
+ continue;
+ }
+
+ perform_idle_server_maintenance(mz, pconf);
+ }
+
+ mpm_state = AP_MPMQ_STOPPING;
+
+ if (shutdown_pending && !mz->is_graceful) {
+ /* Time to shut down:
+ * Kill child processes, tell them to call child_exit, etc...
+ */
+ if (ap_unixd_killpg(getpgrp(), SIGTERM) < 0) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "killpg SIGTERM");
+ }
+ ap_reclaim_child_processes(1, /* Start with SIGTERM */
+ motorz_note_child_killed);
+
+ /* cleanup pid file on normal shutdown */
+ ap_remove_pid(pconf, ap_pid_fname);
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO()
+ "caught SIGTERM, shutting down");
+
+ return DONE;
+ } else if (shutdown_pending) {
+ /* Time to perform a graceful shut down:
+ * Reap the inactive children, and ask the active ones
+ * to close their listeners, then wait until they are
+ * all done to exit.
+ */
+ int active_children;
+ apr_time_t cutoff = 0;
+
+ /* Stop listening */
+ ap_close_listeners();
+
+ /* kill off the idle ones */
+ for (i = 0; i < num_buckets; i++) {
+ ap_mpm_pod_killpg(all_buckets[i].pod, mz->max_daemons_limit);
+ }
+
+ /* Send SIGUSR1 to the active children */
+ active_children = 0;
+ for (index = 0; index < ap_daemons_limit; ++index) {
+ if (ap_scoreboard_image->servers[index][0].status != SERVER_DEAD) {
+ /* Ask each child to close its listeners. */
+ ap_mpm_safe_kill(MPM_CHILD_PID(index), AP_SIG_GRACEFUL);
+ active_children++;
+ }
+ }
+
+ /* Allow each child which actually finished to exit */
+ ap_relieve_child_processes(motorz_note_child_killed);
+
+ /* cleanup pid file */
+ ap_remove_pid(pconf, ap_pid_fname);
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO()
+ "caught " AP_SIG_GRACEFUL_STOP_STRING ", shutting down gracefully");
+
+ if (ap_graceful_shutdown_timeout) {
+ cutoff = apr_time_now() +
+ apr_time_from_sec(ap_graceful_shutdown_timeout);
+ }
+
+ /* Don't really exit until each child has finished */
+ shutdown_pending = 0;
+ do {
+ /* Pause for a second */
+ sleep(1);
+
+ /* Relieve any children which have now exited */
+ ap_relieve_child_processes(motorz_note_child_killed);
+
+ active_children = 0;
+ for (index = 0; index < ap_daemons_limit; ++index) {
+ if (ap_mpm_safe_kill(MPM_CHILD_PID(index), 0) == APR_SUCCESS) {
+ active_children = 1;
+ /* Having just one child is enough to stay around */
+ break;
+ }
+ }
+ } while (!shutdown_pending && active_children &&
+ (!ap_graceful_shutdown_timeout || apr_time_now() < cutoff));
+
+ /* We might be here because we received SIGTERM, either
+ * way, try and make sure that all of our processes are
+ * really dead.
+ */
+ ap_unixd_killpg(getpgrp(), SIGTERM);
+
+ return DONE;
+ }
+
+ /* we've been told to restart */
+ apr_signal(SIGHUP, SIG_IGN);
+ apr_signal(AP_SIG_GRACEFUL, SIG_IGN);
+ if (one_process) {
+ /* not worth thinking about */
+ return DONE;
+ }
+
+ /* advance to the next generation */
+ /* XXX: we really need to make sure this new generation number isn't in
+ * use by any of the children.
+ */
+ ++mz->my_generation;
+ ap_scoreboard_image->global->running_generation = mz->my_generation;
+
+ if (mz->is_graceful) {
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO()
+ "Graceful restart requested, doing restart");
+
+ /* kill off the idle ones */
+ for (i = 0; i < num_buckets; i++) {
+ ap_mpm_pod_killpg(all_buckets[i].pod, mz->max_daemons_limit);
+ }
+
+ /* This is mostly for debugging... so that we know what is still
+ * gracefully dealing with existing request. This will break
+ * in a very nasty way if we ever have the scoreboard totally
+ * file-based (no shared memory)
+ */
+ for (index = 0; index < ap_daemons_limit; ++index) {
+ if (ap_scoreboard_image->servers[index][0].status != SERVER_DEAD) {
+ ap_scoreboard_image->servers[index][0].status = SERVER_GRACEFUL;
+ /* Ask each child to close its listeners.
+ *
+ * NOTE: we use the scoreboard, because if we send SIGUSR1
+ * to every process in the group, this may include CGI's,
+ * piped loggers, etc. They almost certainly won't handle
+ * it gracefully.
+ */
+ ap_mpm_safe_kill(ap_scoreboard_image->parent[index].pid, AP_SIG_GRACEFUL);
+ }
+ }
+ }
+ else {
+ /* Kill 'em off */
+ if (ap_unixd_killpg(getpgrp(), SIGHUP) < 0) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf, APLOGNO() "killpg SIGHUP");
+ }
+ ap_reclaim_child_processes(0, /* Not when just starting up */
+ motorz_note_child_killed);
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO()
+ "SIGHUP received. Attempting to restart");
+ }
+
+ return OK;
+}
+
+/* This really should be a post_config hook, but the error log is already
+ * redirected by that point, so we need to do this in the open_logs phase.
+ */
+static int motorz_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
+{
+ int startup = 0;
+ int level_flags = 0;
+ ap_listen_rec **listen_buckets;
+ apr_status_t rv;
+ char id[16];
+ int i;
+
+ pconf = p;
+ motorz_core_t *mz = motorz_core_get();
+
+ /* the reverse of pre_config, we want this only the first time around */
+ if (mz->module_loads == 1) {
+ startup = 1;
+ level_flags |= APLOG_STARTUP;
+ }
+
+ if ((num_listensocks = ap_setup_listeners(ap_server_conf)) < 1) {
+ ap_log_error(APLOG_MARK, APLOG_ALERT | level_flags, 0,
+ (startup ? NULL : s),
+ "no listening sockets available, shutting down");
+ return DONE;
+ }
+
+ if (one_process) {
+ num_buckets = 1;
+ }
+ else if (!mz->is_graceful) { /* Preserve the number of buckets
+ on graceful restarts. */
+ num_buckets = 0;
+ }
+ if ((rv = ap_duplicate_listeners(pconf, ap_server_conf,
+ &listen_buckets, &num_buckets))) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+ (startup ? NULL : s),
+ "could not duplicate listeners");
+ return DONE;
+ }
+ all_buckets = apr_pcalloc(pconf, num_buckets *
+ sizeof(motorz_child_bucket));
+ for (i = 0; i < num_buckets; i++) {
+ if (!one_process && /* no POD in one_process mode */
+ (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+ (startup ? NULL : s),
+ "could not open pipe-of-death");
+ return DONE;
+ }
+ /* Initialize cross-process accept lock (safe accept needed only) */
+ if ((rv = SAFE_ACCEPT((apr_snprintf(id, sizeof id, "%i", i),
+ ap_proc_mutex_create(&all_buckets[i].mutex,
+ NULL, AP_ACCEPT_MUTEX_TYPE,
+ id, s, pconf, 0))))) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+ (startup ? NULL : s),
+ "could not create accept mutex");
+ return DONE;
+ }
+ all_buckets[i].listeners = listen_buckets[i];
+ }
+
+ return OK;
+}
+
+static int motorz_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
+{
+ int no_detach, debug, foreground;
+ apr_status_t rv;
+ const char *userdata_key = "mpm_motorz_module";
+ motorz_core_t *mz;
+
+ mpm_state = AP_MPMQ_STARTING;
+
+ debug = ap_exists_config_define("DEBUG");
+
+ if (debug) {
+ foreground = one_process = 1;
+ no_detach = 0;
+ }
+ else
+ {
+ no_detach = ap_exists_config_define("NO_DETACH");
+ one_process = ap_exists_config_define("ONE_PROCESS");
+ foreground = ap_exists_config_define("FOREGROUND");
+ }
+
+ ap_mutex_register(p, AP_ACCEPT_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
+
+ /* sigh, want this only the second time around */
+ mz = g_motorz_core = ap_retained_data_get(userdata_key);
+ if (!g_motorz_core) {
+ mz = g_motorz_core = ap_retained_data_create(userdata_key, sizeof(*g_motorz_core));
+ mz->max_daemons_limit = -1;
+ }
+ ++mz->module_loads;
+ if (mz->module_loads == 2) {
+ if (!one_process && !foreground) {
+ /* before we detach, setup crash handlers to log to errorlog */
+ ap_fatal_signal_setup(ap_server_conf, pconf);
+ rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
+ : APR_PROC_DETACH_DAEMONIZE);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, APLOGNO()
+ "apr_proc_detach failed");
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
+ }
+ }
+
+ parent_pid = ap_my_pid = getpid();
+ apr_pool_create(&mz->pool, ap_pglobal);
+ apr_pool_tag(mz->pool, "motorz-mpm-core");
+ apr_skiplist_init(&mz->timer_ring, mz->pool);
+ apr_skiplist_set_compare(mz->timer_ring, indexing_comp, indexing_compk);
+ apr_thread_mutex_create(&mz->mtx, 0, mz->pool);
+
+ ap_listen_pre_config();
+ ap_num_kids = DEFAULT_START_DAEMON;
+ ap_daemons_min_free = DEFAULT_MIN_FREE_DAEMON;
+ ap_daemons_max_free = DEFAULT_MAX_FREE_DAEMON;
+ server_limit = DEFAULT_SERVER_LIMIT;
+ ap_daemons_limit = server_limit;
+ ap_extended_status = 0;
+
+ return OK;
+}
+
+static int motorz_check_config(apr_pool_t *p, apr_pool_t *plog,
+ apr_pool_t *ptemp, server_rec *s)
+{
+ int startup = 0;
+ motorz_core_t *mz = motorz_core_get();
+
+ /* the reverse of pre_config, we want this only the first time around */
+ if (mz->module_loads == 1) {
+ startup = 1;
+ }
+
+ if (server_limit > MAX_SERVER_LIMIT) {
+ if (startup) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO()
+ "WARNING: ServerLimit of %d exceeds compile-time "
+ "limit of", server_limit);
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
+ " %d servers, decreasing to %d.",
+ MAX_SERVER_LIMIT, MAX_SERVER_LIMIT);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "ServerLimit of %d exceeds compile-time limit "
+ "of %d, decreasing to match",
+ server_limit, MAX_SERVER_LIMIT);
+ }
+ server_limit = MAX_SERVER_LIMIT;
+ }
+ else if (server_limit < 1) {
+ if (startup) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO()
+ "WARNING: ServerLimit of %d not allowed, "
+ "increasing to 1.", server_limit);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "ServerLimit of %d not allowed, increasing to 1",
+ server_limit);
+ }
+ server_limit = 1;
+ }
+
+ /* you cannot change ServerLimit across a restart; ignore
+ * any such attempts
+ */
+ if (!mz->first_server_limit) {
+ mz->first_server_limit = server_limit;
+ }
+ else if (server_limit != mz->first_server_limit) {
+ /* don't need a startup console version here */
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "changing ServerLimit to %d from original value of %d "
+ "not allowed during restart",
+ server_limit, mz->first_server_limit);
+ server_limit = mz->first_server_limit;
+ }
+
+ if (ap_daemons_limit > server_limit) {
+ if (startup) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO()
+ "WARNING: MaxRequestWorkers of %d exceeds ServerLimit "
+ "value of", ap_daemons_limit);
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
+ " %d servers, decreasing MaxRequestWorkers to %d.",
+ server_limit, server_limit);
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
+ " To increase, please see the ServerLimit "
+ "directive.");
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "MaxRequestWorkers of %d exceeds ServerLimit value "
+ "of %d, decreasing to match",
+ ap_daemons_limit, server_limit);
+ }
+ ap_daemons_limit = server_limit;
+ }
+ else if (ap_daemons_limit < 1) {
+ if (startup) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO()
+ "WARNING: MaxRequestWorkers of %d not allowed, "
+ "increasing to 1.", ap_daemons_limit);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "MaxRequestWorkers of %d not allowed, increasing to 1",
+ ap_daemons_limit);
+ }
+ ap_daemons_limit = 1;
+ }
+
+ /* ap_num_kids > ap_daemons_limit checked in motorz_run() */
+ if (ap_num_kids < 1) {
+ if (startup) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO()
+ "WARNING: StartServers of %d not allowed, "
+ "increasing to 1.", ap_num_kids);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "StartServers of %d not allowed, increasing to 1",
+ ap_num_kids);
+ }
+ ap_num_kids = 1;
+ }
+
+ if (ap_daemons_min_free < 1) {
+ if (startup) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO()
+ "WARNING: MinSpareServers of %d not allowed, "
+ "increasing to 1", ap_daemons_min_free);
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
+ " to avoid almost certain server failure.");
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL,
+ " Please read the documentation.");
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
+ "MinSpareServers of %d not allowed, increasing to 1",
+ ap_daemons_min_free);
+ }
+ ap_daemons_min_free = 1;
+ }
+
+ /* ap_daemons_max_free < ap_daemons_min_free + 1 checked in motorz_run() */
+
+ return OK;
+}
+
+static void motorz_hooks(apr_pool_t *p)
+{
+ /* Our open_logs hook function must run before the core's, or stderr
+ * will be redirected to a file, and the messages won't print to the
+ * console.
+ */
+ static const char *const aszSucc[] = {"core.c", NULL};
+ ap_force_set_tz(p);
+
+ ap_hook_open_logs(motorz_open_logs, NULL, aszSucc, APR_HOOK_REALLY_FIRST);
+ /* we need to set the MPM state before other pre-config hooks use MPM query
+ * to retrieve it, so register as REALLY_FIRST
+ */
+ ap_hook_pre_config(motorz_pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
+ ap_hook_check_config(motorz_check_config, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_mpm(motorz_run, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_mpm_query(motorz_query, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_mpm_get_name(motorz_get_name, NULL, NULL, APR_HOOK_MIDDLE);
+}
+
+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 err;
+ }
+
+ ap_num_kids = atoi(arg);
+ return NULL;
+}
+
+static const char *set_max_clients (cmd_parms *cmd, void *dummy, const char *arg)
+{
+ const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+ if (err != NULL) {
+ return err;
+ }
+ if (!strcasecmp(cmd->cmd->name, "MaxClients")) {
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO()
+ "MaxClients is deprecated, use MaxRequestWorkers "
+ "instead.");
+ }
+ ap_daemons_limit = atoi(arg);
+ return NULL;
+}
+
+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) {
+ return err;
+ }
+
+ server_limit = atoi(arg);
+ return NULL;
+}
+
+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) {
+ return err;
+ }
+
+ threads_per_child = atoi(arg);
+ return NULL;
+}
+
+static const command_rec motorz_cmds[] = {
+LISTEN_COMMANDS,
+AP_INIT_TAKE1("StartServers", set_daemons_to_start, NULL, RSRC_CONF,
+ "Number of child processes launched at server startup"),
+AP_INIT_TAKE1("MaxClients", set_max_clients, NULL, RSRC_CONF,
+ "Deprecated name of MaxRequestWorkers"),
+AP_INIT_TAKE1("ServerLimit", set_server_limit, NULL, RSRC_CONF,
+ "Maximum value of MaxRequestWorkers for this run of Apache"),
+AP_INIT_TAKE1("ThreadsPerChild", set_threads_per_child, NULL, RSRC_CONF,
+ "Number of threads each child creates"),
+AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
+{ NULL }
+};
+
+AP_DECLARE_MODULE(mpm_motorz) = {
+ 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 */
+ motorz_cmds, /* command apr_table_t */
+ motorz_hooks, /* register hooks */
+};
Added: httpd/httpd/trunk/server/mpm/motorz/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/mpm_default.h?rev=1664077&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/mpm_default.h (added)
+++ httpd/httpd/trunk/server/mpm/motorz/mpm_default.h Wed Mar 4 17:17:53 2015
@@ -0,0 +1,50 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file motorz/mpm_default.h
+ * @brief MotorZ MPM defaults
+ *
+ * @defgroup APACHE_MPM_MOTORZ MotorZ MPM
+ * @ingroup APACHE_INTERNAL
+ * @{
+ */
+
+#ifndef APACHE_MPM_DEFAULT_H
+#define APACHE_MPM_DEFAULT_H
+
+/* Number of servers to spawn off by default ---
+ */
+#ifndef DEFAULT_START_DAEMON
+#define DEFAULT_START_DAEMON 1
+#endif
+
+/* Maximum number of *free* server processes --- more than this, and
+ * they will die off.
+ */
+
+#ifndef DEFAULT_MAX_FREE_DAEMON
+#define DEFAULT_MAX_FREE_DAEMON 2
+#endif
+
+/* Minimum --- fewer than this, and more will be created */
+
+#ifndef DEFAULT_MIN_FREE_DAEMON
+#define DEFAULT_MIN_FREE_DAEMON 1
+#endif
+
+#endif /* AP_MPM_DEFAULT_H */
+/** @} */