lib: make packets and packet messages optional, disabled by default

[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..cdb15e231387e5e1eb77c07f0b47a5fb7a061521 100644 (file)
--- a/src/plugins/text/pretty/print.c
+++ b/src/plugins/text/pretty/print.c
@@ -26,10 +26,12 @@
 #include <babeltrace2/babeltrace.h>
 #include "compat/bitfield.h"
 #include "common/common.h"
+#include "common/uuid.h"
 #include "compat/time.h"
 #include "common/assert.h"
 #include <inttypes.h>
 #include <ctype.h>
+#include <string.h>
 #include "pretty.h"
 
 #define NSEC_PER_SEC 1000000000LL
@@ -294,20 +296,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);
+       stream = bt_event_borrow_stream_const(event);
        trace = bt_stream_borrow_trace_const(stream);
        ret = print_event_timestamp(pretty, event_msg, &pretty->start_line);
        if (ret) {
@@ -335,8 +332,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 +351,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 +372,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 +393,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 +482,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);
        }
@@ -1030,7 +1036,6 @@ int print_stream_packet_context(struct pretty_component *pretty,
 
        packet = bt_event_borrow_packet_const(event);
        if (!packet) {
-               ret = -1;
                goto end;
        }
        main_field = bt_packet_borrow_context_field_const(packet);
@@ -1231,8 +1236,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, "");
@@ -1274,23 +1278,8 @@ int print_discarded_elements_msg(struct pretty_component *pretty,
 
        if (trace_uuid) {
                g_string_append_printf(pretty->string,
-                       "(UUID: %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x) ",
-                       trace_uuid[0],
-                       trace_uuid[1],
-                       trace_uuid[2],
-                       trace_uuid[3],
-                       trace_uuid[4],
-                       trace_uuid[5],
-                       trace_uuid[6],
-                       trace_uuid[7],
-                       trace_uuid[8],
-                       trace_uuid[9],
-                       trace_uuid[10],
-                       trace_uuid[11],
-                       trace_uuid[12],
-                       trace_uuid[13],
-                       trace_uuid[14],
-                       trace_uuid[15]);
+                       "(UUID: " BT_UUID_FMT ") ",
+                       BT_UUID_FMT_VALUES(trace_uuid));
        } else {
                g_string_append(pretty->string, "(no UUID) ");
        }