AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update lib/rocprofiler-sdk-tool (#755)

Browse Source 
- questionable data race within std::regex in CI
- simplify rocprofiler::tool::format
- set config::tmp_directory to default to output_path
- fs::create_directories for tmp_file
- rework get_file_name(...) and compose_tmp_file_name(...) in tool.cpp
This commit is contained in:
Jonathan R. Madsen
2024-04-12 03:48:02 -05:00
committed by GitHub
parent 7ef9e1ea8c
commit 87490d0018
6 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/lib/rocprofiler-sdk-tool/config.cpp
+9 -16
View File
@@ -48,7 +48,10 @@ namespace tool
{
namespace
{
auto launch_time = new std::time_t{std::time(nullptr)};
const auto launch_time = new std::time_t{std::time(nullptr)};
const auto env_regexes =
new std::array<std::regex, 2>{std::regex{"(.*)%(env|ENV)\\{([A-Z0-9_]+)\\}%(.*)"},
std::regex{"(.*)\\$(env|ENV)\\{([A-Z0-9_]+)\\}(.*)"}};
std::string
get_local_datetime(const char* dt_format, std::time_t* dt_curr)
@@ -362,25 +365,15 @@ format(std::string _fpath, const std::string& _tag)
// environment and configuration variables
try
{
for(const auto& _expr : {std::string{"(.*)%(env|ENV)\\{([A-Z0-9_]+)\\}%(.*)"},
std::string{"(.*)\\$(env|ENV)\\{([A-Z0-9_]+)\\}(.*)"}})
for(const auto& _re : *env_regexes)
{
std::regex _re{_expr};
std::string _cbeg = (_expr.find("(.*)%") == 0) ? "%" : "$";
std::string _cend = (_expr.find("(.*)%") == 0) ? "}%" : "}";
bool _is_env = (_expr.find("(env|ENV)") != std::string::npos);
_cbeg += (_is_env) ? "env{" : "cfg{";
while(std::regex_search(_fpath, _re))
{
auto _var = std::regex_replace(_fpath, _re, "$3");
std::string _val = {};
if(_is_env)
{
_val = get_env<std::string>(_var, "");
}
auto _beg = std::regex_replace(_fpath, _re, "$1");
auto _end = std::regex_replace(_fpath, _re, "$4");
_fpath = fmt::format("{}{}{}", _beg, _val, _end);
std::string _val = get_env<std::string>(_var, "");
auto _beg = std::regex_replace(_fpath, _re, "$1");
auto _end = std::regex_replace(_fpath, _re, "$4");
_fpath = fmt::format("{}{}{}", _beg, _val, _end);
}
}
} catch(std::exception& _e)