*/
#define BT_LOG_TAG "MSG-PACKET"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/trace-ir/packet.h>
-#include <babeltrace/trace-ir/packet-internal.h>
-#include <babeltrace/trace-ir/stream-class.h>
-#include <babeltrace/trace-ir/stream.h>
-#include <babeltrace/trace-ir/stream-internal.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/graph/graph-internal.h>
-#include <babeltrace/graph/message-packet-beginning-const.h>
-#include <babeltrace/graph/message-packet-end-const.h>
-#include <babeltrace/graph/message-packet-beginning.h>
-#include <babeltrace/graph/message-packet-end.h>
-#include <babeltrace/graph/message-packet-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/object-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/trace-ir/packet.h>
+#include <babeltrace2/trace-ir/packet-internal.h>
+#include <babeltrace2/trace-ir/stream-class.h>
+#include <babeltrace2/trace-ir/stream.h>
+#include <babeltrace2/trace-ir/stream-internal.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/graph/graph-internal.h>
+#include <babeltrace2/graph/message-packet-beginning-const.h>
+#include <babeltrace2/graph/message-packet-end-const.h>
+#include <babeltrace2/graph/message-packet-beginning.h>
+#include <babeltrace2/graph/message-packet-end.h>
+#include <babeltrace2/graph/message-packet-internal.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/object-internal.h>
#include <inttypes.h>
static inline
struct bt_message_packet *message = NULL;
struct bt_stream *stream;
struct bt_stream_class *stream_class;
- bool packet_has_default_clock_snapshot;
+ bool need_cs;
BT_ASSERT(msg_iter);
BT_ASSERT_PRE_NON_NULL(packet, "Packet");
BT_ASSERT(stream_class);
if (pool == &msg_iter->graph->packet_begin_msg_pool) {
- packet_has_default_clock_snapshot =
- stream_class->packets_have_default_beginning_clock_snapshot;
+ need_cs = stream_class->packets_have_beginning_default_clock_snapshot;
} else {
- packet_has_default_clock_snapshot =
- stream_class->packets_have_default_end_clock_snapshot;
+ need_cs = stream_class->packets_have_end_default_clock_snapshot;
}
/*
* `packet_has_default_clock_snapshot` implies that the stream
* class has a default clock class (precondition).
*/
- BT_ASSERT_PRE((with_cs && packet_has_default_clock_snapshot) ||
- (!with_cs && !packet_has_default_clock_snapshot),
+ BT_ASSERT_PRE(need_cs ? with_cs : true,
"Unexpected stream class configuration when creating "
- "a packet beginning or end message: ",
+ "a packet beginning or end message: "
+ "a default clock snapshot is needed, but none was provided: "
+ "%![stream-]+s, %![sc-]+S, with-cs=%d, "
+ "cs-val=%" PRIu64,
+ stream, stream_class, with_cs, raw_value);
+ BT_ASSERT_PRE(!need_cs ? !with_cs : true,
+ "Unexpected stream class configuration when creating "
+ "a packet beginning or end message: "
+ "no default clock snapshot is needed, but one was provided: "
"%![stream-]+s, %![sc-]+S, with-cs=%d, "
"cs-val=%" PRIu64,
stream, stream_class, with_cs, raw_value);