void set_signal_handler(void)
{
if (!SetConsoleCtrlHandler(signal_handler, TRUE)) {
- BT_LOGE("Failed to set the ctrl+c handler.");
+ BT_LOGE("Failed to set the Ctrl+C handler.");
}
}
const uint64_t sleep_time_us = 100000;
/* Wait 100 ms and retry */
- BT_LOGV("Got BT_QUERY_EXECUTOR_STATUS_AGAIN: sleeping: "
+ BT_LOGD("Got BT_QUERY_EXECUTOR_STATUS_AGAIN: sleeping: "
"time-us=%" PRIu64, sleep_time_us);
if (usleep(sleep_time_us)) {
const bt_plugin *plugin = NULL;
BT_ASSERT(name);
- BT_LOGD("Finding plugin: name=\"%s\"", name);
+ BT_LOGI("Finding plugin: name=\"%s\"", name);
for (i = 0; i < loaded_plugins->len; i++) {
plugin = g_ptr_array_index(loaded_plugins, i);
plugin = NULL;
}
- if (BT_LOG_ON_DEBUG) {
- if (plugin) {
- BT_LOGD("Found plugin: plugin-addr=%p", plugin);
- } else {
- BT_LOGD("Cannot find plugin.");
- }
+ if (plugin) {
+ BT_LOGI("Found plugin: name=\"%s\", plugin-addr=%p",
+ name, plugin);
+ } else {
+ BT_LOGI("Cannot find plugin: name=\"%s\"", name);
}
bt_plugin_get_ref(plugin);
const void *comp_class = NULL;
const bt_plugin *plugin;
- BT_LOGD("Finding component class: plugin-name=\"%s\", "
+ BT_LOGI("Finding component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\"", plugin_name, comp_class_name);
plugin = find_plugin(plugin_name);
BT_PLUGIN_PUT_REF_AND_RESET(plugin);
end:
- if (BT_LOG_ON_DEBUG) {
- if (comp_class) {
- BT_LOGD("Found component class: comp-cls-addr=%p",
- comp_class);
- } else {
- BT_LOGD("Cannot find source component class.");
- }
+ if (comp_class) {
+ BT_LOGI("Found component class: plugin-name=\"%s\", "
+ "comp-cls-name=\"%s\"", plugin_name, comp_class_name);
+ } else {
+ BT_LOGI("Cannot find source component class: "
+ "plugin-name=\"%s\", comp-cls-name=\"%s\"",
+ plugin_name, comp_class_name);
}
return comp_class;
return;
}
- BT_LOGI_STR("Configuration:");
- fprintf(stderr, " Debug mode: %s\n", cfg->debug ? "yes" : "no");
- fprintf(stderr, " Verbose mode: %s\n", cfg->verbose ? "yes" : "no");
+ BT_LOGI_STR("CLI configuration:");
+ BT_LOGI(" Debug mode: %s\n", cfg->debug ? "yes" : "no");
+ BT_LOGI(" Verbose mode: %s\n", cfg->verbose ? "yes" : "no");
switch (cfg->command) {
case BT_CONFIG_COMMAND_RUN:
goto end;
}
- BT_LOGI("Loading dynamic plugins.");
+ BT_LOGI_STR("Loading dynamic plugins.");
for (i = 0; i < nr_paths; i++) {
const bt_value *plugin_path_value = NULL;
* directory.
*/
if (!g_file_test(plugin_path, G_FILE_TEST_IS_DIR)) {
- BT_LOGV("Skipping nonexistent directory path: "
+ BT_LOGI("Skipping nonexistent directory path: "
"path=\"%s\"", plugin_path);
continue;
}
plugin_set = bt_plugin_find_all_from_dir(plugin_path, false);
if (!plugin_set) {
- BT_LOGD("Unable to load dynamic plugins: path=\"%s\"",
- plugin_path);
+ BT_LOGI("Unable to load dynamic plugins from directory: "
+ "path=\"%s\"", plugin_path);
continue;
}
/* Skip port if it's already connected. */
if (bt_port_is_connected(downstream_port)) {
- BT_LOGD("Skipping downstream port: already connected: "
+ BT_LOGI("Skipping downstream port: already connected: "
"port-addr=%p, port-name=\"%s\"",
downstream_port,
bt_port_get_name(downstream_port));
stream_infos, stream_idx);
if (!stream_info || !bt_value_is_map(stream_info)) {
ret = -1;
- BT_LOGD_STR("Cannot retrieve stream informations from trace in query result.");
+ BT_LOGE_STR("Cannot retrieve stream informations from trace in query result.");
goto error;
}
port_name = bt_value_map_borrow_entry_value_const(stream_info, "port-name");
if (!port_name || !bt_value_is_string(port_name)) {
ret = -1;
- BT_LOGD_STR("Cannot retrieve port name in query result.");
+ BT_LOGE_STR("Cannot retrieve port name in query result.");
goto error;
}
*/
if (getenv("BABELTRACE_DEBUG") &&
strcmp(getenv("BABELTRACE_DEBUG"), "1") == 0) {
- cfg->log_level = 'V';
+ cfg->log_level = BT_LOG_VERBOSE;
} else if (getenv("BABELTRACE_VERBOSE") &&
strcmp(getenv("BABELTRACE_VERBOSE"), "1") == 0) {
- cfg->log_level = 'I';
+ cfg->log_level = BT_LOG_INFO;
}
/*
*/
if (!getenv("BABELTRACE_LOGGING_GLOBAL_LEVEL")) {
if (cfg->verbose) {
- bt_logging_set_global_level(BT_LOGGING_LEVEL_INFO);
+ bt_logging_set_global_level(BT_LOG_INFO);
} else if (cfg->debug) {
- bt_logging_set_global_level(BT_LOGGING_LEVEL_VERBOSE);
+ bt_logging_set_global_level(BT_LOG_VERBOSE);
} else {
/*
* Set library's default log level if not
* explicitly specified.
*/
- switch (cfg->log_level) {
- case 'N':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_NONE);
- break;
- case 'V':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_VERBOSE);
- break;
- case 'D':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_DEBUG);
- break;
- case 'I':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_INFO);
- break;
- case 'W':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_WARN);
- break;
- case 'E':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_ERROR);
- break;
- case 'F':
- bt_logging_set_global_level(BT_LOGGING_LEVEL_FATAL);
- break;
- default:
- abort();
- }
+ bt_logging_set_global_level(cfg->log_level);
}
}
* Set CLI's default log level if not explicitly
* specified.
*/
- switch (cfg->log_level) {
- case 'N':
- bt_cli_log_level = BT_LOG_NONE;
- break;
- case 'V':
- bt_cli_log_level = BT_LOG_VERBOSE;
- break;
- case 'D':
- bt_cli_log_level = BT_LOG_DEBUG;
- break;
- case 'I':
- bt_cli_log_level = BT_LOG_INFO;
- break;
- case 'W':
- bt_cli_log_level = BT_LOG_WARN;
- break;
- case 'E':
- bt_cli_log_level = BT_LOG_ERROR;
- break;
- case 'F':
- bt_cli_log_level = BT_LOG_FATAL;
- break;
- default:
- abort();
- }
+ bt_cli_log_level = cfg->log_level;
}
}
* Set module's default log level if not
* explicitly specified.
*/
- val[0] = cfg->log_level;
+ val[0] = bt_log_get_letter_from_level(
+ cfg->log_level);
g_setenv(*env_var_name, val, 1);
}
}
projects / babeltrace.git / blobdiff