X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live.h;h=ef799fd7f5d402fc420cde3bd76e6fea765b1739;hp=c4641df7c62bc934896ea3ac0d81d49ca8bc5d92;hb=21fe3eb3b83998d6fad94f7ec346d57593afe8c1;hpb=fb6b45aa1cd6baad19b42ef7cc7fa575c45895e1

diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h
index c4641df7..ef799fd7 100644
--- a/formats/lttng-live/lttng-live.h
+++ b/formats/lttng-live/lttng-live.h
@@ -25,6 +25,8 @@
  */
 
 #include <stdint.h>
+#include <sys/param.h>
+#include <babeltrace/list.h>
 #include "lttng-viewer-abi.h"
 
 #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT	5344
@@ -32,10 +34,17 @@
 #define LTTNG_LIVE_MAJOR			2
 #define LTTNG_LIVE_MINOR			4
 
+/*
+ * The lttng-live output file pointer is currently hardcoded to stdout,
+ * and is expected to be hardcoded to this by fflush() performed between
+ * each packet.
+ */
+#define LTTNG_LIVE_OUTPUT_FP			stdout
+
 struct lttng_live_ctx {
-	char traced_hostname[NAME_MAX];
-	char session_name[NAME_MAX];
-	char relay_hostname[NAME_MAX];
+	char traced_hostname[MAXNAMLEN];
+	char session_name[MAXNAMLEN];
+	char relay_hostname[MAXNAMLEN];
 	int control_sock;
 	int port;
 	/* Protocol version to use for this connection. */
@@ -57,6 +66,7 @@ struct lttng_live_viewer_stream {
 	struct lttng_live_session *session;
 	struct lttng_live_ctf_trace *ctf_trace;
 	struct lttng_viewer_index current_index;
+	struct bt_list_head stream_node;
 	char path[PATH_MAX];
 };
 
@@ -64,7 +74,7 @@ struct lttng_live_session {
 	uint64_t live_timer_interval;
 	uint64_t stream_count;
 	struct lttng_live_ctx *ctx;
-	struct lttng_live_viewer_stream *streams;
+	struct bt_list_head stream_list;
 	GHashTable *ctf_traces;
 };