* [Buildroot] [PATCH 1/1] haproxy: tweak thread activation
@ 2018-10-02 19:28 Fabrice Fontaine
2018-10-02 20:53 ` Arnout Vandecappelle
2018-10-03 7:47 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2018-10-02 19:28 UTC (permalink / raw)
To: buildroot
If threads are enabled, as described in include/common/hathreads.h,
haproxy uses __sync_*_4 intrisics if gcc < 4.7. Otherwise, haproxy
uses __atomic_ intrinsics.
As a result, instead of adding a dependency on BR2_TOOLCHAIN_HAS_SYNC_4
and BR2_TOOLCHAIN_HAS_ATOMIC in Config.in, enable threads only if the
dependencies are fulfilled in haproxy.mk
Fixes:
- http://autobuild.buildroot.org/results/7f24873ecdd9246c95c03bb8d2fcd4c16c488c6c
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/haproxy/Config.in | 1 -
package/haproxy/haproxy.mk | 6 ++++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in
index cbcbc0c388..fbe5941b55 100644
--- a/package/haproxy/Config.in
+++ b/package/haproxy/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_HAPROXY
bool "haproxy"
depends on BR2_USE_MMU # fork()
- depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics
help
HAProxy is a free, very fast and reliable solution offering
high availability, load balancing, and proxying for TCP and
diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk
index 363fc4447f..061a8cbbaf 100644
--- a/package/haproxy/haproxy.mk
+++ b/package/haproxy/haproxy.mk
@@ -20,7 +20,13 @@ HAPROXY_LIBS += -latomic
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+# threads uses atomics on gcc >= 4.7 and sync otherwise (see
+# include/common/hathreads.h)
+ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y)
HAPROXY_MAKE_OPTS += USE_THREAD=1
+else ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y)
+HAPROXY_MAKE_OPTS += USE_THREAD=1
+endif
endif
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] haproxy: tweak thread activation
2018-10-02 19:28 [Buildroot] [PATCH 1/1] haproxy: tweak thread activation Fabrice Fontaine
@ 2018-10-02 20:53 ` Arnout Vandecappelle
2018-10-03 7:47 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2018-10-02 20:53 UTC (permalink / raw)
To: buildroot
On 02/10/2018 21:28, Fabrice Fontaine wrote:
> If threads are enabled, as described in include/common/hathreads.h,
> haproxy uses __sync_*_4 intrisics if gcc < 4.7. Otherwise, haproxy
> uses __atomic_ intrinsics.
So the problem really is that haproxy is to stupid to realize that it should
fall back on __sync if __atomic is not available...
But trying to encode that in a hand-rolled Makefile is insane. So this approach
looks good to me.
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
>
> As a result, instead of adding a dependency on BR2_TOOLCHAIN_HAS_SYNC_4
> and BR2_TOOLCHAIN_HAS_ATOMIC in Config.in, enable threads only if the
> dependencies are fulfilled in haproxy.mk
>
> Fixes:
> - http://autobuild.buildroot.org/results/7f24873ecdd9246c95c03bb8d2fcd4c16c488c6c
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/haproxy/Config.in | 1 -
> package/haproxy/haproxy.mk | 6 ++++++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in
> index cbcbc0c388..fbe5941b55 100644
> --- a/package/haproxy/Config.in
> +++ b/package/haproxy/Config.in
> @@ -1,7 +1,6 @@
> config BR2_PACKAGE_HAPROXY
> bool "haproxy"
> depends on BR2_USE_MMU # fork()
> - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics
> help
> HAProxy is a free, very fast and reliable solution offering
> high availability, load balancing, and proxying for TCP and
> diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk
> index 363fc4447f..061a8cbbaf 100644
> --- a/package/haproxy/haproxy.mk
> +++ b/package/haproxy/haproxy.mk
> @@ -20,7 +20,13 @@ HAPROXY_LIBS += -latomic
> endif
>
> ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
> +# threads uses atomics on gcc >= 4.7 and sync otherwise (see
> +# include/common/hathreads.h)
> +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y)
> HAPROXY_MAKE_OPTS += USE_THREAD=1
> +else ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y)
> +HAPROXY_MAKE_OPTS += USE_THREAD=1
> +endif
> endif
>
> ifeq ($(BR2_PACKAGE_LUA_5_3),y)
>
--
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] haproxy: tweak thread activation
2018-10-02 19:28 [Buildroot] [PATCH 1/1] haproxy: tweak thread activation Fabrice Fontaine
2018-10-02 20:53 ` Arnout Vandecappelle
@ 2018-10-03 7:47 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-10-03 7:47 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> If threads are enabled, as described in include/common/hathreads.h,
> haproxy uses __sync_*_4 intrisics if gcc < 4.7. Otherwise, haproxy
> uses __atomic_ intrinsics.
> As a result, instead of adding a dependency on BR2_TOOLCHAIN_HAS_SYNC_4
> and BR2_TOOLCHAIN_HAS_ATOMIC in Config.in, enable threads only if the
> dependencies are fulfilled in haproxy.mk
> Fixes:
> - http://autobuild.buildroot.org/results/7f24873ecdd9246c95c03bb8d2fcd4c16c488c6c
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-03 7:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-02 19:28 [Buildroot] [PATCH 1/1] haproxy: tweak thread activation Fabrice Fontaine
2018-10-02 20:53 ` Arnout Vandecappelle
2018-10-03 7:47 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.