From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Mon, 12 Sep 2016 00:39:18 +0200 Subject: [Buildroot] [PATCH v2,1/4] apache: add customization of MPM In-Reply-To: <1473632768-53238-1-git-send-email-fabrice.fontaine@orange.com> References: <1473632768-53238-1-git-send-email-fabrice.fontaine@orange.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 12-09-16 00:26, Fabrice Fontaine wrote: > MPM can be selected between event, prefork or worker > Set worker as the default one as it was before even if event MPM is > better on system supporting thread safe polling > > Signed-off-by: Fabrice Fontaine Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Perhaps the default should change to 'event', however? Regards, Arnout > --- > Changes v1 -> v2 (after review of Yann Morin): > - Do not use unneeded variables in Config.in and apache.mk > > package/apache/Config.in | 28 ++++++++++++++++++++++++++++ > package/apache/apache.mk | 10 +++++++++- > 2 files changed, 37 insertions(+), 1 deletion(-) > > diff --git a/package/apache/Config.in b/package/apache/Config.in > index 0814a17..511876d 100644 > --- a/package/apache/Config.in > +++ b/package/apache/Config.in > @@ -14,6 +14,34 @@ config BR2_PACKAGE_APACHE > > http://httpd.apache.org > > +if BR2_PACKAGE_APACHE > + > +choice > + prompt "Multi-Processing Module (MPM)" > + default BR2_PACKAGE_APACHE_MPM_WORKER > + help > + Select the Multi-Processing Module (MPM). > + > +config BR2_PACKAGE_APACHE_MPM_EVENT > + bool "event" > + help > + A variant of the worker MPM with the goal of consuming threads > + only for connections with active processing > + > +config BR2_PACKAGE_APACHE_MPM_PREFORK > + bool "prefork" > + help > + Implements a non-threaded, pre-forking web server > + > +config BR2_PACKAGE_APACHE_MPM_WORKER > + bool "worker" > + help > + Implements a hybrid multi-threaded multi-process web server > + > +endchoice > + > +endif > + > comment "apache needs a toolchain w/ dynamic library, threads" > depends on BR2_USE_MMU > depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS > diff --git a/package/apache/apache.mk b/package/apache/apache.mk > index e78545a..488ad56 100644 > --- a/package/apache/apache.mk > +++ b/package/apache/apache.mk > @@ -20,6 +20,14 @@ APACHE_CONF_ENV= \ > ap_cv_void_ptr_lt_long=no \ > PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config > > +ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) > +APACHE_MPM = event > +else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y) > +APACHE_MPM = prefork > +else > +APACHE_MPM = worker > +endif > + > APACHE_CONF_OPTS = \ > --sysconfdir=/etc/apache2 \ > --with-apr=$(STAGING_DIR)/usr \ > @@ -31,7 +39,7 @@ APACHE_CONF_OPTS = \ > --enable-mime-magic \ > --without-suexec-bin \ > --enable-mods-shared=all \ > - --with-mpm=worker \ > + --with-mpm=$(APACHE_MPM) \ > --disable-lua \ > --disable-luajit > > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF