pulsebar: use devicetype and device instead of sink (null var)

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

diff --git a/widget/cpu.lua b/widget/cpu.lua
index b6ecb9c1f4fd80cf5811eb102655beb524bb909e..f4cce734763b5238302c73879c1d37284bd89047 100644 (file)
--- a/widget/cpu.lua
+++ b/widget/cpu.lua
@@ -1,16 +1,15 @@
 --[[
 
      Licensed under GNU General Public License v2
 --[[
 
      Licensed under GNU General Public License v2

-      * (c) 2013,      Luke Bonham
+      * (c) 2013,      Luca CPZ

       * (c) 2010-2012, Peter Hofmann
 
 --]]
 
 local helpers  = require("lain.helpers")
 local wibox    = require("wibox")
       * (c) 2010-2012, Peter Hofmann
 
 --]]
 
 local helpers  = require("lain.helpers")
 local wibox    = require("wibox")

-local math     = { ceil   = math.ceil }
-local string   = { format = string.format,
-                   gmatch = string.gmatch }
+local math     = math
+local string   = string

 local tostring = tostring
 
 -- CPU usage
 local tostring = tostring
 
 -- CPU usage


@@ -26,9 +25,7 @@ local function factory(args)
         -- 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.
         -- 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.lines_match("cpu","/proc/stat")
-
-        for index,time in pairs(times) do
+        for index,time in pairs(helpers.lines_match("cpu","/proc/stat")) do

             local coreid = index - 1
             local core   = cpu.core[coreid] or
                            { last_active = 0 , last_total = 0, usage = 0 }
             local coreid = index - 1
             local core   = cpu.core[coreid] or
                            { last_active = 0 , last_total = 0, usage = 0 }