Update logging (#838)
* Update logging
* Remove unused function
* Fix lib/rocprofiler-sdk/hsa/pc_sampling.cpp logging compilation
* Fix logging FLAGS_vmodule string leak and numerical log level
* Update logging
* Update glog submodule
* Leak fixes
* format
[ROCm/rocprofiler-sdk commit: 4d5b71b0e7]
This commit is contained in:
Jonathan R. Madsen
zatwierdzone przez
GitHub
GitHub
rodzic
0b6fe0dd59
commit
e7cba805c5
@@ -22,6 +22,7 @@
|
||||
|
||||
#include "lib/common/logging.hpp"
|
||||
#include "lib/common/environment.hpp"
|
||||
#include "lib/common/filesystem.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <glog/logging.h>
|
||||
@@ -38,19 +39,27 @@ namespace common
|
||||
{
|
||||
namespace
|
||||
{
|
||||
namespace fs = ::rocprofiler::common::filesystem;
|
||||
|
||||
void
|
||||
install_failure_signal_handler()
|
||||
{
|
||||
static auto _once = std::once_flag{};
|
||||
std::call_once(_once, []() { google::InstallFailureSignalHandler(); });
|
||||
}
|
||||
|
||||
struct log_level_info
|
||||
{
|
||||
int32_t google_level = 0;
|
||||
int32_t verbose_level = 0;
|
||||
};
|
||||
} // namespace
|
||||
|
||||
void
|
||||
init_logging(std::string_view env_var, logging_config cfg)
|
||||
init_logging(std::string_view env_prefix, logging_config cfg)
|
||||
{
|
||||
static auto _once = std::once_flag{};
|
||||
std::call_once(_once, [env_var, &cfg]() {
|
||||
std::call_once(_once, [env_prefix, &cfg]() {
|
||||
auto get_argv0 = []() {
|
||||
auto ifs = std::ifstream{"/proc/self/cmdline"};
|
||||
auto sarg = std::string{};
|
||||
@@ -62,60 +71,93 @@ init_logging(std::string_view env_var, logging_config cfg)
|
||||
return sarg;
|
||||
};
|
||||
|
||||
auto loglvl = common::get_env(env_var, "");
|
||||
for(auto& itr : loglvl)
|
||||
itr = tolower(itr);
|
||||
auto to_lower = [](std::string val) {
|
||||
for(auto& itr : val)
|
||||
itr = tolower(itr);
|
||||
return val;
|
||||
};
|
||||
|
||||
const auto env_opts = std::unordered_map<std::string_view, log_level_info>{
|
||||
{"trace", {google::INFO, ROCP_LOG_LEVEL_TRACE}},
|
||||
{"info", {google::INFO, ROCP_LOG_LEVEL_INFO}},
|
||||
{"warning", {google::WARNING, ROCP_LOG_LEVEL_WARNING}},
|
||||
{"error", {google::ERROR, ROCP_LOG_LEVEL_ERROR}},
|
||||
{"fatal", {google::FATAL, ROCP_LOG_LEVEL_NONE}}};
|
||||
|
||||
auto supported = std::vector<std::string>{};
|
||||
supported.reserve(env_opts.size());
|
||||
for(auto itr : env_opts)
|
||||
supported.emplace_back(itr.first);
|
||||
|
||||
if(cfg.name.empty()) cfg.name = to_lower(std::string{env_prefix});
|
||||
|
||||
cfg.logdir = get_env(fmt::format("{}_LOG_DIR", env_prefix), cfg.logdir);
|
||||
cfg.vlog_modules = get_env(fmt::format("{}_vmodule", env_prefix), cfg.vlog_modules);
|
||||
cfg.logtostderr = cfg.logdir.empty(); // log to stderr if no log dir set
|
||||
// cfg.alsologtostderr = !cfg.logdir.empty(); // log to file if log dir set
|
||||
|
||||
auto loglvl = to_lower(common::get_env(fmt::format("{}_LOG_LEVEL", env_prefix), ""));
|
||||
// default to warning
|
||||
auto& loglvl_v = cfg.loglevel;
|
||||
auto& vlog_level = cfg.vlog_level;
|
||||
if(!loglvl.empty() && loglvl.find_first_not_of("0123456789") == std::string::npos)
|
||||
if(!loglvl.empty() && loglvl.find_first_not_of("-0123456789") == std::string::npos)
|
||||
{
|
||||
loglvl_v = std::stoul(loglvl);
|
||||
vlog_level = loglvl_v;
|
||||
auto val = std::stol(loglvl);
|
||||
if(val < 0)
|
||||
{
|
||||
loglvl_v = google::FATAL;
|
||||
vlog_level = val;
|
||||
}
|
||||
else
|
||||
{
|
||||
// default to trace in case val > ROCP_LOG_LEVEL_TRACE
|
||||
auto itr = env_opts.at("trace");
|
||||
for(auto oitr : env_opts)
|
||||
{
|
||||
if(oitr.second.verbose_level == val)
|
||||
{
|
||||
itr = oitr.second;
|
||||
break;
|
||||
}
|
||||
}
|
||||
loglvl_v = itr.google_level;
|
||||
vlog_level = itr.verbose_level;
|
||||
}
|
||||
}
|
||||
else if(!loglvl.empty())
|
||||
{
|
||||
const auto opts = std::unordered_map<std::string_view, std::pair<uint32_t, uint32_t>>{
|
||||
{"trace", {google::INFO, ROCP_LEVEL_TRACE}},
|
||||
{"info", {google::INFO, ROCP_LEVEL_INFO}},
|
||||
{"warning", {google::WARNING, ROCP_LEVEL_WARNING}},
|
||||
{"error", {google::ERROR, ROCP_NO_VLOG}},
|
||||
{"fatal", {google::ERROR, ROCP_NO_VLOG}}};
|
||||
if(opts.find(loglvl) == opts.end())
|
||||
if(env_opts.find(loglvl) == env_opts.end())
|
||||
throw std::runtime_error{fmt::format(
|
||||
"invalid specifier for ROCPROFILER_LOG_LEVEL: {}. Supported: trace, info, "
|
||||
"warning, error, fatal",
|
||||
loglvl)};
|
||||
"invalid specifier for {}_LOG_LEVEL: {}. Supported: {}",
|
||||
env_prefix,
|
||||
loglvl,
|
||||
fmt::format("{}", fmt::join(supported.begin(), supported.end(), ", ")))};
|
||||
else
|
||||
{
|
||||
loglvl_v = opts.at(loglvl).first;
|
||||
vlog_level = opts.at(loglvl).second;
|
||||
loglvl_v = env_opts.at(loglvl).google_level;
|
||||
vlog_level = env_opts.at(loglvl).verbose_level;
|
||||
}
|
||||
}
|
||||
|
||||
update_logging(cfg, true);
|
||||
update_logging(cfg, !google::IsGoogleLoggingInitialized());
|
||||
|
||||
if(!google::IsGoogleLoggingInitialized())
|
||||
{
|
||||
static auto argv0 = get_argv0();
|
||||
// Prevent glog from crashing if vmodule is empty
|
||||
if(FLAGS_vmodule.empty())
|
||||
{
|
||||
FLAGS_vmodule = " ";
|
||||
}
|
||||
if(FLAGS_vmodule.empty()) FLAGS_vmodule = " ";
|
||||
|
||||
google::InitGoogleLogging(argv0.c_str());
|
||||
ROCP_WARNING << "Log Level: " << loglvl << " VLOG Level: " << vlog_level;
|
||||
|
||||
// Swap out memory to avoid leaking the string
|
||||
if(FLAGS_vmodule == " ")
|
||||
{
|
||||
std::string().swap(FLAGS_vmodule);
|
||||
}
|
||||
if(!FLAGS_vmodule.empty()) std::string{}.swap(FLAGS_vmodule);
|
||||
if(!FLAGS_log_dir.empty()) std::string{}.swap(FLAGS_log_dir);
|
||||
}
|
||||
|
||||
update_logging(cfg);
|
||||
ROCP_INFO << "logging initialized via " << env_var;
|
||||
|
||||
ROCP_INFO << "logging initialized via " << fmt::format("{}_LOG_LEVEL", env_prefix)
|
||||
<< ". Log Level: " << loglvl << ". Verbose Log Level: " << vlog_level;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -126,18 +168,45 @@ update_logging(const logging_config& cfg, bool setup_env, int env_override)
|
||||
auto _lk = std::unique_lock<std::mutex>{_mtx};
|
||||
|
||||
FLAGS_timestamp_in_logfile_name = false;
|
||||
FLAGS_logtostderr = cfg.logtostderr;
|
||||
FLAGS_minloglevel = cfg.loglevel;
|
||||
FLAGS_stderrthreshold = cfg.loglevel;
|
||||
FLAGS_logtostderr = cfg.logtostderr;
|
||||
FLAGS_alsologtostderr = cfg.alsologtostderr;
|
||||
FLAGS_v = cfg.vlog_level;
|
||||
|
||||
// if(!cfg.logdir.empty()) FLAGS_log_dir = cfg.logdir.c_str();
|
||||
|
||||
if(cfg.install_failure_handler) install_failure_signal_handler();
|
||||
|
||||
if(!cfg.logdir.empty() && !fs::exists(cfg.logdir))
|
||||
{
|
||||
fs::create_directories(cfg.logdir);
|
||||
|
||||
if(cfg.logdir_gitignore)
|
||||
{
|
||||
auto ignore = fs::path{cfg.logdir} / ".gitignore";
|
||||
if(!fs::exists(ignore))
|
||||
{
|
||||
std::ofstream ofs{ignore.string()};
|
||||
ofs << "/**" << std::flush;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(setup_env)
|
||||
{
|
||||
common::set_env("GLOG_minloglevel", cfg.loglevel, env_override);
|
||||
common::set_env("GLOG_logtostderr", cfg.logtostderr ? 1 : 0, env_override);
|
||||
common::set_env("GLOG_alsologtostderr", cfg.alsologtostderr ? 1 : 0, env_override);
|
||||
common::set_env("GLOG_stderrthreshold", cfg.loglevel, env_override);
|
||||
common::set_env("GLOG_v", cfg.vlog_level, env_override);
|
||||
common::set_env("GOOGLE_LOG_DIR", get_env("PWD", ""), env_override);
|
||||
if(!cfg.logdir.empty())
|
||||
{
|
||||
common::set_env("GOOGLE_LOG_DIR", cfg.logdir, env_override);
|
||||
common::set_env("GLOG_log_dir", cfg.logdir, env_override);
|
||||
}
|
||||
if(!cfg.vlog_modules.empty())
|
||||
common::set_env("GLOG_vmodule", cfg.vlog_modules, env_override);
|
||||
}
|
||||
}
|
||||
} // namespace common
|
||||
|
||||
Reference in New Issue
Block a user