X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=42a4f3088a8dc57d69bbbaf1095b792fbafeca54;hb=c1870f576149d488615883a7cfd12eddf78bd46a;hp=bc03826ca2ebc6eb050d90356065532c05f8a012;hpb=e5bc7f813987de3dc50f218f77b43e3d04e7a0f8;p=babeltrace.git diff --git a/converter/babeltrace.c b/converter/babeltrace.c index bc03826c..42a4f308 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -39,6 +39,9 @@ #include #include #include "babeltrace-cfg.h" +#include "default-cfg.h" + +static struct bt_component_factory *component_factory; static const char *component_type_str(enum bt_component_type type) @@ -207,22 +210,6 @@ void print_bt_config_component(struct bt_config_component *bt_config_component) { printf(" %s.%s\n", bt_config_component->plugin_name->str, bt_config_component->component_name->str); - printf(" begin timestamp: "); - - if (bt_config_component->begin_ns == -1ULL) { - printf("not set\n"); - } else { - printf("%" PRIu64 " ns\n", bt_config_component->begin_ns); - } - - printf(" end timestamp: "); - - if (bt_config_component->end_ns == -1ULL) { - printf("not set\n"); - } else { - printf("%" PRIu64 " ns\n", bt_config_component->end_ns); - } - printf(" params:\n"); print_value(bt_config_component->params, 6, true); } @@ -255,23 +242,187 @@ void print_cfg(struct bt_config *cfg) print_bt_config_components(cfg->sinks); } -int main(int argc, char **argv) +static +struct bt_component *create_trimmer(struct bt_config_component *source_cfg) +{ + struct bt_component *trimmer = NULL; + struct bt_component_class *trimmer_class = NULL; + struct bt_value *trimmer_params = NULL; + struct bt_value *value; + + assert(component_factory); + trimmer_params = bt_value_map_create(); + if (!trimmer_params) { + goto end; + } + + value = bt_value_map_get(source_cfg->params, "begin"); + if (value) { + enum bt_value_status ret; + + ret = bt_value_map_insert(trimmer_params, "begin", + value); + BT_PUT(value); + if (ret) { + goto end; + } + } + value = bt_value_map_get(source_cfg->params, "end"); + if (value) { + enum bt_value_status ret; + + ret = bt_value_map_insert(trimmer_params, "end", + value); + BT_PUT(value); + if (ret) { + goto end; + } + } + value = bt_value_map_get(source_cfg->params, "clock-gmt"); + if (value) { + enum bt_value_status ret; + + ret = bt_value_map_insert(trimmer_params, "clock-gmt", + value); + BT_PUT(value); + if (ret) { + goto end; + } + } + + trimmer_class = bt_component_factory_get_component_class( + component_factory, "utils", BT_COMPONENT_TYPE_FILTER, + "trimmer"); + if (!trimmer_class) { + fprintf(stderr, "Could not find trimmer component class. Aborting...\n"); + goto end; + } + trimmer = bt_component_create(trimmer_class, "source_trimmer", + trimmer_params); + if (!trimmer) { + goto end; + } +end: + bt_put(trimmer_params); + bt_put(trimmer_class); + return trimmer; +} + +static +int connect_source_sink(struct bt_component *source, + struct bt_config_component *source_cfg, + struct bt_component *sink) +{ + int ret = 0; + enum bt_component_status sink_status; + struct bt_component *trimmer = NULL; + struct bt_notification_iterator *source_it = NULL; + struct bt_notification_iterator *to_sink_it = NULL; + + source_it = bt_component_source_create_iterator(source); + if (!source_it) { + fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n"); + ret = -1; + goto end; + } + + if (bt_value_map_has_key(source_cfg->params, "begin") + || bt_value_map_has_key(source_cfg->params, "end")) { + /* A trimmer must be inserted in the graph. */ + enum bt_component_status trimmer_status; + + trimmer = create_trimmer(source_cfg); + if (!trimmer) { + fprintf(stderr, "Failed to create trimmer component. Aborting...\n"); + ret = -1; + goto end; + } + + trimmer_status = bt_component_filter_add_iterator(trimmer, + source_it); + BT_PUT(source_it); + if (trimmer_status != BT_COMPONENT_STATUS_OK) { + fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n"); + ret = -1; + goto end; + } + + to_sink_it = bt_component_filter_create_iterator(trimmer); + if (!to_sink_it) { + fprintf(stderr, "Failed to instantiate trimmer iterator. Aborting...\n"); + ret = -1; + goto end; + } + } else { + BT_MOVE(to_sink_it, source_it); + } + + sink_status = bt_component_sink_add_iterator(sink, to_sink_it); + if (sink_status != BT_COMPONENT_STATUS_OK) { + fprintf(stderr, "Failed to connect to sink component. Aborting...\n"); + ret = -1; + goto end; + } +end: + bt_put(trimmer); + bt_put(source_it); + bt_put(to_sink_it); + 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; - struct bt_component_factory *component_factory = NULL; struct bt_component_class *source_class = NULL; struct bt_component_class *sink_class = NULL; struct bt_component *source = NULL, *sink = NULL; struct bt_value *source_params = NULL, *sink_params = NULL; struct bt_config *cfg; - struct bt_notification_iterator *it = NULL; 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) { print_cfg(cfg); } else { goto end; @@ -296,17 +447,10 @@ int main(int argc, 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); @@ -358,16 +502,8 @@ int main(int argc, char **argv) goto end; } - it = bt_component_source_create_iterator(source); - if (!it) { - fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n"); - ret = -1; - goto end; - } - - sink_status = bt_component_sink_add_iterator(sink, it); - if (sink_status != BT_COMPONENT_STATUS_OK) { - ret = -1; + ret = connect_source_sink(source, source_cfg, sink); + if (ret) { goto end; } @@ -396,9 +532,7 @@ end: BT_PUT(sink); BT_PUT(source_params); BT_PUT(sink_params); - BT_PUT(it); BT_PUT(cfg); - BT_PUT(first_plugin_path_value); BT_PUT(sink_cfg); BT_PUT(source_cfg); return ret ? 1 : 0;