* SOFTWARE.
*/
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/field-types.h>
-#include <babeltrace/ctf-ir/fields.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-discarded-events.h>
-#include <babeltrace/graph/notification-discarded-packets.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
#include <babeltrace/bitfield-internal.h>
#include <babeltrace/common-internal.h>
#include <babeltrace/compat/time-internal.h>
#define COLOR_EVENT_NAME BT_COMMON_COLOR_BOLD BT_COMMON_COLOR_FG_MAGENTA
#define COLOR_TIMESTAMP BT_COMMON_COLOR_BOLD BT_COMMON_COLOR_FG_YELLOW
-static inline
-const char *rem_(const char *str)
-{
- if (str[0] == '_')
- return &str[1];
- else
- return str;
-}
-
struct timestamp {
int64_t real_timestamp; /* Relative to UNIX epoch. */
uint64_t clock_value; /* In cycles. */
iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(
enumeration_field_type, value);
}
- if (!iter) {
- ret = BT_COMPONENT_STATUS_ERROR;
- goto end;
- }
g_string_append(pretty->string, "( ");
+ ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter);
+ if (ret) {
+ if (pretty->use_colors) {
+ g_string_append(pretty->string, COLOR_UNKNOWN);
+ }
+ g_string_append(pretty->string, "<unknown>");
+ if (pretty->use_colors) {
+ g_string_append(pretty->string, COLOR_RST);
+ }
+ goto skip_loop;
+ }
for (;;) {
const char *mapping_name;
break;
}
}
- if (!nr_mappings) {
- if (pretty->use_colors) {
- g_string_append(pretty->string, COLOR_UNKNOWN);
- }
- g_string_append(pretty->string, "<unknown>");
- if (pretty->use_colors) {
- g_string_append(pretty->string, COLOR_RST);
- }
- }
+skip_loop:
g_string_append(pretty->string, " : container = ");
ret = print_integer(pretty, container_field);
if (ret != BT_COMPONENT_STATUS_OK) {
g_string_append(pretty->string, " ");
}
if (print_names) {
- print_field_name_equal(pretty, rem_(field_name));
+ print_field_name_equal(pretty, field_name);
}
ret = print_field(pretty, field, print_names, NULL, 0);
*nr_printed_fields += 1;
}
iter = bt_ctf_field_enumeration_get_mappings(tag_field);
- if (!iter) {
+ iter_ret = bt_ctf_field_type_enumeration_mapping_iterator_next(
+ iter);
+ if (!iter || ret) {
bt_put(tag_field);
ret = BT_COMPONENT_STATUS_ERROR;
goto end;
ret = BT_COMPONENT_STATUS_ERROR;
goto end;
}
- print_field_name_equal(pretty, rem_(tag_choice));
+ print_field_name_equal(pretty, tag_choice);
bt_put(tag_field);
bt_put(iter);
}
case CTF_TYPE_ENUM:
return print_enum(pretty, field);
case CTF_TYPE_STRING:
+ {
+ const char *str;
+
+ str = bt_ctf_field_string_get_value(field);
+ if (!str) {
+ return BT_COMPONENT_STATUS_ERROR;
+ }
+
if (pretty->use_colors) {
g_string_append(pretty->string, COLOR_STRING_VALUE);
}
- print_escape_string(pretty, bt_ctf_field_string_get_value(field));
+ print_escape_string(pretty, str);
if (pretty->use_colors) {
g_string_append(pretty->string, COLOR_RST);
}
return BT_COMPONENT_STATUS_OK;
+ }
case CTF_TYPE_STRUCT:
return print_struct(pretty, field, print_names, filter_fields,
filter_array_len);