From 3217ac37d3dc40c6e1f87949b23f107fef471fc4 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 30 Jan 2012 16:10:08 -0500 Subject: [PATCH] Discarded event time range is between last packet event and timestamp_end Signed-off-by: Mathieu Desnoyers --- formats/ctf-text/ctf-text.c | 2 +- formats/ctf/ctf.c | 5 ++++- include/babeltrace/ctf-ir/metadata.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index a7e7ef6f..f8507e62 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -264,7 +264,7 @@ int ctf_text_write_event(struct stream_pos *ppos, stream->events_discarded); ctf_text_print_timestamp(stderr, pos, stream, stream->prev_timestamp); fprintf(stderr, "] and ["); - ctf_text_print_timestamp(stderr, pos, stream, stream->timestamp); + ctf_text_print_timestamp(stderr, pos, stream, stream->prev_timestamp_end); fprintf(stderr, "]. You should consider increasing the buffer size.\n"); fflush(stderr); stream->events_discarded = 0; diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index c343f183..0e425bbb 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -396,10 +396,12 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) { uint32_t events_discarded_diff; - /* Print lost event count */ + /* For printing discarded event count */ index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); events_discarded_diff = index->events_discarded; + file_stream->parent.prev_timestamp_end = + index->timestamp_end; if (pos->cur_index > 0) { index = &g_array_index(pos->packet_index, struct packet_index, @@ -419,6 +421,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) assert(offset == 0); /* only seek supported for now */ pos->cur_index = 0; file_stream->parent.prev_timestamp = 0; + file_stream->parent.prev_timestamp_end = 0; break; default: assert(0); diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index ce5f8b9e..94de920c 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -36,7 +36,6 @@ struct ctf_event; struct ctf_stream { struct ctf_stream_class *stream_class; uint64_t timestamp; /* Current timestamp, in ns */ - uint64_t prev_timestamp; uint64_t event_id; /* Current event ID */ int has_timestamp; uint64_t stream_id; @@ -51,6 +50,8 @@ struct ctf_stream { /* Event discarded information */ uint32_t events_discarded; + uint64_t prev_timestamp; /* Last event */ + uint64_t prev_timestamp_end; /* End-of-packet timestamp */ }; -- 2.34.1