X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=e9b70a396740164aeaacc6814543248bf938cbb6;hb=1f2f41593be38847883eaf11ca8f5db08adec5a1;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..e9b70a396 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -878,7 +878,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 +977,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 +1030,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 +1058,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 +1081,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 +1097,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 +1133,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;
 	}
@@ -1151,7 +1151,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 +1181,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) {
@@ -1223,7 +1223,7 @@ static
 int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_command *cmd)
 {
-	int ret = htobe32(LTTCOMM_OK);
+	int ret = htobe32(LTTNG_OK);
 	struct lttcomm_relayd_version reply;
 	struct relay_session *session = NULL;
 
@@ -1235,7 +1235,7 @@ 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;
 	}
 	session->version_check_done = 1;
@@ -1248,7 +1248,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 +1341,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 +1357,8 @@ 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);
+	DBG2("Relay wrote %d bytes to tracefile for stream id %" PRIu64,
+		ret, stream->stream_handle);
 
 	stream->prev_seq = net_seq_num;
 
@@ -1405,7 +1407,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 +1580,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,