Adapt `src.ctf.lttng-live` to current API

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

diff --git a/plugins/ctf/lttng-live/viewer-connection.h b/plugins/ctf/lttng-live/viewer-connection.h
index da49e349e6d05885a56fb1588841efda08898989..85fd745d9ddad21cf84d70e0006bd3f7dd768b34 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.h
+++ b/plugins/ctf/lttng-live/viewer-connection.h
@@ -27,6 +27,7 @@
 #include <glib.h>
 
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/compat/socket-internal.h>
 
 //TODO: this should not be used by plugins. Should copy code into plugin
 //instead.
@@ -37,26 +38,30 @@
 #define LTTNG_LIVE_MAJOR                       2
 #define LTTNG_LIVE_MINOR                       4
 
-struct bt_live_viewer_connection {
-       struct bt_object obj;
+struct lttng_live_component;
 
-       FILE *error_fp;
+struct live_viewer_connection {
+       bt_object obj;
 
        GString *url;
 
-       char relay_hostname[MAXNAMLEN];
-       char target_hostname[MAXNAMLEN];
-       char session_name[MAXNAMLEN];
-       int control_sock;
+       GString *relay_hostname;
+       GString *target_hostname;
+       GString *session_name;
+
+       BT_SOCKET control_sock;
        int port;
 
        int32_t major;
        int32_t minor;
+
+       bool in_query;
+       struct lttng_live_msg_iter *lttng_live_msg_iter;
 };
 
 struct packet_index_time {
-       int64_t timestamp_begin;
-       int64_t timestamp_end;
+       uint64_t timestamp_begin;
+       uint64_t timestamp_end;
 };
 
 struct packet_index {
@@ -73,11 +78,15 @@ struct packet_index {
        uint64_t packet_seq_num;        /* packet sequence number */
 };
 
-struct bt_live_viewer_connection *
-       bt_live_viewer_connection_create(const char *url, FILE *error_fp);
+struct live_viewer_connection * live_viewer_connection_create(
+               const char *url, bool in_query,
+               struct lttng_live_msg_iter *lttng_live_msg_iter);
 
-void bt_live_viewer_connection_destroy(struct bt_live_viewer_connection *conn);
+void live_viewer_connection_destroy(
+               struct live_viewer_connection *conn);
 
-struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection);
+bt_query_status live_viewer_connection_list_sessions(
+               struct live_viewer_connection *viewer_connection,
+               const bt_value **user_result);
 
 #endif /* LTTNG_LIVE_VIEWER_CONNECTION_H */