X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8af4a03c754fa1bcac24736633f1b3be8ce8888c..fbc8c2ba7b6b250b7919ef9bb311ab2719ecfd10:/widgets/cpu.lua?ds=inline diff --git a/widgets/cpu.lua b/widgets/cpu.lua index 0b21edc..6019f32 100644 --- a/widgets/cpu.lua +++ b/widgets/cpu.lua @@ -21,14 +21,11 @@ local setmetatable = setmetatable -- CPU usage -- lain.widgets.cpu -local cpu = { - last_total = 0, - last_active = 0 -} +local cpu = { last_total = 0, last_active = 0 } 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('') @@ -43,9 +40,9 @@ local function worker(args) local total = 0 for field in string.gmatch(times, "[%s]+([^%s]+)") do - -- 3 = idle, 4 = ioWait. Essentially, the CPUs have done + -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done -- nothing during these times. - if at == 3 or at == 4 + if at == 4 or at == 5 then idle = idle + field end @@ -53,20 +50,22 @@ local function worker(args) at = at + 1 end local active = total - idle + + if cpu.last_active ~= active or cpu.last_total ~= total then + -- Read current data and calculate relative values. + local dactive = active - cpu.last_active + local dtotal = total - cpu.last_total - -- Read current data and calculate relative values. - local dactive = active - cpu.last_active - local dtotal = total - cpu.last_total + cpu_now = {} + cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100)) - cpu_now = {} - cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100)) + widget = cpu.widget + settings() - widget = cpu.widget - settings() - - -- Save current data for the next run. - cpu.last_active = active - cpu.last_total = total + -- Save current data for the next run. + cpu.last_active = active + cpu.last_total = total + end end newtimer("cpu", timeout, update)