};
BT_HIDDEN
-enum bt_query_status metadata_info_query(
- struct bt_self_component_class_source *comp_class,
- const struct bt_value *params,
- const struct bt_value **user_result)
+bt_query_status metadata_info_query(
+ bt_self_component_class_source *comp_class,
+ const bt_value *params,
+ const bt_value **user_result)
{
- enum bt_query_status status = BT_QUERY_STATUS_OK;
- struct bt_value *result = NULL;
- const struct bt_value *path_value = NULL;
+ bt_query_status status = BT_QUERY_STATUS_OK;
+ bt_value *result = NULL;
+ const bt_value *path_value = NULL;
char *metadata_text = NULL;
FILE *metadata_fp = NULL;
GString *g_metadata_text = NULL;
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(result);
+ BT_VALUE_PUT_REF_AND_RESET(result);
result = NULL;
if (status >= 0) {
}
static
-int add_range(struct bt_value *info, struct range *range,
+int add_range(bt_value *info, struct range *range,
const char *range_name)
{
int ret = 0;
- enum bt_value_status status;
- struct bt_value *range_map = NULL;
+ bt_value_status status;
+ bt_value *range_map = NULL;
if (!range->set) {
/* Not an error. */
}
end:
- bt_object_put_ref(range_map);
+ bt_value_put_ref(range_map);
return ret;
}
static
-int add_stream_ids(struct bt_value *info, const struct bt_stream *stream)
+int add_stream_ids(bt_value *info, struct ctf_fs_ds_file_group *ds_file_group)
{
int ret = 0;
- int64_t stream_class_id, stream_instance_id;
- enum bt_value_status status;
- const struct bt_stream_class *stream_class = NULL;
+ bt_value_status status;
- stream_instance_id = bt_stream_get_id(stream);
- if (stream_instance_id != -1) {
+ if (ds_file_group->stream_id != UINT64_C(-1)) {
status = bt_value_map_insert_integer_entry(info, "id",
- stream_instance_id);
+ (int64_t) ds_file_group->stream_id);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
}
- stream_class = bt_stream_borrow_class_const(stream);
- if (!stream_class) {
- ret = -1;
- goto end;
- }
-
- stream_class_id = bt_stream_class_get_id(stream_class);
- if (stream_class_id == -1) {
- ret = -1;
- goto end;
- }
-
- status = bt_value_map_insert_integer_entry(info, "class-id", stream_class_id);
+ status = bt_value_map_insert_integer_entry(info, "class-id",
+ (int64_t) ds_file_group->sc->id);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
static
int populate_stream_info(struct ctf_fs_ds_file_group *group,
- struct bt_value *group_info, struct range *stream_range)
+ bt_value *group_info, struct range *stream_range)
{
int ret = 0;
size_t file_idx;
- enum bt_value_status status;
- struct bt_value *file_paths;
+ bt_value_status status;
+ bt_value *file_paths;
stream_range->begin_ns = INT64_MAX;
stream_range->end_ns = 0;
for (file_idx = 0; file_idx < group->ds_file_infos->len; file_idx++) {
int64_t file_begin_epoch, file_end_epoch;
struct ctf_fs_ds_file_info *info =
- g_ptr_array_index(group->ds_file_infos,
- file_idx);
+ g_ptr_array_index(group->ds_file_infos,
+ file_idx);
if (!info->index || info->index->entries->len == 0) {
BT_LOGW("Cannot determine range of unindexed stream file \'%s\'",
goto end;
}
- ret = add_stream_ids(group_info, group->stream);
+ ret = add_stream_ids(group_info, group);
if (ret) {
goto end;
}
end:
- bt_object_put_ref(file_paths);
+ bt_value_put_ref(file_paths);
return ret;
}
static
int populate_trace_info(const char *trace_path, const char *trace_name,
- struct bt_value *trace_info)
+ bt_value *trace_info)
{
int ret = 0;
size_t group_idx;
struct ctf_fs_trace *trace = NULL;
- enum bt_value_status status;
- struct bt_value *file_groups;
+ bt_value_status status;
+ bt_value *file_groups;
struct range trace_range = {
.begin_ns = INT64_MAX,
.end_ns = 0,
goto end;
}
- trace = ctf_fs_trace_create(trace_path, trace_name, NULL);
+ trace = ctf_fs_trace_create(NULL, trace_path, trace_name, NULL);
if (!trace) {
BT_LOGE("Failed to create fs trace at \'%s\'", trace_path);
ret = -1;
/* Find range of all stream groups, and of the trace. */
for (group_idx = 0; group_idx < trace->ds_file_groups->len;
group_idx++) {
- struct bt_value *group_info;
+ bt_value *group_info;
struct range group_range = { .set = false };
struct ctf_fs_ds_file_group *group = g_ptr_array_index(
trace->ds_file_groups, group_idx);
ret = populate_stream_info(group, group_info, &group_range);
if (ret) {
- bt_object_put_ref(group_info);
+ bt_value_put_ref(group_info);
goto end;
}
status = bt_value_array_append_element(
file_groups,
group_info);
- bt_object_put_ref(group_info);
+ bt_value_put_ref(group_info);
if (status != BT_VALUE_STATUS_OK) {
goto end;
}
status = bt_value_map_insert_entry(trace_info, "streams",
file_groups);
- BT_OBJECT_PUT_REF_AND_RESET(file_groups);
+ BT_VALUE_PUT_REF_AND_RESET(file_groups);
if (status != BT_VALUE_STATUS_OK) {
ret = -1;
goto end;
}
end:
- bt_object_put_ref(file_groups);
+ bt_value_put_ref(file_groups);
ctf_fs_trace_destroy(trace);
return ret;
}
BT_HIDDEN
-enum bt_query_status trace_info_query(
- struct bt_self_component_class_source *comp_class,
- const struct bt_value *params,
- const struct bt_value **user_result)
+bt_query_status trace_info_query(
+ bt_self_component_class_source *comp_class,
+ const bt_value *params,
+ const bt_value **user_result)
{
- enum bt_query_status status = BT_QUERY_STATUS_OK;
- struct bt_value *result = NULL;
- const struct bt_value *path_value = NULL;
+ bt_query_status status = BT_QUERY_STATUS_OK;
+ bt_value *result = NULL;
+ const bt_value *path_value = NULL;
int ret = 0;
const char *path = NULL;
GList *trace_paths = NULL;
tn_node = g_list_next(tn_node)) {
GString *trace_path = tp_node->data;
GString *trace_name = tn_node->data;
- enum bt_value_status status;
- struct bt_value *trace_info;
+ bt_value_status status;
+ bt_value *trace_info;
trace_info = bt_value_map_create();
if (!trace_info) {
ret = populate_trace_info(trace_path->str, trace_name->str,
trace_info);
if (ret) {
- bt_object_put_ref(trace_info);
+ bt_value_put_ref(trace_info);
goto error;
}
status = bt_value_array_append_element(result, trace_info);
- bt_object_put_ref(trace_info);
+ bt_value_put_ref(trace_info);
if (status != BT_VALUE_STATUS_OK) {
goto error;
}
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(result);
+ BT_VALUE_PUT_REF_AND_RESET(result);
result = NULL;
if (status >= 0) {