wiki updated

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index f307b26b3bcc021218555ca0f65ef7e800183209..6019f3257e07d10d891070caa352eda2d5655bc0 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -21,19 +21,16 @@ local setmetatable = setmetatable
 
 -- CPU usage
 -- lain.widgets.cpu
 
 -- CPU usage
 -- lain.widgets.cpu

-local cpu = {
-    last_total = 0,
-    last_active = 0
-}
+local cpu = { last_total = 0, last_active = 0 }

 
 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 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('')
 

-    function cpu.update()
+    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.
         -- 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.


@@ -43,9 +40,9 @@ local function worker(args)
         local total = 0
         for field in string.gmatch(times, "[%s]+([^%s]+)")
         do
         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


@@ -53,22 +50,25 @@ local function worker(args)
             at = at + 1
         end
         local active = total - idle
             at = at + 1
         end
         local active = total - idle

+        
+        if cpu.last_active ~= active or cpu.last_total ~= 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))

 
 

-        usage = tostring(math.ceil((dactive / dtotal) * 100))
+            widget = cpu.widget
+            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.
+            cpu.last_active = active
+            cpu.last_total = total
+        end

     end
 
     end
 

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

 
     return cpu.widget
 end
 
     return cpu.widget
 end