src/vmem.c: Importing changes from `main`.

Changes:
9369ed71450430266ebd7ca410022c2b1b548fb4 vmem: add metrics starting with `pgrefill`
21ffe63374e08d9c3af28a0df33d46e4a908f84e vmem: add "scan" metrics starting with "pgscan_"
25364414f51603e6940fbc1853071e4bc0bb24aa vmem: add "pgscan_"
a8069c10a05d93b6aae0e52b1c6a14e54350fe6f vmem: add metrics start with "pgscan_" in Kernel Linux

diff --git a/src/vmem.c b/src/vmem.c
index a4112bbbad1d1d3f3a09eeede81b45cbea85b46b..75a4395dbd91e2564aba9040c436e2bd1f2ae7bc 100644 (file)
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -211,14 +211,13 @@ static int vmem_read(void) {
       char *inst = key + strlen("pgsteal_");
       value_t value = {.derive = counter};
       submit_one(inst, "vmpage_action", "steal", value);
-    } else if (strncmp("pgscan_kswapd_", key, strlen("pgscan_kswapd_")) == 0) {
-      char *inst = key + strlen("pgscan_kswapd_");
+    } else if (strncmp("pgscan_", key, strlen("pgscan_")) == 0) {
+      char *inst = key + strlen("pgscan_");
       value_t value = {.derive = counter};
-      submit_one(inst, "vmpage_action", "scan_kswapd", value);
-    } else if (strncmp("pgscan_direct_", key, strlen("pgscan_direct_")) == 0) {
-      char *inst = key + strlen("pgscan_direct_");
+      submit_one(inst, "vmpage_action", "scan", value);
+    } else if (strncmp("pgrefill", key, strlen("pgrefill")) == 0) {
       value_t value = {.derive = counter};
-      submit_one(inst, "vmpage_action", "scan_direct", value);
+      submit_one(NULL, "vmpage_action", "refill", value);
     }
 
     /*