Bump version to 2.4.0

f18m · May 13, 2022 · 3d1cd12 · 3d1cd12
1 parent ac138fc
commit 3d1cd12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Constants.mk b/Constants.mk
@@ -12,7 +12,7 @@ RPM_TARBALL_DIR:=/tmp/cmonitor/tarball
 # IMPORTANT: other places where the version must be updated:
 #  - debian/changelog             -> to release a new Ubuntu package
 # See also https://github.com/f18m/cmonitor/wiki/new-release
-CMONITOR_VERSION:=2.3.2
+CMONITOR_VERSION:=2.4.0
 CMONITOR_RELEASE:=0
 
 ifeq ($(CMONITOR_LAST_COMMIT_HASH),)

diff --git a/collector/src/cgroups_processes.cpp b/collector/src/cgroups_processes.cpp
@@ -474,7 +474,7 @@ void CMonitorCgroups::sample_process_list()
 
     // collect all PIDs for current cgroup
     m_cgroup_all_pids.clear();
-    !collect_pids(m_cgroup_processes_reader_pids, m_cgroup_all_pids);
+    collect_pids(m_cgroup_processes_reader_pids, m_cgroup_all_pids);
 }
 
 void CMonitorCgroups::sample_processes(double elapsed_sec, OutputFields output_opts)
@@ -645,10 +645,8 @@ void CMonitorCgroups::sample_processes(double elapsed_sec, OutputFields output_o
                  the delta of the absolute, monotonic-increasing value and divide by the elapsed time
         */
         m_pOutput->plong("last", CURRENT(pi_last_cpu));
-        m_pOutput->pdouble(
-            "usr", std::min(100.0, (double)DELTA(pi_utime) / elapsed_sec)); // percentage between 0-100
-        m_pOutput->pdouble(
-            "sys", std::min(100.0, (double)DELTA(pi_stime) / elapsed_sec)); // percentage between 0-100
+        m_pOutput->pdouble("usr", std::min(100.0, (double)DELTA(pi_utime) / elapsed_sec)); // percentage between 0-100
+        m_pOutput->pdouble("sys", std::min(100.0, (double)DELTA(pi_stime) / elapsed_sec)); // percentage between 0-100
 
         // provide also the total, monotonically-increasing CPU time:
         // this is used by chart script to produce the "top of the topper" chart