projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inet/inet6 sockets: apply timeout
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 2929bba0d6f677cfdf813e3c89a5bb8d7bc51921..d22e2a63d7d5d96526a7e93b2c2761a0c0894924 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-1298,11
+1298,17
@@
static void *thread_manage_apps(void *data)
goto error;
}
goto error;
}
- /* Set socket timeout for both receiving and ending */
+ /*
+ * Set socket timeout for both receiving and ending.
+ * app_socket_timeout is in seconds, whereas
+ * lttcomm_setsockopt_rcv_timeout and
+ * lttcomm_setsockopt_snd_timeout expect msec as
+ * parameter.
+ */
(void) lttcomm_setsockopt_rcv_timeout(sock,
(void) lttcomm_setsockopt_rcv_timeout(sock,
- app_socket_timeout);
+ app_socket_timeout
* 1000
);
(void) lttcomm_setsockopt_snd_timeout(sock,
(void) lttcomm_setsockopt_snd_timeout(sock,
- app_socket_timeout);
+ app_socket_timeout
* 1000
);
DBG("Apps with sock %d added to poll set", sock);
DBG("Apps with sock %d added to poll set", sock);
@@
-4631,6
+4637,9
@@
int main(int argc, char **argv)
write_pidfile();
write_pidfile();
+ /* Initialize communication library */
+ lttcomm_init();
+
/* Create thread to manage the client socket */
ret = pthread_create(&ht_cleanup_thread, NULL,
thread_ht_cleanup, (void *) NULL);
/* Create thread to manage the client socket */
ret = pthread_create(&ht_cleanup_thread, NULL,
thread_ht_cleanup, (void *) NULL);
This page took
0.026704 seconds
and
4
git commands to generate.