X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8..c23271b418b56cef5892f2681470199966dfd39c:/widgets/mem.lua?ds=sidebyside diff --git a/widgets/mem.lua b/widgets/mem.lua index 763ac4b..7b717ef 100644 --- a/widgets/mem.lua +++ b/widgets/mem.lua @@ -7,11 +7,11 @@ --]] -local newtimer = require("lain.helpers").newtimer +local helpers = require("lain.helpers") local wibox = require("wibox") local gmatch = string.gmatch local lines = io.lines -local math = { ceil = math.ceil, floor = math.floor } +local floor = math.floor local setmetatable = setmetatable -- Memory usage (ignoring caches) @@ -25,17 +25,17 @@ local function worker(args) mem.widget = wibox.widget.textbox() - function update() + function mem.update() mem_now = {} for line in lines("/proc/meminfo") do for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do - if k == "MemTotal" then mem_now.total = math.ceil(v / 1024) - elseif k == "MemFree" then mem_now.free = math.ceil(v / 1024) - elseif k == "Buffers" then mem_now.buf = math.ceil(v / 1024) - elseif k == "Cached" then mem_now.cache = math.ceil(v / 1024) - elseif k == "SwapTotal" then mem_now.swap = math.ceil(v / 1024) - elseif k == "SwapFree" then mem_now.swapf = math.ceil(v / 1024) - elseif k == "SReclaimable" then mem_now.srec = math.ceil(v / 1024) + if k == "MemTotal" then mem_now.total = floor(v / 1024 + 0.5) + elseif k == "MemFree" then mem_now.free = floor(v / 1024 + 0.5) + elseif k == "Buffers" then mem_now.buf = floor(v / 1024 + 0.5) + elseif k == "Cached" then mem_now.cache = floor(v / 1024 + 0.5) + elseif k == "SwapTotal" then mem_now.swap = floor(v / 1024 + 0.5) + elseif k == "SwapFree" then mem_now.swapf = floor(v / 1024 + 0.5) + elseif k == "SReclaimable" then mem_now.srec = floor(v / 1024 + 0.5) end end end @@ -48,9 +48,9 @@ local function worker(args) settings() end - newtimer("mem", timeout, update) + helpers.newtimer("mem", timeout, mem.update) - return mem.widget + return mem end return setmetatable(mem, { __call = function(_, ...) return worker(...) end })