Attachment 10914 Details for Bug 11175 – git-am fix for 4.2.next

[patch] git-am fix for 4.2.next

0001-lib-tdb-Use-sigaction-when-testing-for-robust-mutexe.patch (text/plain), 2.58 KB, created by Jeremy Allison on 2015-03-26 16:36:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-03-26 16:36:49 UTC

Size: 2.58 KB

patch

obsolete

>From 05b61ea47d1a30e6c37e46c199eb975f79099ed3 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 20 Mar 2015 10:59:08 -0700
>Subject: [PATCH] lib: tdb: Use sigaction when testing for robust mutexes.
>
>Working fix that copes with oldact.sa_handler == NULL
>if no handler initially set.
>
>Fixes bug #11175 - Lots of winbindd zombie processes on Solaris platform.
>
>https://bugzilla.samba.org/show_bug.cgi?id=11175
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Thu Mar 26 04:29:42 CET 2015 on sn-devel-104
>---
> lib/tdb/common/mutex.c | 35 +++++++++++++++++++++++++++++++----
> 1 file changed, 31 insertions(+), 4 deletions(-)
>
>diff --git a/lib/tdb/common/mutex.c b/lib/tdb/common/mutex.c
>index 12f89d3..fae43d4 100644
>--- a/lib/tdb/common/mutex.c
>+++ b/lib/tdb/common/mutex.c
>@@ -713,6 +713,31 @@ cleanup_ma:
> static void (*tdb_robust_mutext_old_handler)(int) = SIG_ERR;
> static pid_t tdb_robust_mutex_pid = -1;
> 
>+static bool tdb_robust_mutex_setup_sigchild(void (*handler)(int),
>+			void (**p_old_handler)(int))
>+{
>+#ifdef HAVE_SIGACTION
>+	struct sigaction act;
>+	struct sigaction oldact;
>+
>+	memset(&act, '\0', sizeof(act));
>+
>+	act.sa_handler = handler;
>+#ifdef SA_RESTART
>+	act.sa_flags = SA_RESTART;
>+#endif
>+	sigemptyset(&act.sa_mask);
>+	sigaddset(&act.sa_mask, SIGCHLD);
>+	sigaction(SIGCHLD, &act, &oldact);
>+	if (p_old_handler) {
>+		*p_old_handler = oldact.sa_handler;
>+	}
>+	return true;
>+#else /* !HAVE_SIGACTION */
>+	return false;
>+#endif
>+}
>+
> static void tdb_robust_mutex_handler(int sig)
> {
> 	if (tdb_robust_mutex_pid != -1) {
>@@ -803,8 +828,10 @@ _PUBLIC_ bool tdb_runtime_check_for_robust_mutexes(void)
> 		goto cleanup_ma;
> 	}
> 
>-	tdb_robust_mutext_old_handler = signal(SIGCHLD,
>-					       tdb_robust_mutex_handler);
>+	if (tdb_robust_mutex_setup_sigchild(tdb_robust_mutex_handler,
>+			&tdb_robust_mutext_old_handler) == false) {
>+		goto cleanup_ma;
>+	}
> 
> 	tdb_robust_mutex_pid = fork();
> 	if (tdb_robust_mutex_pid == 0) {
>@@ -869,7 +896,7 @@ _PUBLIC_ bool tdb_runtime_check_for_robust_mutexes(void)
> 			goto cleanup_child;
> 		}
> 	}
>-	signal(SIGCHLD, tdb_robust_mutext_old_handler);
>+	tdb_robust_mutex_setup_sigchild(tdb_robust_mutext_old_handler, NULL);
> 
> 	ret = pthread_mutex_trylock(m);
> 	if (ret != EOWNERDEAD) {
>@@ -915,7 +942,7 @@ cleanup_child:
> 		}
> 	}
> cleanup_sig_child:
>-	signal(SIGCHLD, tdb_robust_mutext_old_handler);
>+	tdb_robust_mutex_setup_sigchild(tdb_robust_mutext_old_handler, NULL);
> cleanup_m:
> 	pthread_mutex_destroy(m);
> cleanup_ma:
>-- 
>2.2.0.rc0.207.ga3a616c
>

Flags:

obnox: review+
asn: review+

Actions: View

Attachments on bug 11175: 10899 | 10910 | 10914