ENH parameterize mem module
This commit is contained in:
parent
50809883a3
commit
779452e9d1
|
|
@ -5,7 +5,6 @@ local common = require 'common'
|
||||||
local geometry = require 'geometry'
|
local geometry = require 'geometry'
|
||||||
local pure = require 'pure'
|
local pure = require 'pure'
|
||||||
|
|
||||||
|
|
||||||
return function(update_freq)
|
return function(update_freq)
|
||||||
local MODULE_Y = 712
|
local MODULE_Y = 712
|
||||||
local DIAL_THICKNESS = 8
|
local DIAL_THICKNESS = 8
|
||||||
|
|
@ -19,101 +18,104 @@ return function(update_freq)
|
||||||
local TABLE_SECTION_BREAK = 20
|
local TABLE_SECTION_BREAK = 20
|
||||||
local TABLE_HEIGHT = 114
|
local TABLE_HEIGHT = 114
|
||||||
|
|
||||||
local MEMINFO_REGEX = '\nMemFree:%s+(%d+).+'..
|
|
||||||
'\nBuffers:%s+(%d+).+'..
|
|
||||||
'\nCached:%s+(%d+).+'..
|
|
||||||
'\nSwapFree:%s+(%d+).+'..
|
|
||||||
'\nShmem:%s+(%d+).+'..
|
|
||||||
'\nSReclaimable:%s+(%d+)'
|
|
||||||
|
|
||||||
local __string_match = string.match
|
local __string_match = string.match
|
||||||
local __math_floor = math.floor
|
local __math_floor = math.floor
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
-- header
|
-- header
|
||||||
|
|
||||||
local header = common.make_header(
|
local mk_header = pure.partial(
|
||||||
geometry.RIGHT_X,
|
common.mk_header,
|
||||||
MODULE_Y,
|
'MEMORY',
|
||||||
geometry.SECTION_WIDTH,
|
geometry.SECTION_WIDTH,
|
||||||
'MEMORY'
|
geometry.RIGHT_X
|
||||||
)
|
)
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
-- mem consumption dial
|
-- mem stats (dial + text)
|
||||||
|
|
||||||
local get_meminfo_field = function(field)
|
|
||||||
return tonumber(i_o.read_file('/proc/meminfo', field..':%s+(%d+)'))
|
|
||||||
end
|
|
||||||
|
|
||||||
local memtotal = get_meminfo_field('MemTotal')
|
|
||||||
local swaptotal = get_meminfo_field('SwapTotal')
|
|
||||||
|
|
||||||
local FORMAT_PERCENT = function(x)
|
|
||||||
return string.format('%i%%', x)
|
|
||||||
end
|
|
||||||
|
|
||||||
|
local mk_stats = function(y)
|
||||||
local MEM_X = geometry.RIGHT_X + DIAL_RADIUS + DIAL_THICKNESS / 2
|
local MEM_X = geometry.RIGHT_X + DIAL_RADIUS + DIAL_THICKNESS / 2
|
||||||
local MEM_Y = header.bottom_y + DIAL_RADIUS + DIAL_THICKNESS / 2
|
|
||||||
local DIAL_DIAMETER = DIAL_RADIUS * 2 + DIAL_THICKNESS
|
local DIAL_DIAMETER = DIAL_RADIUS * 2 + DIAL_THICKNESS
|
||||||
|
|
||||||
local mem = common.make_dial(
|
|
||||||
MEM_X,
|
|
||||||
MEM_Y,
|
|
||||||
DIAL_RADIUS,
|
|
||||||
DIAL_THICKNESS,
|
|
||||||
80,
|
|
||||||
FORMAT_PERCENT,
|
|
||||||
__math_floor
|
|
||||||
)
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
-- swap consumption dial
|
|
||||||
|
|
||||||
local SWAP_X = MEM_X + DIAL_DIAMETER + DIAL_SPACING
|
local SWAP_X = MEM_X + DIAL_DIAMETER + DIAL_SPACING
|
||||||
|
|
||||||
local swap = common.make_dial(
|
|
||||||
SWAP_X,
|
|
||||||
MEM_Y,
|
|
||||||
DIAL_RADIUS,
|
|
||||||
DIAL_THICKNESS,
|
|
||||||
80,
|
|
||||||
FORMAT_PERCENT,
|
|
||||||
__math_floor
|
|
||||||
)
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
-- swap/buffers stats
|
|
||||||
|
|
||||||
local CACHE_Y = header.bottom_y + CACHE_Y_OFFSET
|
|
||||||
local CACHE_X = SWAP_X + CACHE_X_OFFSET + DIAL_DIAMETER / 2
|
local CACHE_X = SWAP_X + CACHE_X_OFFSET + DIAL_DIAMETER / 2
|
||||||
local CACHE_WIDTH = geometry.RIGHT_X + geometry.SECTION_WIDTH - CACHE_X
|
local CACHE_WIDTH = geometry.RIGHT_X + geometry.SECTION_WIDTH - CACHE_X
|
||||||
|
local format_percent = function(x)
|
||||||
|
return string.format('%i%%', x)
|
||||||
|
end
|
||||||
|
local mem = common.make_dial(
|
||||||
|
MEM_X,
|
||||||
|
y + DIAL_RADIUS,
|
||||||
|
DIAL_RADIUS,
|
||||||
|
DIAL_THICKNESS,
|
||||||
|
80,
|
||||||
|
format_percent,
|
||||||
|
__math_floor
|
||||||
|
)
|
||||||
|
local swap = common.make_dial(
|
||||||
|
SWAP_X,
|
||||||
|
y + DIAL_RADIUS,
|
||||||
|
DIAL_RADIUS,
|
||||||
|
DIAL_THICKNESS,
|
||||||
|
80,
|
||||||
|
format_percent,
|
||||||
|
__math_floor
|
||||||
|
)
|
||||||
local cache = common.make_text_rows_formatted(
|
local cache = common.make_text_rows_formatted(
|
||||||
CACHE_X,
|
CACHE_X,
|
||||||
CACHE_Y,
|
y + CACHE_Y_OFFSET,
|
||||||
CACHE_WIDTH,
|
CACHE_WIDTH,
|
||||||
TEXT_SPACING,
|
TEXT_SPACING,
|
||||||
{'Page Cache', 'Buffers', 'Shared', 'Kernel Slab'},
|
{'Page Cache', 'Buffers', 'Shared', 'Kernel Slab'},
|
||||||
'%.1f%%'
|
'%.1f%%'
|
||||||
)
|
)
|
||||||
|
local update = function(s)
|
||||||
|
local m = s.mem
|
||||||
|
local w = s.swap
|
||||||
|
common.dial_set(mem, m.used_percent * 100)
|
||||||
|
common.dial_set(swap, (w.total - w.free) / w.total * 100)
|
||||||
|
|
||||||
|
common.text_rows_set(cache, 1, m.cached / m.total * 100)
|
||||||
|
common.text_rows_set(cache, 2, m.buffers / m.total * 100)
|
||||||
|
common.text_rows_set(cache, 3, m.shmem / m.total * 100)
|
||||||
|
common.text_rows_set(cache, 4, m.sreclaimable / m.total * 100)
|
||||||
|
end
|
||||||
|
local static = function(cr)
|
||||||
|
common.dial_draw_static(mem, cr)
|
||||||
|
common.dial_draw_static(swap, cr)
|
||||||
|
common.text_rows_draw_static(cache, cr)
|
||||||
|
end
|
||||||
|
local dynamic = function(cr)
|
||||||
|
common.dial_draw_dynamic(mem, cr)
|
||||||
|
common.dial_draw_dynamic(swap, cr)
|
||||||
|
common.text_rows_draw_dynamic(cache, cr)
|
||||||
|
end
|
||||||
|
return common.mk_acc(DIAL_DIAMETER, update, static, dynamic)
|
||||||
|
end
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
-- memory consumption plot
|
-- memory consumption plot
|
||||||
|
|
||||||
local PLOT_Y = header.bottom_y + PLOT_SECTION_BREAK + DIAL_DIAMETER
|
local mk_plot = function(y)
|
||||||
|
local obj = common.make_percent_timeseries(
|
||||||
local plot = common.make_percent_timeseries(
|
|
||||||
geometry.RIGHT_X,
|
geometry.RIGHT_X,
|
||||||
PLOT_Y,
|
y,
|
||||||
geometry.SECTION_WIDTH,
|
geometry.SECTION_WIDTH,
|
||||||
PLOT_HEIGHT,
|
PLOT_HEIGHT,
|
||||||
update_freq
|
update_freq
|
||||||
)
|
)
|
||||||
|
return common.mk_acc(
|
||||||
|
PLOT_HEIGHT,
|
||||||
|
function(s) timeseries.update(obj, s.mem.used_percent) end,
|
||||||
|
pure.partial(timeseries.draw_static, obj),
|
||||||
|
pure.partial(timeseries.draw_dynamic, obj)
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
-- memory top table
|
-- memory top table
|
||||||
|
|
||||||
|
local mk_tbl = function(y)
|
||||||
local NUM_ROWS = 5
|
local NUM_ROWS = 5
|
||||||
local TABLE_CONKY = pure.map_n(
|
local TABLE_CONKY = pure.map_n(
|
||||||
function(i)
|
function(i)
|
||||||
|
|
@ -124,69 +126,82 @@ return function(update_freq)
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
NUM_ROWS)
|
NUM_ROWS)
|
||||||
|
local obj = common.make_text_table(
|
||||||
local tbl = common.make_text_table(
|
|
||||||
geometry.RIGHT_X,
|
geometry.RIGHT_X,
|
||||||
PLOT_Y + PLOT_HEIGHT + TABLE_SECTION_BREAK,
|
y,
|
||||||
geometry.SECTION_WIDTH,
|
geometry.SECTION_WIDTH,
|
||||||
TABLE_HEIGHT,
|
TABLE_HEIGHT,
|
||||||
NUM_ROWS,
|
NUM_ROWS,
|
||||||
'Mem (%)'
|
'Mem (%)'
|
||||||
)
|
)
|
||||||
|
local update = function(_)
|
||||||
|
for r = 1, NUM_ROWS do
|
||||||
|
text_table.set(obj, 1, r, i_o.conky(TABLE_CONKY[r].comm, '(%S+)'))
|
||||||
|
text_table.set(obj, 2, r, i_o.conky(TABLE_CONKY[r].pid))
|
||||||
|
text_table.set(obj, 3, r, i_o.conky(TABLE_CONKY[r].mem))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return common.mk_acc(
|
||||||
|
TABLE_HEIGHT,
|
||||||
|
update,
|
||||||
|
pure.partial(text_table.draw_static, obj),
|
||||||
|
pure.partial(text_table.draw_dynamic, obj)
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------------
|
||||||
|
-- state
|
||||||
|
|
||||||
|
local MEMINFO_REGEX = '\nMemFree:%s+(%d+).+'..
|
||||||
|
'\nBuffers:%s+(%d+).+'..
|
||||||
|
'\nCached:%s+(%d+).+'..
|
||||||
|
'\nSwapFree:%s+(%d+).+'..
|
||||||
|
'\nShmem:%s+(%d+).+'..
|
||||||
|
'\nSReclaimable:%s+(%d+)'
|
||||||
|
|
||||||
|
local get_meminfo_field = function(field)
|
||||||
|
return tonumber(i_o.read_file('/proc/meminfo', field..':%s+(%d+)'))
|
||||||
|
end
|
||||||
|
|
||||||
|
local state = {
|
||||||
|
mem = {total = get_meminfo_field('MemTotal')},
|
||||||
|
swap = {total = get_meminfo_field('SwapTotal')}
|
||||||
|
}
|
||||||
|
local read_state = function()
|
||||||
|
local m = state.mem
|
||||||
|
-- see manpage for free command for formulas
|
||||||
|
m.memfree,
|
||||||
|
m.buffers,
|
||||||
|
m.cached,
|
||||||
|
state.swap.free,
|
||||||
|
m.shmem,
|
||||||
|
m.sreclaimable
|
||||||
|
= __string_match(i_o.read_file('/proc/meminfo'), MEMINFO_REGEX)
|
||||||
|
m.used_percent =
|
||||||
|
(m.total -
|
||||||
|
m.memfree -
|
||||||
|
m.cached -
|
||||||
|
m.buffers -
|
||||||
|
m.sreclaimable) / m.total
|
||||||
|
return state
|
||||||
|
end
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
-- main functions
|
-- main functions
|
||||||
|
|
||||||
local update = function()
|
local rbs = common.reduce_blocks_(
|
||||||
-- see manpage for free command for formulas
|
MODULE_Y,
|
||||||
local memfree,
|
{
|
||||||
buffers,
|
common.mk_block(mk_header, true, 0),
|
||||||
cached,
|
common.mk_block(mk_stats, true, 0),
|
||||||
swapfree,
|
common.mk_block(mk_plot, true, PLOT_SECTION_BREAK),
|
||||||
shmem,
|
common.mk_block(mk_tbl, true, TABLE_SECTION_BREAK),
|
||||||
sreclaimable
|
}
|
||||||
= __string_match(i_o.read_file('/proc/meminfo'), MEMINFO_REGEX)
|
)
|
||||||
|
|
||||||
local used_percent =
|
return {
|
||||||
(memtotal -
|
static = rbs.static_drawer,
|
||||||
memfree -
|
dynamic = rbs.dynamic_drawer,
|
||||||
cached -
|
update = function() rbs.updater(read_state()) end,
|
||||||
buffers -
|
}
|
||||||
sreclaimable) / memtotal
|
|
||||||
|
|
||||||
common.dial_set(mem, used_percent * 100)
|
|
||||||
common.dial_set(swap, (swaptotal - swapfree) / swaptotal * 100)
|
|
||||||
|
|
||||||
common.text_rows_set(cache, 1, cached / memtotal * 100)
|
|
||||||
common.text_rows_set(cache, 2, buffers / memtotal * 100)
|
|
||||||
common.text_rows_set(cache, 3, shmem / memtotal * 100)
|
|
||||||
common.text_rows_set(cache, 4, sreclaimable / memtotal * 100)
|
|
||||||
|
|
||||||
timeseries.update(plot, used_percent)
|
|
||||||
|
|
||||||
for r = 1, NUM_ROWS do
|
|
||||||
text_table.set(tbl, 1, r, i_o.conky(TABLE_CONKY[r].comm, '(%S+)'))
|
|
||||||
text_table.set(tbl, 2, r, i_o.conky(TABLE_CONKY[r].pid))
|
|
||||||
text_table.set(tbl, 3, r, i_o.conky(TABLE_CONKY[r].mem))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local draw_static = function(cr)
|
|
||||||
common.draw_header(cr, header)
|
|
||||||
common.dial_draw_static(mem, cr)
|
|
||||||
common.dial_draw_static(swap, cr)
|
|
||||||
common.text_rows_draw_static(cache, cr)
|
|
||||||
timeseries.draw_static(plot, cr)
|
|
||||||
text_table.draw_static(tbl, cr)
|
|
||||||
end
|
|
||||||
|
|
||||||
local draw_dynamic = function(cr)
|
|
||||||
common.dial_draw_dynamic(mem, cr)
|
|
||||||
common.dial_draw_dynamic(swap, cr)
|
|
||||||
common.text_rows_draw_dynamic(cache, cr)
|
|
||||||
timeseries.draw_dynamic(plot, cr)
|
|
||||||
text_table.draw_dynamic(tbl, cr)
|
|
||||||
end
|
|
||||||
|
|
||||||
return {dynamic = draw_dynamic, static = draw_static, update = update}
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue