cli, plugins/ctf/fs-src: Make src.ctf.fs accept multiple root paths
[babeltrace.git] / cli / babeltrace.c
index 0f3b05ca60a6b996788569e2e353a865f911b357..a0de86f770139881ca8599f97a6312ff704b079a 100644 (file)
@@ -56,7 +56,7 @@ static const char* log_level_env_var_names[] = {
        "BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
        "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
        "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
-       "BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL",
+       "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL",
        "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL",
        "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL",
        "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL",
@@ -174,7 +174,7 @@ int query(const bt_component_class *comp_cls, const char *obj,
                const char **fail_reason)
 {
        const bt_value *result = NULL;
-       enum bt_query_executor_status status;
+       bt_query_executor_status status;
        *fail_reason = "unknown error";
        int ret = 0;
 
@@ -360,7 +360,7 @@ const bt_component_class_sink *find_sink_component_class(
 static
 const bt_component_class *find_component_class(const char *plugin_name,
                const char *comp_class_name,
-               enum bt_component_class_type comp_class_type)
+               bt_component_class_type comp_class_type)
 {
        const bt_component_class *comp_cls = NULL;
 
@@ -392,7 +392,7 @@ void print_indent(FILE *fp, size_t indent)
 }
 
 static
-const char *component_type_str(enum bt_component_class_type type)
+const char *component_type_str(bt_component_class_type type)
 {
        switch (type) {
        case BT_COMPONENT_CLASS_TYPE_SOURCE:
@@ -408,7 +408,7 @@ const char *component_type_str(enum bt_component_class_type type)
 
 static
 void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
-               const char *comp_cls_name, enum bt_component_class_type type)
+               const char *comp_cls_name, bt_component_class_type type)
 {
        GString *shell_plugin_name = NULL;
        GString *shell_comp_cls_name = NULL;
@@ -814,7 +814,7 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
 
                /*
                 * Skip this if the directory does not exist because
-                * bt_plugin_create_all_from_dir() expects an existing
+                * bt_plugin_find_all_from_dir() expects an existing
                 * directory.
                 */
                if (!g_file_test(plugin_path, G_FILE_TEST_IS_DIR)) {
@@ -823,7 +823,7 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
                        continue;
                }
 
-               plugin_set = bt_plugin_create_all_from_dir(plugin_path, false);
+               plugin_set = bt_plugin_find_all_from_dir(plugin_path, false);
                if (!plugin_set) {
                        BT_LOGD("Unable to load dynamic plugins: path=\"%s\"",
                                plugin_path);
@@ -844,7 +844,7 @@ int load_static_plugins(void)
        const bt_plugin_set *plugin_set;
 
        BT_LOGI("Loading static plugins.");
-       plugin_set = bt_plugin_create_all_from_static();
+       plugin_set = bt_plugin_find_all_from_static();
        if (!plugin_set) {
                BT_LOGE("Unable to load static plugins.");
                ret = -1;
@@ -883,7 +883,7 @@ void print_plugin_info(const bt_plugin *plugin)
 {
        unsigned int major, minor, patch;
        const char *extra;
-       enum bt_plugin_status version_status;
+       bt_property_availability version_avail;
        const char *plugin_name;
        const char *path;
        const char *author;
@@ -895,7 +895,7 @@ void print_plugin_info(const bt_plugin *plugin)
        author = bt_plugin_get_author(plugin);
        license = bt_plugin_get_license(plugin);
        plugin_description = bt_plugin_get_description(plugin);
-       version_status = bt_plugin_get_version(plugin, &major, &minor,
+       version_avail = bt_plugin_get_version(plugin, &major, &minor,
                &patch, &extra);
        printf("%s%s%s%s:\n", bt_common_color_bold(),
                bt_common_color_fg_blue(), plugin_name,
@@ -907,7 +907,7 @@ void print_plugin_info(const bt_plugin *plugin)
                puts("  Built-in");
        }
 
-       if (version_status == BT_PLUGIN_STATUS_OK) {
+       if (version_avail == BT_PROPERTY_AVAILABILITY_AVAILABLE) {
                printf("  %sVersion%s: %u.%u.%u",
                        bt_common_color_bold(), bt_common_color_reset(),
                        major, minor, patch);
@@ -1010,7 +1010,7 @@ void print_component_class_help(const char *plugin_name,
                bt_component_class_get_description(comp_cls);
        const char *comp_class_help =
                bt_component_class_get_help(comp_cls);
-       enum bt_component_class_type type =
+       bt_component_class_type type =
                bt_component_class_get_type(comp_cls);
 
        print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
@@ -1110,13 +1110,15 @@ void cmd_list_plugins_print_component_classes(const bt_plugin *plugin,
        uint64_t i;
 
        if (count == 0) {
-               printf("  %s%s component classes%s: (none)\n", cc_type_name,
+               printf("  %s%s component classes%s: (none)\n",
                        bt_common_color_bold(),
+                       cc_type_name,
                        bt_common_color_reset());
                goto end;
        } else {
-               printf("  %s%s component classes%s:\n", cc_type_name,
+               printf("  %s%s component classes%s:\n",
                        bt_common_color_bold(),
+                       cc_type_name,
                        bt_common_color_reset());
        }
 
@@ -1128,7 +1130,7 @@ void cmd_list_plugins_print_component_classes(const bt_plugin *plugin,
                        bt_component_class_get_name(comp_class);
                const char *comp_class_description =
                        bt_component_class_get_description(comp_class);
-               enum bt_component_class_type type =
+               bt_component_class_type type =
                        bt_component_class_get_type(comp_class);
 
                printf("    ");
@@ -1187,19 +1189,19 @@ int cmd_list_plugins(struct bt_config *cfg)
                cmd_list_plugins_print_component_classes(plugin, "Source",
                        bt_plugin_get_source_component_class_count(plugin),
                        (plugin_borrow_comp_cls_by_index_func_t)
-                               bt_plugin_borrow_source_component_class_by_name_const,
+                               bt_plugin_borrow_source_component_class_by_index_const,
                        (spec_comp_cls_borrow_comp_cls_func_t)
                                bt_component_class_source_as_component_class);
                cmd_list_plugins_print_component_classes(plugin, "Filter",
                        bt_plugin_get_filter_component_class_count(plugin),
                        (plugin_borrow_comp_cls_by_index_func_t)
-                               bt_plugin_borrow_filter_component_class_by_name_const,
+                               bt_plugin_borrow_filter_component_class_by_index_const,
                        (spec_comp_cls_borrow_comp_cls_func_t)
                                bt_component_class_filter_as_component_class);
                cmd_list_plugins_print_component_classes(plugin, "Sink",
                        bt_plugin_get_sink_component_class_count(plugin),
                        (plugin_borrow_comp_cls_by_index_func_t)
-                               bt_plugin_borrow_sink_component_class_by_name_const,
+                               bt_plugin_borrow_sink_component_class_by_index_const,
                        (spec_comp_cls_borrow_comp_cls_func_t)
                                bt_component_class_sink_as_component_class);
        }
@@ -1219,7 +1221,7 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg)
        const bt_value *v = NULL;
        static const char * const plugin_name = "ctf";
        static const char * const comp_cls_name = "lttng-live";
-       static const enum bt_component_class_type comp_cls_type =
+       static const bt_component_class_type comp_cls_type =
                BT_COMPONENT_CLASS_TYPE_SOURCE;
        int64_t array_size, i;
        const char *fail_reason = NULL;
@@ -1371,7 +1373,7 @@ int cmd_print_ctf_metadata(struct bt_config *cfg)
        const char *metadata_text = NULL;
        static const char * const plugin_name = "ctf";
        static const char * const comp_cls_name = "fs";
-       static const enum bt_component_class_type comp_cls_type =
+       static const bt_component_class_type comp_cls_type =
                BT_COMPONENT_CLASS_TYPE_SOURCE;
        const char *fail_reason = NULL;
        FILE *out_stream = stdout;
@@ -1610,7 +1612,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
        uint64_t i;
        input_port_count_func_t port_count_fn;
        borrow_input_port_by_index_func_t port_by_index_fn;
-       enum bt_graph_status status = BT_GRAPH_STATUS_ERROR;
+       bt_graph_status status = BT_GRAPH_STATUS_ERROR;
        bool insert_trimmer = false;
        bt_value *trimmer_params = NULL;
        char *intersection_begin = NULL;
@@ -1636,7 +1638,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
                range = (struct trace_range *) g_hash_table_lookup(
                        ctx->intersections, &port_id);
                if (range) {
-                       enum bt_value_status status;
+                       bt_value_status status;
 
                        intersection_begin = s_from_ns(
                                range->intersection_range_begin_ns);
@@ -1756,7 +1758,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
                         * source and the trimmer.
                         */
                        char *trimmer_name = NULL;
-                       enum bt_graph_status graph_status;
+                       bt_graph_status graph_status;
 
                        ret = asprintf(&trimmer_name,
                                "stream-intersection-trimmer-%s",
@@ -2076,7 +2078,7 @@ static
 int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
 {
        int ret = 0;
-       enum bt_graph_status status;
+       bt_graph_status status;
 
        ctx->cfg = cfg;
        ctx->connect_ports = false;
@@ -2147,10 +2149,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
        int ret = 0;
        uint64_t trace_idx;
        int64_t trace_count;
-       enum bt_value_status value_status;
        const char *path = NULL;
-       const bt_value *component_path_value = NULL;
-       bt_value *query_params = NULL;
        const bt_value *query_result = NULL;
        const bt_value *trace_info = NULL;
        const bt_value *intersection_range = NULL;
@@ -2166,33 +2165,8 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
        const bt_component_class *comp_cls =
                bt_component_class_source_as_component_class_const(src_comp_cls);
 
-       component_path_value = bt_value_map_borrow_entry_value(cfg_comp->params,
-                                                              "path");
-       if (component_path_value && !bt_value_is_string(component_path_value)) {
-               BT_LOGD("Cannot get path parameter: component-name=%s",
-                       cfg_comp->instance_name->str);
-               ret = -1;
-               goto error;
-       }
-
-       path = bt_value_string_get(component_path_value);
-       query_params = bt_value_map_create();
-       if (!query_params) {
-               BT_LOGE_STR("Cannot create query parameters.");
-               ret = -1;
-               goto error;
-       }
-
-       value_status = bt_value_map_insert_string_entry(query_params, "path",
-               path);
-       if (value_status != BT_VALUE_STATUS_OK) {
-               BT_LOGE_STR("Cannot insert path parameter in query parameter map.");
-               ret = -1;
-               goto error;
-       }
-
        ret = query(comp_cls, "trace-info",
-               query_params, &query_result,
+               cfg_comp->params, &query_result,
                &fail_reason);
        if (ret) {
                BT_LOGD("Component class does not support the `trace-info` query: %s: "
@@ -2370,7 +2344,6 @@ error:
                path ? path : "(unknown)",
                bt_common_color_reset());
 end:
-       bt_value_put_ref(query_params);
        bt_value_put_ref(query_result);
        g_free(port_id);
        g_free(trace_range);
@@ -2619,7 +2592,7 @@ end:
 }
 
 static inline
-const char *bt_graph_status_str(enum bt_graph_status status)
+const char *bt_graph_status_str(bt_graph_status status)
 {
        switch (status) {
        case BT_GRAPH_STATUS_OK:
@@ -2693,7 +2666,7 @@ int cmd_run(struct bt_config *cfg)
 
        /* Run the graph */
        while (true) {
-               enum bt_graph_status graph_status = bt_graph_run(ctx.graph);
+               bt_graph_status graph_status = bt_graph_run(ctx.graph);
 
                /*
                 * Reset console in case something messed with console
This page took 0.0278 seconds and 4 git commands to generate.