X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.h;h=bb1c760ee6a6efe0aaf63bab26213c005711fcba;hb=851de941fc0cdea645b905098fb8f2a61dfdd161;hp=967344dcc1909f100b60c764d78baccb52a67978;hpb=4a39caef874f11e1684e67fd33ad8f86b0a6d651;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index 967344dc..bb1c760e 100644
--- 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;
 
@@ -133,8 +135,6 @@ struct lttng_live_metadata {
 	uint64_t stream_id;
 	/* Weak reference. */
 	struct ctf_metadata_decoder *decoder;
-
-	bool closed;
 };
 
 struct lttng_live_trace {
@@ -189,7 +189,6 @@ struct lttng_live_session {
 };
 
 enum session_not_found_action {
-	SESSION_NOT_FOUND_ACTION_UNKNOWN,
 	SESSION_NOT_FOUND_ACTION_CONTINUE,
 	SESSION_NOT_FOUND_ACTION_FAIL,
 	SESSION_NOT_FOUND_ACTION_END,
@@ -260,8 +259,9 @@ enum lttng_live_iterator_status {
 	LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
 };
 
-bt_component_class_init_method_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_component_class_query_method_status lttng_live_query(
@@ -277,32 +277,65 @@ bt_component_class_message_iterator_next_method_status lttng_live_msg_iter_next(
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count);
 
-bt_component_class_message_iterator_init_method_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);
+
+enum lttng_live_attach_session_status {
+	LTTNG_LIVE_ATTACH_SESSION_STATUS_OK	= 0,
+	LTTNG_LIVE_ATTACH_SESSION_STATUS_ERROR	= -2,
+};
+
+enum lttng_live_attach_session_status lttng_live_attach_session(
+		struct lttng_live_session *session,
+		bt_self_message_iterator *self_msg_iter);
+
 int lttng_live_detach_session(struct lttng_live_session *session);
 enum lttng_live_iterator_status lttng_live_get_new_streams(
-		struct lttng_live_session *session);
+		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);
+enum lttng_live_get_one_metadata_status {
+	/* The end of the metadata stream was reached. */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_END	    = 1,
+	/* One metadata packet was received and written to file. */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK	    = 0,
+	/* The metadata stream was not found on the relay. */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED   = -1,
+	/*
+	 * A critical error occurred when contacting the relay or while
+	 * handling its response.
+	 */
+	LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR    = -2,
+};
+
+/*
+ * 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);