#include "babeltrace2-cfg-cli-args.h"
#include "babeltrace2-cfg-cli-args-connect.h"
#include "babeltrace2-cfg-cli-params-arg.h"
+#include "babeltrace2-plugins.h"
+#include "babeltrace2-cfg-src-auto-disc.h"
#include "common/version.h"
-/*
- * Error printf() macro which prepends "Error: " the first time it's
- * called. This gives a nicer feel than having a bunch of error prefixes
- * (since the following lines usually describe the error and possible
- * solutions), or the error prefix just at the end.
- */
-#define printf_err(fmt, args...) \
- do { \
- if (is_first_error) { \
- fprintf(stderr, "Command line error: "); \
- is_first_error = false; \
- } \
- fprintf(stderr, fmt, ##args); \
- } while (0)
-
-static bool is_first_error = true;
static const int cli_default_log_level = BT_LOG_WARNING;
/* INI-style parsing FSM states */
LEGACY_OUTPUT_FORMAT_DUMMY,
};
-/*
- * Prints the "out of memory" error.
- */
-static
-void print_err_oom(void)
-{
- printf_err("Out of memory\n");
-}
+#define BT_CLI_LOGE_APPEND_CAUSE_OOM() BT_CLI_LOGE_APPEND_CAUSE("Out of memory.")
/*
* Returns the plugin name, component class name, component class type,
BT_ASSERT(comp_cls_type);
if (!bt_common_string_is_printable(arg)) {
- printf_err("Argument contains a non-printable character\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Argument contains a non-printable character.");
goto error;
}
/* Parse the component class type */
gs_comp_cls_type = bt_common_string_until(at, ".:\\", ".", &end_pos);
if (!gs_comp_cls_type || at[end_pos] == '\0') {
- printf_err("Missing component class type (`source`, `filter`, or `sink`)\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Missing component class type (`source`, `filter`, or `sink`).");
goto error;
}
} else if (strcmp(gs_comp_cls_type->str, "sink") == 0) {
*comp_cls_type = BT_COMPONENT_CLASS_TYPE_SINK;
} else {
- printf_err("Unknown component class type: `%s`\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown component class type: `%s`.",
gs_comp_cls_type->str);
goto error;
}
/* Parse the plugin name */
gs_plugin = bt_common_string_until(at, ".:\\", ".", &end_pos);
if (!gs_plugin || gs_plugin->len == 0 || at[end_pos] == '\0') {
- printf_err("Missing plugin or component class name\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Missing plugin or component class name.");
goto error;
}
/* Parse the component class name */
gs_comp_cls = bt_common_string_until(at, ".:\\", ".", &end_pos);
if (!gs_comp_cls || gs_comp_cls->len == 0) {
- printf_err("Missing component class name\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Missing component class name.");
goto error;
}
cfg_component = g_new0(struct bt_config_component, 1);
if (!cfg_component) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg_component->type = type;
cfg_component->plugin_name = g_string_new(plugin_name);
if (!cfg_component->plugin_name) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg_component->comp_cls_name = g_string_new(comp_cls_name);
if (!cfg_component->comp_cls_name) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg_component->instance_name = g_string_new(NULL);
if (!cfg_component->instance_name) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
/* Start with empty parameters */
cfg_component->params = bt_value_map_create();
if (!cfg_component->params) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
return;
}
- for (at = list; at != NULL; at = g_list_next(at)) {
+ for (at = list; at; at = g_list_next(at)) {
g_string_free(at->data, TRUE);
}
scanner = g_scanner_new(&scanner_config);
if (!scanner) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
}
return scanner;
names = bt_value_array_create();
if (!names) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
goto error;
}
} else {
- printf_err("Unknown name: `%s`\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown name: `%s`.",
identifier);
goto error;
}
end:
if (found_none && found_all) {
- printf_err("Only either `all` or `none` can be specified in the list given to the --names option, but not both.\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Only either `all` or `none` can be specified in the list given to the --names option, but not both.");
goto error;
}
/*
fields = bt_value_array_create();
if (!fields) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
goto error;
}
} else {
- printf_err("Unknown field: `%s`\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown field: `%s`.",
identifier);
goto error;
}
tmpstr = g_string_new(NULL);
if (!tmpstr) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
default_value = g_string_new(NULL);
if (!default_value) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
bool is_default = false;
if (!str_obj) {
- printf_err("Unexpected error\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected error.");
ret = -1;
goto end;
}
int ret = 0;
if (cfg_comp->instance_name->len == 0) {
- printf_err("Found an unnamed component\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Found an unnamed component.");
ret = -1;
goto end;
}
if (bt_value_map_has_entry(instance_names,
cfg_comp->instance_name->str)) {
- printf_err("Duplicate component instance name:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate component instance name:\n %s",
cfg_comp->instance_name->str);
ret = -1;
goto end;
if (bt_value_map_insert_entry(instance_names,
cfg_comp->instance_name->str, bt_value_null)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
end:
if (ret) {
- printf_err("Cannot append plugin paths from BABELTRACE_PLUGIN_PATH\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot append plugin paths from BABELTRACE_PLUGIN_PATH.");
}
return ret;
free(home_plugin_dir);
if (ret) {
- printf_err("Invalid home plugin path\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid home plugin path.");
goto error;
}
}
if (!omit_system_plugin_path) {
if (bt_config_append_plugin_paths(plugin_paths,
bt_common_get_system_plugin_path())) {
- printf_err("Invalid system plugin path\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid system plugin path.");
goto error;
}
}
return 0;
error:
- printf_err("Cannot append home and system plugin paths\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot append home and system plugin paths.");
return -1;
}
/* Create config */
cfg = g_new0(struct bt_config, 1);
if (!cfg) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
} else {
cfg->plugin_paths = bt_value_array_create();
if (!cfg->plugin_paths) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
cfg->cmd_data.run.sources = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_object_put_ref);
if (!cfg->cmd_data.run.sources) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.run.filters = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_object_put_ref);
if (!cfg->cmd_data.run.filters) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.run.sinks = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_object_put_ref);
if (!cfg->cmd_data.run.sinks) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.run.connections = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_config_connection_destroy);
if (!cfg->cmd_data.run.connections) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.query.object = g_string_new(NULL);
if (!cfg->cmd_data.query.object) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.print_ctf_metadata.path = g_string_new(NULL);
if (!cfg->cmd_data.print_ctf_metadata.path) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.print_ctf_metadata.output_path = g_string_new(NULL);
if (!cfg->cmd_data.print_ctf_metadata.output_path) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.print_lttng_live_sessions.url = g_string_new(NULL);
if (!cfg->cmd_data.print_lttng_live_sessions.url) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->cmd_data.print_lttng_live_sessions.output_path =
g_string_new(NULL);
if (!cfg->cmd_data.print_lttng_live_sessions.output_path) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
if (bt_config_append_plugin_paths(plugin_paths, arg)) {
- printf_err("Invalid --plugin-path option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid --plugin-path option's argument:\n %s",
arg);
ret = -1;
goto end;
pc = poptGetContext(NULL, argc, (const char **) argv,
help_long_options, 0);
if (!pc) {
- printf_err("Cannot get popt context\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot get popt context.");
goto error;
}
BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
- printf_err("Unknown command-line option specified (option code %d)\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown command-line option specified (option code %d).",
opt);
goto error;
}
/* Check for option parsing error */
if (opt < -1) {
- printf_err("While parsing command-line options, at option %s: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("While parsing command-line options, at option %s: `%s`.",
poptBadOption(pc, 0), poptStrerror(opt));
goto error;
}
error_str = g_string_new(NULL);
if (!error_str) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
pc = poptGetContext(NULL, argc, (const char **) argv,
query_long_options, 0);
if (!pc) {
- printf_err("Cannot get popt context\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot get popt context.");
goto error;
}
bt_value_put_ref(params);
params = cli_value_from_arg(arg, error_str);
if (!params) {
- printf_err("Invalid format for --params option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid format for --params option's argument:\n %s",
error_str->str);
goto error;
}
BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
- printf_err("Unknown command-line option specified (option code %d)\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown command-line option specified (option code %d).",
opt);
goto error;
}
/* Check for option parsing error */
if (opt < -1) {
- printf_err("While parsing command-line options, at option %s: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("While parsing command-line options, at option %s: `%s`.",
poptBadOption(pc, 0), poptStrerror(opt));
goto error;
}
bt_config_component_from_arg(leftover,
default_log_level);
if (!cfg->cmd_data.query.cfg_component) {
- printf_err("Invalid format for component class specification:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid format for component class specification:\n %s",
leftover);
goto error;
}
leftover = poptGetArg(pc);
if (leftover) {
if (strlen(leftover) == 0) {
- printf_err("Invalid empty object\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid empty object.");
goto error;
}
leftover = poptGetArg(pc);
if (leftover) {
- printf_err("Unexpected argument: %s\n", leftover);
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected argument: `%s`.", leftover);
goto error;
}
pc = poptGetContext(NULL, argc, (const char **) argv,
list_plugins_long_options, 0);
if (!pc) {
- printf_err("Cannot get popt context\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot get popt context.");
goto error;
}
BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
- printf_err("Unknown command-line option specified (option code %d)\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown command-line option specified (option code %d).",
opt);
goto error;
}
/* Check for option parsing error */
if (opt < -1) {
- printf_err("While parsing command-line options, at option %s: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("While parsing command-line options, at option %s: %s",
poptBadOption(pc, 0), poptStrerror(opt));
goto error;
}
leftover = poptGetArg(pc);
if (leftover) {
- printf_err("Unexpected argument: %s\n", leftover);
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected argument: `%s`.", leftover);
goto error;
}
error_str = g_string_new(NULL);
if (!error_str) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cfg->omit_home_plugin_path = force_omit_home_plugin_path;
cur_base_params = bt_value_map_create();
if (!cur_base_params) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
instance_names = bt_value_map_create();
if (!instance_names) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
connection_args = bt_value_array_create();
if (!connection_args) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
pc = poptGetContext(NULL, argc, (const char **) argv,
run_long_options, 0);
if (!pc) {
- printf_err("Cannot get popt context\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot get popt context.");
goto error;
}
cur_cfg_comp = bt_config_component_from_arg(arg,
default_log_level);
if (!cur_cfg_comp) {
- printf_err("Invalid format for --component option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid format for --component option's argument:\n %s",
arg);
goto error;
}
bt_value_put_ref(cur_cfg_comp->params);
if (bt_value_copy(cur_base_params,
&cur_cfg_comp->params) < 0) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
bt_value *params_to_set;
if (!cur_cfg_comp) {
- printf_err("Cannot add parameters to unavailable component:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot add parameters to unavailable component:\n %s",
arg);
goto error;
}
params = cli_value_from_arg(arg, error_str);
if (!params) {
- printf_err("Invalid format for --params option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid format for --params option's argument:\n %s",
error_str->str);
goto error;
}
cur_cfg_comp->params, params, ¶ms_to_set);
BT_VALUE_PUT_REF_AND_RESET(params);
if (extend_status != BT_VALUE_MAP_EXTEND_STATUS_OK) {
- printf_err("Cannot extend current component parameters with --params option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot extend current component parameters with --params option's argument:\n %s",
arg);
goto error;
}
}
case OPT_NAME:
if (!cur_cfg_comp) {
- printf_err("Cannot set the name of unavailable component:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot set the name of unavailable component:\n %s",
arg);
goto error;
}
break;
case OPT_LOG_LEVEL:
if (!cur_cfg_comp) {
- printf_err("Cannot set the log level of unavailable component:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot set the log level of unavailable component:\n %s",
arg);
goto error;
}
cur_cfg_comp->log_level =
bt_log_get_level_from_string(arg);
if (cur_cfg_comp->log_level < 0) {
- printf_err("Invalid argument for --log-level option:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid argument for --log-level option:\n %s",
arg);
goto error;
}
bt_value *params = cli_value_from_arg(arg, error_str);
if (!params) {
- printf_err("Invalid format for --base-params option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid format for --base-params option's argument:\n %s",
error_str->str);
goto error;
}
BT_VALUE_PUT_REF_AND_RESET(cur_base_params);
cur_base_params = bt_value_map_create();
if (!cur_base_params) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
case OPT_CONNECT:
if (bt_value_array_append_string_element(
connection_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
case OPT_RETRY_DURATION:
if (retry_duration < 0) {
- printf_err("--retry-duration option's argument must be positive or 0: %ld\n",
+ BT_CLI_LOGE_APPEND_CAUSE("--retry-duration option's argument must be positive or 0: %ld",
retry_duration);
goto error;
}
BT_OBJECT_PUT_REF_AND_RESET(cfg);
goto end;
default:
- printf_err("Unknown command-line option specified (option code %d)\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown command-line option specified (option code %d).",
opt);
goto error;
}
/* Check for option parsing error */
if (opt < -1) {
- printf_err("While parsing command-line options, at option %s: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("While parsing command-line options, at option %s: %s",
poptBadOption(pc, 0), poptStrerror(opt));
goto error;
}
/* This command does not accept leftover arguments */
if (poptPeekArg(pc)) {
- printf_err("Unexpected argument: %s\n", poptPeekArg(pc));
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected argument: %s", poptPeekArg(pc));
goto error;
}
}
if (cfg->cmd_data.run.sources->len == 0) {
- printf_err("Incomplete graph: no source component\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Incomplete graph: no source component.");
goto error;
}
if (cfg->cmd_data.run.sinks->len == 0) {
- printf_err("Incomplete graph: no sink component\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Incomplete graph: no sink component.");
goto error;
}
connection_args,
error_buf, 256);
if (ret) {
- printf_err("Cannot creation connections:\n%s", error_buf);
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot creation connections:\n%s", error_buf);
goto error;
}
argv = calloc(argc, sizeof(*argv));
if (!argv) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto end;
}
len = bt_value_array_get_size(run_args);
if (len < 0) {
- printf_err("Invalid executable arguments\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid executable arguments.");
goto end;
}
for (i = 0; i < len; i++) {
GString *auto_name = g_string_new(NULL);
if (!auto_name) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto end;
}
struct implicit_component_args {
bool exists;
+
+ /* The component class name (e.g. src.ctf.fs). */
GString *comp_arg;
+
+ /* The component instance name. */
GString *name_arg;
+
GString *params_arg;
bt_value *extra_params;
};
if (bt_value_map_insert_entry(existing_names, name->str,
bt_value_null)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
}
if (bt_value_array_append_string_element(run_args, "--component")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, impl_args->comp_arg->str)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, "--name")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, impl_args->name_arg->str)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (impl_args->params_arg->len > 0) {
if (bt_value_array_append_string_element(run_args, "--params")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args,
impl_args->params_arg->str)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
arg = bt_value_string_get(elem);
ret = bt_value_array_append_string_element(run_args, arg);
if (ret) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
return ret;
}
+/* Free the fields of a `struct implicit_component_args`. */
+
static
void finalize_implicit_component_args(struct implicit_component_args *args)
{
bt_value_put_ref(args->extra_params);
}
+/* Destroy a dynamically-allocated `struct implicit_component_args`. */
+
+static
+void destroy_implicit_component_args(struct implicit_component_args *args)
+{
+ finalize_implicit_component_args(args);
+ g_free(args);
+}
+
+/* Initialize the fields of an already allocated `struct implicit_component_args`. */
+
static
int init_implicit_component_args(struct implicit_component_args *args,
const char *comp_arg, bool exists)
!args->params_arg || !args->extra_params) {
ret = -1;
finalize_implicit_component_args(args);
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto end;
}
return ret;
}
+/* Dynamically allocate and initialize a `struct implicit_component_args`. */
+
+static
+struct implicit_component_args *create_implicit_component_args(
+ const char *comp_arg)
+{
+ struct implicit_component_args *args;
+ int status;
+
+ args = g_new(struct implicit_component_args, 1);
+ if (!args) {
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
+ goto end;
+ }
+
+ status = init_implicit_component_args(args, comp_arg, true);
+ if (status != 0) {
+ g_free(args);
+ args = NULL;
+ }
+
+end:
+ return args;
+}
+
static
void append_implicit_component_param(struct implicit_component_args *args,
const char *key, const char *value)
append_param_arg(args->params_arg, key, value);
}
+/*
+ * Append the given parameter (`key=value`) to all component specifications
+ * in `implicit_comp_args` (an array of `struct implicit_component_args *`)
+ * which match `comp_arg`.
+ *
+ * Return the number of matching components.
+ */
+
+static
+int append_multiple_implicit_components_param(GPtrArray *implicit_comp_args,
+ const char *comp_arg, const char *key, const char *value)
+{
+ int i;
+ int n = 0;
+
+ for (i = 0; i < implicit_comp_args->len; i++) {
+ struct implicit_component_args *args = implicit_comp_args->pdata[i];
+
+ if (strcmp(args->comp_arg->str, comp_arg) == 0) {
+ append_implicit_component_param(args, key, value);
+ n++;
+ }
+ }
+
+ return n;
+}
+
/* Escape value to make it suitable to use as a string parameter value. */
static
gchar *escape_string_value(const char *value)
ret = g_string_new(NULL);
if (!ret) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto end;
}
buf = g_string_new(NULL);
if (!buf) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
GString *parameter = NULL;
if (bt_value_array_append_string_element(args, "--params")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
parameter = g_string_new(NULL);
if (!parameter) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
g_string_printf(parameter, "%s=%s", key, str_value);
if (bt_value_array_append_string_element(args, parameter->str)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
str_value = bt_value_string_create_init(value);
if (!str_value) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
*/
if (bt_value_map_has_entry(all_names,
cur_name->str)) {
- printf_err("Duplicate component instance name:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate component instance name:\n %s",
cur_name->str);
goto error;
}
}
if (!name) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
* all component names.
*/
if (bt_value_map_insert_entry(all_names, name->str, bt_value_null)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
*/
if (append_name_opt) {
if (bt_value_array_append_string_element(run_args, "--name")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, name->str)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
const char *ch;
if (!output) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto end;
}
GString *arg = g_string_new(NULL);
if (!e_upstream_name || !e_downstream_name || !arg) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
ret = bt_value_array_append_string_element(run_args, "--connect");
if (ret) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
g_string_append(arg, e_downstream_name->str);
ret = bt_value_array_append_string_element(run_args, arg->str);
if (ret) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
ret = -1;
goto end;
}
BT_ASSERT(sink_names);
/* Connect all sources to the first filter */
- for (source_at = source_names; source_at != NULL; source_at = g_list_next(source_at)) {
+ for (source_at = source_names; source_at; source_at = g_list_next(source_at)) {
GString *source_name = source_at->data;
GString *filter_name = filter_at->data;
filter_at = g_list_next(filter_at);
/* Connect remaining filters */
- for (; filter_at != NULL; filter_prev = filter_at, filter_at = g_list_next(filter_at)) {
+ for (; filter_at; filter_prev = filter_at, filter_at = g_list_next(filter_at)) {
GString *filter_name = filter_at->data;
GString *filter_prev_name = filter_prev->data;
}
/* Connect last filter to all sinks */
- for (sink_at = sink_names; sink_at != NULL; sink_at = g_list_next(sink_at)) {
+ for (sink_at = sink_names; sink_at; sink_at = g_list_next(sink_at)) {
GString *filter_name = filter_prev->data;
GString *sink_name = sink_at->data;
BT_ASSERT(list);
if (!gs) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto end;
}
return ret;
}
+/*
+ * Create `struct implicit_component_args` structures for each of the source
+ * components we identified. Add them to `component_args`.
+ */
+
+static
+void create_implicit_component_args_from_auto_discovered_sources(
+ const struct auto_source_discovery *auto_disc, GPtrArray *component_args)
+{
+ gchar *cc_name = NULL;
+ struct implicit_component_args *comp = NULL;
+ int status;
+ guint i, len;
+
+ len = auto_disc->results->len;
+
+ for (i = 0; i < len; i++) {
+ struct auto_source_discovery_result *res =
+ g_ptr_array_index(auto_disc->results, i);
+
+ g_free(cc_name);
+ cc_name = g_strdup_printf("source.%s.%s", res->plugin_name, res->source_cc_name);
+ if (!cc_name) {
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
+ goto end;
+ }
+
+ comp = create_implicit_component_args(cc_name);
+ if (!comp) {
+ goto end;
+ }
+
+ status = append_parameter_to_args(comp->extra_params, "inputs", res->inputs);
+ if (status != 0) {
+ goto end;
+ }
+
+ g_ptr_array_add(component_args, comp);
+ comp = NULL;
+ }
+
+end:
+ g_free(cc_name);
+
+ if (comp) {
+ destroy_implicit_component_args(comp);
+ }
+}
+
/*
* Creates a Babeltrace config object from the arguments of a convert
* command.
GList *filter_names = NULL;
GList *sink_names = NULL;
bt_value *leftovers = NULL;
- struct implicit_component_args implicit_ctf_input_args = { 0 };
struct implicit_component_args implicit_ctf_output_args = { 0 };
struct implicit_component_args implicit_lttng_live_args = { 0 };
struct implicit_component_args implicit_dummy_args = { 0 };
size_t i;
struct bt_common_lttng_live_url_parts lttng_live_url_parts = { 0 };
char *output = NULL;
+ struct auto_source_discovery auto_disc = { NULL };
+ GString *auto_disc_comp_name = NULL;
+
+ /*
+ * Array of `struct implicit_component_args *` created for the sources
+ * we have auto-discovered.
+ */
+ GPtrArray *discovered_source_args = NULL;
+
+ /*
+ * If set, restrict automatic source discovery to this component class
+ * of this plugin.
+ */
+ const char *auto_source_discovery_restrict_plugin_name = NULL;
+ const char *auto_source_discovery_restrict_component_class_name = NULL;
+
+ gchar *ctf_fs_source_clock_class_offset_arg = NULL;
+ gchar *ctf_fs_source_clock_class_offset_ns_arg = NULL;
(void) bt_value_copy(initial_plugin_paths, &plugin_paths);
goto end;
}
- if (init_implicit_component_args(&implicit_ctf_input_args,
- "source.ctf.fs", false)) {
- goto error;
- }
-
if (init_implicit_component_args(&implicit_ctf_output_args,
"sink.ctf.fs", false)) {
goto error;
all_names = bt_value_map_create();
if (!all_names) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
run_args = bt_value_array_create();
if (!run_args) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cur_name = g_string_new(NULL);
if (!cur_name) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
cur_name_prefix = g_string_new(NULL);
if (!cur_name_prefix) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
leftovers = bt_value_array_create();
if (!leftovers) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
+ goto error;
+ }
+
+ if (auto_source_discovery_init(&auto_disc) != 0) {
+ goto error;
+ }
+
+ discovered_source_args =
+ g_ptr_array_new_with_free_func((GDestroyNotify) destroy_implicit_component_args);
+ if (!discovered_source_args) {
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
+ goto error;
+ }
+
+ auto_disc_comp_name = g_string_new(NULL);
+ if (!auto_disc_comp_name) {
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
pc = poptGetContext(NULL, argc, (const char **) argv,
convert_long_options, 0);
if (!pc) {
- printf_err("Cannot get popt context\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot get popt context.");
goto error;
}
plugin_comp_cls_names(arg, &name, &plugin_name,
&comp_cls_name, &type);
if (!plugin_name || !comp_cls_name) {
- printf_err("Invalid format for --component option's argument:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Invalid format for --component option's argument:\n %s",
arg);
goto error;
}
if (bt_value_array_append_string_element(run_args,
"--component")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
case OPT_PARAMS:
if (cur_name_prefix->len == 0) {
- printf_err("No current component of which to set parameters:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("No current component of which to set parameters:\n %s",
arg);
goto error;
}
if (bt_value_array_append_string_element(run_args,
"--params")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
case OPT_PATH:
if (cur_name_prefix->len == 0) {
- printf_err("No current component of which to set `path` parameter:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("No current component of which to set `path` parameter:\n %s",
arg);
goto error;
}
break;
case OPT_URL:
if (cur_name_prefix->len == 0) {
- printf_err("No current component of which to set `url` parameter:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("No current component of which to set `url` parameter:\n %s",
arg);
goto error;
}
break;
case OPT_NAME:
if (cur_name_prefix->len == 0) {
- printf_err("No current component to name:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("No current component to name:\n %s",
arg);
goto error;
}
if (bt_value_array_append_string_element(run_args, "--name")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
case OPT_LOG_LEVEL:
if (cur_name_prefix->len == 0) {
- printf_err("No current component to assign a log level to:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("No current component to assign a log level to:\n %s",
arg);
goto error;
}
if (bt_value_array_append_string_element(run_args, "--log-level")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args,
"--omit-home-plugin-path")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
case OPT_RETRY_DURATION:
if (bt_value_array_append_string_element(run_args,
"--retry-duration")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
if (bt_value_array_append_string_element(run_args,
"--omit-system-plugin-path")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
if (bt_value_array_append_string_element(run_args,
"--plugin-path")) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
if (bt_value_array_append_string_element(run_args, arg)) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
/* Ignore in this pass */
break;
default:
- printf_err("Unknown command-line option specified (option code %d)\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown command-line option specified (option code %d).",
opt);
goto error;
}
/* Check for option parsing error */
if (opt < -1) {
- printf_err("While parsing command-line options, at option %s: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("While parsing command-line options, at option `%s`: %s.",
poptBadOption(pc, 0), poptStrerror(opt));
goto error;
}
pc = poptGetContext(NULL, argc, (const char **) argv,
convert_long_options, 0);
if (!pc) {
- printf_err("Cannot get popt context\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot get popt context.");
goto error;
}
ret = split_timerange(arg, &begin, &end);
if (ret) {
- printf_err("Invalid --timerange option's argument: expecting BEGIN,END or [BEGIN,END]:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid --timerange option's argument: expecting BEGIN,END or [BEGIN,END]:\n %s",
arg);
goto error;
}
implicit_text_args.exists = true;
break;
case OPT_CLOCK_OFFSET:
- implicit_ctf_input_args.exists = true;
- append_implicit_component_param(
- &implicit_ctf_input_args,
- "clock-class-offset-s", arg);
+ if (ctf_fs_source_clock_class_offset_arg) {
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate --clock-offset option\n");
+ goto error;
+ }
+
+ ctf_fs_source_clock_class_offset_arg = g_strdup(arg);
+ if (!ctf_fs_source_clock_class_offset_arg) {
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
+ goto error;
+ }
break;
case OPT_CLOCK_OFFSET_NS:
- implicit_ctf_input_args.exists = true;
- append_implicit_component_param(
- &implicit_ctf_input_args,
- "clock-class-offset-ns", arg);
+ if (ctf_fs_source_clock_class_offset_ns_arg) {
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate --clock-offset-ns option\n");
+ goto error;
+ }
+
+ ctf_fs_source_clock_class_offset_ns_arg = g_strdup(arg);
+ if (!ctf_fs_source_clock_class_offset_ns_arg) {
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
+ goto error;
+ }
break;
case OPT_CLOCK_SECONDS:
append_implicit_component_param(
break;
case OPT_INPUT_FORMAT:
if (got_input_format_opt) {
- printf_err("Duplicate --input-format option\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate --input-format option.");
goto error;
}
got_input_format_opt = true;
if (strcmp(arg, "ctf") == 0) {
- implicit_ctf_input_args.exists = true;
+ auto_source_discovery_restrict_plugin_name = "ctf";
+ auto_source_discovery_restrict_component_class_name = "fs";
} else if (strcmp(arg, "lttng-live") == 0) {
+ auto_source_discovery_restrict_plugin_name = "ctf";
+ auto_source_discovery_restrict_component_class_name = "lttng-live";
implicit_lttng_live_args.exists = true;
} else {
- printf_err("Unknown legacy input format:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown legacy input format:\n %s",
arg);
goto error;
}
break;
case OPT_OUTPUT_FORMAT:
if (got_output_format_opt) {
- printf_err("Duplicate --output-format option\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate --output-format option.");
goto error;
}
} else if (strcmp(arg, "ctf-metadata") == 0) {
print_ctf_metadata = true;
} else {
- printf_err("Unknown legacy output format:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Unknown legacy output format:\n %s",
arg);
goto error;
}
break;
case OPT_OUTPUT:
if (output) {
- printf_err("Duplicate --output option\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Duplicate --output option");
goto error;
}
output = strdup(arg);
if (!output) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
break;
case OPT_RUN_ARGS:
if (print_run_args_0) {
- printf_err("Cannot specify --run-args and --run-args-0\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot specify --run-args and --run-args-0.");
goto error;
}
break;
case OPT_RUN_ARGS_0:
if (print_run_args) {
- printf_err("Cannot specify --run-args and --run-args-0\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot specify --run-args and --run-args-0.");
goto error;
}
/* Check for option parsing error */
if (opt < -1) {
- printf_err("While parsing command-line options, at option %s: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("While parsing command-line options, at option %s: %s",
poptBadOption(pc, 0), poptStrerror(opt));
goto error;
}
while ((leftover = poptGetArg(pc))) {
if (bt_value_array_append_string_element(leftovers, leftover) !=
BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
- print_err_oom();
+ BT_CLI_LOGE_APPEND_CAUSE_OOM();
goto error;
}
}
const bt_value *bt_val_leftover;
if (bt_value_array_is_empty(leftovers)) {
- printf_err("--output-format=ctf-metadata specified without a path\n");
+ BT_CLI_LOGE_APPEND_CAUSE("--output-format=ctf-metadata specified without a path.");
goto error;
}
if (bt_value_array_get_size(leftovers) > 1) {
- printf_err("Too many paths specified for --output-format=ctf-metadata\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Too many paths specified for --output-format=ctf-metadata.");
goto error;
}
*/
if (implicit_ctf_output_args.exists) {
if (!output) {
- printf_err("--output-format=ctf specified without --output (trace output path)\n");
+ BT_CLI_LOGE_APPEND_CAUSE("--output-format=ctf specified without --output (trace output path).");
goto error;
}
* sink.ctf.fs implicit components.
*/
if (implicit_text_args.exists) {
- printf_err("Ambiguous --output option: --output-format=ctf specified but another option implies --output-format=text\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Ambiguous --output option: --output-format=ctf specified but another option implies --output-format=text.");
goto error;
}
}
const bt_value *bt_val_leftover;
if (bt_value_array_get_size(leftovers) > 1) {
- printf_err("Too many URLs specified for --input-format=lttng-live\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Too many URLs specified for --input-format=lttng-live.");
goto error;
}
bt_common_parse_lttng_live_url(bt_value_string_get(bt_val_leftover),
error_buf, sizeof(error_buf));
if (!lttng_live_url_parts.proto) {
- printf_err("Invalid LTTng live URL format: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid LTTng live URL format: %s.",
error_buf);
goto error;
}
goto error;
}
} else {
- /*
- * Create one source.ctf.fs component, pass it an array
- * with the leftovers.
- * Note that it still has to be named later.
- */
- implicit_ctf_input_args.exists = true;
- ret = append_parameter_to_args(implicit_ctf_input_args.extra_params,
- "paths", leftovers);
- if (ret) {
+ int status;
+
+ status = auto_discover_source_components(plugin_paths, leftovers,
+ auto_source_discovery_restrict_plugin_name,
+ auto_source_discovery_restrict_component_class_name,
+ *default_log_level >= 0 ? *default_log_level : cli_default_log_level,
+ &auto_disc);
+
+ if (status != 0) {
goto error;
}
+
+ create_implicit_component_args_from_auto_discovered_sources(
+ &auto_disc, discovered_source_args);
}
}
- /*
- * Ensure mutual exclusion between implicit `source.ctf.fs` and
- * `source.ctf.lttng-live` components.
- */
- if (implicit_ctf_input_args.exists && implicit_lttng_live_args.exists) {
- printf_err("Cannot create both implicit `%s` and `%s` components\n",
- implicit_ctf_input_args.comp_arg->str,
- implicit_lttng_live_args.comp_arg->str);
- goto error;
+ /* If --clock-offset was given, apply it to any src.ctf.fs component. */
+ if (ctf_fs_source_clock_class_offset_arg) {
+ int n;
+
+ n = append_multiple_implicit_components_param(
+ discovered_source_args, "source.ctf.fs", "clock-class-offset-s",
+ ctf_fs_source_clock_class_offset_arg);
+
+ if (n == 0) {
+ BT_CLI_LOGE_APPEND_CAUSE("--clock-offset specified, but no source.ctf.fs component instantiated.");
+ goto error;
+ }
}
- /*
- * If the implicit `source.ctf.fs` or `source.ctf.lttng-live`
- * components exists, make sure there's at least one leftover
- * (which is the path or URL).
- */
- if (implicit_ctf_input_args.exists && bt_value_array_is_empty(leftovers)) {
- printf_err("Missing path for implicit `%s` component\n",
- implicit_ctf_input_args.comp_arg->str);
- goto error;
+ /* If --clock-offset-ns was given, apply it to any src.ctf.fs component. */
+ if (ctf_fs_source_clock_class_offset_ns_arg) {
+ int n;
+
+ n = append_multiple_implicit_components_param(
+ discovered_source_args, "source.ctf.fs", "clock-class-offset-ns",
+ ctf_fs_source_clock_class_offset_ns_arg);
+
+ if (n == 0) {
+ BT_CLI_LOGE_APPEND_CAUSE("--clock-offset-ns specified, but no source.ctf.fs component instantiated.");
+ goto error;
+ }
}
+ /*
+ * If the implicit `source.ctf.lttng-live` component exists, make sure
+ * there's at least one leftover (which is the URL).
+ */
if (implicit_lttng_live_args.exists && bt_value_array_is_empty(leftovers)) {
- printf_err("Missing URL for implicit `%s` component\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Missing URL for implicit `%s` component.",
implicit_lttng_live_args.comp_arg->str);
goto error;
}
/* Assign names to implicit components */
- ret = assign_name_to_implicit_component(&implicit_ctf_input_args,
- "source-ctf-fs", all_names, &source_names, true);
- if (ret) {
- goto error;
+ for (i = 0; i < discovered_source_args->len; i++) {
+ struct implicit_component_args *args;
+ int j;
+
+ args = discovered_source_args->pdata[i];
+
+ g_string_printf(auto_disc_comp_name, "auto-disc-%s", args->comp_arg->str);
+
+ /* Give it a name like `auto-disc-src-ctf-fs`. */
+ for (j = 0; j < auto_disc_comp_name->len; j++) {
+ if (auto_disc_comp_name->str[j] == '.') {
+ auto_disc_comp_name->str[j] = '-';
+ }
+ }
+
+ ret = assign_name_to_implicit_component(args,
+ auto_disc_comp_name->str, all_names, &source_names, true);
+ if (ret) {
+ goto error;
+ }
}
ret = assign_name_to_implicit_component(&implicit_lttng_live_args,
/* Make sure there's at least one source and one sink */
if (!source_names) {
- printf_err("No source component\n");
+ BT_CLI_LOGE_APPEND_CAUSE("No source component.");
goto error;
}
if (!sink_names) {
- printf_err("No sink component\n");
+ BT_CLI_LOGE_APPEND_CAUSE("No sink component.");
goto error;
}
* Append the equivalent run arguments for the implicit
* components.
*/
- ret = append_run_args_for_implicit_component(&implicit_ctf_input_args, run_args);
- if (ret) {
- goto error;
+ for (i = 0; i < discovered_source_args->len; i++) {
+ struct implicit_component_args *args =
+ discovered_source_args->pdata[i];
+
+ ret = append_run_args_for_implicit_component(args, run_args);
+ if (ret) {
+ goto error;
+ }
}
ret = append_run_args_for_implicit_component(&implicit_lttng_live_args,
ret = convert_auto_connect(run_args, source_names, filter_names,
sink_names);
if (ret) {
- printf_err("Cannot auto-connect components\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot auto-connect components.");
goto error;
}
*/
if (print_run_args || print_run_args_0) {
if (stream_intersection_mode) {
- printf_err("Cannot specify --stream-intersection with --run-args or --run-args-0\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot specify --stream-intersection with --run-args or --run-args-0.");
goto error;
}
destroy_glist_of_gstring(filter_names);
destroy_glist_of_gstring(sink_names);
bt_value_put_ref(leftovers);
- finalize_implicit_component_args(&implicit_ctf_input_args);
finalize_implicit_component_args(&implicit_ctf_output_args);
finalize_implicit_component_args(&implicit_lttng_live_args);
finalize_implicit_component_args(&implicit_dummy_args);
finalize_implicit_component_args(&implicit_trimmer_args);
bt_value_put_ref(plugin_paths);
bt_common_destroy_lttng_live_url_parts(<tng_live_url_parts);
+ auto_source_discovery_fini(&auto_disc);
+
+ if (discovered_source_args) {
+ g_ptr_array_free(discovered_source_args, TRUE);
+ }
+
+ g_free(ctf_fs_source_clock_class_offset_arg);
+ g_free(ctf_fs_source_clock_class_offset_ns_arg);
+
+ if (auto_disc_comp_name) {
+ g_string_free(auto_disc_comp_name, TRUE);
+ }
+
return cfg;
}
} else if (strcmp(cur_arg, "--log-level") == 0 ||
strcmp(cur_arg, "-l") == 0) {
if (!next_arg) {
- printf_err("Missing log level value for --log-level option\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Missing log level value for --log-level option.");
*retcode = 1;
goto end;
}
default_log_level =
bt_log_get_level_from_string(next_arg);
if (default_log_level < 0) {
- printf_err("Invalid argument for --log-level option:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid argument for --log-level option:\n %s",
next_arg);
*retcode = 1;
goto end;
default_log_level = bt_log_get_level_from_string(arg);
if (default_log_level < 0) {
- printf_err("Invalid argument for --log-level option:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid argument for --log-level option:\n %s",
arg);
*retcode = 1;
goto end;
default_log_level = bt_log_get_level_from_string(arg);
if (default_log_level < 0) {
- printf_err("Invalid argument for --log-level option:\n %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Invalid argument for --log-level option:\n %s",
arg);
*retcode = 1;
goto end;
projects / babeltrace.git / blobdiff