From 7371a18293e65e61033d9f2a9a47b95c7afaa09e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 28 Sep 2017 10:00:32 -0400 Subject: [PATCH] lttng-live: print discarded event and packet lost warnings on stderr MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported-by: Liguang Li Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- formats/ctf/ctf.c | 1 - formats/lttng-live/lttng-live-comm.c | 10 ++++++++++ include/babeltrace/ctf/types.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index bc962121..0cdce8ef 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -426,7 +426,6 @@ void print_uuid(FILE *fp, unsigned char *uuid) * consumer had time to extract them. We keep track of those gaps with the * packet sequence number in each packet. */ -static void ctf_print_discarded_lost(FILE *fp, struct ctf_stream_definition *stream) { if ((!stream->events_discarded && !stream->packets_lost) || diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c index a1c95bbc..77bf34ac 100644 --- a/formats/lttng-live/lttng-live-comm.c +++ b/formats/lttng-live/lttng-live-comm.c @@ -1297,6 +1297,16 @@ retry: ctf_update_current_packet_index(&file_stream->parent, prev_index, cur_index); + /* + * We need to check if we are in trace read or called + * from packet indexing. In this last case, the + * collection is not there, so we cannot print the + * timestamps. + */ + if ((&file_stream->parent)->stream_class->trace->parent.collection) { + ctf_print_discarded_lost(stderr, &file_stream->parent); + } + file_stream->parent.cycles_timestamp = cur_index->ts_cycles.timestamp_begin; file_stream->parent.real_timestamp = diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h index cc8acbf5..574f97b3 100644 --- a/include/babeltrace/ctf/types.h +++ b/include/babeltrace/ctf/types.h @@ -249,5 +249,6 @@ void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream, uint64_t timestamp); int ctf_append_trace_metadata(struct bt_trace_descriptor *tdp, FILE *metadata_fp); +void ctf_print_discarded_lost(FILE *fp, struct ctf_stream_definition *stream); #endif /* _BABELTRACE_CTF_TYPES_H */ -- 2.34.1