* SOFTWARE.
*/
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/bitfield-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/compat/time-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/bitfield-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/compat/time-internal.h>
+#include <babeltrace2/assert-internal.h>
#include <inttypes.h>
#include <ctype.h>
#include "pretty.h"
for (i = 0; i < label_count; i++) {
const char *mapping_name = label_array[i];
- if (i == 0) {
+ if (i != 0) {
g_string_append(pretty->string, ", ");
}
if (pretty->use_colors) {
count == 1 ? "" : "s");
}
+ g_string_append_c(pretty->string, ' ');
+
if (begin_clock_snapshot && end_clock_snapshot) {
- g_string_append(pretty->string, " between [");
+ g_string_append(pretty->string, "between [");
print_timestamp_wall(pretty, begin_clock_snapshot, false);
g_string_append(pretty->string, "] and [");
print_timestamp_wall(pretty, end_clock_snapshot, false);
BT_ASSERT(stream);
stream_class = bt_stream_borrow_class_const(stream);
- if (bt_stream_class_borrow_default_clock_class_const(stream_class)) {
- switch (bt_message_get_type(msg)) {
- case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
- begin = bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
+ switch (bt_message_get_type(msg)) {
+ case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+ if (bt_stream_class_discarded_events_have_default_clock_snapshots(
+ stream_class)) {
+ begin = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(
msg);
- end = bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
+ end = bt_message_discarded_events_borrow_end_default_clock_snapshot_const(
msg);
- break;
- case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
- begin = bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
+ }
+
+ break;
+ case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+ if (bt_stream_class_discarded_packets_have_default_clock_snapshots(
+ stream_class)) {
+ begin = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
msg);
- end = bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
+ end = bt_message_discarded_packets_borrow_end_default_clock_snapshot_const(
msg);
- break;
- default:
- abort();
}
+
+ break;
+ default:
+ abort();
}
print_discarded_elements_msg(pretty, stream, begin, end,