lib: remove clock class priority map, use default clock value
[babeltrace.git] / lib / ctf-ir / event.c
index 5cfd5e14a124515e8bbcfc943722c71c8b75e005..9337c4b3c23dc1517615753b9da94b70d6a30a4c 100644 (file)
@@ -137,10 +137,10 @@ static
 int bt_event_common_create_fields(
                struct bt_stream_class_common *stream_class,
                struct bt_validation_output *validation_output,
-               void *(*create_field_func)(void *),
-               void (*release_field_func)(void *),
-               void *(*create_header_field_func)(void *, void *),
-               void (*release_header_field_func)(void *),
+               create_field_func create_field_func,
+               release_field_func release_field_func,
+               create_header_field_func create_header_field_func,
+               release_header_field_func release_header_field_func,
                struct bt_field_wrapper **header_field,
                struct bt_field_common **stream_event_context_field,
                struct bt_field_common **context_field,
@@ -197,7 +197,7 @@ int bt_event_common_create_fields(
 
 error:
        if (*header_field) {
-               release_header_field_func(*header_field);
+               release_header_field_func(*header_field, stream_class);
        }
 
        if (*stream_event_context_field) {
@@ -278,7 +278,8 @@ end:
 }
 
 BT_HIDDEN
-void _bt_event_common_freeze(struct bt_event_common *event)
+void _bt_event_common_set_is_frozen(struct bt_event_common *event,
+               bool is_frozen)
 {
        BT_ASSERT(event);
 
@@ -294,42 +295,44 @@ void _bt_event_common_freeze(struct bt_event_common *event)
        if (event->header_field) {
                BT_LOGD_STR("Freezing event's header field.");
                bt_field_common_set_is_frozen_recursive(
-                       event->header_field->field, true);
+                       event->header_field->field, is_frozen);
        }
 
        if (event->stream_event_context_field) {
                BT_LOGD_STR("Freezing event's stream event context field.");
                bt_field_common_set_is_frozen_recursive(
-                       event->stream_event_context_field, true);
+                       event->stream_event_context_field, is_frozen);
        }
 
        if (event->context_field) {
                BT_LOGD_STR("Freezing event's context field.");
-               bt_field_common_set_is_frozen_recursive(event->context_field, true);
+               bt_field_common_set_is_frozen_recursive(event->context_field,
+                       is_frozen);
        }
 
        if (event->payload_field) {
                BT_LOGD_STR("Freezing event's payload field.");
-               bt_field_common_set_is_frozen_recursive(event->payload_field, true);
+               bt_field_common_set_is_frozen_recursive(event->payload_field,
+                       is_frozen);
        }
 
-       event->frozen = 1;
+       event->frozen = is_frozen;
 }
 
 BT_HIDDEN
 int bt_event_common_initialize(struct bt_event_common *event,
                struct bt_event_class_common *event_class,
                struct bt_clock_class *init_expected_clock_class,
-               bt_object_release_func release_func,
+               bool is_shared_with_parent, bt_object_release_func release_func,
                bt_validation_flag_copy_field_type_func field_type_copy_func,
                bool must_be_in_trace,
                int (*map_clock_classes_func)(struct bt_stream_class_common *stream_class,
                        struct bt_field_type_common *packet_context_field_type,
                        struct bt_field_type_common *event_header_field_type),
-               void *(*create_field_func)(void *),
-               void (*release_field_func)(void *),
-               void *(*create_header_field_func)(void *, void *),
-               void (*release_header_field_func)(void *))
+               create_field_func create_field_func,
+               release_field_func release_field_func,
+               create_header_field_func create_header_field_func,
+               release_header_field_func release_header_field_func)
 {
        int ret;
        struct bt_trace_common *trace = NULL;
@@ -368,7 +371,11 @@ int bt_event_common_initialize(struct bt_event_common *event,
         * failure, the caller releases the reference to `event` to
         * destroy it.
         */
-       bt_object_init(event, release_func);
+       if (is_shared_with_parent) {
+               bt_object_init_shared_with_parent(&event->base, release_func);
+       } else {
+               bt_object_init_unique(&event->base);
+       }
 
        if (!stream_class->frozen) {
                /*
@@ -499,7 +506,7 @@ error:
        bt_put(expected_clock_class);
 
        if (event_header) {
-               release_header_field_func(event_header);
+               release_header_field_func(event_header, stream_class);
        }
 
        if (stream_event_context) {
@@ -572,137 +579,22 @@ struct bt_event *bt_event_new(struct bt_event_class *event_class)
        }
 
        ret = bt_event_common_initialize(BT_TO_COMMON(event),
-               BT_TO_COMMON(event_class), NULL, NULL,
+               BT_TO_COMMON(event_class), NULL, false, NULL,
                (bt_validation_flag_copy_field_type_func) bt_field_type_copy,
                true, NULL,
-               (void *) bt_field_create_recursive,
-               (void *) bt_field_destroy_recursive,
-               (void *) create_event_header_field,
-               (void *) bt_event_header_field_recycle);
+               (create_field_func) bt_field_create_recursive,
+               (release_field_func) bt_field_destroy_recursive,
+               (create_header_field_func) create_event_header_field,
+               (release_header_field_func) bt_event_header_field_recycle);
        if (ret) {
                /* bt_event_common_initialize() logs errors */
                goto error;
        }
 
-       bt_object_set_is_shared((void *) event, false);
-       event->clock_values = g_hash_table_new_full(g_direct_hash,
-                       g_direct_equal, NULL,
-                       (GDestroyNotify) bt_clock_value_recycle);
-       BT_ASSERT(event->clock_values);
        stream_class = bt_event_class_borrow_stream_class(event_class);
        BT_ASSERT(stream_class);
-
-       if (stream_class->common.clock_class) {
-               struct bt_clock_value *clock_value;
-
-               clock_value = bt_clock_value_create(
-                       stream_class->common.clock_class);
-               if (!clock_value) {
-                       BT_LIB_LOGE("Cannot create clock value from clock class: "
-                               "%![cc-]+K", stream_class->common.clock_class);
-                       goto error;
-               }
-
-               g_hash_table_insert(event->clock_values,
-                       stream_class->common.clock_class, clock_value);
-       }
-
-       goto end;
-
-error:
-       if (event) {
-               bt_event_destroy(event);
-               event = NULL;
-       }
-
-end:
-       return event;
-}
-
-BT_ASSERT_PRE_FUNC
-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) {
-               bt_field_common_set_is_frozen_recursive(
-                       event->common.header_field->field, false);
-               bt_field_common_reset_recursive(
-                       event->common.header_field->field);
-       }
-
-       if (event->common.stream_event_context_field) {
-               bt_field_common_set_is_frozen_recursive(
-                       event->common.stream_event_context_field, false);
-               bt_field_common_reset_recursive(
-                       event->common.stream_event_context_field);
-       }
-
-       if (event->common.context_field) {
-               bt_field_common_set_is_frozen_recursive(
-                       event->common.context_field, false);
-               bt_field_common_reset_recursive(event->common.context_field);
-       }
-
-       if (event->common.payload_field) {
-               bt_field_common_set_is_frozen_recursive(
-                       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
-# define bt_event_reset_dev_mode       _bt_event_reset_dev_mode
-#else
-# define bt_event_reset_dev_mode(_x)
-#endif
-
-static inline
-void bt_event_reset(struct bt_event *event)
-{
-       BT_ASSERT(event);
-       event->common.frozen = false;
-       bt_event_reset_dev_mode(event);
-       BT_PUT(event->packet);
-}
-
-BT_HIDDEN
-struct bt_event *bt_event_create(struct bt_event_class *event_class,
-               struct bt_packet *packet)
-{
-       int ret;
-       struct bt_event *event = NULL;
-
-       BT_ASSERT(event_class);
-       event = bt_object_pool_create_object(&event_class->event_pool);
-       if (!event) {
-               BT_LIB_LOGE("Cannot allocate one event from event class's event pool: "
-                       "%![event-class-]+E", event_class);
-               goto error;
-       }
-
-       if (!event->common.class) {
-               event->common.class = bt_get(event_class);
-       }
-
-       BT_ASSERT(packet);
-       ret = bt_event_set_packet(event, packet);
+       ret = bt_clock_value_set_initialize(&event->cv_set);
        if (ret) {
-               BT_LIB_LOGE("Cannot set event's packet: "
-                       "%![event-]+e, %![packet-]+a", event, packet);
                goto error;
        }
 
@@ -710,7 +602,7 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class,
 
 error:
        if (event) {
-               bt_event_recycle(event);
+               bt_event_destroy(event);
                event = NULL;
        }
 
@@ -781,32 +673,36 @@ void bt_event_destroy(struct bt_event *event)
        bt_event_common_finalize((void *) event,
                (void *) bt_field_destroy_recursive,
                (void *) release_event_header_field);
-       g_hash_table_destroy(event->clock_values);
+       bt_clock_value_set_finalize(&event->cv_set);
        BT_LOGD_STR("Putting event's packet.");
        bt_put(event->packet);
        g_free(event);
 }
 
-struct bt_clock_value *bt_event_borrow_clock_value(
-               struct bt_event *event, struct bt_clock_class *clock_class)
+int bt_event_set_clock_value(struct bt_event *event,
+               struct bt_clock_class *clock_class, uint64_t raw_value,
+               bt_bool is_default)
+{
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+       BT_ASSERT_PRE_HOT(BT_TO_COMMON(event), "Event", ": %!+e", event);
+       BT_ASSERT_PRE(is_default,
+               "You can only set a default clock value as of this version.");
+       return bt_clock_value_set_set_clock_value(&event->cv_set, clock_class,
+               raw_value, is_default);
+}
+
+struct bt_clock_value *bt_event_borrow_default_clock_value(
+               struct bt_event *event)
 {
        struct bt_clock_value *clock_value = NULL;
 
        BT_ASSERT_PRE_NON_NULL(event, "Event");
-       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-       clock_value = g_hash_table_lookup(event->clock_values, clock_class);
+       clock_value = event->cv_set.default_cv;
        if (!clock_value) {
-               BT_LOGV("No clock value associated to the given clock class: "
-                       "event-addr=%p, event-class-name=\"%s\", "
-                       "event-class-id=%" PRId64 ", clock-class-addr=%p, "
-                       "clock-class-name=\"%s\"", event,
-                       bt_event_class_common_get_name(event->common.class),
-                       bt_event_class_common_get_id(event->common.class),
-                       clock_class, bt_clock_class_get_name(clock_class));
-               goto end;
+               BT_LIB_LOGV("No default clock value: %![event-]+e", event);
        }
 
-end:
        return clock_value;
 }
 
@@ -830,84 +726,11 @@ end:
 }
 
 BT_HIDDEN
-int bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
+void _bt_event_set_is_frozen(struct bt_event *event, bool is_frozen)
 {
-       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");
-
-       /*
-        * Make sure the new packet was created by this event's
-        * stream, if it is set.
-        */
-       if (bt_event_borrow_stream(event)) {
-               BT_ASSERT_PRE(packet->stream == bt_event_borrow_stream(event),
-                       "Packet's stream and event's stream differ: "
-                       "%![event-]+e, %![packet-]+a",
-                       event, packet);
-       } else {
-               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_get(packet);
-       BT_MOVE(event->packet, packet);
-       BT_LOGV("Set event's packet: event-addr=%p, "
-               "event-class-name=\"%s\", event-class-id=%" PRId64 ", "
-               "packet-addr=%p",
-               event, bt_event_class_common_get_name(event->common.class),
-               bt_event_class_common_get_id(event->common.class), packet);
-       return 0;
-}
-
-BT_HIDDEN
-void _bt_event_freeze(struct bt_event *event)
-{
-       _bt_event_common_freeze(BT_TO_COMMON(event));
+       bt_event_common_set_is_frozen(BT_TO_COMMON(event), is_frozen);
        BT_LOGD_STR("Freezing event's packet.");
-       bt_packet_freeze(event->packet);
-}
-
-BT_HIDDEN
-void bt_event_recycle(struct bt_event *event)
-{
-       struct bt_event_class *event_class;
-
-       BT_ASSERT(event);
-       BT_LIB_LOGD("Recycling event: %!+e", event);
-
-       /*
-        * Those are the important ordered steps:
-        *
-        * 1. Reset the event object (put any permanent reference it
-        *    has, unfreeze it and its fields in developer mode, etc.),
-        *    but do NOT put its class's reference. This event class
-        *    contains the pool to which we're about to recycle this
-        *    event object, so we must guarantee its existence thanks
-        *    to this existing reference.
-        *
-        * 2. Move the event class reference to our `event_class`
-        *    variable so that we can set the event's class member
-        *    to NULL before recycling it. We CANNOT do this after
-        *    we put the event class reference because this bt_put()
-        *    could destroy the event class, also destroying its
-        *    event pool, thus also destroying our event object (this
-        *    would result in an invalid write access).
-        *
-        * 3. Recycle the event object.
-        *
-        * 4. Put our event class reference.
-        */
-       bt_event_reset(event);
-       event_class = BT_FROM_COMMON(event->common.class);
-       BT_ASSERT(event_class);
-       event->common.class = NULL;
-       bt_object_pool_recycle_object(&event_class->event_pool, event);
-       bt_put(event_class);
+       bt_packet_set_is_frozen(event->packet, is_frozen);
 }
 
 int bt_event_move_header(struct bt_event *event,
@@ -918,7 +741,7 @@ int bt_event_move_header(struct bt_event *event,
 
        BT_ASSERT_PRE_NON_NULL(event, "Event");
        BT_ASSERT_PRE_NON_NULL(field_wrapper, "Header field");
-       BT_ASSERT_PRE_HOT(BT_TO_COMMON(event), "Event", ": +%!+e", event);
+       BT_ASSERT_PRE_HOT(BT_TO_COMMON(event), "Event", ": %!+e", event);
        stream_class = bt_event_class_borrow_stream_class(
                bt_event_borrow_class(event));
        BT_ASSERT_PRE(stream_class->common.event_header_field_type,
This page took 0.029501 seconds and 4 git commands to generate.