X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fmetadata.cpp;h=eee28c41145cff19ee202743fee19882d35c53e9;hb=ecd7492f21a492b70569d5ecc1d3a808241b63f0;hp=d49ce76fc143a0889640798d9f1405412d7c6847;hpb=4164020e790fa6c0700715936b40a3fa46df479e;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/metadata.cpp b/src/plugins/ctf/lttng-live/metadata.cpp index d49ce76f..eee28c41 100644 --- a/src/plugins/ctf/lttng-live/metadata.cpp +++ b/src/plugins/ctf/lttng-live/metadata.cpp @@ -94,7 +94,6 @@ end: return cc; } -BT_HIDDEN enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_trace *trace) { struct lttng_live_session *session = trace->session; @@ -114,7 +113,14 @@ enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_tra /* No metadata stream yet. */ if (!metadata) { - if (session->new_streams_needed) { + if (session->closed) { + /* + * The session is closed AND we never received any + * metadata this indicates that we will never receive + * any metadata. + */ + status = LTTNG_LIVE_ITERATOR_STATUS_END; + } else if (session->new_streams_needed) { status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN; } else { session->new_streams_needed = true; @@ -281,9 +287,8 @@ end: return status; } -BT_HIDDEN int lttng_live_metadata_create_stream(struct lttng_live_session *session, uint64_t ctf_trace_id, - uint64_t stream_id, const char *trace_name) + uint64_t stream_id, const char *) { bt_self_component *self_comp = session->self_comp; bt_logging_level log_level = session->log_level; @@ -324,7 +329,6 @@ error: return -1; } -BT_HIDDEN void lttng_live_metadata_fini(struct lttng_live_trace *trace) { struct lttng_live_metadata *metadata = trace->metadata;