X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=57ff9197ac71a106e90e1500affd24612f6e8b0e;hb=48e6cb13aaf1dc3875ac7ba9543649ea301ef20a;hp=5d3449d4f451f49aaf64a6f3506a4b93c1affc3c;hpb=3b463131be76ea826a7e74f9b88422573e3a2076;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 5d3449d4f..57ff9197a 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -327,17 +327,34 @@ int make_viewer_streams(struct relay_session *session,
 					/* Update number of created stream counter. */
 					(*nb_created)++;
 				}
+				/*
+				 * Ensure a self-reference is preserved even
+				 * after we have put our local reference.
+				 */
+				viewer_stream_get(vstream);
 			} else {
 				if (!vstream->sent_flag && nb_unsent) {
 					/* Update number of unsent stream counter. */
 					(*nb_unsent)++;
 				}
-				viewer_stream_put(vstream);
 			}
 			/* Update number of total stream counter. */
 			if (nb_total) {
-				(*nb_total)++;
+				if (stream->is_metadata) {
+					if (!stream->closed ||
+							stream->metadata_received > vstream->metadata_sent) {
+						(*nb_total)++;
+					}
+				} else {
+					if (!stream->closed ||
+						!(((int64_t) (stream->prev_seq - stream->last_net_seq_num)) >= 0)) {
+
+						(*nb_total)++;
+					}
+				}
 			}
+			/* Put local reference. */
+			viewer_stream_put(vstream);
 		next:
 			stream_put(stream);
 		}
@@ -911,7 +928,8 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	response.streams_count = htobe32(nb_streams);
 
 	/*
-	 * If the session is closed, HUP when there are no more streams.
+	 * If the session is closed, HUP when there are no more streams
+	 * with data.
 	 */
 	if (closed && nb_total == 0) {
 		send_streams = 0;
@@ -1273,8 +1291,8 @@ int viewer_get_next_index(struct relay_connection *conn)
 
 	vstream = viewer_stream_get_by_id(be64toh(request_index.stream_id));
 	if (!vstream) {
-		ret = -1;
-		goto end;
+		viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_ERR);
+		goto send_reply;
 	}
 
 	/* Use back. ref. Protected by refcounts. */
@@ -1397,7 +1415,9 @@ int viewer_get_next_index(struct relay_connection *conn)
 	viewer_index.stream_id = packet_index.stream_id;
 
 send_reply:
-	pthread_mutex_unlock(&rstream->lock);
+	if (rstream) {
+		pthread_mutex_unlock(&rstream->lock);
+	}
 
 	if (metadata_viewer_stream) {
 		pthread_mutex_lock(&metadata_viewer_stream->stream->lock);
@@ -1477,7 +1497,8 @@ int viewer_get_packet(struct relay_connection *conn)
 
 	vstream = viewer_stream_get_by_id(be64toh(get_packet_info.stream_id));
 	if (!vstream) {
-		goto error;
+		reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
+		goto send_reply_nolock;
 	}
 
 	ctf_trace = vstream->stream->trace;
@@ -1514,23 +1535,6 @@ int viewer_get_packet(struct relay_connection *conn)
 	}
 
 	pthread_mutex_lock(&vstream->stream->lock);
-	/*
-	 * The vstream->stream_fd used here has been opened by
-	 * get_next_index. It is opened there because this is what
-	 * allows us to grab a reference to the file with stream lock
-	 * held, thus protecting us against overwrite caused by
-	 * tracefile rotation. Since tracefile rotation unlinks the old
-	 * data file, we are ensured that we won't have our data
-	 * overwritten under us.
-	 */
-	ret = check_new_streams(conn);
-	if (ret < 0) {
-		goto end_free;
-	} else if (ret == 1) {
-		reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
-		reply.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM;
-		goto send_reply;
-	}
 
 	len = be32toh(get_packet_info.len);
 	data = zmalloc(len);