pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(memory): Add swap tokens (#1018)

Browse Source
This commit is contained in:
Alexander 2018-02-25 14:12:38 +03:00 committed by Patrick Ziegler
parent 2f62a6fbad
commit 4f6e37449b
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/memory.hpp
View File

@ -29,6 +29,8 @@ namespace modules {
int m_perc_memfree{0}; int m_perc_memfree{0};
ramp_t m_ramp_memused; ramp_t m_ramp_memused;
ramp_t m_ramp_memfree; ramp_t m_ramp_memfree;
int m_perc_swap_used{0};
int m_perc_swap_free{0};
}; };
} }

14
src/modules/memory.cpp
View File

@ -40,6 +40,8 @@ namespace modules {
bool memory_module::update() { bool memory_module::update() {
unsigned long long kb_total{0ULL}; unsigned long long kb_total{0ULL};
unsigned long long kb_avail{0ULL}; unsigned long long kb_avail{0ULL};
unsigned long long kb_swap_total{0ULL};
unsigned long long kb_swap_free{0ULL};
try { try {
std::ifstream meminfo(PATH_MEMORY_INFO); std::ifstream meminfo(PATH_MEMORY_INFO);
@ -58,6 +60,8 @@ namespace modules {
} }
kb_total = parsed["MemTotal"]; kb_total = parsed["MemTotal"];
kb_swap_total = parsed["SwapTotal"];
kb_swap_free = parsed["SwapFree"];
// newer kernels (3.4+) have an accurate available memory field, // newer kernels (3.4+) have an accurate available memory field,
// see https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // see https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
@ -74,6 +78,8 @@ namespace modules {
m_perc_memfree = math_util::percentage(kb_avail, kb_total); m_perc_memfree = math_util::percentage(kb_avail, kb_total);
m_perc_memused = 100 - m_perc_memfree; m_perc_memused = 100 - m_perc_memfree;
m_perc_swap_free = math_util::percentage(kb_swap_free, kb_swap_total);
m_perc_swap_used = 100 - m_perc_swap_free;
// replace tokens // replace tokens
if (m_label) { if (m_label) {
@ -86,6 +92,14 @@ namespace modules {
m_label->replace_token("%mb_total%", string_util::filesize_mb(kb_total, 2, m_bar.locale)); m_label->replace_token("%mb_total%", string_util::filesize_mb(kb_total, 2, m_bar.locale));
m_label->replace_token("%percentage_used%", to_string(m_perc_memused)); m_label->replace_token("%percentage_used%", to_string(m_perc_memused));
m_label->replace_token("%percentage_free%", to_string(m_perc_memfree)); m_label->replace_token("%percentage_free%", to_string(m_perc_memfree));
m_label->replace_token("%percentage_swap_used%", to_string(m_perc_swap_used));
m_label->replace_token("%percentage_swap_free%", to_string(m_perc_swap_free));
m_label->replace_token("%mb_swap_total%", string_util::filesize_mb(kb_swap_total, 2, m_bar.locale));
m_label->replace_token("%mb_swap_free%", string_util::filesize_mb(kb_swap_free, 2, m_bar.locale));
m_label->replace_token("%mb_swap_used%", string_util::filesize_mb(kb_swap_total - kb_swap_free, 2, m_bar.locale));
m_label->replace_token("%gb_swap_total%", string_util::filesize_gb(kb_swap_total, 2, m_bar.locale));
m_label->replace_token("%gb_swap_free%", string_util::filesize_gb(kb_swap_free, 2, m_bar.locale));
m_label->replace_token("%gb_swap_used%", string_util::filesize_gb(kb_swap_total - kb_swap_free, 2, m_bar.locale));
} }
return true; return true;