Attachment 12870 Details for Bug 12469 – Extra patches for master

[patch] Extra patches for master

BZ12469-extra.patch (text/plain), 2.25 KB, created by Amitay Isaacs on 2017-01-31 05:55:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-01-31 05:55:35 UTC

Size: 2.25 KB

patch

obsolete

>From 930aacc5c10b9abf6ffc85ae8e89da0fe7d8985c Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 31 Jan 2017 16:49:14 +1100
>Subject: [PATCH 1/2] ctdb-tests: Support older definitions for robust mutexes
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12469
>
>In older version of glibc PTHREAD_MUTEX_ROBUST_NP and
>pthread_mutexattr_setrobust_np() is defined instead of
>PTHREAD_MUTEX_ROBUST and pthread_mutexattr_setrobust().
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>---
> ctdb/tests/src/test_mutex_raw.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/ctdb/tests/src/test_mutex_raw.c b/ctdb/tests/src/test_mutex_raw.c
>index 8e3cae3..3ae7ade 100644
>--- a/ctdb/tests/src/test_mutex_raw.c
>+++ b/ctdb/tests/src/test_mutex_raw.c
>@@ -202,7 +202,11 @@ int main(int argc, const char **argv)
> 		exit(1);
> 	}
> 
>+#if PTHREAD_MUTEX_ROBUST
> 	ret = pthread_mutexattr_setrobust(&ma, PTHREAD_MUTEX_ROBUST);
>+#else
>+	ret = pthread_mutexattr_setrobust_np(&ma, PTHREAD_MUTEX_ROBUST_NP);
>+#endif
> 	if (ret != 0) {
> 		fprintf(stderr, "pthread_mutexattr_setrobust failed\n");
> 		exit(1);
>-- 
>2.9.3
>
>
>From f39ea0f4b4241b00095b63a6579f74a6476aaca4 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 31 Jan 2017 14:50:53 +1100
>Subject: [PATCH 2/2] ctdb-tests: Do not build mutex test if robust mutexes are
> not supported
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12469
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>---
> ctdb/wscript | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index bc696c5..45a23d2 100644
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -831,10 +831,11 @@ def build(bld):
>                               ib_deps,
>                          install_path='${CTDB_TEST_LIBEXECDIR}')
> 
>-    bld.SAMBA_BINARY('test_mutex_raw',
>-                     source='tests/src/test_mutex_raw.c',
>-                     deps='pthread',
>-                     install_path='${CTDB_TEST_LIBEXECDIR}')
>+    if bld.env.HAVE_ROBUST_MUTEXES:
>+        bld.SAMBA_BINARY('test_mutex_raw',
>+                         source='tests/src/test_mutex_raw.c',
>+                         deps='pthread',
>+                         install_path='${CTDB_TEST_LIBEXECDIR}')
> 
>     test_subdirs = [
>         'complex',
>-- 
>2.9.3
>

Actions: View

Attachments on bug 12469: 12830 | 12831 | 12866 | 12870 | 12874 | 12879 | 12892 | 12893