Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[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 0d551179710dafc368ed9059cbe2a40b62d5facf..992fbdf6c04833c2d901af798f2036fe767a916d 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -3,7 +3,9 @@
  *
  * CTF Text Format registration.
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -53,6 +55,43 @@ struct format ctf_text_format = {
        .close_trace = ctf_text_close_trace,
 };
 
+static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
+       Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
+       Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
+       Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
+       Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+
+static
+void __attribute__((constructor)) init_quarks(void)
+{
+       Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN = g_quark_from_static_string("stream.packet.context.timestamp_begin");
+       Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END = g_quark_from_static_string("stream.packet.context.timestamp_end");
+       Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_static_string("stream.packet.context.events_discarded");
+       Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_static_string("stream.packet.context.content_size");
+       Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
+}
+
+int print_field(struct definition *definition)
+{
+       /* Print all fields in verbose mode */
+       if (babeltrace_verbose)
+               return 1;
+
+       /* Filter out part of the packet context */
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN)
+               return 0;
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END)
+               return 0;
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED)
+               return 0;
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE)
+               return 0;
+       if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
+               return 0;
+
+       return 1;
+}
+
 static
 int ctf_text_write_event(struct stream_pos *ppos,
                         struct ctf_stream *stream)
@@ -62,7 +101,7 @@ int ctf_text_write_event(struct stream_pos *ppos,
        struct ctf_stream_class *stream_class = stream->stream_class;
        int field_nr_saved;
        struct ctf_event *event_class;
-       struct ctf_file_event *event;
+       struct ctf_stream_event *event;
        uint64_t id = 0;
        int ret;
 
@@ -108,7 +147,7 @@ int ctf_text_write_event(struct stream_pos *ppos,
                return -EINVAL;
        }
 
-       if (stream->timestamp) {
+       if (stream->has_timestamp) {
                if (pos->print_names)
                        fprintf(pos->fp, "timestamp = ");
                else