From: Julien Desfossez Date: Wed, 3 Oct 2012 23:40:28 +0000 (-0400) Subject: Fix: output number of bytes written by relayd X-Git-Tag: v2.1.0-rc5~27 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5ab7344e564fad002de7efc879ffbed5bd23d5ef;p=lttng-tools.git Fix: output number of bytes written by relayd The print of the number of bytes written in the tracefile by the relayd was after the call to write the padding, so the debug output was confusing: DEBUG3: Receiving data of size 2097133 for stream id 567 seqnum 0 [in relay_process_data() at main.c:1394] DEBUG2: Relay wrote 19 bytes to tracefile for stream id 567 [in relay_process_data() at main.c:1416 Signed-off-by: Julien Desfossez Signed-off-by: David Goulet --- diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index dc6d2564a..f3d83451f 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -1407,14 +1407,14 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht) goto end_unlock; } + DBG2("Relay wrote %d bytes to tracefile for stream id %" PRIu64, + 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; /* Check if we need to close the FD */