X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live.h;h=f06d65d5803ee39f16cc3d17d242aac857b5e2a1;hb=705105fc18f3a8ca1413913a9954c124a8516dc8;hp=cf47437bbd03e83f55331d2637833c987d1ae7ec;hpb=23285bf35e2f0575ab79666616cec0a57584b00a;p=babeltrace.git

diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h
index cf47437b..f06d65d5 100644
--- a/formats/lttng-live/lttng-live.h
+++ b/formats/lttng-live/lttng-live.h
@@ -25,6 +25,7 @@
  */
 
 #include <stdint.h>
+#include "lttng-viewer-abi.h"
 
 #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT	5344
 
@@ -37,6 +38,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;
@@ -45,12 +49,14 @@ struct lttng_live_ctx {
 struct lttng_live_viewer_stream {
 	uint64_t id;
 	uint64_t mmap_size;
+	uint64_t ctf_stream_id;
 	FILE *metadata_fp_write;
 	ssize_t metadata_len;
 	int metadata_flag;
-	int first_read;
+	int data_pending;
 	struct lttng_live_session *session;
 	struct lttng_live_ctf_trace *ctf_trace;
+	struct lttng_viewer_index current_index;
 	char path[PATH_MAX];
 };
 
@@ -59,6 +65,7 @@ struct lttng_live_session {
 	uint64_t stream_count;
 	struct lttng_live_ctx *ctx;
 	struct lttng_live_viewer_stream *streams;
+	/* HashTable mapping trace_ids to ptrs to struct lttng_live_ctf_trace */
 	GHashTable *ctf_traces;
 };