New upstream version 1.9.0+dfsgupstream/1.9.0+dfsg

1 files changed, 92 insertions, 6 deletions

diff --git a/src/freebsd_kstat_zfs.c b/src/freebsd_kstat_zfs.c
index 17642994e..1bd48d4bf 100644
--- a/src/freebsd_kstat_zfs.c
+++ b/src/freebsd_kstat_zfs.c
@@ -1,9 +1,11 @@
 #include "common.h"
 #include "zfs_common.h"
 
-struct arcstats arcstats = { 0 };
+extern struct arcstats arcstats;
 
+// --------------------------------------------------------------------------------------------------------------------
 // kstat.zfs.misc.arcstats
+
 int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
     (void)dt;
 
@@ -103,15 +105,15 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
         int arc_sys_free[5];
     } mibs;
 
-    l2exist = -1;
+    arcstats.l2exist = -1;
 
     if(unlikely(sysctlbyname("kstat.zfs.misc.arcstats.l2_size", &l2_size, &uint64_t_size, NULL, 0)))
         return 0;
 
     if(likely(l2_size))
-        l2exist = 1;
+        arcstats.l2exist = 1;
     else
-        l2exist = 0;
+        arcstats.l2exist = 0;
 
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hits", mibs.hits, arcstats.hits);
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.misses", mibs.misses, arcstats.misses);
@@ -205,8 +207,92 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
     // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_need_free", mibs.arc_need_free, arcstats.arc_need_free);
     // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_sys_free", mibs.arc_sys_free, arcstats.arc_sys_free);
 
-    generate_charts_arcstats(update_every);
-    generate_charts_arc_summary(update_every);
+    generate_charts_arcstats("freebsd", update_every);
+    generate_charts_arc_summary("freebsd", update_every);
+
+    return 0;
+}
+
+// --------------------------------------------------------------------------------------------------------------------
+// kstat.zfs.misc.zio_trim
+
+int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
+    (void)dt;
+    static int mib_bytes[5] = {0, 0, 0, 0, 0}, mib_success[5] = {0, 0, 0, 0, 0},
+               mib_failed[5] = {0, 0, 0, 0, 0}, mib_unsupported[5] = {0, 0, 0, 0, 0};
+    uint64_t bytes, success, failed, unsupported;
+
+    if (unlikely(GETSYSCTL_SIMPLE("kstat.zfs.misc.zio_trim.bytes", mib_bytes, bytes) ||
+                 GETSYSCTL_SIMPLE("kstat.zfs.misc.zio_trim.success", mib_success, success) ||
+                 GETSYSCTL_SIMPLE("kstat.zfs.misc.zio_trim.failed", mib_failed, failed) ||
+                 GETSYSCTL_SIMPLE("kstat.zfs.misc.zio_trim.unsupported", mib_unsupported, unsupported))) {
+        error("DISABLED: zfs.trim_bytes chart");
+        error("DISABLED: zfs.trim_success chart");
+        error("DISABLED: kstat.zfs.misc.zio_trim module");
+        return 1;
+     } else {
+
+     // --------------------------------------------------------------------
+
+        static RRDSET *st_bytes = NULL;
+        static RRDDIM *rd_bytes = NULL;
+
+        if (unlikely(!st_bytes)) {
+            st_bytes = rrdset_create_localhost(
+                    "zfs",
+                    "trim_bytes",
+                    NULL,
+                    "trim",
+                    NULL,
+                    "Successfully TRIMmed bytes",
+                    "bytes",
+                    "freebsd",
+                    "zfs",
+                    2320,
+                    update_every,
+                    RRDSET_TYPE_LINE
+            );
+
+            rd_bytes = rrddim_add(st_bytes, "TRIMmed", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+        }
+        else rrdset_next(st_bytes);
+
+        rrddim_set_by_pointer(st_bytes, rd_bytes, bytes);
+        rrdset_done(st_bytes);
+        
+        // --------------------------------------------------------------------
+
+        static RRDSET *st_requests = NULL;
+        static RRDDIM *rd_successful = NULL, *rd_failed = NULL, *rd_unsupported = NULL;
+
+        if (unlikely(!st_requests)) {
+            st_requests = rrdset_create_localhost(
+                    "zfs",
+                    "trim_requests",
+                    NULL,
+                    "trim",
+                    NULL,
+                    "TRIM requests",
+                    "requests",
+                    "freebsd",
+                    "zfs",
+                    2321,
+                    update_every,
+                    RRDSET_TYPE_STACKED
+            );
+
+            rd_successful  = rrddim_add(st_requests, "successful",  NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+            rd_failed      = rrddim_add(st_requests, "failed",      NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+            rd_unsupported = rrddim_add(st_requests, "unsupported", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+        }
+        else rrdset_next(st_requests);
+
+        rrddim_set_by_pointer(st_requests, rd_successful,  success);
+        rrddim_set_by_pointer(st_requests, rd_failed,      failed);
+        rrddim_set_by_pointer(st_requests, rd_unsupported, unsupported);
+        rrdset_done(st_requests);
+        
+     }
 
     return 0;
 }
\ No newline at end of file