Improvement: Message from babeltrace concerning discarded events needs improvement

[babeltrace.git] / formats / ctf-text / ctf-text.c

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index b87718b58ddecabeaa66f7f6de0cfc3bc3701404..f60fde62f5fa794b749f91e0201fc92672f0a389 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -265,23 +265,7 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
        /* Print events discarded */
        if (stream->events_discarded) {
                fflush(pos->fp);
-               fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
-                       stream->events_discarded);
-               if (opt_clock_cycles) {
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_cycles_timestamp);
-                       fprintf(stderr, "] and [");
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_cycles_timestamp_end);
-               } else {
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_real_timestamp);
-                       fprintf(stderr, "] and [");
-                       ctf_print_timestamp(stderr, stream,
-                                       stream->prev_real_timestamp_end);
-               }
-               fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
-               fflush(stderr);
+               ctf_print_discarded(stderr, stream);
                stream->events_discarded = 0;
        }
 
@@ -304,7 +288,7 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
                else
                        fprintf(pos->fp, " ");
        }
-       if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) {
+       if (opt_delta_field && stream->has_timestamp) {
                uint64_t delta, delta_sec, delta_nsec;
 
                set_field_names_print(pos, ITEM_HEADER);