summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2018-12-23 09:46:13 +0100
committerStefan Metzmacher <metze@samba.org>2019-01-11 23:11:14 +0100
commit991ca9b56460912ff1024f9ff443200195e507fa (patch)
tree4f4f27a13f1e9a9d8a6fed0d706c6864c8e6f248 /wscript
parentd818e51174e8d5684719b7e09dcd2d83c315944d (diff)
downloadsamba-991ca9b56460912ff1024f9ff443200195e507fa.tar.gz
Revert "pthreadpool: add some lockless coordination between the main and job threads"
This reverts commit 9656b8d8ee11ee351870286f16ea8fbe49112292. See the discussion in https://lists.samba.org/archive/samba-technical/2018-December/131731.html for the reasoning behind this revert. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'wscript')
-rw-r--r--wscript12
1 files changed, 2 insertions, 10 deletions
diff --git a/wscript b/wscript
index da4254efde4..e38a8e9aecf 100644
--- a/wscript
+++ b/wscript
@@ -279,18 +279,10 @@ def configure(conf):
conf.DEFINE('WITH_NTVFS_FILESERVER', 1)
if Options.options.with_pthreadpool:
- if conf.CONFIG_SET('HAVE_PTHREAD') and \
- conf.CONFIG_SET('HAVE___THREAD') and \
- conf.CONFIG_SET('HAVE_ATOMIC_THREAD_FENCE_SUPPORT'):
+ if conf.CONFIG_SET('HAVE_PTHREAD'):
conf.DEFINE('WITH_PTHREADPOOL', '1')
else:
- if not conf.CONFIG_SET('HAVE_PTHREAD'):
- Logs.warn("pthreadpool support cannot be enabled when pthread support was not found")
- if not conf.CONFIG_SET('HAVE_ATOMIC_THREAD_FENCE_SUPPORT'):
- Logs.warn("""pthreadpool support cannot be enabled when there is
- no support for atomic_thead_fence()""")
- if not conf.CONFIG_SET('HAVE___THREAD'):
- Logs.warn("pthreadpool support cannot be enabled when __thread support was not found")
+ Logs.warn("pthreadpool support cannot be enabled when pthread support was not found")
conf.undefine('WITH_PTHREADPOOL')
conf.SET_TARGET_TYPE('jansson', 'EMPTY')