From: copycat-killer <dada@archlinux.info>
Date: Mon, 23 Jan 2017 12:35:30 +0000 (+0100)
Subject: mem: math.floor->ceil and substract SReclaimable too from the total; closes #271
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/23318f8eeafaedcb77d2ee1850dc4606dea7dcaf?ds=inline;hp=--cc

mem: math.floor->ceil and substract SReclaimable too from the total; closes #271
---

23318f8eeafaedcb77d2ee1850dc4606dea7dcaf
diff --git a/scripts/dfs b/scripts/dfs
index 1de819a..4697473 100755
--- a/scripts/dfs
+++ b/scripts/dfs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 #
 #   Adapted from Eridan's "fs" (cleanup, enhancements and switch to bash/Linux)
 #   JM,  10/12/2004
diff --git a/util/init.lua b/util/init.lua
index 3db478d..c62f0da 100644
--- a/util/init.lua
+++ b/util/init.lua
@@ -89,7 +89,6 @@ function util.mc(c)
     c.floating   = true
     local s      = awful.screen.focused()
     local mg     = s.geometry
-    local tag    = s.selected_tag
     local mwfact = beautiful.master_width_factor or 0.5
     local g      = {}
     g.width      = math.sqrt(mwfact) * mg.width
diff --git a/widgets/mem.lua b/widgets/mem.lua
index 7f4f346..763ac4b 100644
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -9,9 +9,9 @@
 
 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 gmatch       = string.gmatch
+local lines        = io.lines
+local math         = { ceil = math.ceil, floor = math.floor }
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
@@ -27,19 +27,20 @@ local function worker(args)
 
     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 = 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
 
-        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)
 
diff --git a/wiki b/wiki
index 2a2beda..a1f6085 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 2a2beda916322177695fbd8b042b04001bc07509
+Subproject commit a1f6085dae8150248baf97bb12229c1c81387f24