From: David Goulet Date: Fri, 11 Oct 2013 19:35:39 +0000 (-0400) Subject: Fix: backported fix uses msec vs sec in stable-2.2 X-Git-Tag: v2.2.5~5 X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=b51183aed8824a07317a3811826ca8d3b567e8f5;hp=af5e22f20180ac52ad30a6c3af1c97d88ef32f6a;p=lttng-tools.git Fix: backported fix uses msec vs sec in stable-2.2 In stable-2.2, setting the timeout expects seconds and not msec like in stable-2.3 and above. This fixes the previous commit that was backported from master. Signed-off-by: David Goulet --- diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index a70ecda4c..95e17fd40 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -1802,9 +1802,9 @@ static void *thread_registration_apps(void *data) * parameter. */ (void) lttcomm_setsockopt_rcv_timeout(sock, - app_socket_timeout * 1000); + app_socket_timeout); (void) lttcomm_setsockopt_snd_timeout(sock, - app_socket_timeout * 1000); + app_socket_timeout); /* * Set the CLOEXEC flag. Return code is useless because