From bc134d87926731ef52755edc63b0e3b619238386 Mon Sep 17 00:00:00 2001 From: mutlusun Date: Fri, 23 Aug 2019 10:45:43 +0200 Subject: [PATCH] [mem_freebsd] Correct async behaviour --- widgets/mem_freebsd.lua | 170 +++++++++++++++++++++++----------------- 1 file changed, 96 insertions(+), 74 deletions(-) diff --git a/widgets/mem_freebsd.lua b/widgets/mem_freebsd.lua index 4a162c1..ebc4484 100644 --- a/widgets/mem_freebsd.lua +++ b/widgets/mem_freebsd.lua @@ -5,7 +5,8 @@ local helpers = require("vicious.helpers") local spawn = require("vicious.spawn") local string = { match = string.match, - gmatch = string.gmatch + gmatch = string.gmatch, + find = string.find } -- }}} @@ -15,80 +16,101 @@ local mem_freebsd = {} -- {{{ Memory widget type -local function parse(stdout, stderr, exitreason, exitcode) - local pagesize = tonumber(helpers.sysctl("hw.pagesize")) - local vm_stats = helpers.sysctl_table("vm.stats.vm") - local _mem = { buf = {}, total = nil } - - -- Get memory space in bytes - _mem.total = tonumber(vm_stats.v_page_count) * pagesize - _mem.buf.free = tonumber(vm_stats.v_free_count) * pagesize - _mem.buf.laundry = tonumber(vm_stats.v_laundry_count) * pagesize - _mem.buf.cache = tonumber(vm_stats.v_cache_count) * pagesize - _mem.buf.wired = tonumber(vm_stats.v_wire_count) * pagesize - - -- Rework into megabytes - _mem.total = math.floor(_mem.total/1048576) - _mem.buf.free = math.floor(_mem.buf.free/1048576) - _mem.buf.laundry = math.floor(_mem.buf.laundry/1048576) - _mem.buf.cache = math.floor(_mem.buf.cache/1048576) - _mem.buf.wired = math.floor(_mem.buf.wired/1048576) - - -- Calculate memory percentage - _mem.free = _mem.buf.free + _mem.buf.cache - -- used memory basically consists of active+inactive+wired - _mem.inuse = _mem.total - _mem.free - _mem.notfreeable = _mem.inuse - _mem.buf.laundry - _mem.wire = _mem.buf.wired - - _mem.usep = math.floor(_mem.inuse / _mem.total * 100) - _mem.wirep = math.floor(_mem.wire / _mem.total * 100) - _mem.notfreeablep = math.floor(_mem.notfreeable / _mem.total * 100) - - -- Get swap states - local vm_swap_total = tonumber(helpers.sysctl("vm.swap_total")) - local vm_swap_enabled = tonumber(helpers.sysctl("vm.swap_enabled")) - local _swp = { buf = {}, total = nil } - - if vm_swap_enabled == 1 and vm_swap_total > 0 then - -- Initialise variables - _swp.usep = 0 - _swp.inuse = 0 - _swp.total = 0 - _swp.buf.free = 0 - - -- Read output of swapinfo in Mbytes (from async function call) - -- Read content and sum up - local counter = 1 - for line in string.gmatch(stdout, "[^\n]+") do - -- Skip first line (table header) - if counter ~= 1 then - local ltotal, lused, lfree = string.match(line, "%s+([%d]+)%s+([%d]+)%s+([%d]+)") - -- Add swap space in Mbytes - _swp.total = _swp.total + tonumber(ltotal) - _swp.inuse = _swp.inuse + tonumber(lused) - _swp.buf.free = _swp.buf.free + tonumber(lfree) - end - counter = counter + 1 - end - - -- Calculate percentage - _swp.usep = math.floor(_swp.inuse / _swp.total * 100) - else - _swp.usep = -1 - _swp.inuse = -1 - _swp.total = -1 - _swp.buf.free = -1 - end - - return { _mem.usep, _mem.inuse, _mem.total, _mem.free, - _swp.usep, _swp.inuse, _swp.total, _swp.buf.free, - _mem.wirep, _mem.wire, _mem.notfreeablep, _mem.notfreeable } -end - function mem_freebsd.async(format, warg, callback) - spawn.easy_async("swapinfo -m", - function (...) callback(parse(...)) end) + helpers.sysctl_async({ "hw.pagesize", + "vm.stats.vm", + "vm.swap_total", + "vm.swap_enabled" }, + function(ret) + + local pagesize = tonumber(ret["hw.pagesize"]) + local _mem = { buf = {}, total = nil } + + -- Get memory space in bytes + _mem.total = tonumber(ret["vm.stats.vm.v_page_count"]) * pagesize + _mem.buf.free = tonumber(ret["vm.stats.vm.v_free_count"]) * pagesize + _mem.buf.laundry = tonumber(ret["vm.stats.vm.v_laundry_count"]) * pagesize + _mem.buf.cache = tonumber(ret["vm.stats.vm.v_cache_count"]) * pagesize + _mem.buf.wired = tonumber(ret["vm.stats.vm.v_wire_count"]) * pagesize + + -- Rework into megabytes + _mem.total = math.floor(_mem.total/1048576) + _mem.buf.free = math.floor(_mem.buf.free/1048576) + _mem.buf.laundry = math.floor(_mem.buf.laundry/1048576) + _mem.buf.cache = math.floor(_mem.buf.cache/1048576) + _mem.buf.wired = math.floor(_mem.buf.wired/1048576) + + -- Calculate memory percentage + _mem.free = _mem.buf.free + _mem.buf.cache + -- used memory basically consists of active+inactive+wired + _mem.inuse = _mem.total - _mem.free + _mem.notfreeable = _mem.inuse - _mem.buf.laundry + _mem.wire = _mem.buf.wired + + _mem.usep = math.floor(_mem.inuse / _mem.total * 100) + _mem.wirep = math.floor(_mem.wire / _mem.total * 100) + _mem.notfreeablep = math.floor(_mem.notfreeable / _mem.total * 100) + + -- Get swap states + local vm_swap_total = tonumber(ret["vm.swap_total"]) + local vm_swap_enabled = tonumber(ret["vm.swap_enabled"]) + local _swp = { buf = {}, total = nil } + + if vm_swap_enabled == 1 and vm_swap_total > 0 then + -- Initialise variables + _swp.usep = 0 + _swp.inuse = 0 + _swp.total = 0 + _swp.buf.free = 0 + + -- Read output of swapinfo in Mbytes (from async function call) + -- Read content and sum up + spawn.with_line_callback("swapinfo -m", { + stdout = function(line) + if not string.find(line, "Device") then + local ltotal, lused, lfree = string.match(line, "%s+([%d]+)%s+([%d]+)%s+([%d]+)") + -- Add swap space in Mbytes + _swp.total = _swp.total + tonumber(ltotal) + _swp.inuse = _swp.inuse + tonumber(lused) + _swp.buf.free = _swp.buf.free + tonumber(lfree) + end + end, + output_done = function() + print(_swp.inuse, _swp.total) + _swp.usep = math.floor(_swp.inuse / _swp.total * 100) + callback({ _mem.usep, + _mem.inuse, + _mem.total, + _mem.free, + _swp.usep, + _swp.inuse, + _swp.total, + _swp.buf.free, + _mem.wirep, + _mem.wire, + _mem.notfreeablep, + _mem.notfreeable }) + end + }) + else + _swp.usep = -1 + _swp.inuse = -1 + _swp.total = -1 + _swp.buf.free = -1 + callback({ _mem.usep, + _mem.inuse, + _mem.total, + _mem.free, + _swp.usep, + _swp.inuse, + _swp.total, + _swp.buf.free, + _mem.wirep, + _mem.wire, + _mem.notfreeablep, + _mem.notfreeable }) + end + end) end -- }}}