X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=c099061ccf7339f03741fc3cda59fb5ae60901a6;hp=9e6d4bf9fa594dc2f51e93ee2f918360acf994c8;hb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;hpb=d7b3776ffb1bef894e7bc4cbfe45c5c2d58b8600

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 9e6d4bf9f..c099061cc 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);
 }
 
 /*
@@ -884,7 +884,8 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 	}
 
 	DBG("Relay deleting session %" PRIu64, cmd->session->id);
-	free(cmd->session->sock);
+
+	lttcomm_destroy_sock(cmd->session->sock);
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(streams_ht->ht, &iter.iter, node, node) {
@@ -902,6 +903,8 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 		}
 	}
 	rcu_read_unlock();
+
+	free(cmd->session);
 }
 
 /*
@@ -1176,6 +1179,8 @@ static int write_padding_to_file(int fd, uint32_t size)
 		PERROR("write padding to file");
 	}
 
+	free(zeros);
+
 end:
 	return ret;
 }
@@ -1309,14 +1314,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;
@@ -1324,7 +1329,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");
@@ -1334,7 +1339,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;
 	}
@@ -1354,17 +1359,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:
@@ -1373,7 +1378,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:
@@ -1399,7 +1404,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;
@@ -1435,8 +1440,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);
@@ -1597,6 +1602,8 @@ void deferred_free_connection(struct rcu_head *head)
 {
 	struct relay_command *relay_connection =
 		caa_container_of(head, struct relay_command, rcu_node);
+
+	lttcomm_destroy_sock(relay_connection->sock);
 	free(relay_connection);
 }
 
@@ -1612,6 +1619,7 @@ void relay_del_connection(struct lttng_ht *relay_connections_ht,
 	if (relay_connection->type == RELAY_CONTROL) {
 		relay_delete_session(relay_connection, streams_ht);
 	}
+
 	call_rcu(&relay_connection->rcu_node,
 		deferred_free_connection);
 }
@@ -1802,6 +1810,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");
 	}