Rename VERBOSE log level to TRACE

[babeltrace.git] / src / cli / babeltrace2.c

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index d4145f1de22895928869efc58f17d935533e925b..396673d0d63ed996c7b9b601ad8d3c96c9511fa1 100644 (file)
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -49,24 +49,8 @@
  * modules.
  */
 static const char* log_level_env_var_names[] = {
-       "BABELTRACE_COMMON_LOG_LEVEL",
-       "BABELTRACE_COMPAT_LOG_LEVEL",
-       "BABELTRACE_CTFSER_LOG_LEVEL",
-       "BABELTRACE_FD_CACHE_LOG_LEVEL",
-       "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL",
-       "BABELTRACE_FLT_UTILS_COUNTER_LOG_LEVEL",
-       "BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL",
-       "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL",
-       "BABELTRACE_PLUGIN_CTF_BFCR_LOG_LEVEL",
        "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
-       "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL",
-       "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL",
        "BABELTRACE_PYTHON_BT2_LOG_LEVEL",
-       "BABELTRACE_SINK_CTF_FS_LOG_LEVEL",
-       "BABELTRACE_SINK_TEXT_DETAILS_LOG_LEVEL",
-       "BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
-       "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
-       "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL",
        NULL,
 };
 
@@ -171,9 +155,9 @@ void destroy_the_query_executor(void)
 }
 
 static
-int query(const bt_component_class *comp_cls, const char *obj,
-               const bt_value *params, const bt_value **user_result,
-               const char **fail_reason)
+int query(struct bt_config *cfg, const bt_component_class *comp_cls,
+               const char *obj, const bt_value *params,
+               const bt_value **user_result, const char **fail_reason)
 {
        const bt_value *result = NULL;
        bt_query_executor_status status;
@@ -199,7 +183,7 @@ int query(const bt_component_class *comp_cls, const char *obj,
 
        while (true) {
                status = bt_query_executor_query(the_query_executor,
-                       comp_cls, obj, params, &result);
+                       comp_cls, obj, params, cfg->log_level, &result);
                switch (status) {
                case BT_QUERY_EXECUTOR_STATUS_OK:
                        goto ok;
@@ -968,7 +952,7 @@ int cmd_query(struct bt_config *cfg)
                goto end;
        }
 
-       ret = query(comp_cls, cfg->cmd_data.query.object->str,
+       ret = query(cfg, comp_cls, cfg->cmd_data.query.object->str,
                cfg->cmd_data.query.cfg_component->params,
                &results, &fail_reason);
        if (ret) {
@@ -1264,7 +1248,7 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg)
                goto error;
        }
 
-       ret = query(comp_cls, "sessions", params,
+       ret = query(cfg, comp_cls, "sessions", params,
                    &results, &fail_reason);
        if (ret) {
                goto failed;
@@ -1418,7 +1402,7 @@ int cmd_print_ctf_metadata(struct bt_config *cfg)
                goto end;
        }
 
-       ret = query(comp_cls, "metadata-info",
+       ret = query(cfg, comp_cls, "metadata-info",
                params, &results, &fail_reason);
        if (ret) {
                goto failed;
@@ -2177,7 +2161,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
        const bt_component_class *comp_cls =
                bt_component_class_source_as_component_class_const(src_comp_cls);
 
-       ret = query(comp_cls, "trace-info",
+       ret = query(ctx->cfg, comp_cls, "trace-info",
                cfg_comp->params, &query_result,
                &fail_reason);
        if (ret) {
@@ -2390,7 +2374,7 @@ int cmd_run_ctx_create_components_from_config_components(
                        goto error;
                }
 
-               BT_ASSERT(cfg_comp->log_level >= BT_LOG_VERBOSE);
+               BT_ASSERT(cfg_comp->log_level >= BT_LOG_TRACE);
 
                switch (cfg_comp->type) {
                case BT_COMPONENT_CLASS_TYPE_SOURCE:
@@ -2662,7 +2646,7 @@ int cmd_run(struct bt_config *cfg)
                printf("%s", bt_common_color_reset());
                fflush(stdout);
                fprintf(stderr, "%s", bt_common_color_reset());
-               BT_LOGV("bt_graph_run() returned: status=%s",
+               BT_LOGT("bt_graph_run() returned: status=%s",
                        bt_graph_status_str(graph_status));
 
                switch (graph_status) {
@@ -2678,7 +2662,7 @@ int cmd_run(struct bt_config *cfg)
                        }
 
                        if (cfg->cmd_data.run.retry_duration_us > 0) {
-                               BT_LOGV("Got BT_GRAPH_STATUS_AGAIN: sleeping: "
+                               BT_LOGT("Got BT_GRAPH_STATUS_AGAIN: sleeping: "
                                        "time-us=%" PRIu64,
                                        cfg->cmd_data.run.retry_duration_us);
 
@@ -2755,7 +2739,7 @@ void set_auto_log_levels(struct bt_config *cfg)
         */
        if (getenv("BABELTRACE_DEBUG") &&
                        strcmp(getenv("BABELTRACE_DEBUG"), "1") == 0) {
-               cfg->log_level = BT_LOG_VERBOSE;
+               cfg->log_level = BT_LOG_TRACE;
        } else if (getenv("BABELTRACE_VERBOSE") &&
                        strcmp(getenv("BABELTRACE_VERBOSE"), "1") == 0) {
                cfg->log_level = BT_LOG_INFO;
@@ -2767,15 +2751,15 @@ void set_auto_log_levels(struct bt_config *cfg)
         * --verbose. So:
         *
         *     --verbose: INFO log level
-        *     --debug:   VERBOSE log level (includes DEBUG, which is
-        *                is less verbose than VERBOSE in the internal
+        *     --debug:   TRACE log level (includes DEBUG, which is
+        *                is less verbose than TRACE in the internal
         *                logging framework)
         */
-       if (!getenv("BABELTRACE_LOGGING_GLOBAL_LEVEL")) {
+       if (!getenv("LIBBABELTRACE2_INIT_LOG_LEVEL")) {
                if (cfg->verbose) {
                        bt_logging_set_global_level(BT_LOG_INFO);
                } else if (cfg->debug) {
-                       bt_logging_set_global_level(BT_LOG_VERBOSE);
+                       bt_logging_set_global_level(BT_LOG_TRACE);
                } else {
                        /*
                         * Set library's default log level if not
@@ -2789,7 +2773,7 @@ void set_auto_log_levels(struct bt_config *cfg)
                if (cfg->verbose) {
                        bt_cli_log_level = BT_LOG_INFO;
                } else if (cfg->debug) {
-                       bt_cli_log_level = BT_LOG_VERBOSE;
+                       bt_cli_log_level = BT_LOG_TRACE;
                } else {
                        /*
                         * Set CLI's default log level if not explicitly
@@ -2804,9 +2788,9 @@ void set_auto_log_levels(struct bt_config *cfg)
        while (*env_var_name) {
                if (!getenv(*env_var_name)) {
                        if (cfg->verbose) {
-                               g_setenv(*env_var_name, "I", 1);
+                               g_setenv(*env_var_name, "INFO", 1);
                        } else if (cfg->debug) {
-                               g_setenv(*env_var_name, "V", 1);
+                               g_setenv(*env_var_name, "TRACE", 1);
                        } else {
                                char val[2] = { 0 };