projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix relayd: initialize beacon to -1ULL
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index cd4f058bf0243df63dd78e573e97fca202b751d3..6f439176f830d3e4b45e9584cd094a4beb698951 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-749,6
+749,7
@@
static struct lttcomm_sock *relay_socket_create(struct lttng_uri *uri)
ret = sock->ops->bind(sock);
if (ret < 0) {
ret = sock->ops->bind(sock);
if (ret < 0) {
+ PERROR("Failed to bind socket");
goto error;
}
goto error;
}
@@
-2053,8
+2054,13
@@
static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
/* no flush. */
ret = 0;
} else {
/* no flush. */
ret = 0;
} else {
+ /*
+ * ret < 0
+ *
+ * relay_index_try_flush is responsible for the self-reference
+ * put of the index object on error.
+ */
ERR("relay_index_try_flush error %d", ret);
ERR("relay_index_try_flush error %d", ret);
- relay_index_put(index);
ret = -1;
}
ret = -1;
}
@@
-2254,9
+2260,13
@@
static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
/* No flush. */
ret = 0;
} else {
/* No flush. */
ret = 0;
} else {
- /* Put self-ref for this index due to error. */
- relay_index_put(index);
- index = NULL;
+ /*
+ * ret < 0
+ *
+ * relay_index_try_flush is responsible for the self-reference
+ * put of the index object on error.
+ */
+ ERR("relay_index_try_flush error %d", ret);
ret = -1;
}
end:
ret = -1;
}
end:
This page took
0.026118 seconds
and
4
git commands to generate.