* BabelTrace - LTTng-live client Component
*/
-#ifndef BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_H
-#define BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_H
+#ifndef BABELTRACE_PLUGINS_CTF_LTTNG_LIVE_LTTNG_LIVE_HPP
+#define BABELTRACE_PLUGINS_CTF_LTTNG_LIVE_LTTNG_LIVE_HPP
#include <glib.h>
#include <stdint.h>
#include <babeltrace2/babeltrace.h>
+#include "cpp-common/bt2/message.hpp"
#include "cpp-common/vendor/fmt/format.h" /* IWYU pragma: keep */
#include "../common/src/metadata/tsdl/decoder.hpp"
#include "../common/src/msg-iter/msg-iter.hpp"
#include "viewer-connection.hpp"
+/*
+ * bt_common_lttng_live_url_parts is defined in common code, and is also used
+ * by C code, so it can't be C++-ified yet. Use this separate deleter object
+ * in the mean time.
+ */
+struct bt_common_lttng_live_url_parts_deleter
+{
+ explicit bt_common_lttng_live_url_parts_deleter(bt_common_lttng_live_url_parts& obj) noexcept :
+ _mObj {&obj}
+ {
+ }
+
+ bt_common_lttng_live_url_parts_deleter(const bt_common_lttng_live_url_parts_deleter&) = delete;
+ bt_common_lttng_live_url_parts&
+ operator=(const bt_common_lttng_live_url_parts_deleter&) = delete;
+
+ ~bt_common_lttng_live_url_parts_deleter()
+ {
+ bt_common_destroy_lttng_live_url_parts(_mObj);
+ }
+
+private:
+ bt_common_lttng_live_url_parts *_mObj;
+};
+
enum lttng_live_stream_state
{
/* This stream won't have data until some known time in the future. */
/* Iterator over a live stream. */
struct lttng_live_stream_iterator
{
+ using UP = std::unique_ptr<lttng_live_stream_iterator>;
+
explicit lttng_live_stream_iterator(const bt2c::Logger& parentLogger) :
logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/STREAM-ITER"}
{
}
+ ~lttng_live_stream_iterator();
+
bt2c::Logger logger;
- /* Owned by this. */
- bt_stream *stream = nullptr;
+ bt2::Stream::Shared stream;
/* Weak reference. */
struct lttng_live_trace *trace = nullptr;
* 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;
enum lttng_live_stream_state state = LTTNG_LIVE_STREAM_QUIESCENT;
- /*
- * The current message produced by this live stream iterator. Owned by
- * this.
- */
- const bt_message *current_msg = nullptr;
+ /* The current message produced by this live stream iterator. */
+ bt2::ConstMessage::Shared current_msg;
/* Timestamp in nanoseconds of the current message (current_msg). */
int64_t current_msg_ts_ns = 0;
- /* Owned by this. */
- uint8_t *buf = nullptr;
- size_t buflen = 0;
+ std::vector<uint8_t> buf;
- /* Owned by this. */
- GString *name = nullptr;
+ std::string name;
bool has_stream_hung_up = false;
};
struct lttng_live_metadata
{
+ using UP = std::unique_ptr<lttng_live_metadata>;
+
explicit lttng_live_metadata(const bt2c::Logger& parentLogger) :
logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/METADATA"}
{
struct lttng_live_trace
{
+ using UP = std::unique_ptr<lttng_live_trace>;
+
explicit lttng_live_trace(const bt2c::Logger& parentLogger) :
logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/TRACE"}
{
/* ctf trace ID within the session. */
uint64_t id = 0;
- /* Owned by this. */
- bt_trace *trace = nullptr;
+ bt2::Trace::Shared trace;
bt2::TraceClass::Shared trace_class;
- struct lttng_live_metadata *metadata = nullptr;
+ lttng_live_metadata::UP metadata;
const bt_clock_class *clock_class = nullptr;
- /* Array of pointers to struct lttng_live_stream_iterator. */
- /* Owned by this. */
- GPtrArray *stream_iterators = nullptr;
+ std::vector<lttng_live_stream_iterator::UP> stream_iterators;
enum lttng_live_metadata_stream_state metadata_stream_state =
LTTNG_LIVE_METADATA_STREAM_STATE_NEEDED;
struct lttng_live_session
{
+ using UP = std::unique_ptr<lttng_live_session>;
+
explicit lttng_live_session(const bt2c::Logger& parentLogger) :
logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/SESSION"}
{
}
+ ~lttng_live_session();
+
bt2c::Logger logger;
bt_self_component *self_comp = nullptr;
/* Weak reference. */
struct lttng_live_msg_iter *lttng_live_msg_iter = nullptr;
- /* Owned by this. */
- GString *hostname = nullptr;
+ std::string hostname;
- /* Owned by this. */
- GString *session_name = nullptr;
+ std::string session_name;
uint64_t id = 0;
- /* Array of pointers to struct lttng_live_trace. */
- GPtrArray *traces = nullptr;
+ std::vector<lttng_live_trace::UP> traces;
bool attached = false;
bool new_streams_needed = false;
*/
struct lttng_live_component
{
+ using UP = std::unique_ptr<lttng_live_component>;
+
explicit lttng_live_component(bt2c::Logger loggerParam) noexcept :
logger {std::move(loggerParam)}
{
struct
{
- GString *url = nullptr;
+ std::string url;
enum session_not_found_action sess_not_found_act = SESSION_NOT_FOUND_ACTION_CONTINUE;
} params;
struct lttng_live_msg_iter
{
+ using UP = std::unique_ptr<lttng_live_msg_iter>;
+
explicit lttng_live_msg_iter(const bt2c::Logger& parentLogger) :
logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/MSG-ITER"}
{
}
+ ~lttng_live_msg_iter();
+
bt2c::Logger logger;
bt_self_component *self_comp = nullptr;
/* Weak reference. */
bt_self_message_iterator *self_msg_iter = nullptr;
- /* Owned by this. */
- struct live_viewer_connection *viewer_connection = nullptr;
+ live_viewer_connection::UP viewer_connection;
- /* Array of pointers to struct lttng_live_session. */
- GPtrArray *sessions = nullptr;
+ std::vector<lttng_live_session::UP> sessions;
/* Number of live stream iterator this message iterator has.*/
uint64_t active_stream_iter = 0;
void lttng_live_stream_iterator_set_state(struct lttng_live_stream_iterator *stream_iter,
enum lttng_live_stream_state new_state);
-#endif /* BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_H */
+#endif /* BABELTRACE_PLUGINS_CTF_LTTNG_LIVE_LTTNG_LIVE_HPP */
projects / babeltrace.git / blobdiff