]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/cpu.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

alsa/bat textbox resize fix
[etc/awesome.git] / widgets / cpu.lua
index 737b6fa454c2cfefe01fb44fd83d65b60d8ef071..c33c7eb68736692b9eede3e456b0cf616b474e8d 100644 (file)
@@ -25,28 +25,26 @@ local cpu = { core = {} }
 
 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.widget = wibox.widget.textbox('')
 
-         function 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.
+        -- 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")
 
-        for index,time in pairs(times)
-        do
+        for index,time in pairs(times) do
             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
@@ -62,15 +60,14 @@ local function worker(args)
                 -- 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.
-                cpu.core[coreid] = core;
+                cpu.core[coreid] = core
             end
         end
 
@@ -82,6 +79,7 @@ local function worker(args)
     end
 
     newtimer("cpu", timeout, update)
+
     return cpu.widget
 end