[OMON-378] Add voluntary context switches to process monitoring (#217)

Author: awegrzyn

CMakeLists.txt

@@ -17,7 +17,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.3.4
+  VERSION 3.4.0
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

include/Monitoring/ProcessMonitor.h

@@ -42,7 +42,8 @@ class ProcessMonitor
     VIRTUAL_MEMORY_SIZE,
     RESIDENT_SET_SIZE,
     CPU_USED_PERCENTAGE,
-    INVOLUNTARY_CONTEXT_SWITCHING,
+    INVOLUNTARY_CONTEXT_SWITCHES,
+    VOLUNTARY_CONTEXT_SWITCHES,
     CPU_USED_ABSOLUTE,
     AVG_RESIDENT_SET_SIZE,
     AVG_VIRTUAL_MEMORY_SIZE,
@@ -72,7 +73,7 @@ class ProcessMonitor
 
  private:
   static constexpr const char* metricsNames[] = {"memoryUsagePercentage", "virtualMemorySize", "residentSetSize",
-                                                 "cpuUsedPercentage", "involuntaryContextSwitches", "cpuUsedAbsolute",
+                                                 "cpuUsedPercentage", "involuntaryContextSwitches", "voluntaryContextSwitches", "cpuUsedAbsolute",
                                                  "averageResidentSetSize", "averageVirtualMemorySize", "averageCpuUsedPercentage",
                                                  "cpuTimeConsumedByProcess", "proportionalSetSize"};
 

src/ProcessMonitor.cxx

@@ -108,7 +108,9 @@ std::vector<Metric> ProcessMonitor::getCpuAndContexts()
 
   metrics.emplace_back(Metric{cpuUsedPerctange, metricsNames[CPU_USED_PERCENTAGE]});
   metrics.emplace_back(Metric{
-    static_cast<uint64_t>(currentUsage.ru_nivcsw - mPreviousGetrUsage.ru_nivcsw), metricsNames[INVOLUNTARY_CONTEXT_SWITCHING]});
+    static_cast<uint64_t>(currentUsage.ru_nivcsw - mPreviousGetrUsage.ru_nivcsw), metricsNames[INVOLUNTARY_CONTEXT_SWITCHES]});
+  metrics.emplace_back(Metric{
+    static_cast<uint64_t>(currentUsage.ru_nvcsw - mPreviousGetrUsage.ru_nvcsw), metricsNames[VOLUNTARY_CONTEXT_SWITCHES]});
   metrics.emplace_back(cpuUsedInMicroSeconds, metricsNames[CPU_USED_ABSOLUTE]);
 
   mTimeLastRun = timeNow;