]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/cpu.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

quake: updated spawn call
[etc/awesome.git] / widgets / cpu.lua
index f9bbe72df725ce3da6b9b37e9a3c8b8b361d0858..c33c7eb68736692b9eede3e456b0cf616b474e8d 100644 (file)
@@ -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,66 @@ 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 5
+    local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
-    widget = wibox.widget.textbox('')
+    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 = first_line("/proc/stat")
-        local at = 1
-        local idle = 0
-        local total = 0
-        for field in string.gmatch(times, "[%s]+([^%s]+)")
-        do
-            -- 3 = idle, 4 = ioWait. Essentially, the CPUs have done
-            -- nothing during these times.
-            if at == 3 or at == 4
-            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
 
-        -- Read current data and calculate relative values.
-        local dactive = active - cpu.last_active
-        local dtotal = total - cpu.last_total
+            local active = total - idle
 
-        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)
 
-        settings()
+                core.last_active = active
+                core.last_total  = total
+                core.usage       = usage
 
-        -- Save current data for the next run.
-        cpu.last_active = active
-        cpu.last_total = 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
 
     newtimer("cpu", timeout, update)
 
-    return widget
+    return cpu.widget
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })