X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=f00270bea4c84ab4727047594443191e028965ef;hb=74df9916833ae6a69520c1a49ddce44ba3eea078;hp=2c3a10574b5499c6a4a8585f3a22e5eac05562bc;hpb=1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 2c3a10574..f00270bea 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -654,12 +654,16 @@ void *thread_dispatcher(void *data)
 
 	health_code_update();
 
-	while (!CMM_LOAD_SHARED(live_dispatch_thread_exit)) {
+	for (;;) {
 		health_code_update();
 
 		/* Atomically prepare the queue futex */
 		futex_nto1_prepare(&viewer_conn_queue.futex);
 
+		if (CMM_LOAD_SHARED(live_dispatch_thread_exit)) {
+			break;
+		}
+
 		do {
 			health_code_update();
 
@@ -1122,8 +1126,8 @@ error:
 /*
  * Open the index file if needed for the given vstream.
  *
- * If an index file is successfully opened, the vstream index_fd set with
- * it.
+ * If an index file is successfully opened, the vstream will set it as its
+ * current index file.
  *
  * Return 0 on success, a negative value on error (-ENOENT if not ready yet).
  *
@@ -1134,7 +1138,7 @@ static int try_open_index(struct relay_viewer_stream *vstream,
 {
 	int ret = 0;
 
-	if (vstream->index_fd) {
+	if (vstream->index_file) {
 		goto end;
 	}
 
@@ -1145,20 +1149,12 @@ static int try_open_index(struct relay_viewer_stream *vstream,
 		ret = -ENOENT;
 		goto end;
 	}
-	ret = index_open(vstream->path_name, vstream->channel_name,
+	vstream->index_file = lttng_index_file_open(vstream->path_name,
+			vstream->channel_name,
 			vstream->stream->tracefile_count,
 			vstream->current_tracefile_id);
-	if (ret >= 0) {
-		vstream->index_fd = stream_fd_create(ret);
-		if (!vstream->index_fd) {
-			if (close(ret)) {
-				PERROR("close");
-			}
-			ret = -1;
-		} else {
-			ret = 0;
-		}
-		goto end;
+	if (!vstream->index_file) {
+		ret = -1;
 	}
 
 end:
@@ -1182,10 +1178,13 @@ static int check_index_status(struct relay_viewer_stream *vstream,
 {
 	int ret;
 
-	if (trace->session->connection_closed
+	if ((trace->session->connection_closed || rstream->closed)
 			&& rstream->index_received_seqcount
 				== vstream->index_sent_seqcount) {
-		/* Last index sent and session connection is closed. */
+		/*
+		 * Last index sent and session connection or relay
+		 * stream are closed.
+		 */
 		index->status = htobe32(LTTNG_VIEWER_INDEX_HUP);
 		goto hup;
 	} else if (rstream->beacon_ts_end != -1ULL &&
@@ -1277,7 +1276,6 @@ static
 int viewer_get_next_index(struct relay_connection *conn)
 {
 	int ret;
-	ssize_t read_ret;
 	struct lttng_viewer_get_next_index request_index;
 	struct lttng_viewer_index viewer_index;
 	struct ctf_packet_index packet_index;
@@ -1400,11 +1398,10 @@ int viewer_get_next_index(struct relay_connection *conn)
 		viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM;
 	}
 
-	read_ret = lttng_read(vstream->index_fd->fd, &packet_index,
-			sizeof(packet_index));
-	if (read_ret < sizeof(packet_index)) {
-		ERR("Relay reading index file %d returned %zd",
-			vstream->index_fd->fd, read_ret);
+	ret = lttng_index_file_read(vstream->index_file, &packet_index);
+	if (ret) {
+		ERR("Relay error reading index file %d",
+				vstream->index_file->fd);
 		viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
 		goto send_reply;
 	} else {