From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 26 Aug 2011 20:55:32 +0000 (-0400)
Subject: Fork handling: fix deadlock between mutex and semaphore
X-Git-Tag: v1.9.1~223
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=318dfea93efe898f9d961978e085998eaf7b2220;p=lttng-ust.git

Fork handling: fix deadlock between mutex and semaphore

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 58e9a648..e7680797 100644
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -279,6 +279,7 @@ void cleanup_sock_info(struct sock_info *sock_info)
 		}
 		sock_info->root_handle = -1;
 	}
+	sock_info->constructor_sem_posted = 0;
 }
 
 /*
@@ -619,7 +620,7 @@ void ust_after_fork_child(ust_fork_info_t *fork_info)
 	/* Release urcu mutexes */
 	rcu_bp_after_fork_child();
 	lttng_ust_cleanup(0);
-	lttng_ust_init();
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(fork_info);
+	lttng_ust_init();
 }