X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=cf3649397425840b9c0c0e0ae07d22073255f0fa;hb=633d0084183d5b0aed953ce267e0e57e5ef29bd5;hp=f79555fa8c1330e988efd0645d57a31839402306;hpb=0a6b5085547c16fe3a62e6a6f68bebf9349ce706;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index f79555fa8..cf3649397 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -70,7 +70,7 @@ static int send_command(struct lttcomm_sock *sock,
 		goto error;
 	}
 
-	DBG3("Relayd sending command %d", cmd);
+	DBG3("Relayd sending command %d of size %" PRIu64, cmd, buf_size);
 
 error:
 	free(buf);
@@ -86,7 +86,7 @@ static int recv_reply(struct lttcomm_sock *sock, void *data, size_t size)
 {
 	int ret;
 
-	DBG3("Relayd waiting for reply...");
+	DBG3("Relayd waiting for reply of size %ld", size);
 
 	ret = sock->ops->recvmsg(sock, data, size, 0);
 	if (ret < 0) {
@@ -125,7 +125,7 @@ int relayd_add_stream(struct lttcomm_sock *sock, const char *channel_name,
 		goto error;
 	}
 
-	/* Recevie response */
+	/* Waiting for reply */
 	ret = recv_reply(sock, (void *) &reply, sizeof(reply));
 	if (ret < 0) {
 		goto error;
@@ -136,7 +136,7 @@ int relayd_add_stream(struct lttcomm_sock *sock, const char *channel_name,
 	reply.ret_code = be32toh(reply.ret_code);
 
 	/* Return session id or negative ret code. */
-	if (reply.ret_code != LTTCOMM_OK) {
+	if (reply.ret_code != LTTNG_OK) {
 		ret = -reply.ret_code;
 		ERR("Relayd add stream replied error %d", ret);
 	} else {
@@ -228,7 +228,7 @@ int relayd_send_metadata(struct lttcomm_sock *sock, size_t len)
 	/*
 	 * After that call, the metadata data MUST be sent to the relayd so the
 	 * receive size on the other end matches the len of the metadata packet
-	 * header.
+	 * header. This is why we don't wait for a reply here.
 	 */
 
 error:
@@ -273,7 +273,7 @@ int relayd_send_data_hdr(struct lttcomm_sock *sock,
 	assert(sock);
 	assert(hdr);
 
-	DBG3("Relayd sending data header...");
+	DBG3("Relayd sending data header of size %ld", size);
 
 	/* Again, safety net */
 	if (size == 0) {
@@ -328,7 +328,7 @@ int relayd_send_close_stream(struct lttcomm_sock *sock, uint64_t stream_id,
 	reply.ret_code = be32toh(reply.ret_code);
 
 	/* Return session id or negative ret code. */
-	if (reply.ret_code != LTTCOMM_OK) {
+	if (reply.ret_code != LTTNG_OK) {
 		ret = -reply.ret_code;
 		ERR("Relayd close stream replied error %d", ret);
 	} else {