X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b7c3cb77a1ca72ab8fb91c8618f8703e3c1e446c..49a4df385e953156e6d1e2ee0bcfd07d8501d0f4:/widgets/cpu.lua diff --git a/widgets/cpu.lua b/widgets/cpu.lua index 96e0d3b..f61e2cc 100644 --- a/widgets/cpu.lua +++ b/widgets/cpu.lua @@ -7,71 +7,76 @@ --]] -local first_line = require("lain.helpers").first_line -local newtimer = require("lain.helpers").newtimer - +local helpers = require("lain.helpers") local wibox = require("wibox") - local math = { ceil = math.ceil } local string = { format = string.format, gmatch = string.gmatch } local tostring = tostring - local setmetatable = setmetatable -- CPU usage -- lain.widgets.cpu -local cpu = { - last_total = 0, - last_active = 0 -} +local cpu = helpers.make_widget_textbox() local function worker(args) local args = args or {} - local timeout = args.timeout or 5 + local timeout = args.timeout or 2 local settings = args.settings or function() end - cpu.widget = wibox.widget.textbox('') + cpu.core = {} function update() -- Read the amount of time the CPUs have spent performing -- different kinds of work. Read the first line of /proc/stat -- which is the sum of all CPUs. - local times = first_line("/proc/stat") - local at = 1 - local idle = 0 - local total = 0 - for field in string.gmatch(times, "[%s]+([^%s]+)") - do - -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done - -- nothing during these times. - if at == 4 or at == 5 - then - idle = idle + field + local times = helpers.lines_match("cpu","/proc/stat") + + for index,time in pairs(times) do + local coreid = index - 1 + local core = cpu.core[coreid] or + { last_active = 0 , last_total = 0, usage = 0 } + local at = 1 + local idle = 0 + local total = 0 + + for field in string.gmatch(time, "[%s]+([^%s]+)") do + -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done + -- nothing during these times. + if at == 4 or at == 5 then + idle = idle + field + end + total = total + field + at = at + 1 end - total = total + field - at = at + 1 - end - local active = total - idle - -- Read current data and calculate relative values. - local dactive = active - cpu.last_active - local dtotal = total - cpu.last_total + local active = total - idle + + if core.last_active ~= active or core.last_total ~= total then + -- Read current data and calculate relative values. + local dactive = active - core.last_active + local dtotal = total - core.last_total + local usage = math.ceil((dactive / dtotal) * 100) - cpu_noj = {} - cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100)) + core.last_active = active + core.last_total = total + core.usage = usage + + -- Save current data for the next run. + cpu.core[coreid] = core + end + end widget = cpu.widget - settings() + cpu_now = cpu.core + cpu_now.usage = cpu_now[0].usage - -- Save current data for the next run. - cpu.last_active = active - cpu.last_total = total + settings() end - newtimer("cpu", timeout, update) + helpers.newtimer("cpu", timeout, update) - return cpu.widget + return cpu end return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })