#288 trying metatables

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 737b6fa454c2cfefe01fb44fd83d65b60d8ef071..f61e2ccf794ae7974abb5fdbf38d8f7f0b5bff5e 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,46 +7,40 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local lines_match  = require("lain.helpers").lines_match
-local newtimer     = require("lain.helpers").newtimer
-
+local helpers      = require("lain.helpers")

 local wibox        = require("wibox")
 local wibox        = require("wibox")

-

 local math         = { ceil   = math.ceil }
 local string       = { format = string.format,
                        gmatch = string.gmatch }
 local tostring     = tostring
 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 setmetatable = setmetatable
 
 -- CPU usage
 -- lain.widgets.cpu

-local cpu = { core = {} }
+local cpu = helpers.make_widget_textbox()

 
 local function worker(args)
     local args     = args or {}
 
 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.core = {}

 
 

-         function update()
+    function update()

         -- Read the amount of time the CPUs have spent performing
         -- 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 = lines_match("cpu","/proc/stat")
+        -- 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(times) do

             local coreid = index - 1
             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
+            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
                 -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done
                 -- nothing during these times.
                 if at == 4 or at == 5 then


@@ -62,15 +56,14 @@ local function worker(args)
                 -- Read current data and calculate relative values.
                 local dactive = active - core.last_active
                 local dtotal  = total - core.last_total
                 -- 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)
+                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.
 
                 core.last_active = active
                 core.last_total  = total
                 core.usage       = usage
 
                 -- Save current data for the next run.

-                cpu.core[coreid] = core;
+                cpu.core[coreid] = core

             end
         end
 
             end
         end
 


@@ -81,8 +74,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("cpu", timeout, update)
-    return cpu.widget
+    helpers.newtimer("cpu", timeout, update)
+
+    return cpu

 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(cpu, { __call = function(_, ...) return worker(...) end })