projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: clear the CTF traces when all the streams are closed
[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 b8e2f72e6706bc194be2d095ddca89f65abb0dca..a6b408a90740943138e43ad69160d34a5395baa6 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-800,8
+800,6
@@
void deferred_free_stream(struct rcu_head *head)
struct relay_stream *stream =
caa_container_of(head, struct relay_stream, rcu_node);
struct relay_stream *stream =
caa_container_of(head, struct relay_stream, rcu_node);
- ctf_trace_try_destroy(stream->ctf_trace);
-
free(stream->path_name);
free(stream->channel_name);
free(stream);
free(stream->path_name);
free(stream->channel_name);
free(stream);
@@
-865,6
+863,11
@@
static void destroy_stream(struct relay_stream *stream)
iter.iter.node = &stream->ctf_trace_node.node;
delret = lttng_ht_del(stream->ctf_traces_ht, &iter);
assert(!delret);
iter.iter.node = &stream->ctf_trace_node.node;
delret = lttng_ht_del(stream->ctf_traces_ht, &iter);
assert(!delret);
+
+ if (stream->ctf_trace) {
+ ctf_trace_try_destroy(stream->ctf_trace);
+ }
+
call_rcu(&stream->rcu_node, deferred_free_stream);
DBG("Closed tracefile %d from close stream", stream->fd);
}
call_rcu(&stream->rcu_node, deferred_free_stream);
DBG("Closed tracefile %d from close stream", stream->fd);
}
This page took
0.023723 seconds
and
4
git commands to generate.