wiki updated

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

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

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

 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


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

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

     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 

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

         local at = 1
         local idle = 0
         local total = 0
         for field in string.gmatch(times, "[%s]+([^%s]+)")
         do
         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
+            -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done

             -- nothing during these times.
             -- nothing during these times.

-            if at == 3 or at == 4
+            if at == 4 or at == 5

             then
                 idle = idle + field
             end
             then
                 idle = idle + field
             end


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

-        -- Read current data and calculate relative values.
-        local dactive = active - cpu.last_active
-        local dtotal = total - cpu.last_total
+        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

 
 

-        usage = tostring(math.ceil((dactive / dtotal) * 100))
+            cpu_now = {}
+            cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))

 
 

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

 
 

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

     end
 
     end
 

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

 
 

-    return widget
+    return cpu.widget

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