adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
copycat-killer 2017-01-23 13:35:30 +01:00
parent a58e36385c
commit 23318f8eea
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/dfs
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env sh
# #
# Adapted from Eridan's "fs" (cleanup, enhancements and switch to bash/Linux) # Adapted from Eridan's "fs" (cleanup, enhancements and switch to bash/Linux)
# JM, 10/12/2004 # JM, 10/12/2004

1
util/init.lua
View file

@ -89,7 +89,6 @@ function util.mc(c)
c.floating = true c.floating = true
local s = awful.screen.focused() local s = awful.screen.focused()
local mg = s.geometry local mg = s.geometry
local tag = s.selected_tag
local mwfact = beautiful.master_width_factor or 0.5 local mwfact = beautiful.master_width_factor or 0.5
local g = {} local g = {}
g.width = math.sqrt(mwfact) * mg.width g.width = math.sqrt(mwfact) * mg.width

25
widgets/mem.lua
View file

@ -9,9 +9,9 @@
local newtimer = require("lain.helpers").newtimer local newtimer = require("lain.helpers").newtimer
local wibox = require("wibox") local wibox = require("wibox")
local io = { lines = io.lines } local gmatch = string.gmatch
local math = { floor = math.floor } local lines = io.lines
local string = { gmatch = string.gmatch } local math = { ceil = math.ceil, floor = math.floor }
local setmetatable = setmetatable local setmetatable = setmetatable
-- Memory usage (ignoring caches) -- Memory usage (ignoring caches)
@ -27,19 +27,20 @@ local function worker(args)
function update() function update()
mem_now = {} mem_now = {}
for line in io.lines("/proc/meminfo") do for line in lines("/proc/meminfo") do
for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+") do for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
if k == "MemTotal" then mem_now.total = math.floor(v / 1024) if k == "MemTotal" then mem_now.total = math.ceil(v / 1024)
elseif k == "MemFree" then mem_now.free = math.floor(v / 1024) elseif k == "MemFree" then mem_now.free = math.ceil(v / 1024)
elseif k == "Buffers" then mem_now.buf = math.floor(v / 1024) elseif k == "Buffers" then mem_now.buf = math.ceil(v / 1024)
elseif k == "Cached" then mem_now.cache = math.floor(v / 1024) elseif k == "Cached" then mem_now.cache = math.ceil(v / 1024)
elseif k == "SwapTotal" then mem_now.swap = math.floor(v / 1024) elseif k == "SwapTotal" then mem_now.swap = math.ceil(v / 1024)
elseif k == "SwapFree" then mem_now.swapf = math.floor(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 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.swapused = mem_now.swap - mem_now.swapf
mem_now.perc = math.floor(mem_now.used / mem_now.total * 100) mem_now.perc = math.floor(mem_now.used / mem_now.total * 100)

2
wiki

@ -1 +1 @@
Subproject commit 2a2beda916322177695fbd8b042b04001bc07509 Subproject commit a1f6085dae8150248baf97bb12229c1c81387f24