X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=dc6d2564a043abb44bb567d85a2a215d3317363f;hb=7f51dcba1efdc03c85412a75ab71894a1b5af798;hp=ae631c70a25afc3407736ea8478f782b2c8793c7;hpb=173af62f4804133d4a7f45e34b6f72126f3eca5f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index ae631c70a..dc6d2564a 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -472,12 +472,6 @@ void *relay_thread_listener(void *data)
 	struct lttng_poll_event events;
 	struct lttcomm_sock *control_sock, *data_sock;
 
-	/*
-	 * Get allocated in this thread, enqueued to a global queue, dequeued and
-	 * freed in the worker thread.
-	 */
-	struct relay_command *relay_cmd = NULL;
-
 	DBG("[thread] Relay listener started");
 
 	control_sock = relay_init_sock(control_uri);
@@ -544,7 +538,13 @@ restart:
 				ERR("socket poll error");
 				goto error;
 			} else if (revents & LPOLLIN) {
-				struct lttcomm_sock *newsock = NULL;
+				/*
+				 * Get allocated in this thread,
+				 * enqueued to a global queue, dequeued
+				 * and freed in the worker thread.
+				 */
+				struct relay_command *relay_cmd;
+				struct lttcomm_sock *newsock;
 
 				relay_cmd = zmalloc(sizeof(struct relay_command));
 				if (relay_cmd == NULL) {
@@ -554,16 +554,19 @@ restart:
 
 				if (pollfd == data_sock->fd) {
 					newsock = data_sock->ops->accept(data_sock);
-					if (newsock < 0) {
+					if (!newsock) {
 						PERROR("accepting data sock");
+						free(relay_cmd);
 						goto error;
 					}
 					relay_cmd->type = RELAY_DATA;
 					DBG("Relay data connection accepted, socket %d", newsock->fd);
-				} else if (pollfd == control_sock->fd) {
+				} else {
+					assert(pollfd == control_sock->fd);
 					newsock = control_sock->ops->accept(control_sock);
-					if (newsock < 0) {
+					if (!newsock) {
 						PERROR("accepting control sock");
+						free(relay_cmd);
 						goto error;
 					}
 					relay_cmd->type = RELAY_CONTROL;
@@ -573,6 +576,8 @@ restart:
 						&val, sizeof(int));
 				if (ret < 0) {
 					PERROR("setsockopt inet");
+					lttcomm_destroy_sock(newsock);
+					free(relay_cmd);
 					goto error;
 				}
 				relay_cmd->sock = newsock;
@@ -878,7 +883,7 @@ void relay_delete_session(struct relay_command *cmd, struct lttng_ht *streams_ht
 		return;
 	}
 
-	DBG("Relay deleting session %lu", cmd->session->id);
+	DBG("Relay deleting session %" PRIu64, cmd->session->id);
 	free(cmd->session->sock);
 
 	rcu_read_lock();
@@ -977,9 +982,9 @@ end:
 	free(root_path);
 	/* send the session id to the client or a negative return code on error */
 	if (ret < 0) {
-		reply.ret_code = htobe32(LTTCOMM_ERR);
+		reply.ret_code = htobe32(LTTNG_ERR_UNK);
 	} else {
-		reply.ret_code = htobe32(LTTCOMM_OK);
+		reply.ret_code = htobe32(LTTNG_OK);
 	}
 	reply.handle = htobe64(stream->stream_handle);
 	send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
@@ -1030,7 +1035,7 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
 			&iter);
 	node = lttng_ht_iter_get_node_ulong(&iter);
 	if (node == NULL) {
-		DBG("Relay stream %lu not found", be64toh(stream_info.stream_id));
+		DBG("Relay stream %" PRIu64 " not found", be64toh(stream_info.stream_id));
 		ret = -1;
 		goto end_unlock;
 	}
@@ -1058,9 +1063,9 @@ end_unlock:
 	rcu_read_unlock();
 
 	if (ret < 0) {
-		reply.ret_code = htobe32(LTTCOMM_ERR);
+		reply.ret_code = htobe32(LTTNG_ERR_UNK);
 	} else {
-		reply.ret_code = htobe32(LTTCOMM_OK);
+		reply.ret_code = htobe32(LTTNG_OK);
 	}
 	send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
 			sizeof(struct lttcomm_relayd_generic_reply), 0);
@@ -1081,7 +1086,7 @@ void relay_unknown_command(struct relay_command *cmd)
 	struct lttcomm_relayd_generic_reply reply;
 	int ret;
 
-	reply.ret_code = htobe32(LTTCOMM_ERR);
+	reply.ret_code = htobe32(LTTNG_ERR_UNK);
 	ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
 			sizeof(struct lttcomm_relayd_generic_reply), 0);
 	if (ret < 0) {
@@ -1097,13 +1102,13 @@ static
 int relay_start(struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_command *cmd)
 {
-	int ret = htobe32(LTTCOMM_OK);
+	int ret = htobe32(LTTNG_OK);
 	struct lttcomm_relayd_generic_reply reply;
 	struct relay_session *session = cmd->session;
 
 	if (!session) {
 		DBG("Trying to start the streaming without a session established");
-		ret = htobe32(LTTCOMM_ERR);
+		ret = htobe32(LTTNG_ERR_UNK);
 	}
 
 	reply.ret_code = ret;
@@ -1133,7 +1138,7 @@ struct relay_stream *relay_stream_from_stream_id(uint64_t stream_id,
 			&iter);
 	node = lttng_ht_iter_get_node_ulong(&iter);
 	if (node == NULL) {
-		DBG("Relay stream %lu not found", stream_id);
+		DBG("Relay stream %" PRIu64 " not found", stream_id);
 		ret = NULL;
 		goto end;
 	}
@@ -1144,6 +1149,36 @@ end:
 	return ret;
 }
 
+/*
+ * Append padding to the file pointed by the file descriptor fd.
+ */
+static int write_padding_to_file(int fd, uint32_t size)
+{
+	int ret = 0;
+	char *zeros;
+
+	if (size == 0) {
+		goto end;
+	}
+
+	zeros = zmalloc(size);
+	if (zeros == NULL) {
+		PERROR("zmalloc zeros for padding");
+		ret = -1;
+		goto end;
+	}
+
+	do {
+		ret = write(fd, zeros, size);
+	} while (ret < 0 && errno == EINTR);
+	if (ret < 0) {
+		PERROR("write padding to file");
+	}
+
+end:
+	return ret;
+}
+
 /*
  * relay_recv_metadata: receive the metada for the session.
  */
@@ -1151,7 +1186,7 @@ static
 int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_command *cmd, struct lttng_ht *streams_ht)
 {
-	int ret = htobe32(LTTCOMM_OK);
+	int ret = htobe32(LTTNG_OK);
 	struct relay_session *session = cmd->session;
 	struct lttcomm_relayd_metadata_payload *metadata_struct;
 	struct relay_stream *metadata_stream;
@@ -1181,7 +1216,7 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
 		data_buffer_size = data_size;
 	}
 	memset(data_buffer, 0, data_size);
-	DBG2("Relay receiving metadata, waiting for %lu bytes", data_size);
+	DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size);
 	ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size,
 			MSG_WAITALL);
 	if (ret < 0 || ret != data_size) {
@@ -1208,6 +1243,13 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
 		ret = -1;
 		goto end_unlock;
 	}
+
+	ret = write_padding_to_file(metadata_stream->fd,
+			be32toh(metadata_struct->padding_size));
+	if (ret < 0) {
+		goto end_unlock;
+	}
+
 	DBG2("Relay metadata written");
 
 end_unlock:
@@ -1223,9 +1265,9 @@ static
 int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_command *cmd)
 {
-	int ret = htobe32(LTTCOMM_OK);
+	int ret;
 	struct lttcomm_relayd_version reply;
-	struct relay_session *session = NULL;
+	struct relay_session *session;
 
 	if (cmd->session == NULL) {
 		session = zmalloc(sizeof(struct relay_session));
@@ -1235,12 +1277,19 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 			goto end;
 		}
 		session->id = ++last_relay_session_id;
-		DBG("Created session %lu", session->id);
+		DBG("Created session %" PRIu64, session->id);
 		cmd->session = session;
+	} else {
+		session = cmd->session;
 	}
 	session->version_check_done = 1;
 
-	sscanf(VERSION, "%u.%u", &reply.major, &reply.minor);
+	ret = sscanf(VERSION, "%u.%u", &reply.major, &reply.minor);
+	if (ret < 2) {
+		ERR("Error in scanning version");
+		ret = -1;
+		goto end;
+	}
 	reply.major = htobe32(reply.major);
 	reply.minor = htobe32(reply.minor);
 	ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
@@ -1248,7 +1297,8 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 	if (ret < 0) {
 		ERR("Relay sending version");
 	}
-	DBG("Version check done");
+	DBG("Version check done (%u.%u)", be32toh(reply.major),
+			be32toh(reply.minor));
 
 end:
 	return ret;
@@ -1340,7 +1390,7 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 
 	net_seq_num = be64toh(data_hdr.net_seq_num);
 
-	DBG3("Receiving data of size %u for stream id %zu seqnum %" PRIu64,
+	DBG3("Receiving data of size %u for stream id %" PRIu64 " seqnum %" PRIu64,
 		data_size, stream_id, net_seq_num);
 	ret = cmd->sock->ops->recvmsg(cmd->sock, data_buffer, data_size, MSG_WAITALL);
 	if (ret <= 0) {
@@ -1356,7 +1406,14 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 		ret = -1;
 		goto end_unlock;
 	}
-	DBG2("Relay wrote %d bytes to tracefile for stream id %lu", ret, stream->stream_handle);
+
+	ret = write_padding_to_file(stream->fd, be32toh(data_hdr.padding_size));
+	if (ret < 0) {
+		goto end_unlock;
+	}
+
+	DBG2("Relay wrote %d bytes to tracefile for stream id %" PRIu64,
+		ret, stream->stream_handle);
 
 	stream->prev_seq = net_seq_num;
 
@@ -1405,7 +1462,7 @@ int relay_add_connection(int fd, struct lttng_poll_event *events,
 		goto error;
 	}
 	ret = read(fd, relay_connection, sizeof(struct relay_command));
-	if (ret < 0 || ret < sizeof(relay_connection)) {
+	if (ret < 0 || ret < sizeof(struct relay_command)) {
 		PERROR("read relay cmd pipe");
 		goto error_read;
 	}
@@ -1578,7 +1635,7 @@ void *relay_thread_worker(void *data)
 							DBG("Control connection closed with %d", pollfd);
 						} else {
 							if (relay_connection->session) {
-								DBG2("Relay worker receiving data for session : %lu",
+								DBG2("Relay worker receiving data for session : %" PRIu64,
 										relay_connection->session->id);
 							}
 							ret = relay_process_control(&recv_hdr,