* 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>
struct tm tm;
time_t time_s = (time_t) ts_sec_abs;
- if (is_negative) {
+ if (is_negative && !pretty->negative_timestamp_warning_done) {
// TODO: log instead
fprintf(stderr, "[warning] Fallback to [sec.ns] to print negative time value. Use --clock-seconds.\n");
+ pretty->negative_timestamp_warning_done = true;
goto seconds;
}
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) {
}
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;
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);
int64_t stream_class_id;
int64_t stream_id;
bool is_discarded_events;
+ int64_t count;
+ struct bt_ctf_clock_value *clock_value = NULL;
/* Stream name */
switch (bt_notification_get_type(notif)) {
case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
stream = bt_notification_discarded_events_get_stream(notif);
+ count = bt_notification_discarded_events_get_count(notif);
is_discarded_events = true;
break;
case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
stream = bt_notification_discarded_packets_get_stream(notif);
+ count = bt_notification_discarded_packets_get_count(notif);
is_discarded_events = false;
break;
default:
* with Babeltrace 1.
*/
fprintf(stderr,
- "%s%sWARNING%s%s: Tracer discarded %" PRId64 " %s between [",
+ "%s%sWARNING%s%s: Tracer discarded %" PRId64 " %s%s between [",
bt_common_color_fg_yellow(),
bt_common_color_bold(),
bt_common_color_reset(),
bt_common_color_fg_yellow(),
- is_discarded_events ?
- bt_notification_discarded_events_get_count(notif) :
- bt_notification_discarded_packets_get_count(notif),
- is_discarded_events ? "events" : "packets");
+ count, is_discarded_events ? "event" : "packet",
+ count == 1 ? "" : "s");
g_string_assign(pretty->string, "");
- print_timestamp_wall(pretty,
- is_discarded_events ?
+ clock_value = is_discarded_events ?
bt_notification_discarded_events_get_begin_clock_value(notif) :
- bt_notification_discarded_packets_get_begin_clock_value(notif));
+ bt_notification_discarded_packets_get_begin_clock_value(notif);
+ print_timestamp_wall(pretty, clock_value);
+ BT_PUT(clock_value);
fprintf(stderr, "%s] and [", pretty->string->str);
g_string_assign(pretty->string, "");
- print_timestamp_wall(pretty,
- is_discarded_events ?
+ clock_value = is_discarded_events ?
bt_notification_discarded_events_get_end_clock_value(notif) :
- bt_notification_discarded_packets_get_end_clock_value(notif));
+ bt_notification_discarded_packets_get_end_clock_value(notif);
+ print_timestamp_wall(pretty, clock_value);
+ BT_PUT(clock_value);
fprintf(stderr, "%s] in trace \"%s\" ",
pretty->string->str, trace_name);
bt_put(stream);
bt_put(stream_class);
bt_put(trace);
+ bt_put(clock_value);
return ret;
}