Skip to content

Detect smaps_rollup at runtime #374

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

Open
ktf wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Detect smaps_rollup at runtime #374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84cabd
Detect smaps_rollup at runtime
ktf Jul 4, 2026
c7bdc9f
Merge branch 'dev' into pr374
ktf Jul 4, 2026
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
9 changes: 4 additions & 5 deletions src/ProcessMonitor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@ namespace o2
namespace monitoring
{

#ifdef O2_MONITORING_OS_CC7
static constexpr auto SMAPS_ROLLUP_FILE = "/proc/self/smaps_rollup";
static constexpr auto SMAPS_FILE = "/proc/self/smaps";
#else
static constexpr auto SMAPS_FILE = "/proc/self/smaps_rollup";
#endif

#ifdef O2_MONITORING_OS_LINUX
namespace
Expand Down Expand Up @@ -148,7 +145,9 @@ std::vector<Metric> ProcessMonitor::getMemoryUsage()

std::vector<Metric> ProcessMonitor::getSmaps()
{
std::ifstream statusStream(SMAPS_FILE);
static const char* const smapsFile =
(::access(SMAPS_ROLLUP_FILE, R_OK) == 0) ? SMAPS_ROLLUP_FILE : SMAPS_FILE;
std::ifstream statusStream(smapsFile);
double pssTotal = 0;
double cleanTotal = 0;
double dirtyTotal = 0;
Expand Down