#define BT_COMP_LOG_SELF_COMP self_comp
#define BT_LOG_OUTPUT_LEVEL log_level
#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
#include "common/common.h"
#include <babeltrace2/babeltrace.h>
-#include "compat/uuid.h"
+#include "common/uuid.h"
#include <glib.h>
#include "common/assert.h"
#include <inttypes.h>
#include "data-stream-file.h"
#include "file.h"
#include "../common/metadata/decoder.h"
+#include "../common/metadata/ctf-meta-configure-ir-trace.h"
#include "../common/msg-iter/msg-iter.h"
#include "query.h"
/* For the trace, use the uuid if present, else the path. */
if (ds_file_group->ctf_fs_trace->metadata->tc->is_uuid_set) {
- char uuid_str[BABELTRACE_UUID_STR_LEN];
+ char uuid_str[BT_UUID_STR_LEN + 1];
- bt_uuid_unparse(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
+ bt_uuid_to_str(ds_file_group->ctf_fs_trace->metadata->tc->uuid, uuid_str);
g_string_assign(name, uuid_str);
} else {
g_string_assign(name, ds_file_group->ctf_fs_trace->path->str);
ret = -1;
end:
- if (port_name) {
- g_free(port_name);
- }
+ g_free(port_name);
port_data_destroy(port_data);
return ret;
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);
bt_logging_level log_level, bt_self_component *self_comp)
{
int ret = 0;
- const bt_trace_class *tc = bt_trace_borrow_class_const(trace);
const bt_value *val;
GString *name;
* Check if we have a trace environment string value named `hostname`.
* If so, use it as the trace name's prefix.
*/
- val = bt_trace_class_borrow_environment_entry_value_by_name_const(
- tc, "hostname");
+ val = bt_trace_borrow_environment_entry_value_by_name_const(
+ trace, "hostname");
if (val && bt_value_is_string(val)) {
g_string_append(name, bt_value_string_get(val));
}
if (ctf_fs_trace->trace) {
+ ret = ctf_trace_class_configure_ir_trace(
+ ctf_fs_trace->metadata->tc, ctf_fs_trace->trace);
+ if (ret) {
+ goto error;
+ }
+
ret = set_trace_name(ctf_fs_trace->trace, name, log_level,
self_comp);
if (ret) {
struct ctf_fs_trace *winner;
guint i;
int ret = 0;
- char uuid_str[BABELTRACE_UUID_STR_LEN];
+ char uuid_str[BT_UUID_STR_LEN + 1];
BT_ASSERT(num_traces >= 2);
}
/* Use the string representation of the UUID as the trace name. */
- bt_uuid_unparse(winner->metadata->tc->uuid, uuid_str);
+ bt_uuid_to_str(winner->metadata->tc->uuid, uuid_str);
g_string_printf(winner->name, "%s", uuid_str);
end:
/* 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++;
int ret = 0;
uint64_t i;
- for (i = 0; i < bt_value_array_get_size(paths_value); i++) {
+ for (i = 0; i < bt_value_array_get_length(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;
}
*/
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;
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_length(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;
}
}
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;
}
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 */
goto error;
}
ctf_fs->metadata_config.clock_class_offset_ns =
- bt_value_signed_integer_get(value);
+ bt_value_integer_signed_get(value);
}
{
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);
goto error;
}
- if (!read_src_fs_parameters(params, &paths_value, ctf_fs)) {
+ if (!read_src_fs_parameters(params, &inputs_value, ctf_fs)) {
goto error;
}
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;
}
BT_HIDDEN
bt_component_class_query_method_status ctf_fs_query(
bt_self_component_class_source *comp_class,
- const bt_query_executor *query_exec,
+ bt_private_query_executor *priv_query_exec,
const char *object, const bt_value *params,
- bt_logging_level log_level,
+ __attribute__((unused)) void *method_data,
const bt_value **result)
{
bt_component_class_query_method_status status =
BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
+ bt_logging_level log_level = bt_query_executor_get_logging_level(
+ bt_private_query_executor_as_query_executor_const(
+ priv_query_exec));
- 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: