X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fclock.c;h=bf2fbda5b2627b8cffb9584650ff1a81921b2afa;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hp=22a5d7475e30083b90dd9ae741f7718a99cbe4b4;hpb=de3dd40e6fcad56e227f5fc8a8290fbaa88b4e07;p=babeltrace.git

diff --git a/formats/ctf/ir/clock.c b/formats/ctf/ir/clock.c
index 22a5d747..bf2fbda5 100644
--- a/formats/ctf/ir/clock.c
+++ b/formats/ctf/ir/clock.c
@@ -28,14 +28,14 @@
 
 #include <babeltrace/ctf-ir/clock-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
-#include <babeltrace/ctf-ir/common-internal.h>
-#include <babeltrace/ctf-ir/ref.h>
+#include <babeltrace/ref.h>
 #include <babeltrace/ctf-writer/writer-internal.h>
+#include <babeltrace/object-internal.h>
 #include <babeltrace/compiler.h>
 #include <inttypes.h>
 
 static
-void bt_ctf_clock_destroy(struct bt_ref *ref);
+void bt_ctf_clock_destroy(struct bt_object *obj);
 
 BT_HIDDEN
 struct bt_ctf_clock *_bt_ctf_clock_create(void)
@@ -49,7 +49,7 @@ struct bt_ctf_clock *_bt_ctf_clock_create(void)
 
 	clock->precision = 1;
 	clock->frequency = 1000000000;
-	bt_ctf_base_init(clock, bt_ctf_clock_destroy);
+	bt_object_init(clock, bt_ctf_clock_destroy);
 end:
 	return clock;
 }
@@ -91,20 +91,19 @@ struct bt_ctf_clock *bt_ctf_clock_create(const char *name)
 
 	ret = bt_ctf_clock_set_name(clock, name);
 	if (ret) {
-		goto error_destroy;
+		goto error;
 	}
 
-	ret = babeltrace_uuid_generate(clock->uuid);
+	ret = bt_uuid_generate(clock->uuid);
 	if (ret) {
-		goto error_destroy;
+		goto error;
 	}
 
 	clock->uuid_set = 1;
 	return clock;
-error_destroy:
-	bt_ctf_clock_destroy(&clock->base.ref_count);
 error:
-	return NULL;
+	BT_PUT(clock);
+	return clock;
 }
 
 const char *bt_ctf_clock_get_name(struct bt_ctf_clock *clock)
@@ -207,20 +206,21 @@ end:
 	return ret;
 }
 
-uint64_t bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock)
+int bt_ctf_clock_get_offset_s(struct bt_ctf_clock *clock, int64_t *offset_s)
 {
-	uint64_t ret = -1ULL;
+	int ret = 0;
 
-	if (!clock) {
+	if (!clock || !offset_s) {
+		ret = -1;
 		goto end;
 	}
 
-	ret = clock->offset_s;
+	*offset_s = clock->offset_s;
 end:
 	return ret;
 }
 
-int bt_ctf_clock_set_offset_s(struct bt_ctf_clock *clock, uint64_t offset_s)
+int bt_ctf_clock_set_offset_s(struct bt_ctf_clock *clock, int64_t offset_s)
 {
 	int ret = 0;
 
@@ -234,20 +234,21 @@ end:
 	return ret;
 }
 
-uint64_t bt_ctf_clock_get_offset(struct bt_ctf_clock *clock)
+int bt_ctf_clock_get_offset(struct bt_ctf_clock *clock, int64_t *offset)
 {
-	uint64_t ret = -1ULL;
+	int ret = 0;
 
-	if (!clock) {
+	if (!clock || !offset) {
+		ret = -1;
 		goto end;
 	}
 
-	ret = clock->offset;
+	*offset = clock->offset;
 end:
 	return ret;
 }
 
-int bt_ctf_clock_set_offset(struct bt_ctf_clock *clock, uint64_t offset)
+int bt_ctf_clock_set_offset(struct bt_ctf_clock *clock, int64_t offset)
 {
 	int ret = 0;
 
@@ -317,20 +318,21 @@ end:
 	return ret;
 }
 
-uint64_t bt_ctf_clock_get_time(struct bt_ctf_clock *clock)
+int bt_ctf_clock_get_time(struct bt_ctf_clock *clock, int64_t *time)
 {
-	uint64_t ret = -1ULL;
+	int ret = 0;
 
-	if (!clock) {
+	if (!clock || !time) {
+		ret = -1;
 		goto end;
 	}
 
-	ret = clock->time;
+	*time = clock->time;
 end:
 	return ret;
 }
 
-int bt_ctf_clock_set_time(struct bt_ctf_clock *clock, uint64_t time)
+int bt_ctf_clock_set_time(struct bt_ctf_clock *clock, int64_t time)
 {
 	int ret = 0;
 
@@ -347,12 +349,12 @@ end:
 
 void bt_ctf_clock_get(struct bt_ctf_clock *clock)
 {
-	bt_ctf_get(clock);
+	bt_get(clock);
 }
 
 void bt_ctf_clock_put(struct bt_ctf_clock *clock)
 {
-	bt_ctf_put(clock);
+	bt_put(clock);
 }
 
 BT_HIDDEN
@@ -404,17 +406,11 @@ void bt_ctf_clock_serialize(struct bt_ctf_clock *clock,
 }
 
 static
-void bt_ctf_clock_destroy(struct bt_ref *ref)
+void bt_ctf_clock_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_clock *clock;
-	struct bt_ctf_base *base;
-
-	if (!ref) {
-		return;
-	}
 
-	base = container_of(ref, struct bt_ctf_base, ref_count);
-	clock = container_of(base, struct bt_ctf_clock, base);
+	clock = container_of(obj, struct bt_ctf_clock, base);
 	if (clock->name) {
 		g_string_free(clock->name, TRUE);
 	}