X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-comm.c;h=03191cd3ddca98ad72107b7ef90b92155888c87e;hp=f9ed51e1b3a1aaa9829309e01ce10aac5649e2f7;hb=96943040bef827c87c828bc1a73ab419cb6b08b3;hpb=b212be1d76fad138dde815066c35d4d24f3d7a99

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index f9ed51e1..03191cd3 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -33,6 +33,7 @@
 #include <inttypes.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <poll.h>
 
 #include <babeltrace/ctf/ctf-index.h>
 
@@ -49,9 +50,13 @@
 #include <babeltrace/ctf/events-internal.h>
 #include <formats/ctf/events-private.h>
 
+#include <babeltrace/compat/memstream.h>
+
 #include "lttng-live.h"
 #include "lttng-viewer-abi.h"
 
+#define ACTIVE_POLL_DELAY	100	/* ms */
+
 /*
  * Memory allocation zeroed
  */
@@ -66,6 +71,41 @@ static void ctf_live_packet_seek(struct bt_stream_pos *stream_pos,
 		size_t index, int whence);
 static void add_traces(gpointer key, gpointer value, gpointer user_data);
 static int del_traces(gpointer key, gpointer value, gpointer user_data);
+static int get_new_metadata(struct lttng_live_ctx *ctx,
+		struct lttng_live_viewer_stream *viewer_stream,
+		char **metadata_buf);
+
+static
+ssize_t lttng_live_recv(int fd, void *buf, size_t len)
+{
+	ssize_t ret;
+	size_t copied = 0, to_copy = len;
+
+	do {
+		ret = recv(fd, buf + copied, to_copy, 0);
+		if (ret > 0) {
+			assert(ret <= to_copy);
+			copied += ret;
+			to_copy -= ret;
+		}
+	} while ((ret > 0 && to_copy > 0)
+		|| (ret < 0 && errno == EINTR));
+	if (ret > 0)
+		ret = copied;
+	/* ret = 0 means orderly shutdown, ret < 0 is error. */
+	return ret;
+}
+
+static
+ssize_t lttng_live_send(int fd, const void *buf, size_t len)
+{
+	ssize_t ret;
+
+	do {
+		ret = send(fd, buf, len, MSG_NOSIGNAL);
+	} while (ret < 0 && errno == EINTR);
+	return ret;
+}
 
 int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
 {
@@ -73,16 +113,21 @@ int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
 	struct sockaddr_in server_addr;
 	int ret;
 
-	host = gethostbyname(ctx->relay_hostname);
-	if (!host) {
+	if (lttng_live_should_quit()) {
 		ret = -1;
 		goto end;
 	}
 
+	host = gethostbyname(ctx->relay_hostname);
+	if (!host) {
+		fprintf(stderr, "[error] Cannot lookup hostname %s\n",
+			ctx->relay_hostname);
+		goto error;
+	}
+
 	if ((ctx->control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
 		perror("Socket");
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	server_addr.sin_family = AF_INET;
@@ -93,14 +138,17 @@ int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
 	if (connect(ctx->control_sock, (struct sockaddr *) &server_addr,
 				sizeof(struct sockaddr)) == -1) {
 		perror("Connect");
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	ret = 0;
 
 end:
 	return ret;
+
+error:
+	fprintf(stderr, "[error] Connection failed\n");
+	return -1;
 }
 
 int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
@@ -110,6 +158,11 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
 	int ret;
 	ssize_t ret_len;
 
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+
 	cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
 	cmd.data_size = sizeof(connect);
 	cmd.cmd_version = 0;
@@ -119,37 +172,27 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
 	connect.minor = htobe32(LTTNG_LIVE_MINOR);
 	connect.type = htobe32(LTTNG_VIEWER_CLIENT_COMMAND);
 
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = send(ctx->control_sock, &connect, sizeof(connect), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &connect, sizeof(connect));
 	if (ret_len < 0) {
 		perror("[error] Error sending version");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(connect));
 
-	do {
-		ret_len = recv(ctx->control_sock, &connect, sizeof(connect), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &connect, sizeof(connect));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving version");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(connect));
@@ -158,11 +201,13 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
 			be64toh(connect.viewer_session_id));
 	printf_verbose("Relayd version : %u.%u\n", be32toh(connect.major),
 			be32toh(connect.minor));
-
 	ret = 0;
+end:
+	return ret;
 
 error:
-	return ret;
+	fprintf(stderr, "[error] Unable to establish connection\n");
+	return -1;
 }
 
 static
@@ -237,6 +282,11 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
 	uint64_t session_id;
 	GPtrArray *session_list = NULL;
 
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+
 	if (strlen(ctx->session_name) == 0) {
 		print_list = 1;
 		session_list = g_ptr_array_new();
@@ -246,44 +296,33 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
 	cmd.data_size = 0;
 	cmd.cmd_version = 0;
 
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = recv(ctx->control_sock, &list, sizeof(list), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &list, sizeof(list));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving session list");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(list));
 
 	sessions_count = be32toh(list.sessions_count);
 	for (i = 0; i < sessions_count; i++) {
-		do {
-			ret_len = recv(ctx->control_sock, &lsession, sizeof(lsession), 0);
-		} while (ret_len < 0 && errno == EINTR);
+		ret_len = lttng_live_recv(ctx->control_sock, &lsession, sizeof(lsession));
 		if (ret_len == 0) {
 			fprintf(stderr, "[error] Remote side has closed connection\n");
-			ret = -1;
 			goto error;
 		}
 		if (ret_len < 0) {
 			perror("[error] Error receiving session");
-			ret = ret_len;
 			goto error;
 		}
 		assert(ret_len == sizeof(lsession));
@@ -314,11 +353,13 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
 		print_session_list(session_list, path);
 		free_session_list(session_list);
 	}
-
 	ret = 0;
+end:
+	return ret;
 
 error:
-	return ret;
+	fprintf(stderr, "[error] Unable to list sessions\n");
+	return -1;
 }
 
 int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream,
@@ -346,6 +387,22 @@ int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream,
 	return ret;
 }
 
+static
+int open_metadata_fp_write(struct lttng_live_viewer_stream *stream,
+		char **metadata_buf, size_t *size)
+{
+	int ret = 0;
+
+	stream->metadata_fp_write =
+		babeltrace_open_memstream(metadata_buf, size);
+	if (!stream->metadata_fp_write) {
+		perror("Metadata open_memstream");
+		ret = -1;
+	}
+
+	return ret;
+}
+
 int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 {
 	struct lttng_viewer_cmd cmd;
@@ -355,6 +412,11 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 	int ret, i;
 	ssize_t ret_len;
 
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+
 	cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
 	cmd.data_size = sizeof(rq);
 	cmd.cmd_version = 0;
@@ -365,37 +427,27 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 	// rq.seek = htobe32(LTTNG_VIEWER_SEEK_BEGINNING);
 	rq.seek = htobe32(LTTNG_VIEWER_SEEK_LAST);
 
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
 	if (ret_len < 0) {
 		perror("[error] Error sending attach request");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rq));
 
-	do {
-		ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving attach response");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rp));
@@ -408,25 +460,20 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 		goto end;
 	case LTTNG_VIEWER_ATTACH_ALREADY:
 		fprintf(stderr, "[error] There is already a viewer attached to this session\n");
-		ret = -1;
-		goto end;
+		goto error;
 	case LTTNG_VIEWER_ATTACH_NOT_LIVE:
 		fprintf(stderr, "[error] Not a live session\n");
-		ret = -1;
-		goto end;
+		goto error;
 	case LTTNG_VIEWER_ATTACH_SEEK_ERR:
 		fprintf(stderr, "[error] Wrong seek parameter\n");
-		ret = -1;
-		goto end;
+		goto error;
 	default:
 		fprintf(stderr, "[error] Unknown attach return code %u\n",
 				be32toh(rp.status));
-		ret = -1;
-		goto end;
+		goto error;
 	}
 	if (be32toh(rp.status) != LTTNG_VIEWER_ATTACH_OK) {
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	ctx->session->stream_count += be32toh(rp.streams_count);
@@ -444,17 +491,13 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 	ctx->session->streams = g_new0(struct lttng_live_viewer_stream,
 			ctx->session->stream_count);
 	for (i = 0; i < be32toh(rp.streams_count); i++) {
-		do {
-			ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
-		} while (ret_len < 0 && errno == EINTR);
+		ret_len = lttng_live_recv(ctx->control_sock, &stream, sizeof(stream));
 		if (ret_len == 0) {
 			fprintf(stderr, "[error] Remote side has closed connection\n");
-			ret = -1;
 			goto error;
 		}
 		if (ret_len < 0) {
 			perror("[error] Error receiving stream");
-			ret = ret_len;
 			goto error;
 		}
 		assert(ret_len == sizeof(stream));
@@ -471,35 +514,7 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 		ctx->session->streams[i].mmap_size = 0;
 
 		if (be32toh(stream.metadata_flag)) {
-			char *path;
-
-			path = strdup(LTTNG_METADATA_PATH_TEMPLATE);
-			if (!path) {
-				perror("strdup");
-				ret = -1;
-				goto error;
-			}
-			if (!mkdtemp(path)) {
-				perror("mkdtemp");
-				free(path);
-				ret = -1;
-				goto error;
-			}
 			ctx->session->streams[i].metadata_flag = 1;
-			snprintf(ctx->session->streams[i].path,
-					sizeof(ctx->session->streams[i].path),
-					"%s/%s", path,
-					stream.channel_name);
-			ret = open(ctx->session->streams[i].path,
-					O_WRONLY | O_CREAT | O_TRUNC,
-					S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-			if (ret < 0) {
-				perror("open");
-				free(path);
-				goto error;
-			}
-			ctx->session->streams[i].fd = ret;
-			free(path);
 		}
 		ret = lttng_live_ctf_trace_assign(&ctx->session->streams[i],
 				be64toh(stream.ctf_trace_id));
@@ -509,10 +524,11 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
 
 	}
 	ret = 0;
-
 end:
-error:
 	return ret;
+
+error:
+	return -1;
 }
 
 static
@@ -553,6 +569,45 @@ end:
 	return ret;
 }
 
+static
+int append_metadata(struct lttng_live_ctx *ctx,
+		struct lttng_live_viewer_stream *viewer_stream)
+{
+	int ret;
+	struct lttng_live_viewer_stream *metadata;
+	char *metadata_buf = NULL;
+
+	printf_verbose("get_next_index: new metadata needed\n");
+	ret = get_new_metadata(ctx, viewer_stream, &metadata_buf);
+	if (ret < 0) {
+		free(metadata_buf);
+		goto error;
+	}
+
+	metadata = viewer_stream->ctf_trace->metadata_stream;
+	metadata->ctf_trace->metadata_fp =
+		babeltrace_fmemopen(metadata_buf,
+				metadata->metadata_len, "rb");
+	if (!metadata->ctf_trace->metadata_fp) {
+		perror("Metadata fmemopen");
+		free(metadata_buf);
+		ret = -1;
+		goto error;
+	}
+	ret = ctf_append_trace_metadata(
+			viewer_stream->ctf_trace->handle->td,
+			metadata->ctf_trace->metadata_fp);
+	/* We accept empty metadata packets */
+	if (ret != 0 && ret != -ENOENT) {
+		fprintf(stderr, "[error] Appending metadata\n");
+		goto error;
+	}
+	ret = 0;
+
+error:
+	return ret;
+}
+
 static
 int get_data_packet(struct lttng_live_ctx *ctx,
 		struct ctf_stream_pos *pos,
@@ -565,6 +620,11 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 	ssize_t ret_len;
 	int ret;
 
+retry:
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
 	cmd.data_size = sizeof(rq);
 	cmd.cmd_version = 0;
@@ -575,44 +635,33 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 	rq.offset = offset;
 	rq.len = htobe32(len);
 
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
 	if (ret_len < 0) {
 		perror("[error] Error sending get_data_packet request");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rq));
 
-	do {
-		ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving data response");
-		ret = ret_len;
 		goto error;
 	}
 	if (ret_len != sizeof(rp)) {
 		fprintf(stderr, "[error] get_data_packet: expected %" PRId64
-				", received %" PRId64 "\n", ret_len,
-				sizeof(rp));
-		ret = -1;
+				", received %" PRId64 "\n", sizeof(rp),
+				ret_len);
 		goto error;
 	}
 
@@ -625,38 +674,40 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 				"\n", len);
 		break;
 	case LTTNG_VIEWER_GET_PACKET_RETRY:
+		/* Unimplemented by relay daemon */
 		printf_verbose("get_data_packet: retry\n");
-		ret = -1;
-		goto end;
+		goto error;
 	case LTTNG_VIEWER_GET_PACKET_ERR:
 		if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
 			printf_verbose("get_data_packet: new metadata needed\n");
-			ret = 0;
-			goto end;
+			ret = append_metadata(ctx, stream);
+			if (ret)
+				goto error;
 		}
 		if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
+			printf_verbose("get_data_packet: new streams needed\n");
 			ret = ask_new_streams(ctx);
 			if (ret < 0)
 				goto error;
-			g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
-					ctx->bt_ctx);
+			g_hash_table_foreach(ctx->session->ctf_traces,
+					add_traces, ctx->bt_ctx);
+		}
+		if (rp.flags & (LTTNG_VIEWER_FLAG_NEW_METADATA
+				| LTTNG_VIEWER_FLAG_NEW_STREAM)) {
+			goto retry;
 		}
 		fprintf(stderr, "[error] get_data_packet: error\n");
-		ret = -1;
-		goto end;
+		goto error;
 	case LTTNG_VIEWER_GET_PACKET_EOF:
 		ret = -2;
-		goto error;
+		goto end;
 	default:
 		printf_verbose("get_data_packet: unknown\n");
-		assert(0);
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	if (len <= 0) {
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	if (len > stream->mmap_size) {
@@ -668,7 +719,6 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 			ret = munmap_align(pos->base_mma);
 			if (ret) {
 				perror("[error] Unable to unmap old base");
-				ret = -1;
 				goto error;
 			}
 			pos->base_mma = NULL;
@@ -679,7 +729,6 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 		if (pos->base_mma == MAP_FAILED) {
 			perror("[error] mmap error");
 			pos->base_mma = NULL;
-			ret = -1;
 			goto error;
 		}
 
@@ -688,83 +737,68 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 				stream->mmap_size);
 	}
 
-	do {
-		ret_len = recv(ctx->control_sock,
-			mmap_align_addr(pos->base_mma), len,
-			MSG_WAITALL);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock,
+			mmap_align_addr(pos->base_mma), len);
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving trace packet");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == len);
-
+	ret = 0;
 end:
-error:
 	return ret;
+
+error:
+	return -1;
 }
 
-/*
- * Return number of metadata bytes written or a negative value on error.
- */
 static
-int get_new_metadata(struct lttng_live_ctx *ctx,
-		struct lttng_live_viewer_stream *viewer_stream,
-		uint64_t *metadata_len)
+int get_one_metadata_packet(struct lttng_live_ctx *ctx,
+		struct lttng_live_viewer_stream *metadata_stream)
 {
 	uint64_t len = 0;
 	int ret;
 	struct lttng_viewer_cmd cmd;
 	struct lttng_viewer_get_metadata rq;
 	struct lttng_viewer_metadata_packet rp;
-	struct lttng_live_viewer_stream *metadata_stream;
 	char *data = NULL;
 	ssize_t ret_len;
 
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+
+	rq.stream_id = htobe64(metadata_stream->id);
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
 	cmd.data_size = sizeof(rq);
 	cmd.cmd_version = 0;
 
-	metadata_stream = viewer_stream->ctf_trace->metadata_stream;
-	rq.stream_id = htobe64(metadata_stream->id);
-
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
 	if (ret_len < 0) {
 		perror("[error] Error sending get_metadata request");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rq));
 
-	do {
-		ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving metadata response");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rp));
@@ -775,63 +809,102 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
 			break;
 		case LTTNG_VIEWER_NO_NEW_METADATA:
 			printf_verbose("get_metadata : NO NEW\n");
-			ret = -1;
+			ret = 0;
 			goto end;
 		case LTTNG_VIEWER_METADATA_ERR:
 			printf_verbose("get_metadata : ERR\n");
-			ret = -1;
-			goto end;
+			goto error;
 		default:
 			printf_verbose("get_metadata : UNKNOWN\n");
-			ret = -1;
-			goto end;
+			goto error;
 	}
 
 	len = be64toh(rp.len);
 	printf_verbose("Writing %" PRIu64" bytes to metadata\n", len);
 	if (len <= 0) {
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	data = zmalloc(len);
 	if (!data) {
 		perror("relay data zmalloc");
-		ret = -1;
 		goto error;
 	}
-	do {
-		ret_len = recv(ctx->control_sock, data, len, MSG_WAITALL);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, data, len);
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
-		free(data);
-		goto error;
+		goto error_free_data;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving trace packet");
-		ret = ret_len;
-		free(data);
-		goto error;
+		goto error_free_data;
 	}
 	assert(ret_len == len);
 
 	do {
-		ret_len = write(metadata_stream->fd, data, len);
+		ret_len = fwrite(data, 1, len,
+				metadata_stream->metadata_fp_write);
 	} while (ret_len < 0 && errno == EINTR);
 	if (ret_len < 0) {
-		free(data);
-		ret = ret_len;
-		goto error;
+		fprintf(stderr, "[error] Writing in the metadata fp\n");
+		goto error_free_data;
 	}
 	assert(ret_len == len);
+	metadata_stream->metadata_len += len;
+	free(data);
+	ret = len;
+end:
+	return ret;
 
+error_free_data:
 	free(data);
+error:
+	return -1;
+}
+
+/*
+ * Return 0 on success, a negative value on error.
+ */
+static
+int get_new_metadata(struct lttng_live_ctx *ctx,
+		struct lttng_live_viewer_stream *viewer_stream,
+		char **metadata_buf)
+{
+	int ret = 0;
+	struct lttng_live_viewer_stream *metadata_stream;
+	size_t size, len_read = 0;;
+
+	metadata_stream = viewer_stream->ctf_trace->metadata_stream;
+	if (!metadata_stream) {
+		fprintf(stderr, "[error] No metadata stream\n");
+		ret = -1;
+		goto error;
+	}
+	metadata_stream->metadata_len = 0;
+	ret = open_metadata_fp_write(metadata_stream, metadata_buf, &size);
+	if (ret < 0) {
+		goto error;
+	}
+
+	do {
+		/*
+		 * get_one_metadata_packet returns the number of bytes
+		 * received, 0 when we have received everything, a
+		 * negative value on error.
+		 */
+		ret = get_one_metadata_packet(ctx, metadata_stream);
+		if (ret > 0) {
+			len_read += ret;
+		}
+		if (!len_read) {
+			(void) poll(NULL, 0, ACTIVE_POLL_DELAY);
+		}
+	} while (ret > 0 || !len_read);
+
+	if (fclose(metadata_stream->metadata_fp_write))
+		perror("fclose");
+	metadata_stream->metadata_fp_write = NULL;
 
-	*metadata_len = len;
-	ret = 0;
-end:
 error:
 	return ret;
 }
@@ -850,7 +923,6 @@ int get_next_index(struct lttng_live_ctx *ctx,
 	struct lttng_viewer_get_next_index rq;
 	struct lttng_viewer_index rp;
 	int ret;
-	uint64_t metadata_len;
 	ssize_t ret_len;
 
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
@@ -861,37 +933,31 @@ int get_next_index(struct lttng_live_ctx *ctx,
 	rq.stream_id = htobe64(viewer_stream->id);
 
 retry:
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
 	if (ret_len < 0) {
 		perror("[error] Error sending get_next_index request");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rq));
 
-	do {
-		ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving index response");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rp));
@@ -915,46 +981,41 @@ retry:
 		index->events_discarded = be64toh(rp.events_discarded);
 
 		if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
-			printf_verbose("get_next_index: new metadata needed\n");
-			ret = get_new_metadata(ctx, viewer_stream,
-					&metadata_len);
-			if (ret < 0) {
+			ret = append_metadata(ctx, viewer_stream);
+			if (ret)
 				goto error;
-			}
 		}
 		if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
 			ret = ask_new_streams(ctx);
 			if (ret < 0)
 				goto error;
-			g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
-					ctx->bt_ctx);
+			g_hash_table_foreach(ctx->session->ctf_traces,
+					add_traces, ctx->bt_ctx);
 		}
 		break;
 	case LTTNG_VIEWER_INDEX_RETRY:
 		printf_verbose("get_next_index: retry\n");
-		sleep(1);
+		(void) poll(NULL, 0, ACTIVE_POLL_DELAY);
 		goto retry;
 	case LTTNG_VIEWER_INDEX_HUP:
 		printf_verbose("get_next_index: stream hung up\n");
 		viewer_stream->id = -1ULL;
-		viewer_stream->fd = -1;
 		index->offset = EOF;
 		ctx->session->stream_count--;
 		break;
 	case LTTNG_VIEWER_INDEX_ERR:
 		fprintf(stderr, "[error] get_next_index: error\n");
-		ret = -1;
 		goto error;
 	default:
 		fprintf(stderr, "[error] get_next_index: unkwown value\n");
-		ret = -1;
 		goto error;
 	}
-
 	ret = 0;
+end:
+	return ret;
 
 error:
-	return ret;
+	return -1;
 }
 
 static
@@ -1098,44 +1159,43 @@ int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
 	int ret;
 	ssize_t ret_len;
 
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+
 	cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
 	cmd.data_size = 0;
 	cmd.cmd_version = 0;
 
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = recv(ctx->control_sock, &resp, sizeof(resp), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &resp, sizeof(resp));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving create session reply");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(resp));
 
 	if (be32toh(resp.status) != LTTNG_VIEWER_CREATE_SESSION_OK) {
 		fprintf(stderr, "[error] Error creating viewer session\n");
-		ret = -1;
 		goto error;
 	}
 	ret = 0;
+end:
+	return ret;
 
 error:
-	return ret;
+	return -1;
 }
 
 static
@@ -1156,14 +1216,15 @@ int del_traces(gpointer key, gpointer value, gpointer user_data)
 static
 void add_traces(gpointer key, gpointer value, gpointer user_data)
 {
-	int i, ret, total_metadata = 0;
-	uint64_t metadata_len;
+	int i, ret;
 	struct bt_context *bt_ctx = user_data;
 	struct lttng_live_ctf_trace *trace = value;
 	struct lttng_live_viewer_stream *stream;
 	struct bt_mmap_stream *new_mmap_stream;
 	struct bt_mmap_stream_list mmap_list;
 	struct lttng_live_ctx *ctx = NULL;
+	struct bt_trace_descriptor *td;
+	struct bt_trace_handle *handle;
 
 	/*
 	 * We don't know how many streams we will receive for a trace, so
@@ -1189,15 +1250,29 @@ void add_traces(gpointer key, gpointer value, gpointer user_data)
 			new_mmap_stream->fd = -1;
 			bt_list_add(&new_mmap_stream->list, &mmap_list.head);
 		} else {
+			char *metadata_buf = NULL;
+
 			/* Get all possible metadata before starting */
-			do {
-				ret = get_new_metadata(ctx, stream,
-						&metadata_len);
-				if (ret == 0) {
-					total_metadata += metadata_len;
-				}
-			} while (ret == 0 || total_metadata == 0);
-			trace->metadata_fp = fopen(stream->path, "r");
+			ret = get_new_metadata(ctx, stream, &metadata_buf);
+			if (ret) {
+				free(metadata_buf);
+				goto end_free;
+			}
+			if (!stream->metadata_len) {
+				fprintf(stderr, "[error] empty metadata\n");
+				ret = -1;
+				free(metadata_buf);
+				goto end_free;
+			}
+
+			trace->metadata_fp = babeltrace_fmemopen(metadata_buf,
+					stream->metadata_len, "rb");
+			if (!trace->metadata_fp) {
+				perror("Metadata fmemopen");
+				ret = -1;
+				free(metadata_buf);
+				goto end_free;
+			}
 		}
 	}
 
@@ -1212,15 +1287,14 @@ void add_traces(gpointer key, gpointer value, gpointer user_data)
 		fprintf(stderr, "[error] Error adding trace\n");
 		goto end_free;
 	}
+	trace->metadata_stream->metadata_len = 0;
 
+	handle = (struct bt_trace_handle *) g_hash_table_lookup(
+			bt_ctx->trace_handles,
+			(gpointer) (unsigned long) ret);
+	td = handle->td;
+	trace->handle = handle;
 	if (bt_ctx->current_iterator) {
-		struct bt_trace_descriptor *td;
-		struct bt_trace_handle *handle;
-
-		handle = (struct bt_trace_handle *) g_hash_table_lookup(
-				bt_ctx->trace_handles,
-				(gpointer) (unsigned long) ret);
-		td = handle->td;
 		bt_iter_add_trace(bt_ctx->current_iterator, td);
 	}
 
@@ -1245,6 +1319,11 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
 	ssize_t ret_len;
 	uint32_t stream_count;
 
+	if (lttng_live_should_quit()) {
+		ret = -1;
+		goto end;
+	}
+
 	cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
 	cmd.data_size = sizeof(rq);
 	cmd.cmd_version = 0;
@@ -1252,37 +1331,27 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
 	memset(&rq, 0, sizeof(rq));
 	rq.session_id = htobe64(id);
 
-	do {
-		ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
 	if (ret_len < 0) {
 		perror("[error] Error sending cmd");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(cmd));
 
-	do {
-		ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_send(ctx->control_sock, &rq, sizeof(rq));
 	if (ret_len < 0) {
 		perror("[error] Error sending get_new_streams request");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rq));
 
-	do {
-		ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
-	} while (ret_len < 0 && errno == EINTR);
+	ret_len = lttng_live_recv(ctx->control_sock, &rp, sizeof(rp));
 	if (ret_len == 0) {
 		fprintf(stderr, "[error] Remote side has closed connection\n");
-		ret = -1;
 		goto error;
 	}
 	if (ret_len < 0) {
 		perror("[error] Error receiving get_new_streams response");
-		ret = ret_len;
 		goto error;
 	}
 	assert(ret_len == sizeof(rp));
@@ -1298,13 +1367,11 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
 		goto end;
 	case LTTNG_VIEWER_NEW_STREAMS_ERR:
 		fprintf(stderr, "[error] get_new_streams error\n");
-		ret = -1;
-		goto end;
+		goto error;
 	default:
 		fprintf(stderr, "[error] Unknown return code %u\n",
 				be32toh(rp.status));
-		ret = -1;
-		goto end;
+		goto error;
 	}
 
 	stream_count = be32toh(rp.streams_count);
@@ -1323,17 +1390,13 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
 	ctx->session->streams = g_new0(struct lttng_live_viewer_stream,
 			ctx->session->stream_count);
 	for (i = 0; i < stream_count; i++) {
-		do {
-			ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
-		} while (ret_len < 0 && errno == EINTR);
+		ret_len = lttng_live_recv(ctx->control_sock, &stream, sizeof(stream));
 		if (ret_len == 0) {
 			fprintf(stderr, "[error] Remote side has closed connection\n");
-			ret = -1;
 			goto error;
 		}
 		if (ret_len < 0) {
 			perror("[error] Error receiving stream");
-			ret = ret_len;
 			goto error;
 		}
 		assert(ret_len == sizeof(stream));
@@ -1350,35 +1413,7 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
 		ctx->session->streams[i].mmap_size = 0;
 
 		if (be32toh(stream.metadata_flag)) {
-			char *path;
-
-			path = strdup(LTTNG_METADATA_PATH_TEMPLATE);
-			if (!path) {
-				perror("strdup");
-				ret = -1;
-				goto error;
-			}
-			if (!mkdtemp(path)) {
-				perror("mkdtemp");
-				free(path);
-				ret = -1;
-				goto error;
-			}
 			ctx->session->streams[i].metadata_flag = 1;
-			snprintf(ctx->session->streams[i].path,
-					sizeof(ctx->session->streams[i].path),
-					"%s/%s", path,
-					stream.channel_name);
-			ret = open(ctx->session->streams[i].path,
-					O_WRONLY | O_CREAT | O_TRUNC,
-					S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-			if (ret < 0) {
-				perror("open");
-				free(path);
-				goto error;
-			}
-			ctx->session->streams[i].fd = ret;
-			free(path);
 		}
 		ret = lttng_live_ctf_trace_assign(&ctx->session->streams[i],
 				be64toh(stream.ctf_trace_id));
@@ -1388,10 +1423,11 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
 
 	}
 	ret = 0;
-
 end:
-error:
 	return ret;
+
+error:
+	return -1;
 }
 
 void lttng_live_read(struct lttng_live_ctx *ctx)
@@ -1425,8 +1461,9 @@ void lttng_live_read(struct lttng_live_ctx *ctx)
 
 	sout = container_of(td_write, struct ctf_text_stream_pos,
 			trace_descriptor);
-	if (!sout->parent.event_cb)
+	if (!sout->parent.event_cb) {
 		goto end_free;
+	}
 
 	ret = lttng_live_create_viewer_session(ctx);
 	if (ret < 0) {
@@ -1452,12 +1489,22 @@ void lttng_live_read(struct lttng_live_ctx *ctx)
 	for (;;) {
 		int flags;
 
+		if (lttng_live_should_quit()) {
+			goto end_free;
+		}
+
 		while (!ctx->session->stream_count) {
-			if (ctx->session_ids->len == 0)
+			if (lttng_live_should_quit()
+					|| ctx->session_ids->len == 0) {
 				goto end_free;
+			}
 			ret = ask_new_streams(ctx);
-			if (ret < 0)
+			if (ret < 0) {
 				goto end_free;
+			}
+			if (!ctx->session->stream_count) {
+				(void) poll(NULL, 0, ACTIVE_POLL_DELAY);
+			}
 		}
 
 		g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
@@ -1470,6 +1517,9 @@ void lttng_live_read(struct lttng_live_ctx *ctx)
 			goto end;
 		}
 		for (;;) {
+			if (lttng_live_should_quit()) {
+				goto end_free;
+			}
 			event = bt_ctf_iter_read_event_flags(iter, &flags);
 			if (!(flags & BT_ITER_FLAG_RETRY)) {
 				if (!event) {