Skip to contentSkip to conversation

lttng-live: print discarded event and packet lost warnings on stderr

PATCH Jérémie Galarneau 1 participant 1 message Oct 5, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged in stable-1.5 and stable-1.4.

Thanks!
Jérémie

Quoted 55 lines · Mathieu Desnoyers
---
 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(-)
formats/ctf/ctf.c +0 -1
index d6d078f5..36424de5 100644
@@ -434,7 +434,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) ||
formats/lttng-live/lttng-live-comm.c +10 -0
index a1c95bbc..77bf34ac 100644
@@ -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 =
include/babeltrace/ctf/types.h +1 -1
index cc8acbf5..574f97b3 100644
@@ -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.11.0

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev