X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.h;h=0c86a687b50c2855f33178a21d63f4829cbbee25;hb=fe4df857056b4a03898f1031f136359ce733b0f5;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..0c86a687 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;
@@ -135,6 +139,7 @@ struct lttng_live_metadata {
 
 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 +166,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;
@@ -183,6 +189,7 @@ 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,
@@ -195,7 +202,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 +220,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,26 +260,27 @@ enum lttng_live_iterator_status {
 	LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
 };
 
-bt_self_component_status lttng_live_component_init(
+bt_component_class_init_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_init_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);
 
@@ -308,6 +317,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 */