Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

DELIA-63042: JSON changes #5

Merged
merged 3 commits into from
Aug 18, 2023
Merged

DELIA-63042: JSON changes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cc1fd3
Remove \n from mac
Aug 18, 2023
5e209ba
Timestamp reformat
Aug 18, 2023
d27a789
Remove spaces in field names
Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions MemoryMetric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ MemoryMetric::MemoryMetric(Platform platform, std::shared_ptr<JsonReportGenerato
: mQuit(false),
mCv(),
mLinuxMemoryMeasurements{},
mCmaFree("Value (KB)"),
mCmaBorrowed("Value (KB)"),
mMemoryBandwidth("Memory Bandwidth (kbps)"),
mCmaFree("Value_KB"),
mCmaBorrowed("Value_KB"),
mMemoryBandwidth("Memory_Bandwidth_kbps"),
mMemoryBandwidthSupported(false),
mMemoryFragmentation{},
mPlatform(platform),
Expand Down Expand Up @@ -79,7 +79,7 @@ MemoryMetric::MemoryMetric(Platform platform, std::shared_ptr<JsonReportGenerato
"Slab Total", "Slab Reclaimable", "Slab Unreclaimable", "Swap Used"};

for (const auto& category : usageCategories) {
Measurement value("Value KB");
Measurement value("Value_KB");
mLinuxMemoryMeasurements.insert(std::make_pair(category, value));
}

Expand Down Expand Up @@ -222,7 +222,7 @@ void MemoryMetric::SaveResults()
for (const auto &result: mCmaMeasurements) {
data.emplace_back(JsonReportGenerator::dataItems{
std::make_pair("Region", result.first),
std::make_pair("Size KB", std::to_string(result.second.sizeKb)),
std::make_pair("Size_KB", std::to_string(result.second.sizeKb)),
result.second.Used,
result.second.Unused
});
Expand Down Expand Up @@ -380,10 +380,10 @@ void MemoryMetric::GetCmaMemoryUsage()
measurement.Unused.AddDataPoint(unusedKb);
} else {
// New CMA region, create measurements
auto used = Measurement("Used KB");
auto used = Measurement("Used_KB");
used.AddDataPoint(usedKb);

auto unused = Measurement("Unused KB");
auto unused = Measurement("Unused_KB");
unused.AddDataPoint(unusedKb);

auto measurement = cmaMeasurement(countKb, used, unused);
Expand Down Expand Up @@ -460,7 +460,7 @@ void MemoryMetric::GetContainerMemoryUsage()
auto &measurement = itr->second;
measurement.AddDataPoint(memoryUsageKb);
} else {
Measurement measurement("Memory Used KB");
Measurement measurement("Memory_Used_KB");
measurement.AddDataPoint(memoryUsageKb);
mContainerMeasurements.insert(std::make_pair(containerName, measurement));
}
Expand Down Expand Up @@ -524,7 +524,7 @@ void MemoryMetric::GetBroadcomBmemUsage()

if (itr == mBroadcomBmemMeasurements.end()) {
// New region
Measurement measurement("Memory Usage (KB)");
Measurement measurement("Memory_Usage_KB");
measurement.AddDataPoint(usageKb);
mBroadcomBmemMeasurements.insert(std::make_pair(std::string(regionName), measurement));
} else {
Expand Down Expand Up @@ -615,10 +615,10 @@ void MemoryMetric::CalculateFragmentation()
} else {
std::vector<memoryFragmentation> measurements = {};
for (int i = 0; i < (int) freePages.size(); i++) {
Measurement fp("Free Pages");
Measurement fp("Free_Pages");
fp.AddDataPoint(freePages[i]);

Measurement frag("Fragmentation %");
Measurement frag("Fragmentation_%");
frag.AddDataPoint(fragmentationPercent[i]);
memoryFragmentation fragMeasurement(fp, frag);
measurements.emplace_back(fragMeasurement);
Expand Down Expand Up @@ -721,7 +721,7 @@ void MemoryMetric::GetGpuMemoryUsageBroadcom()
measurement.Used.AddDataPoint(virtualMemNumBytes / (long double) 1024.0);
} else {
Process process(pid);
Measurement used("Memory Usage KB");
Measurement used("Memory_Usage_KB");
used.AddDataPoint(virtualMemNumBytes / (long double) 1024.0);

auto measurement = gpuMeasurement(process, used);
Expand Down Expand Up @@ -773,7 +773,7 @@ void MemoryMetric::GetGpuMemoryUsageAmlogic()
} else {
Process process(pid);

Measurement used("Memory Usage KB");
Measurement used("Memory_Usage_KB");
used.AddDataPoint(gpuBytes / (long double) 1024.0);

auto measurement = gpuMeasurement(process, used);
Expand Down
15 changes: 8 additions & 7 deletions Metadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,19 @@ std::string Metadata::Mac() const
std::stringstream buffer;
buffer << macFile.rdbuf();

return buffer.str();
std::string macStr = buffer.str();
// Remove trailing \n
macStr.erase(std::remove(macStr.begin(), macStr.end(), '\n'), macStr.cend());
return macStr;
}

std::string Metadata::ReportTimestamp() const
{
auto t = std::time(nullptr);
auto tm = *std::localtime(&t);
std::time_t t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
std::stringstream timeStream;
timeStream << std::put_time( std::localtime( &t ), "%FT%T%z" );

std::stringstream buffer;
buffer << std::put_time(&tm, "%Y-%m-%d %H:%M:%S");

return buffer.str();
return timeStream.str();
}

long Metadata::Duration() const
Expand Down