X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.cpp;h=5aa899b282605a0c058f7f497f9b500ad7e0226b;hb=0283afa961253376a5e18de140d29fffd9e89ae3;hp=70103302cf36f5e49309917b283da94db41b9d2b;hpb=556d5faeec58c69a045ecbe7b24e9dda0760aab4;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.cpp b/src/bin/lttng-relayd/live.cpp
index 70103302c..5aa899b28 100644
--- a/src/bin/lttng-relayd/live.cpp
+++ b/src/bin/lttng-relayd/live.cpp
@@ -464,7 +464,7 @@ static int make_viewer_streams(struct relay_session *relay_session,
 				 * chunk can be used safely.
 				 */
 				if ((relay_stream->ongoing_rotation.is_set ||
-						    relay_session->ongoing_rotation) &&
+						session_has_ongoing_rotation(relay_session)) &&
 						relay_stream->trace_chunk) {
 					viewer_stream_trace_chunk = lttng_trace_chunk_copy(
 							relay_stream->trace_chunk);
@@ -655,7 +655,7 @@ end:
 }
 
 static
-int close_sock(void *data, int *in_fd)
+int close_sock(void *data, int *in_fd __attribute__((unused)))
 {
 	struct lttcomm_sock *sock = (lttcomm_sock *) data;
 
@@ -766,7 +766,7 @@ error:
  * This thread manages the listening for new connections on the network
  */
 static
-void *thread_listener(void *data)
+void *thread_listener(void *data __attribute__((unused)))
 {
 	int i, ret, pollfd, err = -1;
 	uint32_t revents, nb_fd;
@@ -931,7 +931,7 @@ error_sock_control:
  * This thread manages the dispatching of the requests to worker threads
  */
 static
-void *thread_dispatcher(void *data)
+void *thread_dispatcher(void *data __attribute__((unused)))
 {
 	int err = -1;
 	ssize_t ret;
@@ -1256,7 +1256,7 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	 * stream, because the chunk can be in an intermediate state
 	 * due to directory renaming.
 	 */
-	if (session->ongoing_rotation) {
+	if (session_has_ongoing_rotation(session)) {
 		DBG("Relay session %" PRIu64 " rotation ongoing", session_id);
 		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_NO_NEW);
 		goto send_reply_unlock;
@@ -1266,7 +1266,12 @@ int viewer_get_new_streams(struct relay_connection *conn)
 			LTTNG_VIEWER_SEEK_BEGINNING, &nb_total, &nb_unsent,
 			&nb_created, &closed);
 	if (ret < 0) {
-		goto error_unlock_session;
+		/*
+		 * This is caused by an internal error; propagate the negative
+		 * 'ret' to close the connection.
+		 */
+		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_ERR);
+		goto send_reply_unlock;
 	}
 	send_streams = 1;
 	response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_OK);
@@ -1321,10 +1326,6 @@ end_put_session:
 	}
 error:
 	return ret;
-error_unlock_session:
-	pthread_mutex_unlock(&session->lock);
-	session_put(session);
-	return ret;
 }
 
 /*
@@ -1416,7 +1417,7 @@ int viewer_attach_session(struct relay_connection *conn)
 	 * stream, because the chunk can be in an intermediate state
 	 * due to directory renaming.
 	 */
-	if (session->ongoing_rotation) {
+	if (session_has_ongoing_rotation(session)) {
 		DBG("Relay session %" PRIu64 " rotation ongoing", session_id);
 		send_streams = 0;
 		goto send_reply;
@@ -1788,7 +1789,7 @@ int viewer_get_next_index(struct relay_connection *conn)
 		goto send_reply;
 	}
 
-	if (rstream->trace->session->ongoing_rotation) {
+	if (session_has_ongoing_rotation(rstream->trace->session)) {
 		/* Rotation is ongoing, try again later. */
 		viewer_index.status = LTTNG_VIEWER_INDEX_RETRY;
 		DBG("Client requested index for stream id %" PRIu64" while a session rotation is ongoing, returning status=%s",
@@ -2661,7 +2662,7 @@ void cleanup_connection_pollfd(struct lttng_poll_event *events, int pollfd)
  * This thread does the actual work
  */
 static
-void *thread_worker(void *data)
+void *thread_worker(void *data __attribute__((unused)))
 {
 	int ret, err = -1;
 	uint32_t nb_fd;