projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lib: remove "unknown clock snapshot" concept
[babeltrace.git] / lib / trace-ir / stream-class.c
diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c
index 9b3dd621293df3faba890837018759434fa41ef7..e4f48f4eccb252d740019121e08d4bd696a82488 100644 (file)
--- a/lib/trace-ir/stream-class.c
+++ b/lib/trace-ir/stream-class.c
@@ -68,13 +68,10 @@ void destroy_stream_class(struct bt_object *obj)
                stream_class->name.value = NULL;
        }
 
-       BT_LOGD_STR("Putting event header field class.");
-       BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_header_fc);
        BT_LOGD_STR("Putting packet context field class.");
        BT_OBJECT_PUT_REF_AND_RESET(stream_class->packet_context_fc);
        BT_LOGD_STR("Putting event common context field class.");
        BT_OBJECT_PUT_REF_AND_RESET(stream_class->event_common_context_fc);
-       bt_object_pool_finalize(&stream_class->event_header_field_pool);
        bt_object_pool_finalize(&stream_class->packet_context_field_pool);
        g_free(stream_class);
 }
@@ -145,16 +142,6 @@ struct bt_stream_class *create_stream_class_with_id(
                goto error;
        }
 
-       ret = bt_object_pool_initialize(&stream_class->event_header_field_pool,
-               (bt_object_pool_new_object_func) bt_field_wrapper_new,
-               (bt_object_pool_destroy_object_func) free_field_wrapper,
-               stream_class);
-       if (ret) {
-               BT_LOGE("Failed to initialize event header field pool: ret=%d",
-                       ret);
-               goto error;
-       }
-
        ret = bt_object_pool_initialize(&stream_class->packet_context_field_pool,
                (bt_object_pool_new_object_func) bt_field_wrapper_new,
                (bt_object_pool_destroy_object_func) free_field_wrapper,
@@ -217,7 +204,7 @@ const char *bt_stream_class_get_name(const struct bt_stream_class *stream_class)
        return stream_class->name.value;
 }
 
-int bt_stream_class_set_name(
+enum bt_stream_class_status bt_stream_class_set_name(
                struct bt_stream_class *stream_class,
                const char *name)
 {
@@ -227,7 +214,7 @@ int bt_stream_class_set_name(
        g_string_assign(stream_class->name.str, name);
        stream_class->name.value = stream_class->name.str->str;
        BT_LIB_LOGV("Set stream class's name: %!+S", stream_class);
-       return 0;
+       return BT_STREAM_CLASS_STATUS_OK;
 }
 
 uint64_t bt_stream_class_get_id(const struct bt_stream_class *stream_class)
@@ -297,15 +284,21 @@ bt_stream_class_borrow_packet_context_field_class_const(
        return stream_class->packet_context_fc;
 }
 
-int bt_stream_class_set_packet_context_field_class(
+struct bt_field_class *
+bt_stream_class_borrow_packet_context_field_class(
+               struct bt_stream_class *stream_class)
+{
+       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+       return stream_class->packet_context_fc;
+}
+
+enum bt_stream_class_status bt_stream_class_set_packet_context_field_class(
                struct bt_stream_class *stream_class,
                struct bt_field_class *field_class)
 {
        int ret;
        struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
                .packet_context = field_class,
-               .event_header = NULL,
                .event_common_context = NULL,
                .event_specific_context = NULL,
                .event_payload = NULL,
@@ -318,10 +311,14 @@ int bt_stream_class_set_packet_context_field_class(
                BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Packet context field class is not a structure field class: %!+F",
                field_class);
-       resolve_ctx.packet_header =
-               bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc;
        ret = bt_resolve_field_paths(field_class, &resolve_ctx);
        if (ret) {
+               /*
+                * This is the only reason for which
+                * bt_resolve_field_paths() can fail: anything else
+                * would be because a precondition is not satisfied.
+                */
+               ret = BT_STREAM_CLASS_STATUS_NOMEM;
                goto end;
        }
 
@@ -337,71 +334,30 @@ end:
        return ret;
 }
 
-const struct bt_field_class *bt_stream_class_borrow_event_header_field_class_const(
+const struct bt_field_class *
+bt_stream_class_borrow_event_common_context_field_class_const(
                const struct bt_stream_class *stream_class)
 {
        BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       return stream_class->event_header_fc;
-}
-
-int bt_stream_class_set_event_header_field_class(
-               struct bt_stream_class *stream_class,
-               struct bt_field_class *field_class)
-{
-       int ret;
-       struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
-               .packet_context = NULL,
-               .event_header = field_class,
-               .event_common_context = NULL,
-               .event_specific_context = NULL,
-               .event_payload = NULL,
-       };
-
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
-       BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-       BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
-               BT_FIELD_CLASS_TYPE_STRUCTURE,
-               "Event header field class is not a structure field class: %!+F",
-               field_class);
-       resolve_ctx.packet_header =
-               bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc;
-       resolve_ctx.packet_context = stream_class->packet_context_fc;
-       ret = bt_resolve_field_paths(field_class, &resolve_ctx);
-       if (ret) {
-               goto end;
-       }
-
-       bt_field_class_make_part_of_trace_class(field_class);
-       bt_object_put_ref(stream_class->event_header_fc);
-       stream_class->event_header_fc = field_class;
-       bt_object_get_no_null_check(stream_class->event_header_fc);
-       bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set stream class's event header field class: %!+S",
-               stream_class);
-
-end:
-       return ret;
+       return stream_class->event_common_context_fc;
 }
 
-const struct bt_field_class *
-bt_stream_class_borrow_event_common_context_field_class_const(
-               const struct bt_stream_class *stream_class)
+struct bt_field_class *
+bt_stream_class_borrow_event_common_context_field_class(
+               struct bt_stream_class *stream_class)
 {
        BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
        return stream_class->event_common_context_fc;
 }
 
-int bt_stream_class_set_event_common_context_field_class(
+enum bt_stream_class_status
+bt_stream_class_set_event_common_context_field_class(
                struct bt_stream_class *stream_class,
                struct bt_field_class *field_class)
 {
        int ret;
        struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
                .packet_context = NULL,
-               .event_header = NULL,
                .event_common_context = field_class,
                .event_specific_context = NULL,
                .event_payload = NULL,
@@ -414,12 +370,15 @@ int bt_stream_class_set_event_common_context_field_class(
                BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Event common context field class is not a structure field class: %!+F",
                field_class);
-       resolve_ctx.packet_header =
-               bt_stream_class_borrow_trace_class_inline(stream_class)->packet_header_fc;
        resolve_ctx.packet_context = stream_class->packet_context_fc;
-       resolve_ctx.event_header = stream_class->event_header_fc;
        ret = bt_resolve_field_paths(field_class, &resolve_ctx);
        if (ret) {
+               /*
+                * This is the only reason for which
+                * bt_resolve_field_paths() can fail: anything else
+                * would be because a precondition is not satisfied.
+                */
+               ret = BT_STREAM_CLASS_STATUS_NOMEM;
                goto end;
        }
 
@@ -444,7 +403,7 @@ void _bt_stream_class_freeze(const struct bt_stream_class *stream_class)
        ((struct bt_stream_class *) stream_class)->frozen = true;
 }
 
-int bt_stream_class_set_default_clock_class(
+enum bt_stream_class_status bt_stream_class_set_default_clock_class(
                struct bt_stream_class *stream_class,
                struct bt_clock_class *clock_class)
 {
@@ -457,7 +416,7 @@ int bt_stream_class_set_default_clock_class(
        bt_clock_class_freeze(clock_class);
        BT_LIB_LOGV("Set stream class's default clock class: %!+S",
                stream_class);
-       return 0;
+       return BT_STREAM_CLASS_STATUS_OK;
 }
 
 struct bt_clock_class *bt_stream_class_borrow_default_clock_class(
@@ -510,97 +469,6 @@ void bt_stream_class_set_assigns_automatic_stream_id(
                "assignment property: %!+S", stream_class);
 }
 
-bt_bool bt_stream_class_packets_have_discarded_event_counter_snapshot(
-               const struct bt_stream_class *stream_class)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       return (bt_bool) stream_class->packets_have_discarded_event_counter_snapshot;
-}
-
-void bt_stream_class_set_packets_have_discarded_event_counter_snapshot(
-               struct bt_stream_class *stream_class,
-               bt_bool value)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-       stream_class->packets_have_discarded_event_counter_snapshot =
-               (bool) value;
-       BT_LIB_LOGV("Set stream class's "
-               "\"packets have discarded event counter snapshot\" property: "
-               "%!+S", stream_class);
-}
-
-bt_bool bt_stream_class_packets_have_packet_counter_snapshot(
-               const struct bt_stream_class *stream_class)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       return (bt_bool) stream_class->packets_have_packet_counter_snapshot;
-}
-
-void bt_stream_class_set_packets_have_packet_counter_snapshot(
-               struct bt_stream_class *stream_class,
-               bt_bool value)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-       stream_class->packets_have_packet_counter_snapshot =
-               (bool) value;
-       BT_LIB_LOGV("Set stream class's "
-               "\"packets have packet counter snapshot\" property: "
-               "%!+S", stream_class);
-}
-
-bt_bool bt_stream_class_packets_have_default_beginning_clock_snapshot(
-               const struct bt_stream_class *stream_class)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       return (bt_bool) stream_class->packets_have_default_beginning_cs;
-}
-
-void bt_stream_class_set_packets_have_default_beginning_clock_snapshot(
-               struct bt_stream_class *stream_class,
-               bt_bool value)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-       BT_ASSERT_PRE(!value || stream_class->default_clock_class,
-               "Stream class does not have a default clock class: %!+S",
-               stream_class);
-       stream_class->packets_have_default_beginning_cs = (bool) value;
-       BT_LIB_LOGV("Set stream class's "
-               "\"packets have default beginning clock snapshot\" property: "
-               "%!+S", stream_class);
-}
-
-bt_bool bt_stream_class_packets_have_default_end_clock_snapshot(
-               const struct bt_stream_class *stream_class)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       return (bt_bool) stream_class->packets_have_default_end_cs;
-}
-
-void bt_stream_class_set_packets_have_default_end_clock_snapshot(
-               struct bt_stream_class *stream_class,
-               bt_bool value)
-{
-       BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-       BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-       BT_ASSERT_PRE(!value || stream_class->default_clock_class,
-               "Stream class does not have a default clock class: %!+S",
-               stream_class);
-       stream_class->packets_have_default_end_cs = (bool) value;
-       BT_LIB_LOGV("Set stream class's "
-               "\"packets have default end clock snapshot\" property: "
-               "%!+S", stream_class);
-}
-
-bt_bool bt_stream_class_default_clock_is_always_known(
-               const struct bt_stream_class *stream_class)
-{
-       /* BT_CLOCK_SNAPSHOT_STATUS_UNKNOWN is not supported as of 2.0 */
-       return BT_TRUE;
-}
-
 void bt_stream_class_get_ref(const struct bt_stream_class *stream_class)
 {
        bt_object_get_ref(stream_class);
BabelTrace - Trace Format Babel Tower
This page took 0.027131 seconds and 4 git commands to generate.