From fec07047f5911e611d7b0d0edf082f9c1b013cdb Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Fri, 15 Jul 2011 15:05:00 -0400 Subject: [PATCH] Fix locking dependency problem Acked-by: Mathieu Desnoyers Signed-off-by: Julien Desfossez --- liblttkconsumerd/liblttkconsumerd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.34.1