diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2022-06-21 13:26:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 13:26:48 +0300 |
| commit | 1e07dbe8f851857f68b407d3dcf7f007f519f4c7 (patch) | |
| tree | 215ede3a4a51a3a19933b65d3eee892b8fe4d163 /collectors/freebsd.plugin | |
| parent | 73f803fbc8900d0b004a87369983d997b67c094d (diff) | |
fix(freebsd.plugin): fix wired/cached/avail memory calculation on FreeBSD with ZFS (#13183)
Diffstat (limited to 'collectors/freebsd.plugin')
| -rw-r--r-- | collectors/freebsd.plugin/freebsd_sysctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/collectors/freebsd.plugin/freebsd_sysctl.c b/collectors/freebsd.plugin/freebsd_sysctl.c index 2583d7d18c..78d79e4112 100644 --- a/collectors/freebsd.plugin/freebsd_sysctl.c +++ b/collectors/freebsd.plugin/freebsd_sysctl.c @@ -1044,9 +1044,9 @@ int do_system_ram(int update_every, usec_t dt) { rrddim_set_by_pointer(st, rd_free, vmmeter_data.v_free_count); rrddim_set_by_pointer(st, rd_active, vmmeter_data.v_active_count); rrddim_set_by_pointer(st, rd_inactive, vmmeter_data.v_inactive_count); - rrddim_set_by_pointer(st, rd_wired, vmmeter_data.v_wire_count * system_pagesize - zfs_arcstats_shrinkable_cache_size_bytes); + rrddim_set_by_pointer(st, rd_wired, (unsigned long long)vmmeter_data.v_wire_count * (unsigned long long)system_pagesize - zfs_arcstats_shrinkable_cache_size_bytes); #if __FreeBSD_version < 1200016 - rrddim_set_by_pointer(st, rd_cache, vmmeter_data.v_cache_count * system_pagesize + zfs_arcstats_shrinkable_cache_size_bytes); + rrddim_set_by_pointer(st, rd_cache, (unsigned long long)vmmeter_data.v_cache_count * (unsigned long long)system_pagesize + zfs_arcstats_shrinkable_cache_size_bytes); #else rrddim_set_by_pointer(st, rd_cache, zfs_arcstats_shrinkable_cache_size_bytes); #endif @@ -1077,9 +1077,9 @@ int do_system_ram(int update_every, usec_t dt) { else rrdset_next(st_mem_available); #if __FreeBSD_version < 1200016 - rrddim_set_by_pointer(st_mem_available, rd_avail, vmmeter_data.v_inactive_count + vmmeter_data.v_free_count + (vmmeter_data.v_cache_count * system_pagesize + zfs_arcstats_shrinkable_cache_size_bytes)); + rrddim_set_by_pointer(st_mem_available, rd_avail, vmmeter_data.v_inactive_count + vmmeter_data.v_free_count + vmmeter_data.v_cache_count + zfs_arcstats_shrinkable_cache_size_bytes / system_pagesize); #else - rrddim_set_by_pointer(st_mem_available, rd_avail, vmmeter_data.v_inactive_count + vmmeter_data.v_free_count + zfs_arcstats_shrinkable_cache_size_bytes); + rrddim_set_by_pointer(st_mem_available, rd_avail, vmmeter_data.v_inactive_count + vmmeter_data.v_free_count + zfs_arcstats_shrinkable_cache_size_bytes / system_pagesize); #endif rrdset_done(st_mem_available); |