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

[collectd 6] memory: add laundry and user wired pages (#3962)

This ports "add laundry and user wired pages (#3962)" (de33b26ba4d67)
from the main branch to collectd-6.0.

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 5752a76ce..2e1afae1d 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -78,6 +78,8 @@ typedef enum {
   COLLECTD_MEMORY_TYPE_ARC,
   COLLECTD_MEMORY_TYPE_UNUSED,
   COLLECTD_MEMORY_TYPE_AVAILABLE,
+  COLLECTD_MEMORY_TYPE_USER_WIRE,
+  COLLECTD_MEMORY_TYPE_LAUNDRY,
   COLLECTD_MEMORY_TYPE_MAX, /* #states */
 } memory_type_t;
 
@@ -97,6 +99,8 @@ static char const *memory_type_names[COLLECTD_MEMORY_TYPE_MAX] = {
     "arc",
     "unusable",
     "available",
+    "user_wire",
+    "laundry",
 };
 
 /* vm_statistics_data_t */
@@ -356,6 +360,8 @@ static int memory_read_internal(gauge_t values[COLLECTD_MEMORY_TYPE_MAX]) {
    * 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
    */
   struct {
     char const *sysctl_key;
@@ -367,6 +373,8 @@ static int memory_read_internal(gauge_t values[COLLECTD_MEMORY_TYPE_MAX]) {
       {"vm.stats.vm.v_active_count", COLLECTD_MEMORY_TYPE_ACTIVE},
       {"vm.stats.vm.v_inactive_count", COLLECTD_MEMORY_TYPE_INACTIVE},
       {"vm.stats.vm.v_cache_count", COLLECTD_MEMORY_TYPE_CACHED},
+      {"vm.stats.vm.v_user_wire_count", COLLECTD_MEMORY_TYPE_USER_WIRE},
+      {"vm.stats.vm.v_laundry_count", COLLECTD_MEMORY_TYPE_LAUNDRY},
   };
 
   gauge_t pagesize = 0;