API fix: packet_seek should take an index rather than offset

[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 150cf3a5c8124c9da3b59f7fd641493a9623362e..20e18e86fcf1e952c8f090db3dff58eb430a3e76 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -56,9 +56,27 @@ enum field_item {
        ITEM_PAYLOAD,
 };
 
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
-               const char *path, int flags,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+enum bt_loglevel {
+        BT_LOGLEVEL_EMERG                  = 0,
+        BT_LOGLEVEL_ALERT                  = 1,
+        BT_LOGLEVEL_CRIT                   = 2,
+        BT_LOGLEVEL_ERR                    = 3,
+        BT_LOGLEVEL_WARNING                = 4,
+        BT_LOGLEVEL_NOTICE                 = 5,
+        BT_LOGLEVEL_INFO                   = 6,
+        BT_LOGLEVEL_DEBUG_SYSTEM           = 7,
+        BT_LOGLEVEL_DEBUG_PROGRAM          = 8,
+        BT_LOGLEVEL_DEBUG_PROCESS          = 9,
+        BT_LOGLEVEL_DEBUG_MODULE           = 10,
+        BT_LOGLEVEL_DEBUG_UNIT             = 11,
+        BT_LOGLEVEL_DEBUG_FUNCTION         = 12,
+        BT_LOGLEVEL_DEBUG_LINE             = 13,
+        BT_LOGLEVEL_DEBUG                  = 14,
+};
+
+
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp);
 void ctf_text_close_trace(struct trace_descriptor *descriptor);
 
@@ -151,6 +169,47 @@ void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item
        }
 }
 
+static
+const char *print_loglevel(int value)
+{
+       switch (value) {
+       case -1:
+               return "";
+       case BT_LOGLEVEL_EMERG:
+               return "TRACE_EMERG";
+       case BT_LOGLEVEL_ALERT:
+               return "TRACE_ALERT";
+       case BT_LOGLEVEL_CRIT:
+               return "TRACE_CRIT";
+       case BT_LOGLEVEL_ERR:
+               return "TRACE_ERR";
+       case BT_LOGLEVEL_WARNING:
+               return "TRACE_WARNING";
+       case BT_LOGLEVEL_NOTICE:
+               return "TRACE_NOTICE";
+       case BT_LOGLEVEL_INFO:
+               return "TRACE_INFO";
+       case BT_LOGLEVEL_DEBUG_SYSTEM:
+               return "TRACE_DEBUG_SYSTEM";
+       case BT_LOGLEVEL_DEBUG_PROGRAM:
+               return "TRACE_DEBUG_PROGRAM";
+       case BT_LOGLEVEL_DEBUG_PROCESS:
+               return "TRACE_DEBUG_PROCESS";
+       case BT_LOGLEVEL_DEBUG_MODULE:
+               return "TRACE_DEBUG_MODULE";
+       case BT_LOGLEVEL_DEBUG_UNIT:
+               return "TRACE_DEBUG_UNIT";
+       case BT_LOGLEVEL_DEBUG_FUNCTION:
+               return "TRACE_DEBUG_FUNCTION";
+       case BT_LOGLEVEL_DEBUG_LINE:
+               return "TRACE_DEBUG_LINE";
+       case BT_LOGLEVEL_DEBUG:
+               return "TRACE_DEBUG";
+       default:
+               return "<<UNKNOWN>>";
+       }
+}
+
 static
 int ctf_text_write_event(struct stream_pos *ppos,
                         struct ctf_stream *stream)
@@ -248,36 +307,36 @@ int ctf_text_write_event(struct stream_pos *ppos,
                else
                        fprintf(pos->fp, " ");
        }
-       if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->domain[0] != '\0') {
+       if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
                        fprintf(pos->fp, "trace:domain = ");
                }
-               fprintf(pos->fp, "%s", stream_class->trace->domain);
+               fprintf(pos->fp, "%s", stream_class->trace->env.domain);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
                dom_print = 1;
        }
-       if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->procname[0] != '\0') {
+       if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
                        fprintf(pos->fp, "trace:procname = ");
                } else if (dom_print) {
                        fprintf(pos->fp, ":");
                }
-               fprintf(pos->fp, "%s", stream_class->trace->procname);
+               fprintf(pos->fp, "%s", stream_class->trace->env.procname);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
                dom_print = 1;
        }
-       if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->vpid[0] != '\0') {
+       if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
                        fprintf(pos->fp, "trace:vpid = ");
                } else if (dom_print) {
                        fprintf(pos->fp, ":");
                }
-               fprintf(pos->fp, "%s", stream_class->trace->vpid);
+               fprintf(pos->fp, "%d", stream_class->trace->env.vpid);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
                dom_print = 1;
@@ -289,7 +348,8 @@ int ctf_text_write_event(struct stream_pos *ppos,
                } else if (dom_print) {
                        fprintf(pos->fp, ":");
                }
-               fprintf(pos->fp, "(%d)",
+               fprintf(pos->fp, "%s (%d)",
+                       print_loglevel(event_class->loglevel),
                        event_class->loglevel);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
@@ -388,6 +448,7 @@ int ctf_text_write_event(struct stream_pos *ppos,
        /* newline */
        fprintf(pos->fp, "\n");
        pos->field_nr = 0;
+       stream->consumed = 1;
 
        return 0;
 
@@ -397,9 +458,8 @@ error:
 }
 
 
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
-               const char *path, int flags,
-               void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+               void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
 {
        struct ctf_text_stream_pos *pos;