lib: rename "clock value" -> "clock snapshot"

[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 4a47853f8d5aa00491951864762b5c2a119650d8..9b3dd621293df3faba890837018759434fa41ef7 100644 (file)
--- a/lib/trace-ir/stream-class.c
+++ b/lib/trace-ir/stream-class.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -28,15 +27,14 @@
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/trace-ir/clock-class-internal.h>
 #include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/trace-ir/field-classes-internal.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field-class-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <babeltrace/trace-ir/stream-class-internal.h>
 #include <babeltrace/trace-ir/trace-const.h>
 #include <babeltrace/trace-ir/trace-internal.h>
 #include <babeltrace/trace-ir/utils-internal.h>
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
 #include <babeltrace/trace-ir/resolve-field-path-internal.h>
-#include <babeltrace/object.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/align-internal.h>
 #include <babeltrace/endian-internal.h>
@@ -70,11 +68,11 @@ void destroy_stream_class(struct bt_object *obj)
                stream_class->name.value = NULL;
        }
 
-       BT_LOGD_STR("Putting event header field classe.");
+       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 classe.");
+       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 classe.");
+       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);
@@ -318,7 +316,7 @@ int bt_stream_class_set_packet_context_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,
-               "Packet context field classe is not a structure field classe: %!+F",
+               "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;
@@ -332,7 +330,7 @@ int bt_stream_class_set_packet_context_field_class(
        stream_class->packet_context_fc = field_class;
        bt_object_get_no_null_check(stream_class->packet_context_fc);
        bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set stream class's packet context field classe: %!+S",
+       BT_LIB_LOGV("Set stream class's packet context field class: %!+S",
                stream_class);
 
 end:
@@ -365,7 +363,7 @@ int bt_stream_class_set_event_header_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 classe is not a structure field classe: %!+F",
+               "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;
@@ -380,7 +378,7 @@ int bt_stream_class_set_event_header_field_class(
        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 classe: %!+S",
+       BT_LIB_LOGV("Set stream class's event header field class: %!+S",
                stream_class);
 
 end:
@@ -414,7 +412,7 @@ int bt_stream_class_set_event_common_context_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 common context field classe is not a structure field classe: %!+F",
+               "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;
@@ -430,7 +428,7 @@ int bt_stream_class_set_event_common_context_field_class(
        stream_class->event_common_context_fc = field_class;
        bt_object_get_no_null_check(stream_class->event_common_context_fc);
        bt_field_class_freeze(field_class);
-       BT_LIB_LOGV("Set stream class's event common context field classe: %!+S",
+       BT_LIB_LOGV("Set stream class's event common context field class: %!+S",
                stream_class);
 
 end:
@@ -552,14 +550,14 @@ void bt_stream_class_set_packets_have_packet_counter_snapshot(
                "%!+S", stream_class);
 }
 
-bt_bool bt_stream_class_packets_have_default_beginning_clock_value(
+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_cv;
+       return (bt_bool) stream_class->packets_have_default_beginning_cs;
 }
 
-void bt_stream_class_set_packets_have_default_beginning_clock_value(
+void bt_stream_class_set_packets_have_default_beginning_clock_snapshot(
                struct bt_stream_class *stream_class,
                bt_bool value)
 {
@@ -568,20 +566,20 @@ void bt_stream_class_set_packets_have_default_beginning_clock_value(
        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_cv = (bool) value;
+       stream_class->packets_have_default_beginning_cs = (bool) value;
        BT_LIB_LOGV("Set stream class's "
-               "\"packets have default beginning clock value\" property: "
+               "\"packets have default beginning clock snapshot\" property: "
                "%!+S", stream_class);
 }
 
-bt_bool bt_stream_class_packets_have_default_end_clock_value(
+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_cv;
+       return (bt_bool) stream_class->packets_have_default_end_cs;
 }
 
-void bt_stream_class_set_packets_have_default_end_clock_value(
+void bt_stream_class_set_packets_have_default_end_clock_snapshot(
                struct bt_stream_class *stream_class,
                bt_bool value)
 {
@@ -590,15 +588,25 @@ void bt_stream_class_set_packets_have_default_end_clock_value(
        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_cv = (bool) value;
+       stream_class->packets_have_default_end_cs = (bool) value;
        BT_LIB_LOGV("Set stream class's "
-               "\"packets have default end clock value\" property: "
+               "\"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_VALUE_STATUS_UNKNOWN is not supported as of 2.0 */
+       /* 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);
+}
+
+void bt_stream_class_put_ref(const struct bt_stream_class *stream_class)
+{
+       bt_object_put_ref(stream_class);
+}