From 30cc42fcd92891336e4df6734282aba3213d0c17 Mon Sep 17 00:00:00 2001 From: simplepad <35456194+simplepad@users.noreply.github.com> Date: Tue, 5 Jul 2022 00:20:33 +0300 Subject: [PATCH] Move get_zfs_stat_file() and zfs_collect_pool_total_stats() functions declarations to btop_collect.cpp so they aren't included when compiling for macos and freebsd --- src/btop_shared.hpp | 5 ----- src/linux/btop_collect.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/btop_shared.hpp b/src/btop_shared.hpp index d08eb4c..07c042e 100644 --- a/src/btop_shared.hpp +++ b/src/btop_shared.hpp @@ -161,11 +161,6 @@ namespace Mem { //* Draw contents of mem box using as source string draw(const mem_info& mem, const bool force_redraw=false, const bool data_same=false); - //?* Find the filepath to the specified ZFS object's stat file - string get_zfs_stat_file(const string& device_name, size_t dataset_name_start, bool zfs_pools_only); - - //?* Collect total ZFS pool io stats - bool zfs_collect_pool_total_stats(struct disk_info &disk); } namespace Net { diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index 113d418..7598d50 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -741,6 +741,12 @@ namespace Mem { vector last_found; const std::regex zfs_size_regex("^size\\s+\\d\\s+(\\d+)"); + //?* Find the filepath to the specified ZFS object's stat file + string get_zfs_stat_file(const string& device_name, size_t dataset_name_start, bool zfs_pools_only); + + //?* Collect total ZFS pool io stats + bool zfs_collect_pool_total_stats(struct disk_info &disk); + mem_info current_mem {}; uint64_t get_totalMem() {