Fix: check the lttng-relayd protocol version

[babeltrace.git] / formats / lttng-live / lttng-live.h

diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h
index 137a296d58d38cb248c539d62be9b1d22d538e98..d7b0e860b14786950ca5dee227447d6b8dd35a83 100644 (file)
--- a/formats/lttng-live/lttng-live.h
+++ b/formats/lttng-live/lttng-live.h
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-#define LTTNG_METADATA_PATH_TEMPLATE           "/tmp/lttng-live-XXXXXX"
 #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT      5344
 
 #define LTTNG_LIVE_MAJOR                       2
@@ -38,6 +37,9 @@ struct lttng_live_ctx {
        char relay_hostname[NAME_MAX];
        int control_sock;
        int port;
+       /* Protocol version to use for this connection. */
+       uint32_t major;
+       uint32_t minor;
        struct lttng_live_session *session;
        struct bt_context *bt_ctx;
        GArray *session_ids;
@@ -46,7 +48,8 @@ struct lttng_live_ctx {
 struct lttng_live_viewer_stream {
        uint64_t id;
        uint64_t mmap_size;
-       int fd;
+       FILE *metadata_fp_write;
+       ssize_t metadata_len;
        int metadata_flag;
        int first_read;
        struct lttng_live_session *session;
@@ -67,6 +70,7 @@ struct lttng_live_ctf_trace {
        struct lttng_live_viewer_stream *metadata_stream;
        GPtrArray *streams;
        FILE *metadata_fp;
+       struct bt_trace_handle *handle;
        int trace_id;
        int in_use;
 };
@@ -84,7 +88,8 @@ int lttng_live_connect_viewer(struct lttng_live_ctx *ctx);
 int lttng_live_establish_connection(struct lttng_live_ctx *ctx);
 int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path);
 int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id);
-void lttng_live_read(struct lttng_live_ctx *ctx);
+int lttng_live_read(struct lttng_live_ctx *ctx);
 int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id);
+int lttng_live_should_quit(void);
 
 #endif /* _LTTNG_LIVE_H */