X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.c;h=965a9ee8782ea6f66d4eea64e4fed19f04b3313d;hb=1a29b831f3389a6f28a571fca01eee5c750cd86b;hp=fb5fa1c545f92accd8c1e0c422bacc178107043b;hpb=6162e6b7a6d907974d954419c2375f654f39eb72;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c index fb5fa1c5..965a9ee8 100644 --- a/src/plugins/ctf/fs-src/fs.c +++ b/src/plugins/ctf/fs-src/fs.c @@ -496,9 +496,7 @@ error: ret = -1; end: - if (port_name) { - g_free(port_name); - } + g_free(port_name); port_data_destroy(port_data); return ret; @@ -901,7 +899,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) while ((basename = g_dir_read_name(dir))) { struct ctf_fs_file *file; - if (!strcmp(basename, CTF_FS_METADATA_FILENAME)) { + if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) { /* Ignore the metadata stream. */ BT_COMP_LOGI("Ignoring metadata file `%s" G_DIR_SEPARATOR_S "%s`", ctf_fs_trace->path->str, basename); @@ -1685,7 +1683,7 @@ int merge_traces_with_same_uuid(struct ctf_fs_component *ctf_fs) /* Clear any NULL slot (traces that got merged in another one) in the array. */ for (i = 0; i < traces->len;) { - if (g_ptr_array_index(traces, i) == NULL) { + if (!g_ptr_array_index(traces, i)) { g_ptr_array_remove_index_fast(traces, i); } else { i++; @@ -1707,10 +1705,10 @@ int ctf_fs_component_create_ctf_fs_traces(bt_self_component_source *self_comp, for (i = 0; i < bt_value_array_get_size(paths_value); i++) { const bt_value *path_value = bt_value_array_borrow_element_by_index_const(paths_value, i); - const char *path = bt_value_string_get(path_value); + const char *input = bt_value_string_get(path_value); ret = ctf_fs_component_create_ctf_fs_traces_one_root(ctf_fs, - path); + input); if (ret) { goto end; } @@ -1828,8 +1826,8 @@ end: */ static -bool validate_paths_parameter(struct ctf_fs_component *ctf_fs, - const bt_value *paths) +bool validate_inputs_parameter(struct ctf_fs_component *ctf_fs, + const bt_value *inputs) { bool ret; bt_value_type type; @@ -1837,25 +1835,25 @@ bool validate_paths_parameter(struct ctf_fs_component *ctf_fs, bt_logging_level log_level = ctf_fs->log_level; bt_self_component *self_comp = ctf_fs->self_comp; - if (!paths) { - BT_COMP_LOGE("missing \"paths\" parameter"); + if (!inputs) { + BT_COMP_LOGE("missing \"inputs\" parameter"); goto error; } - type = bt_value_get_type(paths); + type = bt_value_get_type(inputs); if (type != BT_VALUE_TYPE_ARRAY) { - BT_COMP_LOGE("`paths` parameter: expecting array value: type=%s", + BT_COMP_LOGE("`inputs` parameter: expecting array value: type=%s", bt_common_value_type_string(type)); goto error; } - for (i = 0; i < bt_value_array_get_size(paths); i++) { + for (i = 0; i < bt_value_array_get_size(inputs); i++) { const bt_value *elem; - elem = bt_value_array_borrow_element_by_index_const(paths, i); + elem = bt_value_array_borrow_element_by_index_const(inputs, i); type = bt_value_get_type(elem); if (type != BT_VALUE_TYPE_STRING) { - BT_COMP_LOGE("`paths` parameter: expecting string value: index=%" PRIu64 ", type=%s", + BT_COMP_LOGE("`inputs` parameter: expecting string value: index=%" PRIu64 ", type=%s", i, bt_common_value_type_string(type)); goto error; } @@ -1872,15 +1870,15 @@ end: } bool read_src_fs_parameters(const bt_value *params, - const bt_value **paths, struct ctf_fs_component *ctf_fs) { + const bt_value **inputs, struct ctf_fs_component *ctf_fs) { bool ret; const bt_value *value; bt_logging_level log_level = ctf_fs->log_level; bt_self_component *self_comp = ctf_fs->self_comp; - /* paths parameter */ - *paths = bt_value_map_borrow_entry_value_const(params, "paths"); - if (!validate_paths_parameter(ctf_fs, *paths)) { + /* inputs parameter */ + *inputs = bt_value_map_borrow_entry_value_const(params, "inputs"); + if (!validate_inputs_parameter(ctf_fs, *inputs)) { goto error; } @@ -1893,7 +1891,7 @@ bool read_src_fs_parameters(const bt_value *params, goto error; } ctf_fs->metadata_config.clock_class_offset_s = - bt_value_signed_integer_get(value); + bt_value_integer_signed_get(value); } /* clock-class-offset-ns parameter */ @@ -1905,7 +1903,7 @@ bool read_src_fs_parameters(const bt_value *params, goto error; } ctf_fs->metadata_config.clock_class_offset_ns = - bt_value_signed_integer_get(value); + bt_value_integer_signed_get(value); } @@ -1926,7 +1924,7 @@ struct ctf_fs_component *ctf_fs_create( { struct ctf_fs_component *ctf_fs = NULL; guint i; - const bt_value *paths_value; + const bt_value *inputs_value; bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src); @@ -1936,7 +1934,7 @@ struct ctf_fs_component *ctf_fs_create( goto error; } - if (!read_src_fs_parameters(params, &paths_value, ctf_fs)) { + if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) { goto error; } @@ -1944,7 +1942,7 @@ struct ctf_fs_component *ctf_fs_create( ctf_fs->self_comp = self_comp; ctf_fs->self_comp_src = self_comp_src; - if (ctf_fs_component_create_ctf_fs_traces(self_comp_src, ctf_fs, paths_value)) { + if (ctf_fs_component_create_ctf_fs_traces(self_comp_src, ctf_fs, inputs_value)) { goto error; } @@ -1999,15 +1997,17 @@ bt_component_class_query_method_status ctf_fs_query( bt_component_class_query_method_status status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK; - if (!strcmp(object, "metadata-info")) { + if (strcmp(object, "metadata-info") == 0) { status = metadata_info_query(comp_class, params, log_level, result); - } else if (!strcmp(object, "trace-info")) { + } else if (strcmp(object, "babeltrace.trace-info") == 0) { status = trace_info_query(comp_class, params, log_level, result); + } else if (!strcmp(object, "babeltrace.support-info")) { + status = support_info_query(comp_class, params, log_level, result); } else { BT_LOGE("Unknown query object `%s`", object); - status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_INVALID_OBJECT; + status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_UNKNOWN_OBJECT; goto end; } end: