Convert lttng_live_msg_iter_destroy to a destructor.
Change-Id: I4bd28e540517e11ede6c210c7645db98951c31f8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8473
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12388
Tested-by: jenkins <jenkins@lttng.org>
-static void lttng_live_msg_iter_destroy(struct lttng_live_msg_iter *lttng_live_msg_iter)
+lttng_live_msg_iter::~lttng_live_msg_iter()
- if (!lttng_live_msg_iter) {
- goto end;
- }
-
- BT_ASSERT(lttng_live_msg_iter->lttng_live_comp);
- BT_ASSERT(lttng_live_msg_iter->lttng_live_comp->has_msg_iter);
+ BT_ASSERT(this->lttng_live_comp);
+ BT_ASSERT(this->lttng_live_comp->has_msg_iter);
/* All stream iterators must be destroyed at this point. */
/* All stream iterators must be destroyed at this point. */
- BT_ASSERT(lttng_live_msg_iter->active_stream_iter == 0);
- lttng_live_msg_iter->lttng_live_comp->has_msg_iter = false;
-
- delete lttng_live_msg_iter;
-
-end:
- return;
+ BT_ASSERT(this->active_stream_iter == 0);
+ this->lttng_live_comp->has_msg_iter = false;
}
void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter)
}
void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter)
lttng_live_msg_iter =
(struct lttng_live_msg_iter *) bt_self_message_iterator_get_data(self_msg_iter);
BT_ASSERT(lttng_live_msg_iter);
lttng_live_msg_iter =
(struct lttng_live_msg_iter *) bt_self_message_iterator_get_data(self_msg_iter);
BT_ASSERT(lttng_live_msg_iter);
- lttng_live_msg_iter_destroy(lttng_live_msg_iter);
+ delete lttng_live_msg_iter;
}
static enum lttng_live_iterator_status
}
static enum lttng_live_iterator_status
- lttng_live_msg_iter_destroy(lttng_live_msg_iter);
+ delete lttng_live_msg_iter;
end:
return status;
} catch (const std::bad_alloc&) {
end:
return status;
} catch (const std::bad_alloc&) {
+ ~lttng_live_msg_iter();
+
bt2c::Logger logger;
bt_self_component *self_comp = nullptr;
bt2c::Logger logger;
bt_self_component *self_comp = nullptr;