X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta.h;h=481a3b6c6206c38121b6c843baef0746454f0894;hb=398454ed067b95215c7affbe265fd36edab931ee;hp=60b9e0c62f40181968861b425a1950db6f53a8e2;hpb=864cad701843d041ae0c9113fc2c20f9b3e1835d;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/ctf-meta.h b/plugins/ctf/common/metadata/ctf-meta.h
index 60b9e0c6..481a3b6c 100644
--- a/plugins/ctf/common/metadata/ctf-meta.h
+++ b/plugins/ctf/common/metadata/ctf-meta.h
@@ -66,7 +66,7 @@ struct ctf_field_class {
 	bool in_ir;
 
 	/* Weak, set during translation. NULL if `in_ir` is false below. */
-	struct bt_field_class *ir_fc;
+	struct bt_private_field_class *ir_fc;
 };
 
 struct ctf_field_class_bit_array {
@@ -84,7 +84,7 @@ struct ctf_field_class_int {
 	int64_t storing_index;
 
 	/* Owned by this */
-	struct bt_clock_class *mapped_clock_class;
+	struct bt_private_clock_class *mapped_clock_class;
 };
 
 struct ctf_range {
@@ -198,7 +198,7 @@ struct ctf_event_class {
 	struct ctf_field_class *payload_fc;
 
 	/* Weak, set during translation */
-	struct bt_event_class *ir_ec;
+	struct bt_private_event_class *ir_ec;
 };
 
 struct ctf_stream_class {
@@ -224,10 +224,10 @@ struct ctf_stream_class {
 	GHashTable *event_classes_by_id;
 
 	/* Owned by this */
-	struct bt_clock_class *default_clock_class;
+	struct bt_private_clock_class *default_clock_class;
 
 	/* Weak, set during translation */
-	struct bt_stream_class *ir_sc;
+	struct bt_private_stream_class *ir_sc;
 };
 
 enum ctf_trace_class_env_entry_type {
@@ -258,7 +258,7 @@ struct ctf_trace_class {
 
 	uint64_t stored_value_count;
 
-	/* Array of `struct bt_clock_class *` (owned by this) */
+	/* Array of `struct bt_private_clock_class *` (owned by this) */
 	GPtrArray *clock_classes;
 
 	/* Array of `struct ctf_stream_class *` */
@@ -270,7 +270,7 @@ struct ctf_trace_class {
 	bool is_translated;
 
 	/* Weak, set during translation */
-	struct bt_trace *ir_tc;
+	struct bt_private_trace *ir_tc;
 };
 
 static inline
@@ -472,7 +472,7 @@ static inline
 void _ctf_field_class_int_destroy(struct ctf_field_class_int *fc)
 {
 	BT_ASSERT(fc);
-	bt_put(fc->mapped_clock_class);
+	bt_object_put_ref(fc->mapped_clock_class);
 	g_free(fc);
 }
 
@@ -480,7 +480,7 @@ static inline
 void _ctf_field_class_enum_destroy(struct ctf_field_class_enum *fc)
 {
 	BT_ASSERT(fc);
-	bt_put(fc->base.mapped_clock_class);
+	bt_object_put_ref(fc->base.mapped_clock_class);
 
 	if (fc->mappings) {
 		uint64_t i;
@@ -1108,7 +1108,8 @@ void ctf_field_class_int_copy_content(
 	dst_fc->is_signed = src_fc->is_signed;
 	dst_fc->disp_base = src_fc->disp_base;
 	dst_fc->encoding = src_fc->encoding;
-	dst_fc->mapped_clock_class = bt_get(src_fc->mapped_clock_class);
+	dst_fc->mapped_clock_class = src_fc->mapped_clock_class;
+	bt_object_get_ref(dst_fc->mapped_clock_class);
 	dst_fc->storing_index = src_fc->storing_index;
 }
 
@@ -1397,7 +1398,7 @@ void ctf_stream_class_destroy(struct ctf_stream_class *sc)
 	ctf_field_class_destroy(sc->packet_context_fc);
 	ctf_field_class_destroy(sc->event_header_fc);
 	ctf_field_class_destroy(sc->event_common_context_fc);
-	bt_put(sc->default_clock_class);
+	bt_object_put_ref(sc->default_clock_class);
 	g_free(sc);
 }
 
@@ -1453,7 +1454,7 @@ struct ctf_trace_class *ctf_trace_class_create(void)
 	tc->default_byte_order = -1;
 	BT_ASSERT(tc->name);
 	tc->clock_classes = g_ptr_array_new_with_free_func(
-		(GDestroyNotify) bt_put);
+		(GDestroyNotify) bt_object_put_ref);
 	BT_ASSERT(tc->clock_classes);
 	tc->stream_classes = g_ptr_array_new_with_free_func(
 		(GDestroyNotify) ctf_stream_class_destroy);
@@ -1548,18 +1549,19 @@ end:
 }
 
 static inline
-struct bt_clock_class *ctf_trace_class_borrow_clock_class_by_name(
+struct bt_private_clock_class *ctf_trace_class_borrow_clock_class_by_name(
 		struct ctf_trace_class *tc, const char *name)
 {
 	uint64_t i;
-	struct bt_clock_class *ret_cc = NULL;
+	struct bt_private_clock_class *ret_cc = NULL;
 
 	BT_ASSERT(tc);
 	BT_ASSERT(name);
 
 	for (i = 0; i < tc->clock_classes->len; i++) {
-		struct bt_clock_class *cc = tc->clock_classes->pdata[i];
-		const char *cc_name = bt_clock_class_get_name(cc);
+		struct bt_private_clock_class *cc = tc->clock_classes->pdata[i];
+		const char *cc_name = bt_clock_class_get_name(
+			bt_private_clock_class_as_clock_class(cc));
 
 		BT_ASSERT(cc_name);
 		if (strcmp(cc_name, name) == 0) {