X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e73a70c2ab26caf981d356756d4f83ad8bfbdb5a..23318f8eeafaedcb77d2ee1850dc4606dea7dcaf:/widgets/mem.lua

diff --git a/widgets/mem.lua b/widgets/mem.lua
index f014149..763ac4b 100644
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -1,25 +1,18 @@
 
 --[[
-                                                           
-     Licensed under GNU General Public License v2          
-      * (c) 2013,      Luke Bonham                         
-      * (c) 2010-2012, Peter Hofmann                       
-      * (c) 2010,      Adrian C.      <anrxc@sysphere.org> 
-      * (c) 2009,      Lucas de Vries <lucas@glacicle.com> 
-                                                           
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013,      Luke Bonham                
+      * (c) 2010-2012, Peter Hofmann              
+                                                  
 --]]
 
-local newtimer        = require("lain.helpers").newtimer
-
-local wibox           = require("wibox")
-
-local io              = { lines  = io.lines }
-local math            = { floor  = math.floor }
-local string          = { format = string.format,
-                          gmatch = string.gmatch,
-                          len    = string.len }
-
-local setmetatable    = setmetatable
+local newtimer     = require("lain.helpers").newtimer
+local wibox        = require("wibox")
+local gmatch       = string.gmatch
+local lines        = io.lines
+local math         = { ceil = math.ceil, floor = math.floor }
+local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem
@@ -27,35 +20,35 @@ 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('')
-
-    function mem.update()
-        mem = {}
-        for line in io.lines("/proc/meminfo")
-        do
-            for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
-            do
-                if     k == "MemTotal"  then mem.total = math.floor(v / 1024)
-                elseif k == "MemFree"   then mem.free  = math.floor(v / 1024)
-                elseif k == "Buffers"   then mem.buf   = math.floor(v / 1024)
-                elseif k == "Cached"    then mem.cache = math.floor(v / 1024)
-                elseif k == "SwapTotal" then mem.swap  = math.floor(v / 1024)
-                elseif k == "SwapFree"  then mem.swapf = math.floor(v / 1024)
+    mem.widget = wibox.widget.textbox()
+
+    function update()
+        mem_now = {}
+        for line in lines("/proc/meminfo") do
+            for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
+                if     k == "MemTotal"     then mem_now.total = math.ceil(v / 1024)
+                elseif k == "MemFree"      then mem_now.free  = math.ceil(v / 1024)
+                elseif k == "Buffers"      then mem_now.buf   = math.ceil(v / 1024)
+                elseif k == "Cached"       then mem_now.cache = math.ceil(v / 1024)
+                elseif k == "SwapTotal"    then mem_now.swap  = math.ceil(v / 1024)
+                elseif k == "SwapFree"     then mem_now.swapf = math.ceil(v / 1024)
+                elseif k == "SReclaimable" then mem_now.srec  = math.ceil(v / 1024)
                 end
             end
         end
 
-        used = mem.total - (mem.free + mem.buf + mem.cache)
-        swapused = mem.swap - mem.swapf
+        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, mem.update)
+    newtimer("mem", timeout, update)
 
     return mem.widget
 end