X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/98977a1888c57a00dbefcbf83c4e598daeab33aa..e0d4a89435d68714c0cee849625e0b14edca3d1c:/widgets/cpu.lua

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 1554443..8501388 100644
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,9 +7,9 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
+local lines_match  = require("lain.helpers").lines_match
+local newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
-
 local math         = { ceil   = math.ceil }
 local string       = { format = string.format,
                        gmatch = string.gmatch }
@@ -18,61 +18,64 @@ local setmetatable = setmetatable
 
 -- CPU usage
 -- lain.widgets.cpu
-local cpu = {
-    last_total = 0,
-    last_active = 0
-}
+local cpu = { core = {} }
 
 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
 
-    cpu.widget = wibox.widget.textbox('')
-    helpers.set_map("cpuactive", 0)
-    helpers.set_map("cputotal", 0)
+    cpu.widget = wibox.widget.textbox()
 
     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 = helpers.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 = 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
 
-        if helpers.get_map("cpuactive") ~= active
-           or helpers.get_map("cputotal") ~= total
-        then
-            -- Read current data and calculate relative values.
-            local dactive = active - cpu.last_active
-            local dtotal = total - cpu.last_total
+            local active = total - idle
 
-            cpu_now = {}
-            cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))
+            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)
 
-            widget = cpu.widget
-            settings()
+                core.last_active = active
+                core.last_total  = total
+                core.usage       = usage
 
-            -- Save current data for the next run.
-            helpers.set_map("cpuactive", active)
-            helpers.set_map("cputotal", total)
+                -- Save current data for the next run.
+                cpu.core[coreid] = core
+            end
         end
+
+        widget = cpu.widget
+        cpu_now = cpu.core
+        cpu_now.usage = cpu_now[0].usage
+
+        settings()
     end
 
-    helpers.newtimer("cpu", timeout, update)
+    newtimer("cpu", timeout, update)
 
     return cpu.widget
 end