Merge pull request #153 from TheReverend403/master

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 15544433b91dc9c6ad751b58589072a3ff0f823e..ec84101f6d0be1bf1ed07b8b6dfe015f4b916208 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -7,13 +7,16 @@
                                                   
 --]]
 
                                                   
 --]]
 

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

 local wibox        = require("wibox")
 
 local math         = { ceil   = math.ceil }
 local string       = { format = string.format,
                        gmatch = string.gmatch }
 local tostring     = tostring
 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
 local setmetatable = setmetatable
 
 -- CPU usage


@@ -25,18 +28,16 @@ local cpu = {
 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}

-    local timeout  = args.timeout or 1
+    local timeout  = args.timeout or 2

     local settings = args.settings or function() end
 
     cpu.widget = wibox.widget.textbox('')
     local settings = args.settings or function() end
 
     cpu.widget = wibox.widget.textbox('')

-    helpers.set_map("cpuactive", 0)
-    helpers.set_map("cputotal", 0)

 
     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.
 
     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 = helpers.first_line("/proc/stat")
+        local times = first_line("/proc/stat")

         local at = 1
         local idle = 0
         local total = 0
         local at = 1
         local idle = 0
         local total = 0


@@ -53,26 +54,22 @@ local function worker(args)
         end
         local active = total - idle
 
         end
         local active = total - idle
 

-        if helpers.get_map("cpuactive") ~= active
-           or helpers.get_map("cputotal") ~= total
-        then
-            -- Read current data and calculate relative values.
-            local dactive = active - cpu.last_active
-            local dtotal = total - cpu.last_total
+        -- 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))
+        cpu_now = {}
+        cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))

 
 

-            widget = cpu.widget
-            settings()
+        widget = cpu.widget
+        settings()

 
 

-            -- Save current data for the next run.
-            helpers.set_map("cpuactive", active)
-            helpers.set_map("cputotal", total)
-        end
+        -- Save current data for the next run.
+        cpu.last_active = active
+        cpu.last_total = total

     end
 
     end
 

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

 
     return cpu.widget
 end
 
     return cpu.widget
 end