Prefix definitions with O2_MONITORING (#123)

Author: awegrzyn

CMakeLists.txt

@@ -126,9 +126,9 @@ endif()
 # Handle custom compile definitions
 target_compile_definitions(Monitoring
   PRIVATE
-    $<$<BOOL:${APPLE}>:_OS_MAC>
-    $<$<BOOL:${LINUX}>:_OS_LINUX>
-    $<$<BOOL:${ApMon_FOUND}>:_WITH_APPMON>
+    $<$<BOOL:${APPLE}>:O2_MONITORING_OS_MAC>
+    $<$<BOOL:${LINUX}>:O2_MONITORING_OS_LINUX>
+    $<$<BOOL:${ApMon_FOUND}>:O2_MONITORING_WITH_APPMON>
   )
 
 # Use C++17

src/Monitoring.cxx

@@ -74,7 +74,7 @@ void Monitoring::enableProcessMonitoring(const unsigned int interval) {
     mMonitorRunning = true;
     mMonitorThread = std::thread(&Monitoring::pushLoop, this);
   }
-  #ifdef _OS_LINUX
+  #ifdef O2_MONITORING_OS_LINUX
   MonLogger::Get() << "Process Monitor : Automatic updates enabled" << MonLogger::End();
   #else
   MonLogger::Get() << "!! Process Monitor : Limited metrics available" << MonLogger::End();
@@ -123,7 +123,7 @@ void Monitoring::pushLoop()
   while (mMonitorRunning) {
     if (mProcessMonitoringInterval != 0 && (loopCount % (mProcessMonitoringInterval*10)) == 0) {
       transmit(mProcessMonitor->getCpuAndContexts());
-      #ifdef _OS_LINUX
+      #ifdef O2_MONITORING_OS_LINUX
       transmit(mProcessMonitor->getMemoryUsage());
       #endif
     }

src/MonitoringFactory.cxx

@@ -14,7 +14,7 @@
 #include "Backends/Flume.h"
 #include "Backends/Noop.h"
 
-#ifdef _WITH_APPMON
+#ifdef O2_MONITORING_WITH_APPMON
 #include "Backends/ApMonBackend.h"
 #endif
 
@@ -65,7 +65,7 @@ std::unique_ptr<Backend> getInfluxDb(http::url uri) {
   throw std::runtime_error("InfluxDB transport protocol not supported");
 }
 
-#ifdef _WITH_APPMON
+#ifdef O2_MONITORING_WITH_APPMON
 std::unique_ptr<Backend> getApMon(http::url uri) {
   return std::make_unique<backends::ApMonBackend>(uri.path);
 }

src/ProcessDetails.cxx

@@ -7,7 +7,7 @@
 
 #include <unistd.h>
 
-#ifdef _OS_MAC
+#ifdef O2_MONITORING_OS_MAC
 #include <mach-o/dyld.h>
 #endif
 
@@ -32,15 +32,15 @@ inline void ProcessDetails::generatePid()
 inline void ProcessDetails::generateProcessName()
 {
   char buff[255];
-  #ifdef _OS_LINUX
+  #ifdef O2_MONITORING_OS_LINUX
   ssize_t len = ::readlink("/proc/self/exe", buff, sizeof(buff)-1);
   if (len != -1) {
     buff[len] = '\0';
     mProcessName = std::string(buff);
   }
   #endif
 
-  #ifdef _OS_MAC
+  #ifdef O2_MONITORING_OS_MAC
   uint32_t size = sizeof(buff);
   if (_NSGetExecutablePath(buff, &size) == 0) {
     mProcessName = std::string(buff);

src/ProcessMonitor.cxx

@@ -23,7 +23,7 @@ ProcessMonitor::ProcessMonitor()
   mPid = static_cast<unsigned int>(::getpid());
   getrusage(RUSAGE_SELF, &mPreviousGetrUsage);
   mTimeLastRun = std::chrono::high_resolution_clock::now();
-  #ifdef _OS_LINUX
+  #ifdef O2_MONITORING_OS_LINUX
   setTotalMemory();
   #endif
 }

test/testMonitoring.cxx

@@ -53,10 +53,9 @@ BOOST_AUTO_TEST_CASE(testPush)
 
 BOOST_AUTO_TEST_CASE(testSymbols)
 {
-  BOOST_WARN_MESSAGE(!BOOST_IS_DEFINED( _WITH_APPMON ), "ApMon Backend disabled");
-  BOOST_WARN_MESSAGE(BOOST_IS_DEFINED( _OS_LINUX ), "Linux OS detected");
-  BOOST_WARN_MESSAGE(BOOST_IS_DEFINED( _OS_WINDOWS ), "Windows OS detected");
-  BOOST_WARN_MESSAGE(BOOST_IS_DEFINED( _OS_MAC ), "Mac OS detected");
+  BOOST_WARN_MESSAGE(!BOOST_IS_DEFINED( O2_MONITORING_WITH_APPMON ), "ApMon Backend disabled");
+  BOOST_WARN_MESSAGE(BOOST_IS_DEFINED( O2_MONITORING_OS_LINUX ), "Linux OS detected");
+  BOOST_WARN_MESSAGE(BOOST_IS_DEFINED( O2_MONITORING_OS_MAC ), "Mac OS detected");
 }
 
 } // namespace Test

test/testProcessMonitor.cxx

@@ -13,7 +13,7 @@ BOOST_AUTO_TEST_CASE(createProcessMonitor)
 {
   o2::monitoring::ProcessMonitor processMonitor;
   processMonitor.getCpuAndContexts();
-  #ifdef _OS_LINUX
+  #ifdef O2_MONITORING_OS_LINUX
   processMonitor.getMemoryUsage();
   #endif
 }