diff --git a/include/modules/memory.hpp b/include/modules/memory.hpp index 7fd984d0..9e2c6a9e 100644 --- a/include/modules/memory.hpp +++ b/include/modules/memory.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "util/chrono.hpp" #include "ALabel.hpp" @@ -12,6 +12,9 @@ class Memory : public ALabel { Memory(const Json::Value&); auto update() -> void; private: + unsigned long memtotal_; + unsigned long memfree_; + void parseMeminfo(); waybar::util::SleeperThread thread_; }; diff --git a/src/modules/memory.cpp b/src/modules/memory.cpp index b2093e8e..108380f5 100644 --- a/src/modules/memory.cpp +++ b/src/modules/memory.cpp @@ -13,13 +13,30 @@ waybar::modules::Memory::Memory(const Json::Value& config) auto waybar::modules::Memory::update() -> void { - struct sysinfo info = {}; - if (sysinfo(&info) == 0) { - auto total = info.totalram * info.mem_unit; - auto freeram = info.freeram * info.mem_unit; - int used_ram_percentage = 100 * (total - freeram) / total; - label_.set_text(fmt::format(format_, used_ram_percentage)); - auto used_ram_gigabytes = (total - freeram) / std::pow(1024, 3); - label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1)); - } + parseMeminfo(); + int used_ram_percentage = 100 * (memtotal_ - memfree_) / memtotal_; + label_.set_text(fmt::format(format_, used_ram_percentage)); + auto used_ram_gigabytes = (memtotal_ - memfree_) / std::pow(1024, 2); + label_.set_tooltip_text(fmt::format("{:.{}f}Gb used", used_ram_gigabytes, 1)); +} + +void waybar::modules::Memory::parseMeminfo() +{ + int memtotal, memfree, memavail, membuffer, memcache; + FILE* info = fopen("/proc/meminfo","r"); + if(fscanf (info, "MemTotal: %d kB MemFree: %d kB Buffers: %d kB Cached: %d kB",&memtotal, &memfree, &membuffer, &memcache) < 4) { // Old meminfo format + fclose(info); + info = fopen("/proc/meminfo","r"); + if(fscanf(info, "MemTotal: %d kB MemFree: %d kB MemAvailable: %d kB Buffers: %d kB Cached: %d kB",&memtotal, &memfree, &memavail, &membuffer, &memcache) < 5) { // Current meminfo format + memtotal_ = -1; + memfree_ = -1; + } else { + memtotal_ = memtotal; + memfree_ = memavail; + } + } else { + memtotal_ = memtotal; + memfree_ = memfree + (membuffer + memcache); + } + fclose(info); }