lib: remove clock class priority map, use default clock value

[babeltrace.git] / include / babeltrace / ctf-ir / event-internal.h

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index fe5e64decf70367dc6fc4cff63701bb2d10162aa..f1d09205feee70669b9a2c9caab3a0c6bedf7511 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -32,12 +32,13 @@
 #include <babeltrace/values.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/ctf-ir/stream-internal.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/ctf-ir/packet-internal.h>
 #include <babeltrace/ctf-ir/fields.h>
 #include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/ctf-ir/event-class-internal.h>
-#include <babeltrace/ctf-ir/clock-value-internal.h>
+#include <babeltrace/ctf-ir/clock-value-set-internal.h>
 #include <babeltrace/ctf-ir/field-wrapper-internal.h>
 #include <babeltrace/ctf-ir/validation-internal.h>
 #include <babeltrace/object-internal.h>
@@ -58,9 +59,7 @@ struct bt_event_common {
 
 struct bt_event {
        struct bt_event_common common;
-
-       /* Maps clock classes to bt_clock_value. */
-       GHashTable *clock_values;
+       struct bt_clock_value_set cv_set;
        struct bt_packet *packet;
 };
 
@@ -85,7 +84,7 @@ void _bt_event_set_is_frozen(struct bt_event *event, bool is_frozen);
 #endif
 
 #define BT_ASSERT_PRE_EVENT_COMMON_HOT(_event, _name)                  \
-       BT_ASSERT_PRE_HOT((_event), (_name), ": +%!+_e", (_event))
+       BT_ASSERT_PRE_HOT((_event), (_name), ": %!+_e", (_event))
 
 static inline
 struct bt_event_class_common *bt_event_common_borrow_class(
@@ -255,9 +254,6 @@ BT_UNUSED
 static inline
 void _bt_event_reset_dev_mode(struct bt_event *event)
 {
-       GHashTableIter iter;
-       gpointer key, value;
-
        BT_ASSERT(event);
 
        if (event->common.header_field) {
@@ -285,15 +281,6 @@ void _bt_event_reset_dev_mode(struct bt_event *event)
                        event->common.payload_field, false);
                bt_field_common_reset_recursive(event->common.payload_field);
        }
-
-       g_hash_table_iter_init(&iter, event->clock_values);
-       while (g_hash_table_iter_next(&iter, &key, &value)) {
-               struct bt_clock_value *clock_value = value;
-
-               BT_ASSERT(clock_value);
-               bt_clock_value_reset(clock_value);
-               bt_clock_value_set_is_frozen(clock_value, false);
-       }
 }
 
 #ifdef BT_DEV_MODE
@@ -310,7 +297,7 @@ void bt_event_reset(struct bt_event *event)
 {
        BT_ASSERT(event);
        bt_event_set_is_frozen(event, false);
-       bt_event_reset_dev_mode(event);
+       bt_clock_value_set_reset(&event->cv_set);
        bt_object_put_no_null_check(&event->packet->base);
        event->packet = NULL;
 }
@@ -359,6 +346,13 @@ void bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
        BT_ASSERT_PRE_NON_NULL(event, "Event");
        BT_ASSERT_PRE_NON_NULL(packet, "Packet");
        BT_ASSERT_PRE_EVENT_COMMON_HOT(BT_TO_COMMON(event), "Event");
+       BT_ASSERT_PRE(bt_event_class_borrow_stream_class(
+               BT_FROM_COMMON(event->common.class)) ==
+               BT_FROM_COMMON(packet->stream->common.stream_class),
+               "Packet's stream class and event's stream class differ: "
+               "%![event-]+e, %![packet-]+a",
+               event, packet);
+
        BT_ASSERT(!event->packet);
        event->packet = packet;
        bt_object_get_no_null_check_no_parent_check(&event->packet->base);