From 684430e89685fde6243d7e04d7fec9f41c8ad808 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:39:27 +0100 Subject: [PATCH 1/2] Inverse logic to use smaps_rollup Consider not having smaps_rollup a special case, rather than the other way around. --- src/ProcessMonitor.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ProcessMonitor.cxx b/src/ProcessMonitor.cxx index c28cf6ab..c613ce10 100644 --- a/src/ProcessMonitor.cxx +++ b/src/ProcessMonitor.cxx @@ -31,10 +31,10 @@ namespace o2 namespace monitoring { -#ifdef O2_MONITORING_OS_CS8 -static constexpr auto SMAPS_FILE = "/proc/self/smaps_rollup"; -#else +#ifdef O2_MONITORING_OS_CS7 static constexpr auto SMAPS_FILE = "/proc/self/smaps"; +#else +static constexpr auto SMAPS_FILE = "/proc/self/smaps_rollup"; #endif ProcessMonitor::ProcessMonitor() From 0aa472df985599176ade4770b7c7e126fce53455 Mon Sep 17 00:00:00 2001 From: sy-c Date: Thu, 23 Jan 2025 21:16:32 +0100 Subject: [PATCH 2/2] Update ProcessMonitor.cxx fixed name of constant for CC7 --- src/ProcessMonitor.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProcessMonitor.cxx b/src/ProcessMonitor.cxx index c613ce10..1918a853 100644 --- a/src/ProcessMonitor.cxx +++ b/src/ProcessMonitor.cxx @@ -31,7 +31,7 @@ namespace o2 namespace monitoring { -#ifdef O2_MONITORING_OS_CS7 +#ifdef O2_MONITORING_OS_CC7 static constexpr auto SMAPS_FILE = "/proc/self/smaps"; #else static constexpr auto SMAPS_FILE = "/proc/self/smaps_rollup";