src.ctf.lttng-live: make component class handle interruptions

[babeltrace.git] / src / plugins / ctf / lttng-live / lttng-live.h

diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index f003d6270f2b57b5548c849625801be758861fb3..1447cc5d2815ea7bb16a65a6f934b36191b8d2c5 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.h
+++ b/src/plugins/ctf/lttng-live/lttng-live.h
@@ -30,13 +30,15 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
+
+#include <glib.h>
 
-#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 
+#include "common/macros.h"
 #include "../common/metadata/decoder.h"
 #include "../common/msg-iter/msg-iter.h"
-
 #include "viewer-connection.h"
 
 struct lttng_live_component;
@@ -77,7 +79,7 @@ struct lttng_live_stream_iterator {
         * Since only a single iterator per viewer connection, we have
         * only a single message iterator per stream.
         */
-       struct bt_msg_iter *msg_iter;
+       struct ctf_msg_iter *msg_iter;
 
        uint64_t viewer_stream_id;
 
@@ -119,6 +121,8 @@ struct lttng_live_stream_iterator {
 
        /* Owned by this. */
        GString *name;
+
+       bool has_stream_hung_up;
 };
 
 struct lttng_live_metadata {
@@ -131,8 +135,6 @@ struct lttng_live_metadata {
        uint64_t stream_id;
        /* Weak reference. */
        struct ctf_metadata_decoder *decoder;
-
-       bool closed;
 };
 
 struct lttng_live_trace {
@@ -236,6 +238,9 @@ struct lttng_live_msg_iter {
 
        /* Timestamp in nanosecond of the last message sent downstream. */
        int64_t last_msg_ts_ns;
+
+       /* True if the iterator was interrupted. */
+       bool was_interrupted;
 };
 
 enum lttng_live_iterator_status {
@@ -257,50 +262,67 @@ enum lttng_live_iterator_status {
        LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
 };
 
-bt_self_component_status lttng_live_component_init(
+bt_component_class_initialize_method_status lttng_live_component_init(
                bt_self_component_source *self_comp,
+               bt_self_component_source_configuration *config,
                const bt_value *params, void *init_method_data);
 
-bt_query_status lttng_live_query(
+bt_component_class_query_method_status lttng_live_query(
                bt_self_component_class_source *comp_class,
-               const bt_query_executor *query_exec,
+               bt_private_query_executor *priv_query_exec,
                const char *object, const bt_value *params,
-               bt_logging_level log_level,
-               const bt_value **result);
+               void *method_data, const bt_value **result);
 
 void lttng_live_component_finalize(bt_self_component_source *component);
 
-bt_self_message_iterator_status lttng_live_msg_iter_next(
+bt_component_class_message_iterator_next_method_status lttng_live_msg_iter_next(
                bt_self_message_iterator *iterator,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count);
 
-bt_self_message_iterator_status lttng_live_msg_iter_init(
+bt_component_class_message_iterator_initialize_method_status lttng_live_msg_iter_init(
                bt_self_message_iterator *self_msg_it,
+               bt_self_message_iterator_configuration *config,
                bt_self_component_source *self_comp,
                bt_self_component_port_output *self_port);
 
 void lttng_live_msg_iter_finalize(bt_self_message_iterator *it);
 
-int lttng_live_create_viewer_session(struct lttng_live_msg_iter *lttng_live_msg_iter);
-int lttng_live_attach_session(struct lttng_live_session *session);
-int lttng_live_detach_session(struct lttng_live_session *session);
-enum lttng_live_iterator_status lttng_live_get_new_streams(
+enum lttng_live_viewer_status lttng_live_create_viewer_session(
+               struct lttng_live_msg_iter *lttng_live_msg_iter);
+
+enum lttng_live_viewer_status lttng_live_attach_session(
+               struct lttng_live_session *session,
+               bt_self_message_iterator *self_msg_iter);
+
+enum lttng_live_viewer_status lttng_live_detach_session(
                struct lttng_live_session *session);
 
+enum lttng_live_iterator_status lttng_live_get_new_streams(
+               struct lttng_live_session *session,
+               bt_self_message_iterator *self_msg_iter);
+
 int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
                uint64_t session_id,
                const char *hostname,
                const char *session_name);
 
-ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
-               FILE *fp);
+/*
+ * lttng_live_get_one_metadata_packet() asks the Relay Daemon for new metadata.
+ * If new metadata is received, the function writes it to the provided file
+ * handle and updates the reply_len output parameter. This function should be
+ * called in loop until _END status is received to ensure all metadata is
+ * written to the file.
+ */
+enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
+               struct lttng_live_trace *trace, FILE *fp, size_t *reply_len);
+
 enum lttng_live_iterator_status lttng_live_get_next_index(
                struct lttng_live_msg_iter *lttng_live_msg_iter,
                struct lttng_live_stream_iterator *stream,
                struct packet_index *index);
 
-enum bt_msg_iter_medium_status lttng_live_get_stream_bytes(
+enum ctf_msg_iter_medium_status lttng_live_get_stream_bytes(
                struct lttng_live_msg_iter *lttng_live_msg_iter,
                struct lttng_live_stream_iterator *stream, uint8_t *buf,
                uint64_t offset, uint64_t req_len, uint64_t *recv_len);
@@ -313,6 +335,6 @@ struct lttng_live_trace *lttng_live_borrow_trace(
                struct lttng_live_session *session, uint64_t trace_id);
 void lttng_live_need_new_streams(struct lttng_live_msg_iter *lttng_live_msg_iter);
 
-bool lttng_live_graph_is_canceled(struct lttng_live_component *lttng_live);
+bool lttng_live_graph_is_canceled(struct lttng_live_msg_iter *msg_iter);
 
 #endif /* BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_H */