Skip to content

Commit a84cabd

Browse files
committed
Detect smaps_rollup at runtime
One variable less to worry about.
1 parent 2b4b5a7 commit a84cabd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/ProcessMonitor.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ namespace o2
3131
namespace monitoring
3232
{
3333

34-
#ifdef O2_MONITORING_OS_CS8
35-
static constexpr auto SMAPS_FILE = "/proc/self/smaps_rollup";
36-
#else
34+
static constexpr auto SMAPS_ROLLUP_FILE = "/proc/self/smaps_rollup";
3735
static constexpr auto SMAPS_FILE = "/proc/self/smaps";
3836
#endif
3937

@@ -98,7 +96,9 @@ std::vector<Metric> ProcessMonitor::getMemoryUsage()
9896

9997
std::vector<Metric> ProcessMonitor::getSmaps()
10098
{
101-
std::ifstream statusStream(SMAPS_FILE);
99+
static const char* const smapsFile =
100+
(::access(SMAPS_ROLLUP_FILE, R_OK) == 0) ? SMAPS_ROLLUP_FILE : SMAPS_FILE;
101+
std::ifstream statusStream(smapsFile);
102102
double pssTotal = 0;
103103
double cleanTotal = 0;
104104
double dirtyTotal = 0;

0 commit comments

Comments
 (0)