X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fclock-class.c;h=515cdb4fd872be0e02c2a7f3f4f64f31659735be;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=f21518e6c5061975516e2a27c8ab1ac50a067cd6;hpb=0f2d58c93fe05b0f40c1c9589aa59d4f9cad877b;p=babeltrace.git

diff --git a/lib/trace-ir/clock-class.c b/lib/trace-ir/clock-class.c
index f21518e6..515cdb4f 100644
--- a/lib/trace-ir/clock-class.c
+++ b/lib/trace-ir/clock-class.c
@@ -22,21 +22,21 @@
  */
 
 #define BT_LOG_TAG "CLOCK-CLASS"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/trace-ir/clock-class-const.h>
-#include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/clock-class-internal.h>
-#include <babeltrace/trace-ir/clock-snapshot-internal.h>
-#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/types.h>
-#include <babeltrace/compat/string-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/trace-ir/clock-class-const.h>
+#include <babeltrace2/trace-ir/clock-class.h>
+#include <babeltrace2/trace-ir/clock-class-internal.h>
+#include <babeltrace2/trace-ir/clock-snapshot-internal.h>
+#include <babeltrace2/trace-ir/utils-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/types.h>
+#include <babeltrace2/compat/string-internal.h>
 #include <inttypes.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/assert-internal.h>
 
 #define BT_ASSERT_PRE_CLOCK_CLASS_HOT(_cc) \
 	BT_ASSERT_PRE_HOT((_cc), "Clock class", ": %!+K", (_cc))
@@ -79,12 +79,12 @@ void set_base_offset(struct bt_clock_class *clock_class)
 		clock_class->frequency, &clock_class->base_offset.value_ns);
 }
 
-struct bt_clock_class *bt_clock_class_create(bt_trace_class *trace_class)
+struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp)
 {
 	int ret;
 	struct bt_clock_class *clock_class = NULL;
 
-	BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+	BT_ASSERT_PRE_NON_NULL(self_comp, "Self component");
 	BT_LOGD_STR("Creating default clock class object");
 
 	clock_class = g_new0(struct bt_clock_class, 1);
@@ -107,7 +107,7 @@ struct bt_clock_class *bt_clock_class_create(bt_trace_class *trace_class)
 	}
 
 	clock_class->frequency = UINT64_C(1000000000);
-	clock_class->is_absolute = BT_TRUE;
+	clock_class->origin_is_unix_epoch = BT_TRUE;
 	set_base_offset(clock_class);
 	ret = bt_object_pool_initialize(&clock_class->cs_pool,
 		(bt_object_pool_new_object_func) bt_clock_snapshot_new,
@@ -232,19 +232,19 @@ void bt_clock_class_set_offset(struct bt_clock_class *clock_class,
 	BT_LIB_LOGV("Set clock class's offset: %!+K", clock_class);
 }
 
-bt_bool bt_clock_class_is_absolute(const struct bt_clock_class *clock_class)
+bt_bool bt_clock_class_origin_is_unix_epoch(const struct bt_clock_class *clock_class)
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	return (bool) clock_class->is_absolute;
+	return (bool) clock_class->origin_is_unix_epoch;
 }
 
-void bt_clock_class_set_is_absolute(struct bt_clock_class *clock_class,
-		bt_bool is_absolute)
+void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class,
+		bt_bool origin_is_unix_epoch)
 {
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
 	BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
-	clock_class->is_absolute = (bool) is_absolute;
-	BT_LIB_LOGV("Set clock class's absolute property: %!+K",
+	clock_class->origin_is_unix_epoch = (bool) origin_is_unix_epoch;
+	BT_LIB_LOGV("Set clock class's origin is Unix epoch property: %!+K",
 		clock_class);
 }