X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=a00fb3c48ab258459de880d3a4720ef9dfd9b0ed;hb=4028eeb991f5fc7e430ce09036f57bfbaa59a664;hp=152e4bbc86911a00a53f8598e472e7b1545736eb;hpb=5b6d8097dcb979a1e10b5fea7b8dd7a2f1498fe0;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 152e4bbc8..a00fb3c48 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -239,8 +239,8 @@ void cleanup(void)
 	/* Close thread quit pipes */
 	utils_close_pipe(thread_quit_pipe);
 
-	/* Close relay cmd pipes */
-	utils_close_pipe(relay_cmd_pipe);
+	uri_free(control_uri);
+	uri_free(data_uri);
 }
 
 /*
@@ -894,7 +894,10 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 			stream = caa_container_of(node,
 					struct relay_stream, stream_n);
 			if (stream->session == cmd->session) {
-				close(stream->fd);
+				ret = close(stream->fd);
+				if (ret < 0) {
+					PERROR("close stream fd on delete session");
+				}
 				ret = lttng_ht_del(streams_ht, &iter);
 				assert(!ret);
 				call_rcu(&stream->rcu_node,
@@ -1055,7 +1058,10 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
 	if (close_stream_check(stream)) {
 		int delret;
 
-		close(stream->fd);
+		delret = close(stream->fd);
+		if (delret < 0) {
+			PERROR("close stream");
+		}
 		delret = lttng_ht_del(streams_ht, &iter);
 		assert(!delret);
 		call_rcu(&stream->rcu_node,
@@ -1314,14 +1320,14 @@ end:
 }
 
 /*
- * Check for data availability for a given stream id from the session daemon.
+ * Check for data pending for a given stream id from the session daemon.
  */
 static
-int relay_data_available(struct lttcomm_relayd_hdr *recv_hdr,
+int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_command *cmd, struct lttng_ht *streams_ht)
 {
 	struct relay_session *session = cmd->session;
-	struct lttcomm_relayd_data_available msg;
+	struct lttcomm_relayd_data_pending msg;
 	struct lttcomm_relayd_generic_reply reply;
 	struct relay_stream *stream;
 	int ret;
@@ -1329,7 +1335,7 @@ int relay_data_available(struct lttcomm_relayd_hdr *recv_hdr,
 	struct lttng_ht_iter iter;
 	uint64_t last_net_seq_num, stream_id;
 
-	DBG("Data available command received");
+	DBG("Data pending command received");
 
 	if (!session || session->version_check_done == 0) {
 		ERR("Trying to check for data before version check");
@@ -1339,7 +1345,7 @@ int relay_data_available(struct lttcomm_relayd_hdr *recv_hdr,
 
 	ret = cmd->sock->ops->recvmsg(cmd->sock, &msg, sizeof(msg), MSG_WAITALL);
 	if (ret < sizeof(msg)) {
-		ERR("Relay didn't receive valid data_available struct size : %d", ret);
+		ERR("Relay didn't receive valid data_pending struct size : %d", ret);
 		ret = -1;
 		goto end_no_session;
 	}
@@ -1359,17 +1365,17 @@ int relay_data_available(struct lttcomm_relayd_hdr *recv_hdr,
 	stream = caa_container_of(node, struct relay_stream, stream_n);
 	assert(stream);
 
-	DBG("Data available for stream id %" PRIu64 " prev_seq %" PRIu64
+	DBG("Data pending for stream id %" PRIu64 " prev_seq %" PRIu64
 			" and last_seq %" PRIu64, stream_id, stream->prev_seq,
 			last_net_seq_num);
 
 	/* Avoid wrapping issue */
 	if (((int64_t) (stream->prev_seq - last_net_seq_num)) <= 0) {
-		/* Data has in fact been written and is available */
-		ret = 1;
-	} else {
-		/* Data still being streamed. */
+		/* Data has in fact been written and is NOT pending */
 		ret = 0;
+	} else {
+		/* Data still being streamed thus pending */
+		ret = 1;
 	}
 
 end_unlock:
@@ -1378,7 +1384,7 @@ end_unlock:
 	reply.ret_code = htobe32(ret);
 	ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
 	if (ret < 0) {
-		ERR("Relay data available ret code failed");
+		ERR("Relay data pending ret code failed");
 	}
 
 end_no_session:
@@ -1404,7 +1410,7 @@ int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr,
 	reply.ret_code = htobe32(LTTNG_OK);
 	ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
 	if (ret < 0) {
-		ERR("Relay data available ret code failed");
+		ERR("Relay data quiescent control ret code failed");
 	}
 
 	return ret;
@@ -1440,8 +1446,8 @@ int relay_process_control(struct lttcomm_relayd_hdr *recv_hdr,
 	case RELAYD_CLOSE_STREAM:
 		ret = relay_close_stream(recv_hdr, cmd, streams_ht);
 		break;
-	case RELAYD_DATA_AVAILABLE:
-		ret = relay_data_available(recv_hdr, cmd, streams_ht);
+	case RELAYD_DATA_PENDING:
+		ret = relay_data_pending(recv_hdr, cmd, streams_ht);
 		break;
 	case RELAYD_QUIESCENT_CONTROL:
 		ret = relay_quiescent_control(recv_hdr, cmd);
@@ -1533,9 +1539,13 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 
 	/* Check if we need to close the FD */
 	if (close_stream_check(stream)) {
+		int cret;
 		struct lttng_ht_iter iter;
 
-		close(stream->fd);
+		cret = close(stream->fd);
+		if (cret < 0) {
+			PERROR("close stream process data");
+		}
 		iter.iter.node = &stream->stream_n.node;
 		ret = lttng_ht_del(streams_ht, &iter);
 		assert(!ret);
@@ -1810,6 +1820,8 @@ error_poll_create:
 streams_ht_error:
 	lttng_ht_destroy(relay_connections_ht);
 relay_connections_ht_error:
+	/* Close relay cmd pipes */
+	utils_close_pipe(relay_cmd_pipe);
 	if (err) {
 		DBG("Thread exited with error");
 	}