projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: honor send timeout on unix socket connect
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-comm.c
diff --git
a/liblttng-ust/lttng-ust-comm.c
b/liblttng-ust/lttng-ust-comm.c
index 373a1c2df6b177e4bd6bc2378359e19bd713b87a..335279fb2be77847530b2b5217aada0b7d9eab70 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-433,7
+433,7
@@
int setup_local_apps(void)
}
/*
}
/*
- * Get
notify_sock
timeout, in ms.
+ * Get
socket
timeout, in ms.
* -1: wait forever. 0: don't wait. >0: timeout, in ms.
*/
static
* -1: wait forever. 0: don't wait. >0: timeout, in ms.
*/
static
@@
-453,12
+453,20
@@
long get_timeout(void)
return constructor_delay_ms;
}
return constructor_delay_ms;
}
+/* Timeout for notify socket send and recv. */
static
long get_notify_sock_timeout(void)
{
return get_timeout();
}
static
long get_notify_sock_timeout(void)
{
return get_timeout();
}
+/* Timeout for connecting to cmd and notify sockets. */
+static
+long get_connect_sock_timeout(void)
+{
+ return get_timeout();
+}
+
/*
* Return values: -1: wait forever. 0: don't wait. 1: timeout wait.
*/
/*
* Return values: -1: wait forever. 0: don't wait. 1: timeout wait.
*/
@@
-1274,7
+1282,8
@@
restart:
* first connect registration message.
*/
/* Connect cmd socket */
* first connect registration message.
*/
/* Connect cmd socket */
- ret = ustcomm_connect_unix_sock(sock_info->sock_path);
+ ret = ustcomm_connect_unix_sock(sock_info->sock_path,
+ get_connect_sock_timeout());
if (ret < 0) {
DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
prev_connect_failed = 1;
if (ret < 0) {
DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
prev_connect_failed = 1;
@@
-1330,7
+1339,8
@@
restart:
ust_unlock();
/* Connect notify socket */
ust_unlock();
/* Connect notify socket */
- ret = ustcomm_connect_unix_sock(sock_info->sock_path);
+ ret = ustcomm_connect_unix_sock(sock_info->sock_path,
+ get_connect_sock_timeout());
if (ret < 0) {
DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
prev_connect_failed = 1;
if (ret < 0) {
DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
prev_connect_failed = 1;
This page took
0.030364 seconds
and
4
git commands to generate.