[Buildroot] [PATCH 1/2] apache: add customization of MPM

[Yann E. MORIN <yann.morin.1998@free.fr>]

Fabrice, All,

On 2016-09-10 21:17 +0200, Fabrice Fontaine spake thusly:
> 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 <fabrice.fontaine@orange.com>
> ---
>  package/apache/Config.in | 40 ++++++++++++++++++++++++++++++++++++++++
>  package/apache/apache.mk | 14 +++++++++++++-
>  2 files changed, 53 insertions(+), 1 deletion(-)
> 
> diff --git a/package/apache/Config.in b/package/apache/Config.in
> index 0814a17..3b25988 100644
> --- a/package/apache/Config.in
> +++ b/package/apache/Config.in
> @@ -14,6 +14,46 @@ config BR2_PACKAGE_APACHE
>  
>  	  http://httpd.apache.org
>  
> +if BR2_PACKAGE_APACHE
> +
> +config BR2_PACKAGE_APACHE_EVENT
> +	bool
> +
> +config BR2_PACKAGE_APACHE_PREFORK
> +	bool
> +
> +config BR2_PACKAGE_APACHE_WORKER
> +	bool

Why do you have those symbols?
See below...

> +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"
> +	select BR2_PACKAGE_APACHE_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"
> +	select BR2_PACKAGE_APACHE_PREFORK
> +	help
> +	  Implements a non-threaded, pre-forking web server
> +
> +config BR2_PACKAGE_APACHE_MPM_WORKER
> +	bool "worker"
> +	select BR2_PACKAGE_APACHE_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..a3f49a1 100644
> --- a/package/apache/apache.mk
> +++ b/package/apache/apache.mk
> @@ -20,6 +20,18 @@ APACHE_CONF_ENV= \
>  	ap_cv_void_ptr_lt_long=no \
>  	PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
>  
> +ifeq ($(BR2_PACKAGE_APACHE_EVENT),y)
> +APACHE_MPM = "event"
> +endif
> +
> +ifeq ($(BR2_PACKAGE_APACHE_PREFORK),y)
> +APACHE_MPM = "prefork"
> +endif
> +
> +ifeq ($(BR2_PACKAGE_APACHE_WORKER),y)
> +APACHE_MPM = "worker"
> +endif

You can re-use the symbols from the choice here:

        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

(No need to test the last case, since the symbols are from a choice: one
and only one can be enabled at a time.

Also, no need to quote the value.

Regards,
Yann E. MORIN.

PS. See ya on Monday! ;-)

>  APACHE_CONF_OPTS = \
>  	--sysconfdir=/etc/apache2 \
>  	--with-apr=$(STAGING_DIR)/usr \
> @@ -31,7 +43,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
>  
> -- 
> 2.5.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'