Merge pull request #77 from loudcry/patch-1

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

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 55a3799457271598d60e05847480a23bf149bc49..7c1ecb032b3f613f30423fcb467219e7bc6bf9da 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -43,9 +43,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


@@ -58,7 +58,8 @@ local function worker(args)
         local dactive = active - cpu.last_active
         local dtotal = total - cpu.last_total
 
         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))

 
         widget = cpu.widget
         settings()
 
         widget = cpu.widget
         settings()