X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fdata-stream.c;h=ce3049638d00692381314de69f8caf6fff97be1a;hb=1419db2bc0c6a10865f6bf6f22e055e51a1449bc;hp=8ea914dbc26b46f59c26139e24eaed1378b2990d;hpb=3f7d4d90b0456de9d34fac337350818ef06163bd;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c index 8ea914db..ce304963 100644 --- a/src/plugins/ctf/lttng-live/data-stream.c +++ b/src/plugins/ctf/lttng-live/data-stream.c @@ -23,13 +23,14 @@ * SOFTWARE. */ -#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC-DS" -#include "logging.h" +#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 "logging/comp-logging.h" #include #include #include -#include #include #include #include "compat/mman.h" @@ -56,12 +57,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, @@ -70,6 +77,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; } @@ -78,11 +86,13 @@ bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t stream_id, void *data) { struct lttng_live_stream_iterator *lttng_live_stream = data; + bt_logging_level log_level = lttng_live_stream->log_level; + bt_self_component *self_comp = lttng_live_stream->self_comp; if (!lttng_live_stream->stream) { uint64_t stream_class_id = bt_stream_class_get_id(stream_class); - BT_LOGI("Creating stream %s (ID: %" PRIu64 ") out of stream " + BT_COMP_LOGI("Creating stream %s (ID: %" PRIu64 ") out of stream " "class %" PRId64, lttng_live_stream->name->str, stream_id, stream_class_id); @@ -103,15 +113,19 @@ bt_stream *medop_borrow_stream(bt_stream_class *stream_class, } if (!lttng_live_stream->stream) { - BT_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); + goto end; } + bt_stream_set_name(lttng_live_stream->stream, lttng_live_stream->name->str); } +end: return lttng_live_stream->stream; } @@ -128,6 +142,8 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init( struct lttng_live_component *lttng_live = session->lttng_live_msg_iter->lttng_live_comp; uint64_t trace_idx, stream_iter_idx; + bt_logging_level log_level = session->log_level; + bt_self_component *self_comp = session->self_comp; if (!session->lazy_stream_msg_init) { return LTTNG_LIVE_ITERATOR_STATUS_OK; @@ -143,19 +159,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); + 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); } } @@ -176,20 +199,30 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create( struct lttng_live_stream_iterator *stream_iter; struct lttng_live_component *lttng_live; struct lttng_live_trace *trace; + bt_logging_level log_level; + bt_self_component *self_comp; BT_ASSERT(session); BT_ASSERT(session->lttng_live_msg_iter); BT_ASSERT(session->lttng_live_msg_iter->lttng_live_comp); + log_level = session->log_level; + self_comp = session->self_comp; lttng_live = session->lttng_live_msg_iter->lttng_live_comp; 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; } + stream_iter->log_level = log_level; + 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; } @@ -202,28 +235,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); + 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. */ @@ -252,9 +296,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); }