X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=af789b1856f849bb186eafbf7eaba04d3710b4a1;hb=8d24f1c074ca616e1e2a784cdd0f7fa2faa220a9;hp=49f4cc2c02eea36b45daa366fd2e24327a2cddf6;hpb=528debdf7f5593bfb1abddac48554fc635d26a6d;p=babeltrace.git diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 49f4cc2c..af789b18 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -39,6 +39,7 @@ #include #include #include "babeltrace-cfg.h" +#include "default-cfg.h" static struct bt_component_factory *component_factory; @@ -115,7 +116,7 @@ void print_indent(size_t indent) size_t i; for (i = 0; i < indent; i++) { - printf(" "); + printf_verbose(" "); } } @@ -128,7 +129,7 @@ bool print_map_value(const char *key, struct bt_value *object, void *data) size_t indent = (size_t) data; print_indent(indent); - printf("\"%s\": ", key); + printf_verbose("\"%s\": ", key); print_value(object, indent, false); return true; @@ -154,27 +155,27 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent) switch (bt_value_get_type(value)) { case BT_VALUE_TYPE_NULL: - printf("null\n"); + printf_verbose("null\n"); break; case BT_VALUE_TYPE_BOOL: bt_value_bool_get(value, &bool_val); - printf("%s\n", bool_val ? "true" : "false"); + printf_verbose("%s\n", bool_val ? "true" : "false"); break; case BT_VALUE_TYPE_INTEGER: bt_value_integer_get(value, &int_val); - printf("%" PRId64 "\n", int_val); + printf_verbose("%" PRId64 "\n", int_val); break; case BT_VALUE_TYPE_FLOAT: bt_value_float_get(value, &dbl_val); - printf("%lf\n", dbl_val); + printf_verbose("%lf\n", dbl_val); break; case BT_VALUE_TYPE_STRING: bt_value_string_get(value, &str_val); - printf("\"%s\"\n", str_val); + printf_verbose("\"%s\"\n", str_val); break; case BT_VALUE_TYPE_ARRAY: size = bt_value_array_size(value); - printf("[\n"); + printf_verbose("[\n"); for (i = 0; i < size; i++) { struct bt_value *element = @@ -185,19 +186,19 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent) } print_indent(indent); - printf("]\n"); + printf_verbose("]\n"); break; case BT_VALUE_TYPE_MAP: if (bt_value_map_is_empty(value)) { - printf("{}\n"); + printf_verbose("{}\n"); return; } - printf("{\n"); + printf_verbose("{\n"); bt_value_map_foreach(value, print_map_value, (void *) (indent + 2)); print_indent(indent); - printf("}\n"); + printf_verbose("}\n"); break; default: assert(false); @@ -207,9 +208,9 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent) static void print_bt_config_component(struct bt_config_component *bt_config_component) { - printf(" %s.%s\n", bt_config_component->plugin_name->str, + printf_verbose(" %s.%s\n", bt_config_component->plugin_name->str, bt_config_component->component_name->str); - printf(" params:\n"); + printf_verbose(" params:\n"); print_value(bt_config_component->params, 6, true); } @@ -229,15 +230,15 @@ void print_bt_config_components(GPtrArray *array) static void print_cfg(struct bt_config *cfg) { - printf("debug: %d\n", cfg->debug); - printf("verbose: %d\n", cfg->verbose); - printf("do list: %d\n", cfg->do_list); - printf("force correlate: %d\n", cfg->force_correlate); - printf("plugin paths:\n"); + printf_verbose("debug: %d\n", cfg->debug); + printf_verbose("verbose: %d\n", cfg->verbose); + printf_verbose("do list: %d\n", cfg->do_list); + printf_verbose("force correlate: %d\n", cfg->force_correlate); + printf_verbose("plugin paths:\n"); print_value(cfg->plugin_paths, 2, true); - printf("sources:\n"); + printf_verbose("sources:\n"); print_bt_config_components(cfg->sources); - printf("sinks:\n"); + printf_verbose("sinks:\n"); print_bt_config_components(cfg->sinks); } @@ -369,6 +370,34 @@ end: return ret; } +static int load_plugins(struct bt_config *cfg) +{ + int nr_paths, i; + + nr_paths = bt_value_array_size(cfg->plugin_paths); + if (nr_paths < 0) { + return -1; + } + for (i = 0; i < nr_paths; i++) { + struct bt_value *plugin_path_value = NULL; + const char *plugin_path; + + plugin_path_value = bt_value_array_get(cfg->plugin_paths, i); + if (bt_value_string_get(plugin_path_value, + &plugin_path)) { + BT_PUT(plugin_path_value); + continue; + } + if (bt_component_factory_load_recursive(component_factory, + plugin_path)) { + printf_debug("Unable to dynamically load plugins from path %s.\n", + plugin_path); + } + BT_PUT(plugin_path_value); + } + return 0; +} + int main(int argc, const char **argv) { int ret; @@ -378,23 +407,31 @@ int main(int argc, const char **argv) struct bt_value *source_params = NULL, *sink_params = NULL; struct bt_config *cfg; enum bt_component_status sink_status; - struct bt_value *first_plugin_path_value = NULL; - const char *first_plugin_path; struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL; - cfg = bt_config_from_args(argc, argv, &ret); - if (cfg) { + cfg = bt_config_create(); + if (!cfg) { + fprintf(stderr, "Failed to create Babeltrace configuration\n"); + ret = 1; + goto end; + } + + ret = set_default_config(cfg); + if (ret) { + goto end; + } + + ret = bt_config_init_from_args(cfg, argc, argv); + if (ret == 0) { + babeltrace_verbose = cfg->verbose; + babeltrace_debug = cfg->debug; print_cfg(cfg); } else { goto end; } - babeltrace_verbose = cfg->verbose; - babeltrace_debug = cfg->debug; - /* TODO handle more than 1 source and 1 sink. */ if (cfg->sources->len != 1 || cfg->sinks->len != 1) { - fprintf(stderr, "Unexpected configuration, aborting...\n"); ret = -1; goto end; } @@ -408,17 +445,10 @@ int main(int argc, const char **argv) goto end; } - if (cfg->plugin_paths && !bt_value_array_is_empty(cfg->plugin_paths)) { - first_plugin_path_value = bt_value_array_get( - cfg->plugin_paths, 0); - bt_value_string_get(first_plugin_path_value, - &first_plugin_path); - ret = bt_component_factory_load_recursive(component_factory, - first_plugin_path); - if (ret) { - fprintf(stderr, "Failed to dynamically load plugins.\n"); - goto end; - } + if (load_plugins(cfg)) { + fprintf(stderr, "Failed to load plugins.\n"); + ret = -1; + goto end; } ret = bt_component_factory_load_static(component_factory); @@ -501,7 +531,6 @@ end: BT_PUT(source_params); BT_PUT(sink_params); BT_PUT(cfg); - BT_PUT(first_plugin_path_value); BT_PUT(sink_cfg); BT_PUT(source_cfg); return ret ? 1 : 0;