diff options
author | Jeff Trawick <trawick@apache.org> | 2009-03-27 12:35:33 +0000 |
---|---|---|
committer | Jeff Trawick <trawick@apache.org> | 2009-03-27 12:35:33 +0000 |
commit | 0221146859b39833fbf8e409a561af87d665572d (patch) | |
tree | 4299e3b12f872f135b4dc10335a3c66f614a93a1 | |
parent | 4cc23690d48f226ba229829a2866736a66f87c9f (diff) | |
download | httpd-0221146859b39833fbf8e409a561af87d665572d.tar.gz |
The Event MPM is no longer experimental; move it out of that ghetto.
Yank the few bits that implement the concept of an experimental MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759115 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | LAYOUT | 4 | ||||
-rw-r--r-- | configure.in | 20 | ||||
-rw-r--r-- | docs/manual/mod/event.xml | 9 | ||||
-rw-r--r-- | server/mpm/config.m4 | 17 | ||||
-rw-r--r-- | server/mpm/event/Makefile.in (renamed from server/mpm/experimental/event/Makefile.in) | 0 | ||||
-rw-r--r-- | server/mpm/event/config5.m4 (renamed from server/mpm/experimental/event/config5.m4) | 0 | ||||
-rw-r--r-- | server/mpm/event/event.c (renamed from server/mpm/experimental/event/event.c) | 0 | ||||
-rw-r--r-- | server/mpm/event/fdqueue.c (renamed from server/mpm/experimental/event/fdqueue.c) | 0 | ||||
-rw-r--r-- | server/mpm/event/fdqueue.h (renamed from server/mpm/experimental/event/fdqueue.h) | 0 | ||||
-rw-r--r-- | server/mpm/event/mpm_default.h (renamed from server/mpm/experimental/event/mpm_default.h) | 0 | ||||
-rw-r--r-- | server/mpm/event/pod.c (renamed from server/mpm/experimental/event/pod.c) | 0 | ||||
-rw-r--r-- | server/mpm/event/pod.h (renamed from server/mpm/experimental/event/pod.h) | 0 |
12 files changed, 4 insertions, 46 deletions
@@ -151,9 +151,7 @@ server/ ................. mpm/ .................... - experimental/ ........... - - event/ ................. + event/ .................. netware/ ................ diff --git a/configure.in b/configure.in index 6967bfb4ac..45083891c4 100644 --- a/configure.in +++ b/configure.in @@ -716,23 +716,3 @@ AC_SUBST(HTTPD_VERSION) AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh,[true],[ APACHE_GEN_MAKEFILES ]) - -case $MPM_SUBDIR_NAME in -*experimental*) - echo "" - echo "" - echo "============================================================" - echo " WARNING: THE '${APACHE_MPM}' MPM IS EXPERIMENTAL" - echo "============================================================" - echo " The selected MPM might not be fully functional!" - echo "" - echo " Development of this MPM is not complete. Do not use this" - echo " MPM unless you are a programmer willing to help fix it." - echo "" - echo " If you are looking for a stable server, you should not use" - echo " the '${APACHE_MPM}' MPM until it is moved out of experimental." - echo "============================================================" - echo "" - echo "" - ;; -esac diff --git a/docs/manual/mod/event.xml b/docs/manual/mod/event.xml index 65bcf003fd..9439e1899d 100644 --- a/docs/manual/mod/event.xml +++ b/docs/manual/mod/event.xml @@ -22,18 +22,13 @@ <modulesynopsis metafile="event.xml.meta"> <name>event</name> -<description>An experimental variant of the standard <module>worker</module> -MPM</description> +<description>A variant of the <module>worker</module> MPM with the goal +of consuming threads only for connections with active processing</description> <status>MPM</status> <sourcefile>event.c</sourcefile> <identifier>mpm_event_module</identifier> <summary> - <note type="warning"><title>Warning</title> - <p>This MPM is experimental, so it may or may not work as - expected.</p> - </note> - <p>The <module>event</module> Multi-Processing Module (MPM) is designed to allow more requests to be served simultaneously by passing off some processing work to supporting threads, freeing up diff --git a/server/mpm/config.m4 b/server/mpm/config.m4 index a4a7e325d7..fa61ff0a7c 100644 --- a/server/mpm/config.m4 +++ b/server/mpm/config.m4 @@ -24,16 +24,6 @@ ap_mpm_is_threaded () fi } -dnl No such check for a shared MPM. -ap_mpm_is_experimental () -{ - if test "$apache_cv_mpm" = "event"; then - return 0 - else - return 1 - fi -} - if ap_mpm_is_threaded; then APR_CHECK_APR_DEFINE(APR_HAS_THREADS) @@ -70,12 +60,7 @@ if test "$apache_cv_mpm" = "shared"; then MPM_DIR="" else MPM_NAME=$apache_cv_mpm - if ap_mpm_is_experimental; then - AC_MSG_WARN(You have selected an EXPERIMENTAL MPM. Be warned!) - MPM_SUBDIR_NAME=experimental/$MPM_NAME - else - MPM_SUBDIR_NAME=$MPM_NAME - fi + MPM_SUBDIR_NAME=$MPM_NAME MPM_DIR=server/mpm/$MPM_SUBDIR_NAME MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la diff --git a/server/mpm/experimental/event/Makefile.in b/server/mpm/event/Makefile.in index 7c2a1a7a6d..7c2a1a7a6d 100644 --- a/server/mpm/experimental/event/Makefile.in +++ b/server/mpm/event/Makefile.in diff --git a/server/mpm/experimental/event/config5.m4 b/server/mpm/event/config5.m4 index 5e1db5398b..5e1db5398b 100644 --- a/server/mpm/experimental/event/config5.m4 +++ b/server/mpm/event/config5.m4 diff --git a/server/mpm/experimental/event/event.c b/server/mpm/event/event.c index f6b409d750..f6b409d750 100644 --- a/server/mpm/experimental/event/event.c +++ b/server/mpm/event/event.c diff --git a/server/mpm/experimental/event/fdqueue.c b/server/mpm/event/fdqueue.c index 10015b7d39..10015b7d39 100644 --- a/server/mpm/experimental/event/fdqueue.c +++ b/server/mpm/event/fdqueue.c diff --git a/server/mpm/experimental/event/fdqueue.h b/server/mpm/event/fdqueue.h index 9482d71b0c..9482d71b0c 100644 --- a/server/mpm/experimental/event/fdqueue.h +++ b/server/mpm/event/fdqueue.h diff --git a/server/mpm/experimental/event/mpm_default.h b/server/mpm/event/mpm_default.h index c26ee714bf..c26ee714bf 100644 --- a/server/mpm/experimental/event/mpm_default.h +++ b/server/mpm/event/mpm_default.h diff --git a/server/mpm/experimental/event/pod.c b/server/mpm/event/pod.c index 262bd1197b..262bd1197b 100644 --- a/server/mpm/experimental/event/pod.c +++ b/server/mpm/event/pod.c diff --git a/server/mpm/experimental/event/pod.h b/server/mpm/event/pod.h index 861e4d9957..861e4d9957 100644 --- a/server/mpm/experimental/event/pod.h +++ b/server/mpm/event/pod.h |