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: don't send streams if there is no metadata
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
viewer-stream.c
diff --git
a/src/bin/lttng-relayd/viewer-stream.c
b/src/bin/lttng-relayd/viewer-stream.c
index f41bbe1a8de8c45a13b96c05491f64e16694b244..8e3a1949288dfddf250b0f5cd6edfb3690318218 100644
(file)
--- a/
src/bin/lttng-relayd/viewer-stream.c
+++ b/
src/bin/lttng-relayd/viewer-stream.c
@@
-27,7
+27,6
@@
static void viewer_stream_destroy(struct relay_viewer_stream *vstream)
{
static void viewer_stream_destroy(struct relay_viewer_stream *vstream)
{
- lttng_trace_chunk_put(vstream->stream_file.trace_chunk);
free(vstream->path_name);
free(vstream->channel_name);
free(vstream);
free(vstream->path_name);
free(vstream->channel_name);
free(vstream);
@@
-106,7
+105,7
@@
struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
}
case LTTNG_VIEWER_SEEK_LAST:
vstream->current_tracefile_id =
}
case LTTNG_VIEWER_SEEK_LAST:
vstream->current_tracefile_id =
- tracefile_array_get_file_index_head(stream->tfa);
+ tracefile_array_get_
read_
file_index_head(stream->tfa);
/*
* We seek at the very end of each stream, awaiting for
* a future packet to eventually come in.
/*
* We seek at the very end of each stream, awaiting for
* a future packet to eventually come in.
@@
-212,7
+211,8
@@
static void viewer_stream_release(struct urcu_ref *ref)
stream_put(vstream->stream);
vstream->stream = NULL;
}
stream_put(vstream->stream);
vstream->stream = NULL;
}
-
+ lttng_trace_chunk_put(vstream->stream_file.trace_chunk);
+ vstream->stream_file.trace_chunk = NULL;
call_rcu(&vstream->rcu_node, viewer_stream_destroy_rcu);
}
call_rcu(&vstream->rcu_node, viewer_stream_destroy_rcu);
}
This page took
0.037986 seconds
and
5
git commands to generate.