projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bt2: test query info API
[babeltrace.git] / converter / babeltrace-cfg.c
diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c
index 6d8ff8d9846e23853853cf8af577369139dbde70..1426136e74fd77d87ced7991f9e855711d8b57cf 100644 (file)
--- a/converter/babeltrace-cfg.c
+++ b/converter/babeltrace-cfg.c
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include "babeltrace-cfg.h"
+#include "babeltrace-cfg-connect.h"
 
 #define DEFAULT_SOURCE_COMPONENT_NAME  "ctf.fs"
 #define DEFAULT_SINK_COMPONENT_NAME    "text.text"
@@ -781,7 +782,6 @@ end:
  * Creates a component configuration from a command-line source/sink
  * option's argument.
  */
-static
 struct bt_config_component *bt_config_component_from_arg(const char *arg)
 {
        struct bt_config_component *bt_config_component = NULL;
@@ -830,10 +830,19 @@ void bt_config_destroy(struct bt_object *obj)
                        g_ptr_array_free(cfg->cmd_data.convert.sources, TRUE);
                }
 
+               if (cfg->cmd_data.convert.filters) {
+                       g_ptr_array_free(cfg->cmd_data.convert.filters, TRUE);
+               }
+
                if (cfg->cmd_data.convert.sinks) {
                        g_ptr_array_free(cfg->cmd_data.convert.sinks, TRUE);
                }
 
+               if (cfg->cmd_data.convert.connections) {
+                       g_ptr_array_free(cfg->cmd_data.convert.connections,
+                               TRUE);
+               }
+
                BT_PUT(cfg->cmd_data.convert.plugin_paths);
                break;
        case BT_CONFIG_COMMAND_LIST_PLUGINS:
@@ -1353,7 +1362,7 @@ int append_sinks_from_legacy_opts(GPtrArray *sinks,
                component_name = "metadata-text";
                break;
        case LEGACY_OUTPUT_FORMAT_DUMMY:
-               plugin_name = "dummy";
+               plugin_name = "utils";
                component_name = "dummy";
                break;
        default:
@@ -1674,7 +1683,7 @@ void print_output_legacy_to_sinks(
                enum legacy_output_format legacy_output_format,
                struct text_legacy_opts *text_legacy_opts)
 {
-       const char *input_format;
+       const char *output_format;
        GString *str = NULL;
 
        str = g_string_new("    ");
@@ -1685,22 +1694,22 @@ void print_output_legacy_to_sinks(
 
        switch (legacy_output_format) {
        case LEGACY_OUTPUT_FORMAT_TEXT:
-               input_format = "text";
+               output_format = "text";
                break;
        case LEGACY_OUTPUT_FORMAT_CTF_METADATA:
-               input_format = "ctf-metadata";
+               output_format = "ctf-metadata";
                break;
        case LEGACY_OUTPUT_FORMAT_DUMMY:
-               input_format = "dummy";
+               output_format = "dummy";
                break;
        default:
                assert(false);
        }
 
        printf_err("Both `%s` legacy output format and non-legacy sink component\ninstances(s) specified.\n\n",
-               input_format);
+               output_format);
        printf_err("Specify the following non-legacy sink component instance instead of the\nlegacy `%s` output format options:\n\n",
-               input_format);
+               output_format);
        g_string_append(str, "-o ");
 
        switch (legacy_output_format) {
@@ -1711,7 +1720,7 @@ void print_output_legacy_to_sinks(
                g_string_append(str, "ctf.metadata-text");
                break;
        case LEGACY_OUTPUT_FORMAT_DUMMY:
-               g_string_append(str, "dummy.dummy");
+               g_string_append(str, "utils.dummy");
                break;
        default:
                assert(false);
@@ -1998,6 +2007,7 @@ enum {
        OPT_CLOCK_OFFSET,
        OPT_CLOCK_OFFSET_NS,
        OPT_CLOCK_SECONDS,
+       OPT_CONNECT,
        OPT_DEBUG,
        OPT_DEBUG_INFO_DIR,
        OPT_DEBUG_INFO_FULL_PATH,
@@ -2212,6 +2222,13 @@ static struct bt_config *bt_config_convert_create(
                goto error;
        }
 
+       cfg->cmd_data.convert.filters = g_ptr_array_new_with_free_func(
+               (GDestroyNotify) bt_put);
+       if (!cfg->cmd_data.convert.filters) {
+               print_err_oom();
+               goto error;
+       }
+
        cfg->cmd_data.convert.sinks = g_ptr_array_new_with_free_func(
                (GDestroyNotify) bt_put);
        if (!cfg->cmd_data.convert.sinks) {
@@ -2219,6 +2236,13 @@ static struct bt_config *bt_config_convert_create(
                goto error;
        }
 
+       cfg->cmd_data.convert.connections = g_ptr_array_new_with_free_func(
+               (GDestroyNotify) bt_config_connection_destroy);
+       if (!cfg->cmd_data.convert.connections) {
+               print_err_oom();
+               goto error;
+       }
+
        if (initial_plugin_paths) {
                cfg->cmd_data.convert.plugin_paths =
                        bt_get(initial_plugin_paths);
@@ -2768,6 +2792,8 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "      --begin=BEGIN                 Set the `begin` parameter of the latest\n");
        fprintf(fp, "                                    source component instance to BEGIN\n");
        fprintf(fp, "                                    (see the suggested format of BEGIN below)\n");
+       fprintf(fp, "  -c, --connect=CONNECTION          Connect two component instances (see the\n");
+       fprintf(fp, "                                    expected format of CONNECTION below)\n");
        fprintf(fp, "  -d, --debug                       Enable debug mode\n");
        fprintf(fp, "      --end=END                     Set the `end` parameter of the latest\n");
        fprintf(fp, "                                    source component instance to END\n");
@@ -2807,6 +2833,26 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "\n");
        fprintf(fp, "    [YYYY-MM-DD [hh:mm:]]ss[.nnnnnnnnn]\n");
        fprintf(fp, "\n\n");
+       fprintf(fp, "Expected format of CONNECTION\n");
+       fprintf(fp, "-----------------------------\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "    SRC[.SRCPORT]:DST[.DSTPORT]\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "SRC and DST are the names of the source and destination component\n");
+       fprintf(fp, "instances to connect together. You can set the name of a component\n");
+       fprintf(fp, "instance with the --name option.\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "SRCPORT and DSTPORT are the optional source and destination ports to use\n");
+       fprintf(fp, "for the connection. When the port is not specified, the default port is\n");
+       fprintf(fp, "used.\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "You can connect a source component to a filter or sink component. You\n");
+       fprintf(fp, "can connect a filter component to a sink component.\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "Example:\n");
+       fprintf(fp, "\n");
+       fprintf(fp, "    my-filter.top10:json-out\n");
+       fprintf(fp, "\n\n");
        fprintf(fp, "Expected format of PARAMS\n");
        fprintf(fp, "-------------------------\n");
        fprintf(fp, "\n");
@@ -2849,6 +2895,7 @@ static struct poptOption convert_long_options[] = {
        { "clock-offset", '\0', POPT_ARG_STRING, NULL, OPT_CLOCK_OFFSET, NULL, NULL },
        { "clock-offset-ns", '\0', POPT_ARG_STRING, NULL, OPT_CLOCK_OFFSET_NS, NULL, NULL },
        { "clock-seconds", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_SECONDS, NULL, NULL },
+       { "connect", 'c', POPT_ARG_STRING, NULL, OPT_CONNECT, NULL, NULL },
        { "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
        { "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_DIR, NULL, NULL },
        { "debug-info-full-path", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_INFO_FULL_PATH, NULL, NULL },
@@ -2905,6 +2952,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
        int opt, ret = 0;
        struct bt_config *cfg = NULL;
        struct bt_value *instance_names = NULL;
+       struct bt_value *connection_args = NULL;
+       char error_buf[256] = { 0 };
 
        *retcode = 0;
        memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts));
@@ -2960,6 +3009,12 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                goto error;
        }
 
+       connection_args = bt_value_array_create();
+       if (!connection_args) {
+               print_err_oom();
+               goto error;
+       }
+
        ret = append_env_var_plugin_paths(cfg->cmd_data.convert.plugin_paths);
        if (ret) {
                printf_err("Cannot append plugin paths from BABELTRACE_PLUGIN_PATH\n");
@@ -3388,6 +3443,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        }
                        break;
                }
+               case OPT_CONNECT:
+                       if (bt_value_array_append_string(connection_args,
+                                       arg)) {
+                               print_err_oom();
+                               goto error;
+                       }
+                       break;
                case OPT_HELP:
                        print_convert_usage(stdout);
                        *retcode = -1;
@@ -3510,6 +3572,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                cur_cfg_comp = NULL;
        }
 
+       ret = bt_config_create_connections(cfg, connection_args,
+               error_buf, 256);
+       if (ret) {
+               printf_err("Cannot creation connections:\n%s", error_buf);
+               goto error;
+       }
+
        goto end;
 
 error:
@@ -3541,6 +3610,7 @@ end:
        BT_PUT(text_legacy_opts.fields);
        BT_PUT(legacy_input_paths);
        BT_PUT(instance_names);
+       BT_PUT(connection_args);
        return cfg;
 }
 
BabelTrace - Trace Format Babel Tower
This page took 0.050006 seconds and 4 git commands to generate.