From: Julien Desfossez <julien.desfossez@polymtl.ca>
Date: Fri, 15 Jul 2011 19:05:00 +0000 (-0400)
Subject: Fix locking dependency problem
X-Git-Tag: v2.0-pre1~39
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=fec07047f5911e611d7b0d0edf082f9c1b013cdb;p=lttng-tools.git

Fix locking dependency problem

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Julien Desfossez <julien.desfossez@polymtl.ca>
---

diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/liblttkconsumerd.c
index de942a198..4ec949e0f 100644
--- a/liblttkconsumerd/liblttkconsumerd.c
+++ b/liblttkconsumerd/liblttkconsumerd.c
@@ -75,6 +75,7 @@ static int kconsumerd_poll_pipe[2];
  * received by the library.
  */
 
+
 /* timeout parameter, to control the polling thread grace period */
 static int kconsumerd_poll_timeout = -1;
 
@@ -116,6 +117,7 @@ void kconsumerd_set_command_socket_path(char *sock)
  * kconsumerd_find_session_fd
  *
  * Find a session fd in the global list.
+ * The kconsumerd_data.lock must be locked during this call
  *
  * Return 1 if found else 0
  */
@@ -123,7 +125,6 @@ static int kconsumerd_find_session_fd(int fd)
 {
 	struct kconsumerd_fd *iter;
 
-	pthread_mutex_lock(&kconsumerd_data.lock);
 	cds_list_for_each_entry(iter, &kconsumerd_data.fd_list.head, list) {
 		if (iter->sessiond_fd == fd) {
 			DBG("Duplicate session fd %d", fd);
@@ -131,7 +132,6 @@ static int kconsumerd_find_session_fd(int fd)
 			return 1;
 		}
 	}
-	pthread_mutex_unlock(&kconsumerd_data.lock);
 
 	return 0;
 }