mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

instrumentation: Use end time for snippet file names

Browse Source
This commit is contained in:
Tyler Yankee
2025-09-26 11:20:32 -04:00
parent 441b1ebe75
commit a31e781fe8
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmInstrumentation.cxx
View File

@@ -539,10 +539,12 @@ std::string cmInstrumentation::InstrumentTest(
}
cmsys::SystemInformation& info = this->GetSystemInformation();
std::chrono::system_clock::time_point endTime =
systemStart + std::chrono::milliseconds(root["duration"].asUInt64());
std::string file_name = cmStrCat(
"test-",
this->ComputeSuffixHash(cmStrCat(command_str, info.GetProcessId())),
this->ComputeSuffixTime(), ".json");
this->ComputeSuffixHash(cmStrCat(command_str, info.GetProcessId())), '-',
this->ComputeSuffixTime(endTime), ".json");
this->WriteInstrumentationJson(root, "data", file_name);
return file_name;
}
@@ -674,10 +676,12 @@ int cmInstrumentation::InstrumentCommand(
// Write Json
cmsys::SystemInformation& info = this->GetSystemInformation();
std::chrono::system_clock::time_point endTime =
system_start + std::chrono::milliseconds(root["duration"].asUInt64());
std::string const& file_name = cmStrCat(
command_type, '-',
this->ComputeSuffixHash(cmStrCat(command_str, info.GetProcessId())),
this->ComputeSuffixTime(), ".json");
this->ComputeSuffixHash(cmStrCat(command_str, info.GetProcessId())), '-',
this->ComputeSuffixTime(endTime), ".json");
this->WriteInstrumentationJson(root, "data", file_name);
return ret;
}
@@ -704,11 +708,13 @@ std::string cmInstrumentation::ComputeSuffixHash(
return hash;
}
std::string cmInstrumentation::ComputeSuffixTime()
std::string cmInstrumentation::ComputeSuffixTime(
cm::optional<std::chrono::system_clock::time_point> time)
{
std::chrono::milliseconds ms =
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch());
(time.has_value() ? time.value() : std::chrono::system_clock::now())
.time_since_epoch());
std::chrono::seconds s =
std::chrono::duration_cast<std::chrono::seconds>(ms);

3
Source/cmInstrumentation.h
View File

@@ -89,7 +89,8 @@ private:
bool HasQueryFile(std::string const& file);
static std::string GetCommandStr(std::vector<std::string> const& args);
static std::string ComputeSuffixHash(std::string const& command_str);
static std::string ComputeSuffixTime();
static std::string ComputeSuffixTime(
cm::optional<std::chrono::system_clock::time_point> time = cm::nullopt);
void PrepareDataForCDash(std::string const& data_dir,
std::string const& index_path);
void RemoveOldFiles(std::string const& dataSubdir);