X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=3081f1f074601d4ce96337e04c9215f0193bc0a0;hb=7c7c0433f4507935fbe2adab29d942df22ee8168;hp=14d165ad915849ec7f407a0acc7a1fd9ce5a1f06;hpb=7e3e3582f6fc79c97b07fad7fa7019e8a80aeb0e;p=babeltrace.git diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 14d165ad..3081f1f0 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -39,6 +39,11 @@ #include #include +#include +#include +#include +#include +#include #include #include #include @@ -73,6 +78,7 @@ static char *opt_input_format, *opt_output_format; static GPtrArray *opt_input_paths; static char *opt_output_path; static int opt_stream_intersection; +static char *opt_plugin_path; static struct bt_format *fmt_read; @@ -98,6 +104,7 @@ enum { OPT_OUTPUT_FORMAT, OPT_HELP, OPT_LIST, + OPT_PLUGIN_PATH, OPT_VERBOSE, OPT_DEBUG, OPT_NAMES, @@ -117,7 +124,7 @@ enum { }; /* - * We are _not_ using POPT_ARG_STRING ability to store directly into + * We are _not_ using POPT_ARG_STRING's ability to store directly into * variables, because we want to cast the return to non-const, which is * not possible without using poptGetOptArg explicitly. This helps us * controlling memory allocation correctly without making assumptions @@ -131,6 +138,7 @@ static struct poptOption long_options[] = { { "output-format", 'o', POPT_ARG_STRING, NULL, OPT_OUTPUT_FORMAT, NULL, NULL }, { "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL }, { "list", 'l', POPT_ARG_NONE, NULL, OPT_LIST, NULL, NULL }, + { "plugin-path", 0, POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL }, { "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL }, { "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL }, { "names", 'n', POPT_ARG_STRING, NULL, OPT_NAMES, NULL, NULL }, @@ -172,6 +180,7 @@ static void usage(FILE *fp) fprintf(fp, "\n"); fprintf(fp, " -h, --help This help message\n"); fprintf(fp, " -l, --list List available formats\n"); + fprintf(fp, " --plugin-path Supplementary plug-in path\n"); fprintf(fp, " -v, --verbose Verbose mode\n"); fprintf(fp, " (or set BABELTRACE_VERBOSE environment variable)\n"); fprintf(fp, " -d, --debug Debug mode\n"); @@ -339,6 +348,13 @@ static int parse_options(int argc, char **argv) list_formats(stdout); ret = 1; goto end; + case OPT_PLUGIN_PATH: + opt_plugin_path = (char *) poptGetOptArg(pc); + if (!opt_plugin_path) { + ret = -EINVAL; + goto end; + } ; + break; case OPT_VERBOSE: babeltrace_verbose = 1; break; @@ -451,10 +467,6 @@ static int parse_options(int argc, char **argv) if (ipath) g_ptr_array_add(opt_input_paths, (gpointer) ipath); } while (ipath); - if (opt_input_paths->len == 0) { - ret = -EINVAL; - goto end; - } end: if (pc) { @@ -709,13 +721,74 @@ error_iter: return ret; } -void call_plugins_hooks(void) +static +const char *component_type_str(enum bt_component_type type) { - bt_dummy_hook(); - bt_lttng_live_hook(); - bt_ctf_hook(); - bt_ctf_text_hook(); - bt_ctf_metadata_hook(); + switch (type) { + case BT_COMPONENT_TYPE_SOURCE: + return "source"; + case BT_COMPONENT_TYPE_SINK: + return "sink"; + case BT_COMPONENT_TYPE_FILTER: + return "filter"; + case BT_COMPONENT_TYPE_UNKNOWN: + default: + return "unknown"; + } +} + +static +void print_detected_component_classes(struct bt_component_factory *factory) +{ + int count, 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."); + 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); + printf_verbose("\tauthor: %s\n", author); + printf_verbose("\tlicense: %s\n", license); + printf_verbose("\tplugin description: %s\n", + plugin_description ? plugin_description : "None"); + printf_verbose("\tcomponent description: %s\n", + component_description ? component_description : "None"); + } +} + +static +void test_sink_notifications(struct bt_component *sink) +{ + return; } int main(int argc, char **argv) @@ -724,6 +797,11 @@ int main(int argc, char **argv) struct bt_format *fmt_write; struct bt_trace_descriptor *td_write; struct bt_context *ctx; + 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; int i; call_plugins_hooks(); @@ -743,6 +821,51 @@ int main(int argc, char **argv) printf_verbose("Verbose mode active.\n"); printf_debug("Debug mode active.\n"); + if (!opt_plugin_path) { + fprintf(stderr, "No plugin path specified, aborting...\n"); + ret = -1; + goto end; + } + printf_verbose("Looking-up plugins at %s\n", + opt_plugin_path ? opt_plugin_path : "Invalid"); + component_factory = bt_component_factory_create(); + if (!component_factory) { + fprintf(stderr, "Failed to create component factory.\n"); + ret = -1; + goto end; + } + + ret = bt_component_factory_load(component_factory, opt_plugin_path); + if (ret) { + fprintf(stderr, "Failed to load plugins.\n"); + goto end; + } + + print_detected_component_classes(component_factory); + + sink_class = bt_component_factory_get_component_class(component_factory, + NULL, BT_COMPONENT_TYPE_SINK, "text"); + if (!sink_class) { + fprintf(stderr, "Could not find text output component class. Aborting...\n"); + ret = -1; + goto end; + } + + sink = bt_component_create(sink_class, "bt_text_output", sink_params); + if (!sink) { + fprintf(stderr, "Failed to instanciate text output. Aborting...\n"); + ret = -1; + goto end; + } + + test_sink_notifications(sink); + goto end; + + if (opt_input_paths->len == 0) { + ret = -1; + goto end; + } + if (opt_input_format) strlower(opt_input_format); if (opt_output_format) @@ -873,6 +996,14 @@ end: free(opt_debug_info_dir); free(opt_debug_info_target_prefix); g_ptr_array_free(opt_input_paths, TRUE); + BT_PUT(component_factory); + BT_PUT(sink_class); + BT_PUT(source_class); + BT_PUT(source); + BT_PUT(sink); + BT_PUT(source_params); + BT_PUT(sink_params); + if (partial_error) exit(EXIT_FAILURE); else