#199 syntactic change

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index cf0b76c911296596c172654a74c6eaf93f045349..737b6fa454c2cfefe01fb44fd83d65b60d8ef071 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,74 +7,82 @@
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
-local first_line   = require("lain.helpers").first_line
+local lines_match  = require("lain.helpers").lines_match
+local newtimer     = require("lain.helpers").newtimer
 
-local beautiful    = require("beautiful")
 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
-}
-
-function worker(args)
-    local args = args or {}
-    local refresh_timeout = args.refresh_timeout or 5
-    local header = args.header or " Cpu "
-    local header_color = args.header or beautiful.fg_normal or "#FFFFFF"
-    local color = args.color or beautiful.fg_focus or "#FFFFFF"
-    local footer = args.footer or "%"
-
-    local w = wibox.widget.textbox()
-
-    local cpuusageupdate = function()
+local cpu = { core = {} }
+
+local function worker(args)
+    local args     = args or {}
+         local timeout  = args.timeout or 2
+         local settings = args.settings or function() end
+
+         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]+)")
+                   -- 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
-            -- 3 = idle, 4 = ioWait. Essentially, the CPUs have done
-            -- nothing during these times.
-            if at == 3 or at == 4
-            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
-            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 dta = math.ceil((dactive / dtotal) * 100)
+            local active = total - idle
 
-        w:set_markup(markup(header_color, header) .. markup(color, dta .. footer) .. " ")
+            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
 
-        -- Save current data for the next run.
-        cpu.last_active = active
-        cpu.last_total = total
-    end
+                local usage = math.ceil((dactive / dtotal) * 100)
 
-    local cpuusagetimer = timer({ timeout = refresh_timeout })
-    cpuusagetimer:connect_signal("timeout", cpuusageupdate)
-    cpuusagetimer:start()
-    cpuusagetimer:emit_signal("timeout")
+                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
+        cpu_now = cpu.core
+        cpu_now.usage = cpu_now[0].usage
+
+        settings()
+    end
 
-    return w
+    newtimer("cpu", timeout, update)
+    return cpu.widget
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })