tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / lttng-utils / debug-info / debug-info.c

diff --git a/plugins/lttng-utils/debug-info/debug-info.c b/plugins/lttng-utils/debug-info/debug-info.c
index 1859d27360bc1e1cf10d1ea347bb13baffbce49a..1e7a2381ed7fe062da9494c7c47c430d12141f70 100644 (file)
--- a/plugins/lttng-utils/debug-info/debug-info.c
+++ b/plugins/lttng-utils/debug-info/debug-info.c
@@ -32,9 +32,9 @@
 #include <glib.h>
 #include <plugins-common.h>
 
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/fd-cache-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/fd-cache-internal.h>
 
 #include "bin-info.h"
 #include "debug-info.h"
@@ -1353,7 +1353,7 @@ bt_message *handle_packet_begin_message(struct debug_info_msg_iter *debug_it,
        BT_ASSERT(out_packet);
 
        has_default_clock_snapshot =
-               bt_stream_class_packets_have_default_beginning_clock_snapshot(
+               bt_stream_class_packets_have_beginning_default_clock_snapshot(
                        bt_stream_borrow_class_const(
                                bt_packet_borrow_stream_const(in_packet)));
        if (has_default_clock_snapshot) {
@@ -1394,7 +1394,7 @@ bt_message *handle_packet_end_message(struct debug_info_msg_iter *debug_it,
        BT_ASSERT(out_packet);
 
        has_default_clock_snapshot =
-               bt_stream_class_packets_have_default_end_clock_snapshot(
+               bt_stream_class_packets_have_end_default_clock_snapshot(
                        bt_stream_borrow_class_const(
                                bt_packet_borrow_stream_const(in_packet)));
        if (has_default_clock_snapshot) {
@@ -1540,7 +1540,7 @@ bt_message *handle_discarded_events_message(struct debug_info_msg_iter *debug_it
 {
        const bt_clock_snapshot *begin_cs, *end_cs;
        const bt_stream *in_stream;
-       const bt_clock_class *default_cc;
+       bool has_default_clock_snapshots;
        uint64_t discarded_events, begin_cs_value, end_cs_value;
        bt_property_availability prop_avail;
        bt_message *out_message = NULL;
@@ -1554,14 +1554,15 @@ bt_message *handle_discarded_events_message(struct debug_info_msg_iter *debug_it
                                debug_it->ir_maps, in_stream);
        BT_ASSERT(out_stream);
 
-       default_cc = bt_stream_class_borrow_default_clock_class_const(
+       has_default_clock_snapshots =
+               bt_stream_class_discarded_events_have_default_clock_snapshots(
                        bt_stream_borrow_class_const(in_stream));
-       if (default_cc) {
+       if (has_default_clock_snapshots) {
                begin_cs =
-                       bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
+                       bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(
                                in_message);
                end_cs =
-                       bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
+                       bt_message_discarded_events_borrow_end_default_clock_snapshot_const(
                                in_message);
 
                begin_cs_value = bt_clock_snapshot_get_value(begin_cs);
@@ -1598,7 +1599,7 @@ bt_message *handle_discarded_packets_message(struct debug_info_msg_iter *debug_i
                const bt_message *in_message)
 {
        const bt_clock_snapshot *begin_cs, *end_cs;
-       const bt_clock_class *default_cc;
+       bool has_default_clock_snapshots;
        const bt_stream *in_stream;
        uint64_t discarded_packets, begin_cs_value, end_cs_value;
        bt_property_availability prop_avail;
@@ -1613,15 +1614,16 @@ bt_message *handle_discarded_packets_message(struct debug_info_msg_iter *debug_i
                        debug_it->ir_maps, in_stream);
        BT_ASSERT(out_stream);
 
-       default_cc = bt_stream_class_borrow_default_clock_class_const(
+       has_default_clock_snapshots =
+               bt_stream_class_discarded_packets_have_default_clock_snapshots(
                        bt_stream_borrow_class_const(in_stream));
-       if (default_cc) {
+       if (has_default_clock_snapshots) {
                begin_cs =
-                       bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
+                       bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
                                in_message);
 
                end_cs =
-                       bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
+                       bt_message_discarded_packets_borrow_end_default_clock_snapshot_const(
                                in_message);
 
                begin_cs_value = bt_clock_snapshot_get_value(begin_cs);