projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: session conditions not evaluated at subscription/registration
[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 5a3bcb43fbc8aea671e4cc7b0a3c15451522181e..5f56ba9b318ea14ec94f66e9c00f7408b8f21f4e 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-2318,8
+2318,13
@@
static int relay_recv_index(const 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;
}
@@
-3217,9
+3222,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.023576 seconds
and
4
git commands to generate.