Use environment information for extra fields

[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 83f0cf9c9ac1e8385e2ed29c2574ba0ab60a2e7e..b7889ec0b945455402149cb6ac7cb8c5a0be25f9 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -248,50 +248,49 @@ 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;
        }
-       if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel_identifier != 0) {
+       if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel != -1) {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
                        fprintf(pos->fp, "loglevel = ");
                } else if (dom_print) {
                        fprintf(pos->fp, ":");
                }
-               fprintf(pos->fp, "%s (%lld)",
-                       g_quark_to_string(event_class->loglevel_identifier),
-                       (long long) event_class->loglevel_value);
+               fprintf(pos->fp, "(%d)",
+                       event_class->loglevel);
                if (pos->print_names)
                        fprintf(pos->fp, ", ");
                dom_print = 1;