]> 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:

fixed typo
[etc/awesome.git] / widgets / mem.lua
index 763ac4b4925b83a7695c9290862472197795b140..e96dc1b735d1184a4ee4e3a32887015c6d813a3b 100644 (file)
@@ -11,7 +11,7 @@ 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 floor        = math.floor
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
@@ -29,13 +29,13 @@ local function worker(args)
         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)
+                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
@@ -50,7 +50,7 @@ local function worker(args)
 
     newtimer("mem", timeout, update)
 
-    return mem.widget
+    return setmetatable(mem, { __index = mem.widget })
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })