X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/912bd26ede8901c98fd8d7a35f8493ee448109ad..b8adf932213faa797fcd69df28bb8bf9451cf5df:/widgets/mem.lua diff --git a/widgets/mem.lua b/widgets/mem.lua index dc72279..aede803 100644 --- a/widgets/mem.lua +++ b/widgets/mem.lua @@ -7,7 +7,8 @@ --]] -local helpers = require("lain.helpers") +local newtimer = require("lain.helpers").newtimer + local wibox = require("wibox") local io = { lines = io.lines } @@ -16,24 +17,17 @@ local string = { gmatch = string.gmatch } local setmetatable = setmetatable --- Memory usage +-- Memory usage (ignoring caches) -- lain.widgets.mem local mem = {} local function worker(args) local args = args or {} - local timeout = args.timeout or 1 + local timeout = args.timeout or 2 local settings = args.settings or function() end mem.widget = wibox.widget.textbox('') - helpers.set_map("mem_last_total", 0) - helpers.set_map("mem_last_free", 0) - helpers.set_map("mem_last_buf", 0) - helpers.set_map("mem_last_cache", 0) - helpers.set_map("mem_last_swap", 0) - helpers.set_map("mem_last_swapf", 0) - function update() mem_now = {} for line in io.lines("/proc/meminfo") @@ -50,29 +44,15 @@ local function worker(args) end end - if mem_now.total ~= helpers.set_map("mem_last_total") - or mem_now.free ~= helpers.set_map("mem_last_free") - or mem_now.buf ~= helpers.set_map("mem_last_buf") - or mem_now.cache ~= helpers.set_map("mem_last_cache") - or mem_now.swap ~= helpers.set_map("mem_last_swap") - or mem_now.swapf ~= helpers.set_map("mem_last_swapf") - then - mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache) - mem_now.swapused = mem_now.swap - mem_now.swapf + mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache) + mem_now.swapused = mem_now.swap - mem_now.swapf + mem_now.perc = math.floor(mem_now.used / mem_now.total * 100) - widget = mem.widget - settings() - - helpers.set_map("mem_last_total", mem_now.total) - helpers.set_map("mem_last_free", mem_now.free) - helpers.set_map("mem_last_buf", mem_now.buf) - helpers.set_map("mem_last_cache", mem_now.cache) - helpers.set_map("mem_last_swap", mem_now.swap) - helpers.set_map("mem_last_swapf", mem_now.swapf) - end + widget = mem.widget + settings() end - helpers.newtimer("mem", timeout, update) + newtimer("mem", timeout, update) return mem.widget end