Avoid unnecessary inclusions in public headers

[babeltrace.git] / plugins / ctf / lttng-live / lttng-live-internal.h

diff --git a/plugins/ctf/lttng-live/lttng-live-internal.h b/plugins/ctf/lttng-live/lttng-live-internal.h
index c55d999a1ae99368efca985a2f79f2aae0b3a1e0..486cc5db7654fdf53c8f02079b2188134ebf8867 100644 (file)
--- a/plugins/ctf/lttng-live/lttng-live-internal.h
+++ b/plugins/ctf/lttng-live/lttng-live-internal.h
@@ -31,9 +31,7 @@
 #include <stdbool.h>
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include "viewer-connection.h"
 
 //TODO: this should not be used by plugins. Should copy code into plugin
@@ -47,8 +45,6 @@
 #define U64_STR_MAX_LEN                20
 #define STREAM_NAME_MAX_LEN    (sizeof(STREAM_NAME_PREFIX) + U64_STR_MAX_LEN)
 
-extern bool lttng_live_debug;
-
 struct lttng_live_component;
 struct lttng_live_session;
 
@@ -75,7 +71,7 @@ struct lttng_live_stream_iterator {
 
        struct bt_ctf_stream *stream;
        struct lttng_live_trace *trace;
-       struct bt_private_port *port;
+       struct bt_private_port *port;   /* weak ref. */
 
        /* Node of stream list within the trace. */
        struct bt_list_head node;
@@ -111,7 +107,7 @@ struct lttng_live_no_stream_iterator {
        struct lttng_live_stream_iterator_generic p;
 
        struct lttng_live_component *lttng_live;
-       struct bt_private_port *port;
+       struct bt_private_port *port;   /* weak ref. */
 };
 
 struct lttng_live_component_options {
@@ -159,6 +155,9 @@ struct lttng_live_session {
 
        struct lttng_live_component *lttng_live;
 
+       GString *hostname;
+       GString *session_name;
+
        uint64_t id;
 
        /* List of struct lttng_live_trace */
@@ -182,12 +181,13 @@ struct lttng_live_component {
        struct bt_list_head sessions;
 
        GString *url;
-       FILE *error_fp;
        size_t max_query_size;
        struct lttng_live_component_options options;
 
-       struct bt_private_port *no_stream_port;
+       struct bt_private_port *no_stream_port; /* weak */
        struct lttng_live_no_stream_iterator *no_stream_iter;
+
+       struct bt_component *downstream_component;
 };
 
 enum bt_ctf_lttng_live_iterator_status {
@@ -209,25 +209,29 @@ enum bt_ctf_lttng_live_iterator_status {
        BT_CTF_LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4,
 };
 
-BT_HIDDEN
 enum bt_component_status lttng_live_component_init(struct bt_private_component *source,
                struct bt_value *params, void *init_method_data);
 
-struct bt_value *lttng_live_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_method_return lttng_live_query(
+               struct bt_component_class *comp_class,
+               struct bt_query_executor *query_exec,
                const char *object, struct bt_value *params);
 
 void lttng_live_component_finalize(struct bt_private_component *component);
 
-BT_HIDDEN
-struct bt_notification_iterator_next_return lttng_live_iterator_next(
-        struct bt_private_notification_iterator *iterator);
+struct bt_notification_iterator_next_method_return lttng_live_iterator_next(
+        struct bt_private_connection_private_notification_iterator *iterator);
 
+enum bt_component_status lttng_live_accept_port_connection(
+               struct bt_private_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_notification_iterator *it,
+               struct bt_private_connection_private_notification_iterator *it,
                struct bt_private_port *port);
 
-void lttng_live_iterator_finalize(struct bt_private_notification_iterator *it);
+void lttng_live_iterator_finalize(struct bt_private_connection_private_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);
@@ -235,7 +239,10 @@ int lttng_live_detach_session(struct lttng_live_session *session);
 enum bt_ctf_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, uint64_t session_id);
+int lttng_live_add_session(struct lttng_live_component *lttng_live,
+               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);
@@ -258,4 +265,6 @@ struct lttng_live_trace *lttng_live_ref_trace(
 void lttng_live_unref_trace(struct lttng_live_trace *trace);
 void lttng_live_need_new_streams(struct lttng_live_component *lttng_live);
 
+bt_bool lttng_live_is_canceled(struct lttng_live_component *lttng_live);
+
 #endif /* BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_INTERNAL_H */