X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fdata-stream.c;h=61777519e7819e1f4253f9b02b1c2ded3c907dd7;hb=3c22a2420b7a79eb5bce946bcf314349d2ebfe14;hp=b94bbd382ce5be665785e2a3d979d8a54f0a23f6;hpb=b80991f68094e8e2ed3c9d5f69db442a663d1511;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c index b94bbd38..61777519 100644 --- a/src/plugins/ctf/lttng-live/data-stream.c +++ b/src/plugins/ctf/lttng-live/data-stream.c @@ -26,19 +26,19 @@ #define BT_COMP_LOG_SELF_COMP self_comp #define BT_LOG_OUTPUT_LEVEL log_level #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS" -#include "plugins/comp-logging.h" +#include "logging/comp-logging.h" +#include #include -#include #include -#include + #include -#include -#include "compat/mman.h" + #include + #include "../common/msg-iter/msg-iter.h" #include "common/assert.h" - +#include "compat/mman.h" #include "data-stream.h" #define STREAM_NAME_PREFIX "stream-" @@ -58,12 +58,18 @@ enum bt_msg_iter_medium_status medop_request_bytes( uint64_t len_left; uint64_t read_len; + if (stream->has_stream_hung_up) { + status = BT_MSG_ITER_MEDIUM_STATUS_EOF; + goto end; + } + len_left = stream->base_offset + stream->len - stream->offset; if (!len_left) { stream->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA; status = BT_MSG_ITER_MEDIUM_STATUS_AGAIN; - return status; + goto end; } + read_len = MIN(request_sz, stream->buflen); read_len = MIN(read_len, len_left); status = lttng_live_get_stream_bytes(live_msg_iter, @@ -72,6 +78,7 @@ enum bt_msg_iter_medium_status medop_request_bytes( *buffer_addr = stream->buf; *buffer_sz = recv_len; stream->offset += recv_len; +end: return status; } @@ -107,7 +114,8 @@ bt_stream *medop_borrow_stream(bt_stream_class *stream_class, } if (!lttng_live_stream->stream) { - BT_COMP_LOGE("Cannot create stream %s (stream class ID " + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Cannot create stream %s (stream class ID " "%" PRId64 ", stream ID %" PRIu64 ")", lttng_live_stream->name->str, stream_class_id, stream_id); @@ -152,19 +160,26 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init( struct ctf_trace_class *ctf_tc; struct lttng_live_stream_iterator *stream_iter = g_ptr_array_index(trace->stream_iterators, - stream_iter_idx); + stream_iter_idx); if (stream_iter->msg_iter) { continue; } ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class( - trace->metadata->decoder); + trace->metadata->decoder); stream_iter->msg_iter = bt_msg_iter_create(ctf_tc, - lttng_live->max_query_size, medops, - stream_iter, log_level, self_comp); + lttng_live->max_query_size, medops, stream_iter, + log_level, self_comp); if (!stream_iter->msg_iter) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to create CTF message iterator"); goto error; } + + bt_msg_iter_set_emit_stream_end_message( + stream_iter->msg_iter, true); + bt_msg_iter_set_emit_stream_beginning_message( + stream_iter->msg_iter, true); } } @@ -198,6 +213,8 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create( stream_iter = g_new0(struct lttng_live_stream_iterator, 1); if (!stream_iter) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to allocate struct lttng_live_stream_iterator"); goto error; } @@ -205,6 +222,8 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create( stream_iter->self_comp = self_comp; trace = lttng_live_borrow_trace(session, ctf_trace_id); if (!trace) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to borrow CTF trace."); goto error; } @@ -217,28 +236,39 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create( if (trace->trace) { struct ctf_trace_class *ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class( - trace->metadata->decoder); + trace->metadata->decoder); BT_ASSERT(!stream_iter->msg_iter); stream_iter->msg_iter = bt_msg_iter_create(ctf_tc, - lttng_live->max_query_size, medops, - stream_iter, log_level, self_comp); + lttng_live->max_query_size, medops, stream_iter, + log_level, self_comp); if (!stream_iter->msg_iter) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to create CTF message iterator"); goto error; } + + bt_msg_iter_set_emit_stream_end_message( + stream_iter->msg_iter, true); + bt_msg_iter_set_emit_stream_beginning_message( + stream_iter->msg_iter, true); } stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size); if (!stream_iter->buf) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to allocate live stream iterator buffer"); goto error; } stream_iter->buflen = lttng_live->max_query_size; stream_iter->name = g_string_new(NULL); if (!stream_iter->name) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, + "Failed to allocate live stream iterator name buffer"); goto error; } g_string_printf(stream_iter->name, STREAM_NAME_PREFIX "%" PRIu64, - stream_iter->viewer_stream_id); + stream_iter->viewer_stream_id); g_ptr_array_add(trace->stream_iterators, stream_iter); /* Track the number of active stream iterator. */ @@ -267,9 +297,7 @@ void lttng_live_stream_iterator_destroy( if (stream_iter->msg_iter) { bt_msg_iter_destroy(stream_iter->msg_iter); } - if (stream_iter->buf) { - g_free(stream_iter->buf); - } + g_free(stream_iter->buf); if (stream_iter->name) { g_string_free(stream_iter->name, TRUE); }