* SOFTWARE.
*/
+#define BT_LOG_TAG "CLI-CFG-CLI-ARGS"
+#include "logging.h"
+
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <popt.h>
#include <glib.h>
#include <sys/types.h>
-#include <pwd.h>
#include "babeltrace-cfg.h"
#include "babeltrace-cfg-cli-args.h"
#include "babeltrace-cfg-cli-args-connect.h"
-#define BT_LOG_TAG "CLI-CFG-ARGS"
-#include "logging.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
static
void destroy_glist_of_gstring(GList *list)
{
+ GList *at;
+
if (!list) {
return;
}
- GList *at;
-
for (at = list; at != NULL; at = g_list_next(at)) {
g_string_free(at->data, TRUE);
}
const char *envvar;
if (bt_common_is_setuid_setgid()) {
- printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n");
+ BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
goto end;
}
if (!omit_home_plugin_path) {
if (bt_common_is_setuid_setgid()) {
- printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n");
+ BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
} else {
char *home_plugin_dir =
bt_common_get_home_plugin_path();
int ret = 0;
if (bt_common_is_setuid_setgid()) {
- printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n");
+ BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
goto end;
}
fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n");
fprintf(fp, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which\n");
fprintf(fp, " dynamic plugins can be loaded\n");
- fprintf(fp, " -h --help Show this help and quit\n");
+ fprintf(fp, " -h, --help Show this help and quit\n");
fprintf(fp, "\n");
fprintf(fp, "See `babeltrace --help` for the list of general options.\n");
fprintf(fp, "\n");
leftover = poptGetArg(pc);
if (leftover) {
- if (!plug_comp_cls_names) {
+ if (plug_comp_cls_names) {
printf_err("Cannot specify plugin name and --component component class:\n %s\n",
leftover);
goto error;
fprintf(fp, " (see the expected format of PARAMS below)\n");
fprintf(fp, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which\n");
fprintf(fp, " dynamic plugins can be loaded\n");
- fprintf(fp, " -h --help Show this help and quit\n");
+ fprintf(fp, " -h, --help Show this help and quit\n");
fprintf(fp, "\n\n");
print_expected_params_format(fp);
}
fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n");
fprintf(fp, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which\n");
fprintf(fp, " dynamic plugins can be loaded\n");
- fprintf(fp, " -h --help Show this help and quit\n");
+ fprintf(fp, " -h, --help Show this help and quit\n");
fprintf(fp, "\n");
fprintf(fp, "See `babeltrace --help` for the list of general options.\n");
fprintf(fp, "\n");
fprintf(fp, " the current component with a name given by\n");
fprintf(fp, " the last argument of the --key option and a\n");
fprintf(fp, " value set to VAL\n");
- fprintf(fp, " -h --help Show this help and quit\n");
+ fprintf(fp, " -h, --help Show this help and quit\n");
fprintf(fp, "\n");
fprintf(fp, "See `babeltrace --help` for the list of general options.\n");
fprintf(fp, "\n\n");
fprintf(fp, " formatted for `xargs -0`, and quit\n");
fprintf(fp, " -u, --url=URL Set the `url` string parameter of the\n");
fprintf(fp, " current component to URL\n");
- fprintf(fp, " -h --help Show this help and quit\n");
+ fprintf(fp, " -h, --help Show this help and quit\n");
fprintf(fp, "\n");
fprintf(fp, "Implicit `source.ctf.fs` component options:\n");
fprintf(fp, "\n");
}
static
-void destroy_implicit_component_args(struct implicit_component_args *args)
+void finalize_implicit_component_args(struct implicit_component_args *args)
{
assert(args);
bt_put(args->extra_params);
}
+static
+void destroy_implicit_component_args(void *args)
+{
+ if (!args) {
+ return;
+ }
+
+ finalize_implicit_component_args(args);
+ g_free(args);
+}
+
static
int init_implicit_component_args(struct implicit_component_args *args,
const char *comp_arg, bool exists)
if (!args->comp_arg || !args->name_arg ||
!args->params_arg || !args->extra_params) {
ret = -1;
- destroy_implicit_component_args(args);
+ finalize_implicit_component_args(args);
print_err_oom();
goto end;
}
return ret;
}
+static
+struct implicit_component_args *create_implicit_component_args(void)
+{
+ struct implicit_component_args *impl_args =
+ g_new0(struct implicit_component_args, 1);
+
+ if (!impl_args) {
+ goto end;
+ }
+
+ if (init_implicit_component_args(impl_args, NULL, true)) {
+ destroy_implicit_component_args(impl_args);
+ impl_args = NULL;
+ goto end;
+ }
+
+end:
+ return impl_args;
+}
+
+static
+int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args,
+ struct implicit_component_args *base_implicit_ctf_input_args,
+ GList *leftovers)
+{
+ int ret = 0;
+ GList *leftover;
+
+ for (leftover = leftovers; leftover != NULL;
+ leftover = g_list_next(leftover)) {
+ GString *gs_leftover = leftover->data;
+ struct implicit_component_args *impl_args =
+ create_implicit_component_args();
+
+ if (!impl_args) {
+ print_err_oom();
+ goto error;
+ }
+
+ impl_args->exists = true;
+ g_string_assign(impl_args->comp_arg,
+ base_implicit_ctf_input_args->comp_arg->str);
+ g_string_assign(impl_args->params_arg,
+ base_implicit_ctf_input_args->params_arg->str);
+
+ /*
+ * We need our own copy of the extra parameters because
+ * this is where the unique path goes.
+ */
+ BT_PUT(impl_args->extra_params);
+ impl_args->extra_params =
+ bt_value_copy(base_implicit_ctf_input_args->extra_params);
+ if (!impl_args) {
+ print_err_oom();
+ destroy_implicit_component_args(impl_args);
+ goto error;
+ }
+
+ /* Append unique path parameter */
+ ret = append_implicit_component_extra_param(impl_args,
+ "path", gs_leftover->str);
+ if (ret) {
+ destroy_implicit_component_args(impl_args);
+ goto error;
+ }
+
+ g_ptr_array_add(implicit_ctf_inputs_args, impl_args);
+ }
+
+ goto end;
+
+error:
+ ret = -1;
+
+end:
+ return ret;
+}
+
/*
* Creates a Babeltrace config object from the arguments of a convert
* command.
struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path, bool force_no_debug_info,
- struct bt_value *initial_plugin_paths)
+ struct bt_value *initial_plugin_paths, char *log_level)
{
poptContext pc = NULL;
char *arg = NULL;
BT_CONFIG_COMPONENT_DEST_UNKNOWN;
int opt, ret = 0;
struct bt_config *cfg = NULL;
- bool got_verbose_opt = false;
- bool got_debug_opt = false;
bool got_input_format_opt = false;
bool got_output_format_opt = false;
bool trimmer_has_begin = false;
GList *source_names = NULL;
GList *filter_names = NULL;
GList *sink_names = NULL;
- struct implicit_component_args implicit_ctf_input_args = { 0 };
+ GList *leftovers = NULL;
+ GPtrArray *implicit_ctf_inputs_args = NULL;
+ struct implicit_component_args base_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 };
goto end;
}
- if (init_implicit_component_args(&implicit_ctf_input_args,
+ if (init_implicit_component_args(&base_implicit_ctf_input_args,
"source.ctf.fs", false)) {
goto error;
}
goto error;
}
+ implicit_ctf_inputs_args = g_ptr_array_new_with_free_func(
+ (GDestroyNotify) destroy_implicit_component_args);
+ if (!implicit_ctf_inputs_args) {
+ print_err_oom();
+ goto error;
+ }
+
all_names = bt_value_map_create();
if (!all_names) {
print_err_oom();
break;
case OPT_CLOCK_FORCE_CORRELATE:
append_implicit_component_param(
- &implicit_muxer_args, "assume-absolute-clock-classes", "yes");
+ &implicit_muxer_args,
+ "assume-absolute-clock-classes", "yes");
break;
case OPT_CLOCK_GMT:
append_implicit_component_param(
&implicit_text_args, "clock-gmt", "yes");
+ append_implicit_component_param(
+ &implicit_trimmer_args, "clock-gmt", "yes");
implicit_text_args.exists = true;
break;
case OPT_CLOCK_OFFSET:
- implicit_ctf_input_args.exists = true;
- ret = append_implicit_component_extra_param(
- &implicit_ctf_input_args, "clock-offset-cycles", arg);
+ base_implicit_ctf_input_args.exists = true;
+ append_implicit_component_param(
+ &implicit_muxer_args,
+ "clock-class-offset-s", arg);
if (ret) {
goto error;
}
break;
case OPT_CLOCK_OFFSET_NS:
- implicit_ctf_input_args.exists = true;
+ base_implicit_ctf_input_args.exists = true;
ret = append_implicit_component_extra_param(
- &implicit_ctf_input_args, "clock-offset-ns", arg);
+ &base_implicit_ctf_input_args,
+ "clock-class-offset-ns", arg);
if (ret) {
goto error;
}
got_input_format_opt = true;
if (strcmp(arg, "ctf") == 0) {
- implicit_ctf_input_args.exists = true;
+ base_implicit_ctf_input_args.exists = true;
} else if (strcmp(arg, "lttng-live") == 0) {
implicit_lttng_live_args.exists = true;
} else {
print_run_args_0 = true;
break;
case OPT_STREAM_INTERSECTION:
- append_implicit_component_param(&implicit_ctf_input_args,
+ append_implicit_component_param(
+ &base_implicit_ctf_input_args,
"stream-intersection", "yes");
- implicit_ctf_input_args.exists = true;
+ base_implicit_ctf_input_args.exists = true;
break;
case OPT_VERBOSE:
- if (got_verbose_opt) {
- printf_err("Duplicate -v/--verbose option\n");
- goto error;
+ if (*log_level != 'V' && *log_level != 'D') {
+ *log_level = 'I';
}
-
- append_implicit_component_param(&implicit_text_args,
- "verbose", "yes");
- implicit_text_args.exists = true;
- got_verbose_opt = true;
break;
case OPT_DEBUG:
- got_debug_opt = true;
+ *log_level = 'V';
break;
}
goto error;
}
+ /*
+ * Legacy behaviour: --verbose used to make the `text` output
+ * format print more information. --verbose is now equivalent to
+ * the INFO log level, which is why we compare to 'I' here.
+ */
+ if (*log_level == 'I') {
+ append_implicit_component_param(&implicit_text_args,
+ "verbose", "yes");
+ }
+
/*
* Append home and system plugin paths now that we possibly got
* --plugin-path.
goto error;
}
- /* Consume leftover argument */
- leftover = poptGetArg(pc);
+ /* Consume and keep leftover arguments */
+ while ((leftover = poptGetArg(pc))) {
+ GString *gs_leftover = g_string_new(leftover);
- if (poptPeekArg(pc)) {
- printf_err("Unexpected argument:\n %s\n",
- poptPeekArg(pc));
- goto error;
+ if (!gs_leftover) {
+ print_err_oom();
+ goto error;
+ }
+
+ leftovers = g_list_append(leftovers, gs_leftover);
+ if (!leftovers) {
+ g_string_free(gs_leftover, TRUE);
+ print_err_oom();
+ goto error;
+ }
}
/* Print CTF metadata or print LTTng live sessions */
if (print_ctf_metadata) {
- if (!leftover) {
+ GString *gs_leftover;
+
+ if (g_list_length(leftovers) == 0) {
printf_err("--output-format=ctf-metadata specified without a path\n");
goto error;
}
+ if (g_list_length(leftovers) > 1) {
+ printf_err("Too many paths specified for --output-format=ctf-metadata\n");
+ goto error;
+ }
+
cfg = bt_config_print_ctf_metadata_create(plugin_paths);
if (!cfg) {
goto error;
}
- cfg->debug = got_debug_opt;
- cfg->verbose = got_verbose_opt;
+ gs_leftover = leftovers->data;
g_string_assign(cfg->cmd_data.print_ctf_metadata.path,
- leftover);
+ gs_leftover->str);
goto end;
}
}
}
- /* Decide where the leftover argument goes */
- if (leftover) {
+ /* Decide where the leftover argument(s) go */
+ if (g_list_length(leftovers) > 0) {
if (implicit_lttng_live_args.exists) {
+ GString *gs_leftover;
+
+ if (g_list_length(leftovers) > 1) {
+ printf_err("Too many URLs specified for --output-format=lttng-live\n");
+ goto error;
+ }
+
+ gs_leftover = leftovers->data;
lttng_live_url_parts =
- bt_common_parse_lttng_live_url(leftover,
+ bt_common_parse_lttng_live_url(gs_leftover->str,
error_buf, sizeof(error_buf));
if (!lttng_live_url_parts.proto) {
printf_err("Invalid LTTng live URL format: %s\n",
goto error;
}
- cfg->debug = got_debug_opt;
- cfg->verbose = got_verbose_opt;
g_string_assign(cfg->cmd_data.print_lttng_live_sessions.url,
- leftover);
+ gs_leftover->str);
goto end;
}
ret = append_implicit_component_extra_param(
- &implicit_lttng_live_args, "url", leftover);
+ &implicit_lttng_live_args, "url",
+ gs_leftover->str);
if (ret) {
goto error;
}
} else {
- ret = append_implicit_component_extra_param(
- &implicit_ctf_input_args, "path", leftover);
- implicit_ctf_input_args.exists = true;
+ /*
+ * Append one implicit component argument set
+ * for each leftover (souce.ctf.fs paths). Copy
+ * the base implicit component arguments.
+ * Note that they still have to be named later.
+ */
+ ret = fill_implicit_ctf_inputs_args(
+ implicit_ctf_inputs_args,
+ &base_implicit_ctf_input_args, leftovers);
if (ret) {
goto error;
}
* 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) {
+ if (base_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,
+ base_implicit_ctf_input_args.comp_arg->str,
implicit_lttng_live_args.comp_arg->str);
goto error;
}
/*
* If the implicit `source.ctf.fs` or `source.ctf.lttng-live`
- * components exists, make sure there's a leftover (which is the
- * path or URL).
+ * components exists, make sure there's at least one leftover
+ * (which is the path or URL).
*/
- if (implicit_ctf_input_args.exists && !leftover) {
+ if (base_implicit_ctf_input_args.exists &&
+ g_list_length(leftovers) == 0) {
printf_err("Missing path for implicit `%s` component\n",
- implicit_ctf_input_args.comp_arg->str);
+ base_implicit_ctf_input_args.comp_arg->str);
goto error;
}
- if (implicit_lttng_live_args.exists && !leftover) {
+ if (implicit_lttng_live_args.exists && g_list_length(leftovers) == 0) {
printf_err("Missing URL for implicit `%s` component\n",
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 < implicit_ctf_inputs_args->len; i++) {
+ struct implicit_component_args *impl_args =
+ g_ptr_array_index(implicit_ctf_inputs_args, i);
+
+ ret = assign_name_to_implicit_component(impl_args,
+ "source-ctf-fs", all_names, &source_names, true);
+ if (ret) {
+ goto error;
+ }
}
ret = assign_name_to_implicit_component(&implicit_lttng_live_args,
* 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 < implicit_ctf_inputs_args->len; i++) {
+ struct implicit_component_args *impl_args =
+ g_ptr_array_index(implicit_ctf_inputs_args, i);
+
+ ret = append_run_args_for_implicit_component(impl_args,
+ run_args);
+ if (ret) {
+ goto error;
+ }
}
ret = append_run_args_for_implicit_component(&implicit_lttng_live_args,
cfg = bt_config_run_from_args_array(run_args, retcode,
force_omit_system_plugin_path, force_omit_home_plugin_path,
initial_plugin_paths);
+ if (!cfg) {
+ goto error;
+ }
+
goto end;
error:
g_string_free(cur_name_prefix, TRUE);
}
+ if (implicit_ctf_inputs_args) {
+ g_ptr_array_free(implicit_ctf_inputs_args, TRUE);
+ }
+
bt_put(run_args);
bt_put(all_names);
destroy_glist_of_gstring(source_names);
destroy_glist_of_gstring(filter_names);
destroy_glist_of_gstring(sink_names);
- destroy_implicit_component_args(&implicit_ctf_input_args);
- destroy_implicit_component_args(&implicit_ctf_output_args);
- destroy_implicit_component_args(&implicit_lttng_live_args);
- destroy_implicit_component_args(&implicit_dummy_args);
- destroy_implicit_component_args(&implicit_text_args);
- destroy_implicit_component_args(&implicit_debug_info_args);
- destroy_implicit_component_args(&implicit_muxer_args);
- destroy_implicit_component_args(&implicit_trimmer_args);
+ destroy_glist_of_gstring(leftovers);
+ finalize_implicit_component_args(&base_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_text_args);
+ finalize_implicit_component_args(&implicit_debug_info_args);
+ finalize_implicit_component_args(&implicit_muxer_args);
+ finalize_implicit_component_args(&implicit_trimmer_args);
bt_put(plugin_paths);
bt_common_destroy_lttng_live_url_parts(<tng_live_url_parts);
return cfg;
fprintf(fp, "\n");
fprintf(fp, "General options:\n");
fprintf(fp, "\n");
- fprintf(fp, " -d, --debug Turn on debug mode\n");
- fprintf(fp, " -h --help Show this help and quit\n");
- fprintf(fp, " -v, --verbose Turn on verbose mode\n");
- fprintf(fp, " -V, --version Show version and quit\n");
+ fprintf(fp, " -d, --debug Enable debug mode (same as --log-level=V)\n");
+ fprintf(fp, " -h, --help Show this help and quit\n");
+ fprintf(fp, " --log-level=LVL Set all log levels to LVL (`N`, `V`, `D`,\n");
+ fprintf(fp, " `I`, `W` (default), `E`, or `F`)\n");
+ fprintf(fp, " -v, --verbose Enable verbose mode (same as --log-level=I)\n");
+ fprintf(fp, " -V, --version Show version and quit\n");
fprintf(fp, "\n");
fprintf(fp, "Available commands:\n");
fprintf(fp, "\n");
fprintf(fp, "Use `babeltrace COMMAND --help` to show the help of COMMAND.\n");
}
+static
+char log_level_from_arg(const char *arg)
+{
+ char level = 'U';
+
+ if (strcmp(arg, "VERBOSE") == 0 ||
+ strcmp(arg, "V") == 0) {
+ level = 'V';
+ } else if (strcmp(arg, "DEBUG") == 0 ||
+ strcmp(arg, "D") == 0) {
+ level = 'D';
+ } else if (strcmp(arg, "INFO") == 0 ||
+ strcmp(arg, "I") == 0) {
+ level = 'I';
+ } else if (strcmp(arg, "WARN") == 0 ||
+ strcmp(arg, "WARNING") == 0 ||
+ strcmp(arg, "W") == 0) {
+ level = 'W';
+ } else if (strcmp(arg, "ERROR") == 0 ||
+ strcmp(arg, "E") == 0) {
+ level = 'E';
+ } else if (strcmp(arg, "FATAL") == 0 ||
+ strcmp(arg, "F") == 0) {
+ level = 'F';
+ } else if (strcmp(arg, "NONE") == 0 ||
+ strcmp(arg, "N") == 0) {
+ level = 'N';
+ }
+
+ return level;
+}
+
struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
int *retcode, bool force_omit_system_plugin_path,
bool force_omit_home_plugin_path, bool force_no_debug_info,
struct bt_value *initial_plugin_paths)
{
struct bt_config *config = NULL;
- bool verbose = false;
- bool debug = false;
int i;
const char **command_argv = NULL;
int command_argc = -1;
const char *command_name = NULL;
+ char log_level = 'U';
enum command_type {
COMMAND_TYPE_NONE = -1,
for (i = 1; i < argc; i++) {
const char *cur_arg = argv[i];
+ const char *next_arg = i == (argc - 1) ? NULL : argv[i + 1];
if (strcmp(cur_arg, "-d") == 0 ||
strcmp(cur_arg, "--debug") == 0) {
- debug = true;
+ log_level = 'V';
} else if (strcmp(cur_arg, "-v") == 0 ||
strcmp(cur_arg, "--verbose") == 0) {
- verbose = true;
+ if (log_level != 'V' && log_level != 'D') {
+ /*
+ * Legacy: do not override a previous
+ * --debug because --verbose and --debug
+ * can be specified together (in this
+ * case we want the lowest log level to
+ * apply, VERBOSE).
+ */
+ log_level = 'I';
+ }
+ } else if (strcmp(cur_arg, "--log-level") == 0) {
+ if (!next_arg) {
+ printf_err("Missing log level value for --log-level option\n");
+ *retcode = 1;
+ goto end;
+ }
+
+ log_level = log_level_from_arg(next_arg);
+ if (log_level == 'U') {
+ printf_err("Invalid argument for --log-level option:\n %s\n",
+ next_arg);
+ *retcode = 1;
+ goto end;
+ }
+
+ i++;
+ } else if (strncmp(cur_arg, "--log-level=", 12) == 0) {
+ const char *arg = &cur_arg[12];
+
+ log_level = log_level_from_arg(arg);
+ if (log_level == 'U') {
+ printf_err("Invalid argument for --log-level option:\n %s\n",
+ arg);
+ *retcode = 1;
+ goto end;
+ }
} else if (strcmp(cur_arg, "-V") == 0 ||
strcmp(cur_arg, "--version") == 0) {
print_version();
print_gen_usage(stdout);
goto end;
} else {
- bool has_command = true;
-
/*
* First unknown argument: is it a known command
* name?
*/
+ command_argv = &argv[i];
+ command_argc = argc - i;
+
if (strcmp(cur_arg, "convert") == 0) {
command_type = COMMAND_TYPE_CONVERT;
} else if (strcmp(cur_arg, "list-plugins") == 0) {
} else {
/*
* Unknown argument, but not a known
- * command name: assume the whole
- * arguments are for the default convert
- * command.
+ * command name: assume the default
+ * `convert` command.
*/
command_type = COMMAND_TYPE_CONVERT;
- command_argv = argv;
- command_argc = argc;
- has_command = false;
- }
-
- if (has_command) {
- command_argv = &argv[i];
- command_argc = argc - i;
- command_name = cur_arg;
+ command_name = "convert";
+ command_argv = &argv[i - 1];
+ command_argc = argc - i + 1;
}
break;
}
config = bt_config_convert_from_args(command_argc, command_argv,
retcode, force_omit_system_plugin_path,
force_omit_home_plugin_path, force_no_debug_info,
- initial_plugin_paths);
+ initial_plugin_paths, &log_level);
break;
case COMMAND_TYPE_LIST_PLUGINS:
config = bt_config_list_plugins_from_args(command_argc,
}
if (config) {
- if (verbose) {
- config->verbose = true;
- }
-
- if (debug) {
- config->debug = true;
+ if (log_level == 'U') {
+ log_level = 'W';
}
+ config->log_level = log_level;
config->command_name = command_name;
}
projects / babeltrace.git / blobdiff