lib: move trace class's name, UUID, and environment props to trace API

[babeltrace.git] / src / plugins / text / pretty / print.c

diff --git a/src/plugins/text/pretty/print.c b/src/plugins/text/pretty/print.c
index 388a0915dbeda9c0a30e6ec3e30b9af03108f5dd..80651f15fa97e23a4b54df71d4186d1e6461e2d1 100644 (file)
--- a/src/plugins/text/pretty/print.c
+++ b/src/plugins/text/pretty/print.c
@@ -30,6 +30,7 @@
 #include "common/assert.h"
 #include <inttypes.h>
 #include <ctype.h>
+#include <string.h>
 #include "pretty.h"
 
 #define NSEC_PER_SEC 1000000000LL
@@ -294,18 +295,15 @@ int print_event_header(struct pretty_component *pretty,
        bool print_names = pretty->options.print_header_field_names;
        int ret = 0;
        const bt_event_class *event_class = NULL;
-       const bt_stream_class *stream_class = NULL;
-       const bt_trace_class *trace_class = NULL;
        const bt_packet *packet = NULL;
        const bt_stream *stream = NULL;
        const bt_trace *trace = NULL;
        const bt_event *event = bt_message_event_borrow_event_const(event_msg);
+       const char *ev_name;
        int dom_print = 0;
        bt_property_availability prop_avail;
 
        event_class = bt_event_borrow_class_const(event);
-       stream_class = bt_event_class_borrow_stream_class_const(event_class);
-       trace_class = bt_stream_class_borrow_trace_class_const(stream_class);
        packet = bt_event_borrow_packet_const(event);
        stream = bt_packet_borrow_stream_const(packet);
        trace = bt_stream_borrow_trace_const(stream);
@@ -335,8 +333,8 @@ int print_event_header(struct pretty_component *pretty,
        if (pretty->options.print_trace_hostname_field) {
                const bt_value *hostname_str;
 
-               hostname_str = bt_trace_class_borrow_environment_entry_value_by_name_const(
-                       trace_class, "hostname");
+               hostname_str = bt_trace_borrow_environment_entry_value_by_name_const(
+                       trace, "hostname");
                if (hostname_str) {
                        const char *str;
 
@@ -354,8 +352,8 @@ int print_event_header(struct pretty_component *pretty,
        if (pretty->options.print_trace_domain_field) {
                const bt_value *domain_str;
 
-               domain_str = bt_trace_class_borrow_environment_entry_value_by_name_const(
-                       trace_class, "domain");
+               domain_str = bt_trace_borrow_environment_entry_value_by_name_const(
+                       trace, "domain");
                if (domain_str) {
                        const char *str;
 
@@ -375,8 +373,8 @@ int print_event_header(struct pretty_component *pretty,
        if (pretty->options.print_trace_procname_field) {
                const bt_value *procname_str;
 
-               procname_str = bt_trace_class_borrow_environment_entry_value_by_name_const(
-                       trace_class, "procname");
+               procname_str = bt_trace_borrow_environment_entry_value_by_name_const(
+                       trace, "procname");
                if (procname_str) {
                        const char *str;
 
@@ -396,8 +394,8 @@ int print_event_header(struct pretty_component *pretty,
        if (pretty->options.print_trace_vpid_field) {
                const bt_value *vpid_value;
 
-               vpid_value = bt_trace_class_borrow_environment_entry_value_by_name_const(
-                       trace_class, "vpid");
+               vpid_value = bt_trace_borrow_environment_entry_value_by_name_const(
+                       trace, "vpid");
                if (vpid_value) {
                        int64_t value;
 
@@ -485,10 +483,19 @@ int print_event_header(struct pretty_component *pretty,
        if (print_names) {
                print_name_equal(pretty, "name");
        }
+       ev_name = bt_event_class_get_name(event_class);
        if (pretty->use_colors) {
-               g_string_append(pretty->string, COLOR_EVENT_NAME);
+               if (ev_name) {
+                       g_string_append(pretty->string, COLOR_EVENT_NAME);
+               } else {
+                       g_string_append(pretty->string, COLOR_UNKNOWN);
+               }
+       }
+       if (ev_name) {
+               g_string_append(pretty->string, ev_name);
+       } else {
+               g_string_append(pretty->string, "<unknown>");
        }
-       g_string_append(pretty->string, bt_event_class_get_name(event_class));
        if (pretty->use_colors) {
                g_string_append(pretty->string, COLOR_RST);
        }
@@ -1231,8 +1238,7 @@ int print_discarded_elements_msg(struct pretty_component *pretty,
        }
 
        /* Trace UUID */
-       trace_uuid = bt_trace_class_get_uuid(
-               bt_trace_borrow_class_const(trace));
+       trace_uuid = bt_trace_get_uuid(trace);
 
        /* Format message */
        g_string_assign(pretty->string, "");