From: François Charlier <fcharlier@users.noreply.github.com>
Date: Tue, 15 Feb 2022 12:02:55 +0000 (+0100)
Subject: memory: add laundry and user wired pages (#3962)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de33b26ba4d67;p=thirdparty%2Fcollectd.git

memory: add laundry and user wired pages (#3962)

Changelog: memory: report for laundry and user_wire pages on FreeBSD

Add the `vm.stats.vm.v_laundry_count` and
`vm.stats.vm.v_user_wire_count`  which have been present on FreeBSD for
a little while now.
---

diff --git a/src/memory.c b/src/memory.c
index 1adbdf80c..4f544f0aa 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -281,13 +281,16 @@ static int memory_read_internal(value_list_t *vl) {
    * vm.stats.vm.v_active_count: 55239
    * vm.stats.vm.v_inactive_count: 113730
    * vm.stats.vm.v_cache_count: 10809
+   * vm.stats.vm.v_user_wire_count: 0
+   * vm.stats.vm.v_laundry_count: 40394
    */
-  const char *sysctl_keys[8] = {
-      "vm.stats.vm.v_page_size",    "vm.stats.vm.v_page_count",
-      "vm.stats.vm.v_free_count",   "vm.stats.vm.v_wire_count",
-      "vm.stats.vm.v_active_count", "vm.stats.vm.v_inactive_count",
-      "vm.stats.vm.v_cache_count",  NULL};
-  double sysctl_vals[8];
+  const char *sysctl_keys[10] = {
+      "vm.stats.vm.v_page_size",     "vm.stats.vm.v_page_count",
+      "vm.stats.vm.v_free_count",    "vm.stats.vm.v_wire_count",
+      "vm.stats.vm.v_active_count",  "vm.stats.vm.v_inactive_count",
+      "vm.stats.vm.v_cache_count",   "vm.stats.vm.v_user_wire_count",
+      "vm.stats.vm.v_laundry_count", NULL};
+  double sysctl_vals[10];
 
   for (int i = 0; sysctl_keys[i] != NULL; i++) {
     int value;
@@ -310,7 +313,8 @@ static int memory_read_internal(value_list_t *vl) {
   MEMORY_SUBMIT("free", (gauge_t)sysctl_vals[2], "wired",
                 (gauge_t)sysctl_vals[3], "active", (gauge_t)sysctl_vals[4],
                 "inactive", (gauge_t)sysctl_vals[5], "cache",
-                (gauge_t)sysctl_vals[6]);
+                (gauge_t)sysctl_vals[6], "user_wire", (gauge_t)sysctl_vals[7],
+                "laundry", (gauge_t)sysctl_vals[8]);
 
 #endif /* HAVE_SYSCTL && KERNEL_NETBSD */
   /* #endif HAVE_SYSCTLBYNAME */