X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Flttng-live%2Flttng-live-internal.h;h=a698e6bef699aa3217a7436593e4758dad931e15;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=486cc5db7654fdf53c8f02079b2188134ebf8867;hpb=9d408fcae74602e3591f66623ceb85f482d948ed;p=babeltrace.git

diff --git a/plugins/ctf/lttng-live/lttng-live-internal.h b/plugins/ctf/lttng-live/lttng-live-internal.h
index 486cc5db..a698e6be 100644
--- a/plugins/ctf/lttng-live/lttng-live-internal.h
+++ b/plugins/ctf/lttng-live/lttng-live-internal.h
@@ -69,7 +69,7 @@ struct lttng_live_stream_iterator_generic {
 struct lttng_live_stream_iterator {
 	struct lttng_live_stream_iterator_generic p;
 
-	struct bt_ctf_stream *stream;
+	const struct bt_stream *stream;
 	struct lttng_live_trace *trace;
 	struct bt_private_port *port;	/* weak ref. */
 
@@ -80,7 +80,7 @@ struct lttng_live_stream_iterator {
 	 * Since only a single iterator per viewer connection, we have
 	 * only a single notification iterator per stream.
 	 */
-	struct bt_ctf_notif_iter *notif_iter;
+	struct bt_notif_iter *notif_iter;
 
 	uint64_t viewer_stream_id;
 
@@ -138,7 +138,7 @@ struct lttng_live_trace {
 
 	uint64_t id;	/* ctf trace ID within the session. */
 
-	struct bt_ctf_trace *trace;
+	const struct bt_trace *trace;
 
 	struct lttng_live_metadata *metadata;
 	struct bt_clock_class_priority_map *cc_prio_map;
@@ -174,7 +174,7 @@ struct lttng_live_session {
  */
 struct lttng_live_component {
 	struct bt_object obj;
-	struct bt_private_component *private_component;	/* weak */
+	struct bt_self_component *private_component;	/* weak */
 	struct bt_live_viewer_connection *viewer_connection;
 
 	/* List of struct lttng_live_session */
@@ -190,26 +190,26 @@ struct lttng_live_component {
 	struct bt_component *downstream_component;
 };
 
-enum bt_ctf_lttng_live_iterator_status {
+enum bt_lttng_live_iterator_status {
 	/** Iterator state has progressed. Continue iteration immediately. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_CONTINUE = 3,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_CONTINUE = 3,
 	/** No notification available for now. Try again later. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_AGAIN = 2,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_AGAIN = 2,
 	/** No more CTF_LTTNG_LIVEs to be delivered. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_END = 1,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_END = 1,
 	/** No error, okay. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_OK = 0,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_OK = 0,
 	/** Invalid arguments. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_INVAL = -1,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_INVAL = -1,
 	/** General error. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_ERROR = -2,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_ERROR = -2,
 	/** Out of memory. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_NOMEM = -3,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_NOMEM = -3,
 	/** Unsupported iterator feature. */
-	BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
+	BT_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
 };
 
-enum bt_component_status lttng_live_component_init(struct bt_private_component *source,
+enum bt_component_status lttng_live_component_init(struct bt_self_component *source,
 		struct bt_value *params, void *init_method_data);
 
 struct bt_component_class_query_method_return lttng_live_query(
@@ -217,26 +217,26 @@ struct bt_component_class_query_method_return lttng_live_query(
 		struct bt_query_executor *query_exec,
 		const char *object, struct bt_value *params);
 
-void lttng_live_component_finalize(struct bt_private_component *component);
+void lttng_live_component_finalize(struct bt_self_component *component);
 
 struct bt_notification_iterator_next_method_return lttng_live_iterator_next(
-        struct bt_private_connection_private_notification_iterator *iterator);
+        struct bt_self_notification_iterator *iterator);
 
 enum bt_component_status lttng_live_accept_port_connection(
-		struct bt_private_component *private_component,
+		struct bt_self_component *private_component,
 		struct bt_private_port *self_private_port,
 		struct bt_port *other_port);
 
 enum bt_notification_iterator_status lttng_live_iterator_init(
-		struct bt_private_connection_private_notification_iterator *it,
+		struct bt_self_notification_iterator *it,
 		struct bt_private_port *port);
 
-void lttng_live_iterator_finalize(struct bt_private_connection_private_notification_iterator *it);
+void lttng_live_iterator_finalize(struct bt_self_notification_iterator *it);
 
 int lttng_live_create_viewer_session(struct lttng_live_component *lttng_live);
 int lttng_live_attach_session(struct lttng_live_session *session);
 int lttng_live_detach_session(struct lttng_live_session *session);
-enum bt_ctf_lttng_live_iterator_status lttng_live_get_new_streams(
+enum bt_lttng_live_iterator_status lttng_live_get_new_streams(
 		struct lttng_live_session *session);
 
 int lttng_live_add_session(struct lttng_live_component *lttng_live,
@@ -246,11 +246,11 @@ int lttng_live_add_session(struct lttng_live_component *lttng_live,
 
 ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
 		FILE *fp);
-enum bt_ctf_lttng_live_iterator_status lttng_live_get_next_index(
+enum bt_lttng_live_iterator_status lttng_live_get_next_index(
 		struct lttng_live_component *lttng_live,
 		struct lttng_live_stream_iterator *stream,
 		struct packet_index *index);
-enum bt_ctf_notif_iter_medium_status lttng_live_get_stream_bytes(
+enum bt_notif_iter_medium_status lttng_live_get_stream_bytes(
 		struct lttng_live_component *lttng_live,
 		struct lttng_live_stream_iterator *stream, uint8_t *buf, uint64_t offset,
 		uint64_t req_len, uint64_t *recv_len);