Skip to content

DELIA-64029: Don't error out if CMA friendly name is not known #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TeknoVenus merged 2 commits into from
Dec 7, 2023
Merged

DELIA-64029: Don't error out if CMA friendly name is not known #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49eb4d8
Don't error out if CMA friendly name is not known
Dec 5, 2023
404d416
Improve exclusion list for container names
Dec 7, 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
14 changes: 8 additions & 6 deletions MemoryMetric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <filesystem>
#include <unistd.h>
#include <cmath>
#include <regex>

MemoryMetric::MemoryMetric(Platform platform, std::shared_ptr<JsonReportGenerator> reportGenerator)
: mQuit(false),
Expand Down Expand Up @@ -53,7 +54,7 @@ MemoryMetric::MemoryMetric(Platform platform, std::shared_ptr<JsonReportGenerato
std::make_pair("cma-3", "ion_cma_reserved"),
std::make_pair("cma-4", "vdin1_cma_reserved"),
std::make_pair("cma-5", "demod_cma_reserved"),
std::make_pair("cma-6", "kernel_reserved")
std::make_pair("cma-6", "kernel_reserved"),
};
} else if (platform == Platform::REALTEK) {
mCmaNames = {
Expand Down Expand Up @@ -364,8 +365,8 @@ void MemoryMetric::GetCmaMemoryUsage()
cmaName = mCmaNames.at(dirEntry.path().filename());
}
catch (const std::exception &ex) {
LOG_ERROR("Could not find CMA name for directory %s", dirEntry.path().filename().string().c_str());
break;
LOG_WARN("Could not find friendly CMA name for directory %s", dirEntry.path().filename().string().c_str());
cmaName = dirEntry.path().filename();
}

// Add to measurements
Expand Down Expand Up @@ -431,8 +432,9 @@ void MemoryMetric::GetContainerMemoryUsage()
//LOG_INFO("Getting Container memory usage");

long double memoryUsageKb = 0;
// List of system containers which we are not interested in.
std::string ignore_list[] = {"init.scope", "system.slice"};

// List of systemd-created cgroups which we are not interested in.
static const std::regex ignoreRegex = std::regex("(init.scope)|(.*.slice)|(.*.mount)|(.*.scope)");

std::string memoryCgroupDir = "/sys/fs/cgroup/memory";

Expand All @@ -449,7 +451,7 @@ void MemoryMetric::GetContainerMemoryUsage()
}

auto containerName = dirEntry.path().filename().string();
if (std::find(std::begin(ignore_list), std::end(ignore_list), containerName.c_str()) == std::end(ignore_list)) {
if (!std::regex_match(containerName, ignoreRegex)) {
auto memoryUsageFile = std::ifstream(dirEntry.path() / "memory.usage_in_bytes");
memoryUsageFile >> memoryUsageKb;
memoryUsageKb /= (long double) 1024.0;
Expand Down