]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/mem.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:

#293: eradicate proxy widget
[etc/awesome.git] / widgets / mem.lua
index 46bb5f90dc593631b270b5d41ff428208382d8c7..2b414ef1bb31156b80749ce05eb5283ba2ef16d6 100644 (file)
@@ -7,15 +7,12 @@
                                                   
 --]]
 
-local newtimer        = require("lain.helpers").newtimer
-
-local wibox           = require("wibox")
-
-local io              = { lines  = io.lines }
-local math            = { floor  = math.floor }
-local string          = { gmatch = string.gmatch }
-
-local setmetatable    = setmetatable
+local helpers      = require("lain.helpers")
+local wibox        = require("wibox")
+local gmatch       = string.gmatch
+local lines        = io.lines
+local floor        = math.floor
+local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem
@@ -23,37 +20,37 @@ local mem = {}
 
 local function worker(args)
     local args     = args or {}
-    local timeout  = args.timeout or 3
+    local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
-    mem.widget = wibox.widget.textbox('')
+    mem.widget = wibox.widget.textbox()
 
     function update()
         mem_now = {}
-        for line in io.lines("/proc/meminfo")
-        do
-            for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
-            do
-                if     k == "MemTotal"  then mem_now.total = math.floor(v / 1024)
-                elseif k == "MemFree"   then mem_now.free  = math.floor(v / 1024)
-                elseif k == "Buffers"   then mem_now.buf   = math.floor(v / 1024)
-                elseif k == "Cached"    then mem_now.cache = math.floor(v / 1024)
-                elseif k == "SwapTotal" then mem_now.swap  = math.floor(v / 1024)
-                elseif k == "SwapFree"  then mem_now.swapf = math.floor(v / 1024)
+        for line in lines("/proc/meminfo") do
+            for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
+                if     k == "MemTotal"     then mem_now.total = floor(v / 1024 + 0.5)
+                elseif k == "MemFree"      then mem_now.free  = floor(v / 1024 + 0.5)
+                elseif k == "Buffers"      then mem_now.buf   = floor(v / 1024 + 0.5)
+                elseif k == "Cached"       then mem_now.cache = floor(v / 1024 + 0.5)
+                elseif k == "SwapTotal"    then mem_now.swap  = floor(v / 1024 + 0.5)
+                elseif k == "SwapFree"     then mem_now.swapf = floor(v / 1024 + 0.5)
+                elseif k == "SReclaimable" then mem_now.srec  = floor(v / 1024 + 0.5)
                 end
             end
         end
 
-        mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache)
+        mem_now.used = mem_now.total - mem_now.free - mem_now.buf - mem_now.cache - mem_now.srec
         mem_now.swapused = mem_now.swap - mem_now.swapf
+        mem_now.perc = math.floor(mem_now.used / mem_now.total * 100)
 
         widget = mem.widget
         settings()
     end
 
-    newtimer("mem", timeout, update)
+    helpers.newtimer("mem", timeout, update)
 
-    return mem.widget
+    return mem
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })