X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=07b4c049fc28bbd0ca155f6ab239a1921197f965;hp=4d8fea746860c437cc1bb61e16c325439fda9b18;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=3dca22768a95bef664012559aa9ac977091de6ac

diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index 4d8fea74..07b4c049 100644
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -425,7 +425,7 @@ uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace,
 		goto end;
 	}
 
-	stream_instance_id_field = bt_field_structure_get_field_by_name(
+	stream_instance_id_field = bt_field_structure_borrow_field_by_name(
 		packet_header_field, "stream_instance_id");
 	if (!stream_instance_id_field) {
 		goto end;
@@ -439,7 +439,6 @@ uint64_t get_packet_header_stream_instance_id(struct ctf_fs_trace *ctf_fs_trace,
 	}
 
 end:
-	bt_put(stream_instance_id_field);
 	return stream_instance_id;
 }
 
@@ -454,22 +453,21 @@ uint64_t get_packet_context_timestamp_begin_ns(
 	uint64_t timestamp_begin_ns = -1ULL;
 	int64_t timestamp_begin_ns_signed;
 	struct bt_clock_class *timestamp_begin_clock_class = NULL;
-	struct bt_clock_value *clock_value = NULL;
 
 	if (!packet_context_field) {
 		goto end;
 	}
 
-	timestamp_begin_field = bt_field_structure_get_field_by_name(
+	timestamp_begin_field = bt_field_structure_borrow_field_by_name(
 		packet_context_field, "timestamp_begin");
 	if (!timestamp_begin_field) {
 		goto end;
 	}
 
-	timestamp_begin_ft = bt_field_get_type(timestamp_begin_field);
+	timestamp_begin_ft = bt_field_borrow_type(timestamp_begin_field);
 	BT_ASSERT(timestamp_begin_ft);
 	timestamp_begin_clock_class =
-		bt_field_type_integer_get_mapped_clock_class(timestamp_begin_ft);
+		bt_field_type_integer_borrow_mapped_clock_class(timestamp_begin_ft);
 	if (!timestamp_begin_clock_class) {
 		goto end;
 	}
@@ -480,14 +478,8 @@ uint64_t get_packet_context_timestamp_begin_ns(
 		goto end;
 	}
 
-	clock_value = bt_clock_value_create(timestamp_begin_clock_class,
-		timestamp_begin_raw_value);
-	if (!clock_value) {
-		goto end;
-	}
-
-	ret = bt_clock_value_get_value_ns_from_epoch(clock_value,
-		&timestamp_begin_ns_signed);
+	ret = bt_clock_class_cycles_to_ns(timestamp_begin_clock_class,
+		timestamp_begin_raw_value, &timestamp_begin_ns_signed);
 	if (ret) {
 		goto end;
 	}
@@ -495,10 +487,6 @@ uint64_t get_packet_context_timestamp_begin_ns(
 	timestamp_begin_ns = (uint64_t) timestamp_begin_ns_signed;
 
 end:
-	bt_put(timestamp_begin_field);
-	bt_put(timestamp_begin_ft);
-	bt_put(timestamp_begin_clock_class);
-	bt_put(clock_value);
 	return timestamp_begin_ns;
 }
 
@@ -681,7 +669,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 		goto error;
 	}
 
-	ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file,
+	ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file,
 		&packet_header_field, &packet_context_field);
 	if (ret) {
 		BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
@@ -693,7 +681,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 		packet_header_field);
 	begin_ns = get_packet_context_timestamp_begin_ns(ctf_fs_trace,
 		packet_context_field);
-	stream_class = ctf_utils_stream_class_from_packet_header(
+	stream_class = ctf_utils_borrow_stream_class_from_packet_header(
 		ctf_fs_trace->metadata->trace, packet_header_field);
 	if (!stream_class) {
 		goto error;
@@ -792,9 +780,6 @@ end:
 	}
 
 	ctf_fs_ds_index_destroy(index);
-	bt_put(packet_header_field);
-	bt_put(packet_context_field);
-	bt_put(stream_class);
 	return ret;
 }
 
@@ -953,13 +938,12 @@ int create_cc_prio_map(struct ctf_fs_trace *ctf_fs_trace)
 
 	for (i = 0; i < count; i++) {
 		struct bt_clock_class *clock_class =
-			bt_trace_get_clock_class_by_index(
+			bt_trace_borrow_clock_class_by_index(
 				ctf_fs_trace->metadata->trace, i);
 
 		BT_ASSERT(clock_class);
 		ret = bt_clock_class_priority_map_add_clock_class(
 			ctf_fs_trace->cc_prio_map, clock_class, 0);
-		BT_PUT(clock_class);
 
 		if (ret) {
 			goto end;
@@ -1330,15 +1314,14 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
 	 * private component should also exist.
 	 */
 	ctf_fs->priv_comp = priv_comp;
-	value = bt_value_map_get(params, "path");
+	value = bt_value_map_borrow(params, "path");
 	if (value && !bt_value_is_string(value)) {
 		goto error;
 	}
 
 	value_ret = bt_value_string_get(value, &path_param);
 	BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
-	BT_PUT(value);
-	value = bt_value_map_get(params, "clock-class-offset-s");
+	value = bt_value_map_borrow(params, "clock-class-offset-s");
 	if (value) {
 		if (!bt_value_is_integer(value)) {
 			BT_LOGE("clock-class-offset-s should be an integer");
@@ -1347,10 +1330,9 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
 		value_ret = bt_value_integer_get(value,
 			&ctf_fs->metadata_config.clock_class_offset_s);
 		BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
-		BT_PUT(value);
 	}
 
-	value = bt_value_map_get(params, "clock-class-offset-ns");
+	value = bt_value_map_borrow(params, "clock-class-offset-ns");
 	if (value) {
 		if (!bt_value_is_integer(value)) {
 			BT_LOGE("clock-class-offset-ns should be an integer");
@@ -1359,7 +1341,6 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
 		value_ret = bt_value_integer_get(value,
 			&ctf_fs->metadata_config.clock_class_offset_ns);
 		BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
-		BT_PUT(value);
 	}
 
 	ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy);
@@ -1386,7 +1367,6 @@ error:
 	BT_ASSERT(ret == BT_COMPONENT_STATUS_OK);
 
 end:
-	bt_put(value);
 	return ctf_fs;
 }