X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.h;h=511c0c486793e9d98ecd774ad6b223847bac8ec2;hb=eee8e741ebf99d48ddc1dbf518aa17b9baa40515;hp=35de9051618aa36f8572c99352834cb5b29a29de;hpb=c01594dea908eeacf22c4d8bf5c4e629792a91d5;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index 35de9051..511c0c48 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.h
+++ b/src/plugins/ctf/lttng-live/lttng-live.h
@@ -65,6 +65,7 @@ enum lttng_live_stream_state {
 /* Iterator over a live stream. */
 struct lttng_live_stream_iterator {
 	bt_logging_level log_level;
+	bt_self_component *self_comp;
 
 	/* Owned by this. */
 	bt_stream *stream;
@@ -118,10 +119,13 @@ struct lttng_live_stream_iterator {
 
 	/* Owned by this. */
 	GString *name;
+
+	bool has_stream_hung_up;
 };
 
 struct lttng_live_metadata {
 	bt_logging_level log_level;
+	bt_self_component *self_comp;
 
 	/* Weak reference. */
 	struct lttng_live_trace *trace;
@@ -129,12 +133,11 @@ struct lttng_live_metadata {
 	uint64_t stream_id;
 	/* Weak reference. */
 	struct ctf_metadata_decoder *decoder;
-
-	bool closed;
 };
 
 struct lttng_live_trace {
 	bt_logging_level log_level;
+	bt_self_component *self_comp;
 
 	/* Back reference to session. */
 	struct lttng_live_session *session;
@@ -161,6 +164,7 @@ struct lttng_live_trace {
 
 struct lttng_live_session {
 	bt_logging_level log_level;
+	bt_self_component *self_comp;
 
 	/* Weak reference. */
 	struct lttng_live_msg_iter *lttng_live_msg_iter;
@@ -195,7 +199,7 @@ struct lttng_live_component {
 	bt_logging_level log_level;
 
 	/* Weak reference. */
-	bt_self_component_source *self_comp;
+	bt_self_component *self_comp;
 
 	struct {
 		GString *url;
@@ -213,6 +217,7 @@ struct lttng_live_component {
 
 struct lttng_live_msg_iter {
 	bt_logging_level log_level;
+	bt_self_component *self_comp;
 
 	/* Weak reference. */
 	struct lttng_live_component *lttng_live_comp;
@@ -252,33 +257,42 @@ 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);
+
+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);
+
 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);
@@ -288,8 +302,30 @@ int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter,
 		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,
@@ -308,6 +344,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 */