From: Francis Deslauriers Date: Fri, 12 Nov 2021 14:01:39 +0000 (-0500) Subject: ctf: logging: missing comma and space between fields X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=82338bfd24b995ca7b5224f54f1a245d906d517e ctf: logging: missing comma and space between fields Signed-off-by: Francis Deslauriers Change-Id: I75a0021fd465d08df898b9f0557f5129f09a9ab7 Reviewed-on: https://review.lttng.org/c/babeltrace/+/6723 Tested-by: jenkins Reviewed-by: Philippe Proulx --- diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c index de802639..b56cf0c1 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.c +++ b/src/plugins/ctf/common/msg-iter/msg-iter.c @@ -818,7 +818,7 @@ enum ctf_msg_iter_status read_packet_header_begin_state( msg_it->cur_stream_class_id = -1; msg_it->cur_event_class_id = -1; msg_it->cur_data_stream_id = -1; - BT_COMP_LOGD("Decoding packet header field:" + BT_COMP_LOGD("Decoding packet header field: " "msg-it-addr=%p, trace-class-addr=%p, fc-addr=%p", msg_it, msg_it->meta.tc, packet_header_fc); status = read_dscope_begin_state(msg_it, packet_header_fc, diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c index e15d8b04..6c412dd8 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.c +++ b/src/plugins/ctf/lttng-live/lttng-live.c @@ -104,8 +104,8 @@ void lttng_live_stream_iterator_set_state(struct lttng_live_stream_iterator *str #define LTTNG_LIVE_LOGD_STREAM_ITER(live_stream_iter) \ do { \ BT_COMP_LOGD("Live stream iterator state=%s, " \ - "last-inact-ts-is-set=%d, last-inact-ts-value=%" PRId64 "), " \ - "curr-inact-ts %" PRId64, \ + "last-inact-ts-is-set=%d, last-inact-ts-value=%" PRId64 ", " \ + "curr-inact-ts=%" PRId64, \ lttng_live_stream_state_string(live_stream_iter->state), \ live_stream_iter->last_inactivity_ts.is_set, \ live_stream_iter->last_inactivity_ts.value, \ @@ -1066,7 +1066,7 @@ end: goto retry; } - BT_COMP_LOGD("Returning from advancing live stream iterator: status=%s" + BT_COMP_LOGD("Returning from advancing live stream iterator: status=%s, " "stream-name=\"%s\", viewer-stream-id=%" PRIu64, lttng_live_iterator_status_string(live_status), stream_iter->name->str, stream_iter->viewer_stream_id); @@ -1326,7 +1326,7 @@ enum lttng_live_iterator_status next_stream_iterator_for_trace( BT_ASSERT_DBG(msg); - BT_COMP_LOGD("Live stream iterator returned message: msg-type=%s" + BT_COMP_LOGD("Live stream iterator returned message: msg-type=%s, " "stream-name=\"%s\", viewer-stream-id=%" PRIu64, bt_common_message_type_string(bt_message_get_type(msg)), stream_iter->name->str, stream_iter->viewer_stream_id);