X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.h;h=fd5d742e77e1879ae7ac33d48f989b9a1a8b2c14;hb=4175c1d52f91f7e5d66a12135ad8ec6ec736a539;hp=dc49bfb3e5af9213ade919d7baf07e5ff6f3d19f;hpb=83da519a8ccd49e126d6bcd9392ee7067acb078b;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index dc49bfb3..fd5d742e 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.h
+++ b/src/plugins/ctf/lttng-live/lttng-live.h
@@ -64,6 +64,9 @@ 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;
 
@@ -116,9 +119,14 @@ 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;
 
@@ -130,6 +138,9 @@ 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;
 
@@ -154,6 +165,9 @@ 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;
 
@@ -175,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,
@@ -184,8 +199,10 @@ enum session_not_found_action {
  * A component instance is an iterator on a single session.
  */
 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;
@@ -202,6 +219,9 @@ 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;
 
@@ -240,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_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);
 
@@ -296,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 */