X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=9a5af9fb01efa436dc1f0604de83df2f1a0e886a;hb=5a3ee633fdd379e8acf7535f0ba91fb05234a36a;hp=f969f8d73cc0d728ea4d373d932d820d3b0b2b22;hpb=98ecef3256466e76ec8b0936ab1b7da3fa3a2c3f;p=babeltrace.git diff --git a/converter/babeltrace.c b/converter/babeltrace.c index f969f8d7..9a5af9fb 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -27,10 +27,13 @@ */ #include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -38,74 +41,155 @@ #include #include #include +#include #include "babeltrace-cfg.h" +#include "default-cfg.h" -static struct bt_component_factory *component_factory; +GPtrArray *loaded_plugins; static -const char *component_type_str(enum bt_component_type type) +void init_loaded_plugins_array(void) +{ + loaded_plugins = g_ptr_array_new_full(8, bt_put); +} + +static +void fini_loaded_plugins_array(void) +{ + g_ptr_array_free(loaded_plugins, TRUE); +} + +static +struct bt_plugin *find_plugin(const char *name) +{ + int i; + struct bt_plugin *plugin = NULL; + + for (i = 0; i < loaded_plugins->len; i++) { + plugin = g_ptr_array_index(loaded_plugins, i); + + if (strcmp(name, bt_plugin_get_name(plugin)) == 0) { + break; + } + + plugin = NULL; + } + + return bt_get(plugin); +} + +static +struct bt_component_class *find_component_class(const char *plugin_name, + const char *comp_class_name, + enum bt_component_class_type comp_class_type) +{ + struct bt_component_class *comp_class = NULL; + struct bt_plugin *plugin = find_plugin(plugin_name); + + if (!plugin) { + goto end; + } + + comp_class = bt_plugin_get_component_class_by_name_and_type(plugin, + comp_class_name, comp_class_type); + BT_PUT(plugin); +end: + return comp_class; +} + +static +const char *component_type_str(enum bt_component_class_type type) { switch (type) { - case BT_COMPONENT_TYPE_SOURCE: + case BT_COMPONENT_CLASS_TYPE_SOURCE: return "source"; - case BT_COMPONENT_TYPE_SINK: + case BT_COMPONENT_CLASS_TYPE_SINK: return "sink"; - case BT_COMPONENT_TYPE_FILTER: + case BT_COMPONENT_CLASS_TYPE_FILTER: return "filter"; - case BT_COMPONENT_TYPE_UNKNOWN: + case BT_COMPONENT_CLASS_TYPE_UNKNOWN: default: return "unknown"; } } static -void print_component_classes_found(struct bt_component_factory *factory) +void print_component_classes_found(void) { - int count, i; + int plugins_count, component_classes_count = 0, i; if (!babeltrace_verbose) { return; } - count = bt_component_factory_get_component_class_count(factory); - if (count <= 0) { - fprintf(stderr, "No component classes found. Please make sure your plug-in search path is set correctly.\n"); + plugins_count = loaded_plugins->len; + if (plugins_count == 0) { + fprintf(stderr, "No plugins found. Please make sure your plug-in search path is set correctly.\n"); return; } - printf_verbose("Found %d component classes.\n", count); - for (i = 0; i < count; i++) { - struct bt_component_class *component_class = - bt_component_factory_get_component_class_index( - factory, i); - struct bt_plugin *plugin = bt_component_class_get_plugin( - component_class); - const char *plugin_name = bt_plugin_get_name(plugin); - const char *component_name = bt_component_class_get_name( - component_class); - const char *path = bt_plugin_get_path(plugin); - const char *author = bt_plugin_get_author(plugin); - const char *license = bt_plugin_get_license(plugin); - const char *plugin_description = bt_plugin_get_description( - plugin); - const char *component_description = - bt_component_class_get_description( - component_class); - enum bt_component_type type = bt_component_class_get_type( - component_class); - - printf_verbose("[%s - %s (%s)]\n", plugin_name, component_name, - component_type_str(type)); - printf_verbose("\tpath: %s\n", path ? path : "None"); - printf_verbose("\tauthor: %s\n", author ? author : "Unknown"); - printf_verbose("\tlicense: %s\n", license ? license : "Unknown"); - printf_verbose("\tplugin description: %s\n", + for (i = 0; i < plugins_count; i++) { + struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i); + + component_classes_count += bt_plugin_get_component_class_count(plugin); + } + + printf_verbose("Found %d component classes in %d plugins.\n", + component_classes_count, plugins_count); + + for (i = 0; i < plugins_count; i++) { + int j; + struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i); + unsigned int major, minor, patch; + const char *extra; + enum bt_plugin_status version_status; + + component_classes_count = + bt_plugin_get_component_class_count(plugin); + version_status = bt_plugin_get_version(plugin, &major, &minor, + &patch, &extra); + + for (j = 0; j < component_classes_count; j++) { + struct bt_component_class *comp_class = + bt_plugin_get_component_class(plugin, j); + const char *plugin_name = bt_plugin_get_name(plugin); + const char *comp_class_name = + bt_component_class_get_name(comp_class); + const char *path = bt_plugin_get_path(plugin); + const char *author = bt_plugin_get_author(plugin); + const char *license = bt_plugin_get_license(plugin); + const char *plugin_description = + bt_plugin_get_description(plugin); + const char *comp_class_description = + bt_component_class_get_description(comp_class); + enum bt_component_class_type type = + bt_component_class_get_type(comp_class); + + printf_verbose("[%s - %s (%s)]\n", plugin_name, + comp_class_name, component_type_str(type)); + printf_verbose("\tpath: %s\n", path ? path : "None"); + printf_verbose("\tauthor: %s\n", + author ? author : "Unknown"); + printf_verbose("\tlicense: %s\n", + license ? license : "Unknown"); + printf_verbose("\tplugin description: %s\n", plugin_description ? plugin_description : "None"); - printf_verbose("\tcomponent description: %s\n", - component_description ? component_description : "None"); - bt_put(plugin); - bt_put(component_class); + if (version_status == BT_PLUGIN_STATUS_OK) { + printf_verbose("\tplugin version: %u.%u.%u", + major, minor, patch); + + if (extra) { + printf("%s", extra); + } + + printf("\n"); + } + + printf_verbose("\tcomponent description: %s\n", + comp_class_description ? comp_class_description : "None"); + bt_put(comp_class); + } } } @@ -115,7 +199,7 @@ void print_indent(size_t indent) size_t i; for (i = 0; i < indent; i++) { - printf(" "); + printf_verbose(" "); } } @@ -128,7 +212,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 +238,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 +269,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 +291,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 +313,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); } @@ -249,7 +333,6 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg) struct bt_value *trimmer_params = NULL; struct bt_value *value; - assert(component_factory); trimmer_params = bt_value_map_create(); if (!trimmer_params) { goto end; @@ -289,9 +372,8 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg) } } - trimmer_class = bt_component_factory_get_component_class( - component_factory, "utils", BT_COMPONENT_TYPE_FILTER, - "trimmer"); + trimmer_class = find_component_class("utils", "trimmer", + BT_COMPONENT_CLASS_TYPE_FILTER); if (!trimmer_class) { fprintf(stderr, "Could not find trimmer component class. Aborting...\n"); goto end; @@ -318,7 +400,7 @@ int connect_source_sink(struct bt_component *source, struct bt_notification_iterator *source_it = NULL; struct bt_notification_iterator *to_sink_it = NULL; - source_it = bt_component_source_create_iterator(source); + source_it = bt_component_source_create_notification_iterator(source); if (!source_it) { fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n"); ret = -1; @@ -346,7 +428,7 @@ int connect_source_sink(struct bt_component *source, goto end; } - to_sink_it = bt_component_filter_create_iterator(trimmer); + to_sink_it = bt_component_filter_create_notification_iterator(trimmer); if (!to_sink_it) { fprintf(stderr, "Failed to instantiate trimmer iterator. Aborting...\n"); ret = -1; @@ -369,17 +451,44 @@ end: return ret; } -static int load_plugins(struct bt_config *cfg) +static +void add_to_loaded_plugins(struct bt_plugin **plugins) { - int nr_paths, i; + while (*plugins) { + struct bt_plugin *plugin = *plugins; + /* Check if it's already loaded (from another path). */ + struct bt_plugin *loaded_plugin = + find_plugin(bt_plugin_get_name(plugin)); + + if (loaded_plugin) { + printf_verbose("Not loading plugin `%s`: already loaded from `%s`\n", + bt_plugin_get_path(plugin), + bt_plugin_get_path(loaded_plugin)); + BT_PUT(loaded_plugin); + BT_PUT(plugin); + } else { + /* Transfer ownership to global array. */ + g_ptr_array_add(loaded_plugins, plugin); + } + *(plugins++) = NULL; + } +} + +static +int load_dynamic_plugins(struct bt_config *cfg) +{ + int nr_paths, i, ret = 0; nr_paths = bt_value_array_size(cfg->plugin_paths); if (nr_paths < 0) { - return -1; + ret = -1; + goto end; } + for (i = 0; i < nr_paths; i++) { struct bt_value *plugin_path_value = NULL; const char *plugin_path; + struct bt_plugin **plugins; plugin_path_value = bt_value_array_get(cfg->plugin_paths, i); if (bt_value_string_get(plugin_path_value, @@ -387,14 +496,41 @@ static int load_plugins(struct bt_config *cfg) BT_PUT(plugin_path_value); continue; } - if (bt_component_factory_load_recursive(component_factory, - plugin_path)) { + + plugins = bt_plugin_create_all_from_dir(plugin_path, false); + if (!plugins) { printf_debug("Unable to dynamically load plugins from path %s.\n", plugin_path); + BT_PUT(plugin_path_value); + continue; } + + add_to_loaded_plugins(plugins); + free(plugins); + BT_PUT(plugin_path_value); } - return 0; +end: + return ret; +} + +static +int load_static_plugins(void) +{ + int ret = 0; + struct bt_plugin **plugins; + + plugins = bt_plugin_create_all_from_static(); + if (!plugins) { + printf_debug("Unable to load static plugins.\n"); + ret = -1; + goto end; + } + + add_to_loaded_plugins(plugins); + free(plugins); +end: + return ret; } int main(int argc, const char **argv) @@ -408,52 +544,55 @@ int main(int argc, const char **argv) enum bt_component_status sink_status; struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL; - cfg = bt_config_from_args(argc, argv, &ret); - if (cfg) { + init_loaded_plugins_array(); + + 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; } printf_verbose("Verbose mode active.\n"); printf_debug("Debug mode active.\n"); - component_factory = bt_component_factory_create(); - if (!component_factory) { - fprintf(stderr, "Failed to create component factory.\n"); - ret = -1; - goto end; - } - if (load_plugins(cfg)) { - fprintf(stderr, "Failed to load plugins.\n"); + if (load_dynamic_plugins(cfg)) { + fprintf(stderr, "Failed to load dynamic plugins.\n"); ret = -1; goto end; } - ret = bt_component_factory_load_static(component_factory); - if (ret) { + if (load_static_plugins()) { fprintf(stderr, "Failed to load static plugins.\n"); goto end; } - print_component_classes_found(component_factory); - + print_component_classes_found(); source_cfg = bt_config_get_component(cfg->sources, 0); source_params = bt_get(source_cfg->params); - source_class = bt_component_factory_get_component_class( - component_factory, source_cfg->plugin_name->str, - BT_COMPONENT_TYPE_SOURCE, - source_cfg->component_name->str); + source_class = find_component_class(source_cfg->plugin_name->str, + source_cfg->component_name->str, + BT_COMPONENT_CLASS_TYPE_SOURCE); if (!source_class) { fprintf(stderr, "Could not find %s.%s source component class. Aborting...\n", source_cfg->plugin_name->str, @@ -464,9 +603,9 @@ int main(int argc, const char **argv) sink_cfg = bt_config_get_component(cfg->sinks, 0); sink_params = bt_get(sink_cfg->params); - sink_class = bt_component_factory_get_component_class(component_factory, - sink_cfg->plugin_name->str, BT_COMPONENT_TYPE_SINK, - sink_cfg->component_name->str); + sink_class = find_component_class(sink_cfg->plugin_name->str, + sink_cfg->component_name->str, + BT_COMPONENT_CLASS_TYPE_SINK); if (!sink_class) { fprintf(stderr, "Could not find %s.%s output component class. Aborting...\n", sink_cfg->plugin_name->str, @@ -512,7 +651,6 @@ int main(int argc, const char **argv) } } end: - BT_PUT(component_factory); BT_PUT(sink_class); BT_PUT(source_class); BT_PUT(source); @@ -522,5 +660,6 @@ end: BT_PUT(cfg); BT_PUT(sink_cfg); BT_PUT(source_cfg); + fini_loaded_plugins_array(); return ret ? 1 : 0; }