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:

mem: math.floor->ceil and substract SReclaimable too from the total; closes #271
authorcopycat-killer <dada@archlinux.info>
Mon, 23 Jan 2017 12:35:30 +0000 (13:35 +0100)
committercopycat-killer <dada@archlinux.info>
Mon, 23 Jan 2017 12:35:30 +0000 (13:35 +0100)
scripts/dfs
util/init.lua
widgets/mem.lua
wiki

index 1de819a94ba2813867b8fb2d19197fafc8e0a871..46974735ff5994e7dd7de4a3cdb24e63436bced9 100755 (executable)
@@ -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
index 3db478d987ca068a1c1771df98f9e42e68bcc82a..c62f0da3a10a9745649fd15b279d2b3f57ca22b6 100644 (file)
@@ -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
index 7f4f346b99d7ae8880e00f465212855529c5f902..763ac4b4925b83a7695c9290862472197795b140 100644 (file)
@@ -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 2a2beda916322177695fbd8b042b04001bc07509..a1f6085dae8150248baf97bb12229c1c81387f24 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 2a2beda916322177695fbd8b042b04001bc07509
+Subproject commit a1f6085dae8150248baf97bb12229c1c81387f24