Jan Rybar ef4d31
diff -up ./proc/sysinfo.c.ori ./proc/sysinfo.c
Jan Rybar ef4d31
--- ./proc/sysinfo.c.ori	2021-02-09 11:11:25.000000000 +0100
Jan Rybar ef4d31
+++ ./proc/sysinfo.c	2022-07-29 14:08:42.093322509 +0200
Jan Rybar ef4d31
@@ -786,10 +786,8 @@ nextline:
Jan Rybar ef4d31
      where such values will be dramatically distorted over those of the host. */
Jan Rybar ef4d31
   if (kb_main_available > kb_main_total)
Jan Rybar ef4d31
     kb_main_available = kb_main_free;
Jan Rybar ef4d31
-  mem_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers;
Jan Rybar ef4d31
-  if (mem_used < 0)
Jan Rybar ef4d31
-    mem_used = kb_main_total - kb_main_free;
Jan Rybar ef4d31
-  kb_main_used = (unsigned long)mem_used;
Jan Rybar ef4d31
+  mem_used = kb_main_total - kb_main_available;
Jan Rybar ef4d31
+  kb_main_used = mem_used < 0 ? 0 : (unsigned long) mem_used;
Jan Rybar ef4d31
 
Jan Rybar ef4d31
   /* zero? might need fallback for 2.6.27 <= kernel 
Jan Rybar ef4d31
   if (!kb_main_available) {
Jan Rybar ef4d31
diff -up ./top/top.c.ori ./top/top.c
Jan Rybar ef4d31
--- ./top/top.c.ori	2021-02-09 11:11:25.000000000 +0100
Jan Rybar ef4d31
+++ ./top/top.c	2022-07-29 13:59:04.681966019 +0200
Jan Rybar ef4d31
@@ -6076,12 +6076,16 @@ numa_nope:
Jan Rybar ef4d31
          char used[SMLBUFSIZ], util[SMLBUFSIZ], dual[MEDBUFSIZ];
Jan Rybar ef4d31
          float pct_used, pct_misc, pct_swap;
Jan Rybar ef4d31
          int ix, num_used, num_misc;
Jan Rybar ef4d31
+         unsigned long my_used;
Jan Rybar ef4d31
 
Jan Rybar ef4d31
-         pct_used = (float)kb_main_used * (100.0 / (float)kb_main_total);
Jan Rybar ef4d31
+         // upstream kept old calculation of 'used' here for some reason
Jan Rybar ef4d31
+         // https://gitlab.com/procps-ng/procps/-/commit/047d16ccfda6638eda78f56b67def196a2002b6f
Jan Rybar ef4d31
+         my_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers;
Jan Rybar ef4d31
+         pct_used = (float)my_used * (100.0 / (float)kb_main_total);
Jan Rybar ef4d31
 #ifdef MEMGRAPH_OLD
Jan Rybar ef4d31
          pct_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total);
Jan Rybar ef4d31
 #else
Jan Rybar ef4d31
-         pct_misc = (float)(kb_main_total - kb_main_available - kb_main_used) * (100.0 / (float)kb_main_total);
Jan Rybar ef4d31
+         pct_misc = (float)(kb_main_total - kb_main_available - my_used) * (100.0 / (float)kb_main_total);
Jan Rybar ef4d31
 #endif
Jan Rybar ef4d31
          if (pct_used + pct_misc > 100.0 || pct_misc < 0) pct_misc = 0;
Jan Rybar ef4d31
          pct_swap = kb_swap_total ? (float)kb_swap_used * (100.0 / (float)kb_swap_total) : 0;