X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fdata-stream.cpp;h=8f4ae873d234d7415b8c737c081d88209898dc5b;hb=refs%2Fheads%2Fmaster;hp=c83d84915c9086e32d9ea3fe9e54af20c9f574b4;hpb=0f5c5d5ce30884c93b4e4d0662e2914029c3e90f;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/data-stream.cpp b/src/plugins/ctf/lttng-live/data-stream.cpp index c83d8491..8f4ae873 100644 --- a/src/plugins/ctf/lttng-live/data-stream.cpp +++ b/src/plugins/ctf/lttng-live/data-stream.cpp @@ -7,8 +7,9 @@ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation */ +#include + #include -#include #include #include @@ -16,6 +17,7 @@ #include "common/assert.h" #include "compat/mman.h" /* IWYU pragma: keep */ +#include "cpp-common/bt2s/make-unique.hpp" #include "cpp-common/vendor/fmt/format.h" #include "../common/src/msg-iter/msg-iter.hpp" @@ -26,7 +28,6 @@ static enum ctf_msg_iter_medium_status medop_request_bytes(size_t request_sz, uint8_t **buffer_addr, size_t *buffer_sz, void *data) { - enum ctf_msg_iter_medium_status status = CTF_MSG_ITER_MEDIUM_STATUS_OK; lttng_live_stream_iterator *stream = (lttng_live_stream_iterator *) data; struct lttng_live_trace *trace = stream->trace; struct lttng_live_session *session = trace->session; @@ -38,26 +39,30 @@ static enum ctf_msg_iter_medium_status medop_request_bytes(size_t request_sz, ui BT_ASSERT(request_sz); if (stream->has_stream_hung_up) { - status = CTF_MSG_ITER_MEDIUM_STATUS_EOF; - goto end; + return CTF_MSG_ITER_MEDIUM_STATUS_EOF; } len_left = stream->base_offset + stream->len - stream->offset; if (!len_left) { lttng_live_stream_iterator_set_state(stream, LTTNG_LIVE_STREAM_ACTIVE_NO_DATA); - status = CTF_MSG_ITER_MEDIUM_STATUS_AGAIN; - goto end; + return CTF_MSG_ITER_MEDIUM_STATUS_AGAIN; } - read_len = MIN(request_sz, stream->buflen); + read_len = MIN(request_sz, stream->buf.size()); read_len = MIN(read_len, len_left); - status = lttng_live_get_stream_bytes(live_msg_iter, stream, stream->buf, stream->offset, - read_len, &recv_len); - *buffer_addr = stream->buf; + + const auto status = lttng_live_get_stream_bytes(live_msg_iter, stream, stream->buf.data(), + stream->offset, read_len, &recv_len); + + if (status != CTF_MSG_ITER_MEDIUM_STATUS_OK) { + return status; + } + + *buffer_addr = stream->buf.data(); *buffer_sz = recv_len; stream->offset += recv_len; -end: - return status; + + return CTF_MSG_ITER_MEDIUM_STATUS_OK; } static bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t stream_id, void *data) @@ -69,7 +74,9 @@ static bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t str BT_CPPLOGI_SPEC(lttng_live_stream->logger, "Creating stream {} (ID: {}) out of stream class {}", - lttng_live_stream->name->str, stream_id, stream_class_id); + lttng_live_stream->name, stream_id, stream_class_id); + + bt_stream *stream; if (stream_id < 0) { /* @@ -78,26 +85,28 @@ static bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t str * LTTng. In these cases, use the viewer_stream_id that * is unique for a live viewer session. */ - lttng_live_stream->stream = bt_stream_create_with_id( - stream_class, lttng_live_stream->trace->trace, lttng_live_stream->viewer_stream_id); + stream = + bt_stream_create_with_id(stream_class, lttng_live_stream->trace->trace->libObjPtr(), + lttng_live_stream->viewer_stream_id); } else { - lttng_live_stream->stream = bt_stream_create_with_id( - stream_class, lttng_live_stream->trace->trace, (uint64_t) stream_id); + stream = bt_stream_create_with_id( + stream_class, lttng_live_stream->trace->trace->libObjPtr(), (uint64_t) stream_id); } - if (!lttng_live_stream->stream) { + if (!stream) { BT_CPPLOGE_APPEND_CAUSE_SPEC( lttng_live_stream->logger, "Cannot create stream {} (stream class ID {}, stream ID {})", - lttng_live_stream->name->str, stream_class_id, stream_id); - goto end; + lttng_live_stream->name, stream_class_id, stream_id); + return nullptr; } - bt_stream_set_name(lttng_live_stream->stream, lttng_live_stream->name->str); + lttng_live_stream->stream = bt2::Stream::Shared::createWithoutRef(stream); + + lttng_live_stream->stream->name(lttng_live_stream->name); } -end: - return lttng_live_stream->stream; + return lttng_live_stream->stream->libObjPtr(); } static struct ctf_msg_iter_medium_ops medops = { @@ -111,7 +120,6 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_sessi bt_self_message_iterator *self_msg_iter) { struct lttng_live_component *lttng_live = session->lttng_live_msg_iter->lttng_live_comp; - uint64_t trace_idx, stream_iter_idx; if (!session->lazy_stream_msg_init) { return LTTNG_LIVE_ITERATOR_STATUS_OK; @@ -122,33 +130,27 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_sessi "session-id={}, self-msg-iter-addr={}", session->id, fmt::ptr(self_msg_iter)); - for (trace_idx = 0; trace_idx < session->traces->len; trace_idx++) { - struct lttng_live_trace *trace = - (lttng_live_trace *) g_ptr_array_index(session->traces, trace_idx); - - for (stream_iter_idx = 0; stream_iter_idx < trace->stream_iterators->len; - stream_iter_idx++) { + for (lttng_live_trace::UP& trace : session->traces) { + for (lttng_live_stream_iterator::UP& stream_iter : trace->stream_iterators) { struct ctf_trace_class *ctf_tc; - struct lttng_live_stream_iterator *stream_iter = - (lttng_live_stream_iterator *) g_ptr_array_index(trace->stream_iterators, - stream_iter_idx); if (stream_iter->msg_iter) { continue; } - ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class(trace->metadata->decoder); + + ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class(trace->metadata->decoder.get()); BT_CPPLOGD_SPEC(stream_iter->logger, "Creating CTF message iterator: session-id={}, ctf-tc-addr={}, " "stream-iter-name={}, self-msg-iter-addr={}", - session->id, fmt::ptr(ctf_tc), stream_iter->name->str, + session->id, fmt::ptr(ctf_tc), stream_iter->name, fmt::ptr(self_msg_iter)); stream_iter->msg_iter = - ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter, + ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter.get(), self_msg_iter, stream_iter->logger); if (!stream_iter->msg_iter) { BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger, "Failed to create CTF message iterator"); - goto error; + return LTTNG_LIVE_ITERATOR_STATUS_ERROR; } } } @@ -156,16 +158,13 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_sessi session->lazy_stream_msg_init = false; return LTTNG_LIVE_ITERATOR_STATUS_OK; - -error: - return LTTNG_LIVE_ITERATOR_STATUS_ERROR; } struct lttng_live_stream_iterator * lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t ctf_trace_id, uint64_t stream_id, bt_self_message_iterator *self_msg_iter) { - lttng_live_stream_iterator *stream_iter = nullptr; + std::stringstream nameSs; BT_ASSERT(session); BT_ASSERT(session->lttng_live_msg_iter); @@ -176,10 +175,11 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c lttng_live_session_borrow_or_create_trace_by_id(session, ctf_trace_id); if (!trace) { BT_CPPLOGE_APPEND_CAUSE_SPEC(session->logger, "Failed to borrow CTF trace."); - goto error; + return nullptr; } - stream_iter = new lttng_live_stream_iterator {session->logger}; + auto stream_iter = bt2s::make_unique(session->logger); + stream_iter->trace = trace; stream_iter->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA; stream_iter->viewer_stream_id = stream_id; @@ -192,69 +192,33 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c if (trace->trace) { struct ctf_trace_class *ctf_tc = - ctf_metadata_decoder_borrow_ctf_trace_class(trace->metadata->decoder); + ctf_metadata_decoder_borrow_ctf_trace_class(trace->metadata->decoder.get()); BT_ASSERT(!stream_iter->msg_iter); stream_iter->msg_iter = - ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter, + ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter.get(), self_msg_iter, stream_iter->logger); if (!stream_iter->msg_iter) { BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger, "Failed to create CTF message iterator"); - goto error; + return nullptr; } } - stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size); - if (!stream_iter->buf) { - BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger, - "Failed to allocate live stream iterator buffer"); - goto error; - } + stream_iter->buf.resize(lttng_live->max_query_size); - stream_iter->buflen = lttng_live->max_query_size; - stream_iter->name = g_string_new(NULL); - if (!stream_iter->name) { - BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger, - "Failed to allocate live stream iterator name buffer"); - goto error; - } + nameSs << STREAM_NAME_PREFIX << stream_iter->viewer_stream_id; + stream_iter->name = nameSs.str(); - g_string_printf(stream_iter->name, STREAM_NAME_PREFIX "%" PRIu64, - stream_iter->viewer_stream_id); - g_ptr_array_add(trace->stream_iterators, stream_iter); + const auto ret = stream_iter.get(); + trace->stream_iterators.emplace_back(std::move(stream_iter)); /* Track the number of active stream iterator. */ session->lttng_live_msg_iter->active_stream_iter++; - goto end; -error: - lttng_live_stream_iterator_destroy(stream_iter); - stream_iter = NULL; -end: - return stream_iter; + return ret; } -void lttng_live_stream_iterator_destroy(struct lttng_live_stream_iterator *stream_iter) +lttng_live_stream_iterator::~lttng_live_stream_iterator() { - if (!stream_iter) { - return; - } - - if (stream_iter->stream) { - BT_STREAM_PUT_REF_AND_RESET(stream_iter->stream); - } - - if (stream_iter->msg_iter) { - ctf_msg_iter_destroy(stream_iter->msg_iter); - } - g_free(stream_iter->buf); - if (stream_iter->name) { - g_string_free(stream_iter->name, TRUE); - } - - bt_message_put_ref(stream_iter->current_msg); - /* Track the number of active stream iterator. */ - stream_iter->trace->session->lttng_live_msg_iter->active_stream_iter--; - - delete stream_iter; + this->trace->session->lttng_live_msg_iter->active_stream_iter--; }