X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=a36179fb574fdc77bc7a3f57b605cb09d621544a;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=082d8fa48c978647a50a7da06a1f196a06847fea;hpb=707b7d3548cc010d582f7faed43630aed26508fd;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index 082d8fa4..a36179fb 100644
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -518,7 +518,7 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group)
 static
 struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
 		struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_private_stream_class *stream_class,
+		struct bt_stream_class *stream_class,
 		uint64_t stream_instance_id)
 {
 	struct ctf_fs_ds_file_group *ds_file_group;
@@ -536,7 +536,8 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
 
 	ds_file_group->stream_id = stream_instance_id;
 	BT_ASSERT(stream_class);
-	ds_file_group->stream_class = bt_object_get_ref(stream_class);
+	ds_file_group->stream_class = stream_class;
+	bt_object_get_ref(ds_file_group->stream_class);
 	ds_file_group->ctf_fs_trace = ctf_fs_trace;
 	goto end;
 
@@ -611,7 +612,7 @@ static
 int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 		const char *path)
 {
-	struct bt_private_stream_class *stream_class = NULL;
+	struct bt_stream_class *stream_class = NULL;
 	int64_t stream_instance_id = -1;
 	int64_t begin_ns = -1;
 	struct ctf_fs_ds_file_group *ds_file_group = NULL;
@@ -657,8 +658,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 	if (props.snapshots.beginning_clock != UINT64_C(-1)) {
 		BT_ASSERT(sc->default_clock_class);
 		ret = bt_clock_class_cycles_to_ns_from_origin(
-			bt_private_clock_class_as_clock_class(
-				sc->default_clock_class),
+			sc->default_clock_class,
 			props.snapshots.beginning_clock, &begin_ns);
 		if (ret) {
 			BT_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
@@ -859,13 +859,13 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
 
 		if (ds_file_group->stream_id == UINT64_C(-1)) {
 			/* No stream ID: use 0 */
-			ds_file_group->stream = bt_private_stream_create_with_id(
+			ds_file_group->stream = bt_stream_create_with_id(
 				ds_file_group->stream_class,
 				ctf_fs_trace->next_stream_id);
 			ctf_fs_trace->next_stream_id++;
 		} else {
 			/* Specific stream ID */
-			ds_file_group->stream = bt_private_stream_create_with_id(
+			ds_file_group->stream = bt_stream_create_with_id(
 				ds_file_group->stream_class,
 				(uint64_t) ds_file_group->stream_id);
 		}
@@ -878,7 +878,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
 			goto error;
 		}
 
-		ret = bt_private_stream_set_name(ds_file_group->stream,
+		ret = bt_stream_set_name(ds_file_group->stream,
 			name->str);
 		if (ret) {
 			BT_LOGE("Cannot set stream's name: "
@@ -958,7 +958,7 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
 	 * trace needs. There won't be any more. Therefore it is safe to
 	 * make this trace static.
 	 */
-	(void) bt_private_trace_make_static(ctf_fs_trace->metadata->trace);
+	(void) bt_trace_make_static(ctf_fs_trace->metadata->trace);
 
 	goto end;
 
@@ -1245,10 +1245,10 @@ end:
 static
 struct ctf_fs_component *ctf_fs_create(
 		struct bt_self_component_source *self_comp,
-		struct bt_value *params)
+		const struct bt_value *params)
 {
 	struct ctf_fs_component *ctf_fs;
-	struct bt_value *value = NULL;
+	const struct bt_value *value = NULL;
 	const char *path_param;
 
 	ctf_fs = g_new0(struct ctf_fs_component, 1);
@@ -1266,13 +1266,14 @@ struct ctf_fs_component *ctf_fs_create(
 	 * private component should also exist.
 	 */
 	ctf_fs->self_comp = self_comp;
-	value = bt_value_map_borrow_entry_value(params, "path");
+	value = bt_value_map_borrow_entry_value_const(params, "path");
 	if (value && !bt_value_is_string(value)) {
 		goto error;
 	}
 
 	path_param = bt_value_string_get(value);
-	value = bt_value_map_borrow_entry_value(params, "clock-class-offset-s");
+	value = bt_value_map_borrow_entry_value_const(params,
+		"clock-class-offset-s");
 	if (value) {
 		if (!bt_value_is_integer(value)) {
 			BT_LOGE("clock-class-offset-s should be an integer");
@@ -1281,7 +1282,8 @@ struct ctf_fs_component *ctf_fs_create(
 		ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_get(value);
 	}
 
-	value = bt_value_map_borrow_entry_value(params, "clock-class-offset-ns");
+	value = bt_value_map_borrow_entry_value_const(params,
+		"clock-class-offset-ns");
 	if (value) {
 		if (!bt_value_is_integer(value)) {
 			BT_LOGE("clock-class-offset-ns should be an integer");
@@ -1321,7 +1323,7 @@ end:
 BT_HIDDEN
 enum bt_self_component_status ctf_fs_init(
 		struct bt_self_component_source *self_comp,
-		struct bt_value *params, UNUSED_VAR void *init_method_data)
+		const struct bt_value *params, UNUSED_VAR void *init_method_data)
 {
 	struct ctf_fs_component *ctf_fs;
 	enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
@@ -1338,8 +1340,8 @@ BT_HIDDEN
 enum bt_query_status ctf_fs_query(
 		struct bt_self_component_class_source *comp_class,
 		struct bt_query_executor *query_exec,
-		const char *object, struct bt_value *params,
-		struct bt_value **result)
+		const char *object, const struct bt_value *params,
+		const struct bt_value **result)
 {
 	enum bt_query_status status = BT_QUERY_STATUS_OK;