Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I603a9daa109ebab118fe72e38ac175a7f7006335
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8455
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12370
Tested-by: jenkins <jenkins@lttng.org>
fmt::ptr(self_msg_iter));
stream_iter->msg_iter =
ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter,
fmt::ptr(self_msg_iter));
stream_iter->msg_iter =
ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter,
- self_msg_iter, stream_iter->logger)
- .release();
+ 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");
if (!stream_iter->msg_iter) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
"Failed to create CTF message iterator");
struct ctf_trace_class *ctf_tc =
ctf_metadata_decoder_borrow_ctf_trace_class(trace->metadata->decoder.get());
BT_ASSERT(!stream_iter->msg_iter);
struct ctf_trace_class *ctf_tc =
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, self_msg_iter, stream_iter->logger)
- .release();
+ stream_iter->msg_iter =
+ ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter,
+ 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");
if (!stream_iter->msg_iter) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
"Failed to create CTF message iterator");
- 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);
g_free(stream_iter->buf);
if (stream_iter->name) {
g_string_free(stream_iter->name, TRUE);
- status = ctf_msg_iter_get_next_message(lttng_live_stream->msg_iter, message);
+ status = ctf_msg_iter_get_next_message(lttng_live_stream->msg_iter.get(), message);
switch (status) {
case CTF_MSG_ITER_STATUS_EOF:
ret = LTTNG_LIVE_ITERATOR_STATUS_END;
switch (status) {
case CTF_MSG_ITER_STATUS_EOF:
ret = LTTNG_LIVE_ITERATOR_STATUS_END;
* stream properly by emitting the necessary stream end message.
*/
enum ctf_msg_iter_status status =
* stream properly by emitting the necessary stream end message.
*/
enum ctf_msg_iter_status status =
- ctf_msg_iter_get_next_message(stream_iter->msg_iter, curr_msg);
+ ctf_msg_iter_get_next_message(stream_iter->msg_iter.get(), curr_msg);
if (status == CTF_MSG_ITER_STATUS_ERROR) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(lttng_live_msg_iter->logger,
if (status == CTF_MSG_ITER_STATUS_ERROR) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(lttng_live_msg_iter->logger,
* Since only a single iterator per viewer connection, we have
* only a single message iterator per stream.
*/
* Since only a single iterator per viewer connection, we have
* only a single message iterator per stream.
*/
- struct ctf_msg_iter *msg_iter = nullptr;
+ ctf_msg_iter_up msg_iter;
uint64_t viewer_stream_id = 0;
uint64_t viewer_stream_id = 0;