Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3

[etc/awesome.git] / widgets / cpu.lua

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 6019f3257e07d10d891070caa352eda2d5655bc0..737b6fa454c2cfefe01fb44fd83d65b60d8ef071 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,7 +7,7 @@
                                                   
 --]]
 
-local first_line   = require("lain.helpers").first_line
+local lines_match  = require("lain.helpers").lines_match
 local newtimer     = require("lain.helpers").newtimer
 
 local wibox        = require("wibox")
@@ -21,55 +21,67 @@ 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 2
-    local settings = args.settings or function() end
+         local timeout  = args.timeout or 2
+         local settings = args.settings or function() end
 
-    cpu.widget = wibox.widget.textbox('')
+         cpu.widget = wibox.widget.textbox('')
 
-    function update()
+         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]+)")
+                   -- different kinds of work. Read the first line of /proc/stat
+                   -- which is the sum of all CPUs.
+        local times = lines_match("cpu","/proc/stat")
+
+        for index,time in pairs(times)
         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 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
+
+            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)
+
+                core.last_active = active
+                core.last_total  = total
+                core.usage       = usage
+
+                -- Save current data for the next run.
+                cpu.core[coreid] = core;
             end
-            total = total + field
-            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
-
-            cpu_now = {}
-            cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))
-
-            widget = cpu.widget
-            settings()
-
-            -- Save current data for the next run.
-            cpu.last_active = active
-            cpu.last_total = total
         end
+
+        widget = cpu.widget
+        cpu_now = cpu.core
+        cpu_now.usage = cpu_now[0].usage
+
+        settings()
     end
 
     newtimer("cpu", timeout, update)
-
     return cpu.widget
 end