ndwarshuis
/
conky-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

REF clean up code

This commit is contained in:
Nathan Dwarshuis 2022-07-24 11:40:21 -04:00
parent 1f5fa3ddd6
commit 696d6b16d7
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sys.lua
View File

@ -193,7 +193,7 @@ end
local get_core_id_indexer = function() local get_core_id_indexer = function()
local make_indexer = pure.compose( local make_indexer = pure.compose(
pure.array_to_map, pure.array_to_map,
pure.partial(pure.imap, function(i, c) return {tonumber(c), i} end), pure.partial(pure.imap, function(i, c) return {__tonumber(c), i} end),
pure.partial(gmatch_to_table1, '(%d+)') pure.partial(gmatch_to_table1, '(%d+)')
) )
return pure.fmap_maybe( return pure.fmap_maybe(
@ -203,19 +203,17 @@ local get_core_id_indexer = function()
end end
local get_core_mappings = function() local get_core_mappings = function()
local ncpus = M.get_cpu_number()
local ncores = M.get_core_number() local ncores = M.get_core_number()
local nthreads = ncpus / ncores
local map_ids = function(indexer) local map_ids = function(indexer)
local f = function(acc, next) local f = function(acc, next)
local cpu_id = tonumber(next[1]) + 1 local cpu_id = __tonumber(next[1]) + 1
local core_id = next[2] local core_id = next[2]
local conky_core_idx = indexer[tonumber(core_id)] local conky_core_idx = indexer[__tonumber(core_id)]
acc.mappings[cpu_id] = { acc.mappings[cpu_id] = {
conky_core_idx = conky_core_idx, conky_core_idx = conky_core_idx,
conky_thread_id = acc.thread_ids[conky_core_idx], conky_thread_id = acc.thread_ids[conky_core_idx],
} }
acc.thread_ids[conky_core_idx] = acc.thread_ids[conky_core_idx] - 1 acc.thread_ids[conky_core_idx] = acc.thread_ids[conky_core_idx] + 1
return acc return acc
end end
local cpu_to_core_map = pure.maybe( local cpu_to_core_map = pure.maybe(
@ -223,7 +221,7 @@ local get_core_mappings = function()
pure.partial(gmatch_to_tableN, '(%d+),(%d+)'), pure.partial(gmatch_to_tableN, '(%d+),(%d+)'),
i_o.execute_cmd('lscpu -p=cpu,CORE | tail -n+5') i_o.execute_cmd('lscpu -p=cpu,CORE | tail -n+5')
) )
local init = {mappings = {}, thread_ids = pure.rep(ncores, nthreads)} local init = {mappings = {}, thread_ids = pure.rep(ncores, 1)}
return pure.reduce(f, init, cpu_to_core_map).mappings return pure.reduce(f, init, cpu_to_core_map).mappings
end end
return pure.fmap_maybe(map_ids, get_core_id_indexer()) return pure.fmap_maybe(map_ids, get_core_id_indexer())
@ -235,11 +233,11 @@ M.get_coretemp_paths = function()
i_o.assert_exe_exists('grep') i_o.assert_exe_exists('grep')
local get_labels = pure.compose( local get_labels = pure.compose(
i_o.execute_cmd, i_o.execute_cmd,
pure.partial(string.format, 'grep Core %s/temp*_label', true) pure.partial(__string_format, 'grep Core %s/temp*_label', true)
) )
local to_tuple = function(m) local to_tuple = function(m)
return { return {
indexer[tonumber(m[2])], indexer[__tonumber(m[2])],
__string_format('%s/%s_input', d, m[1]) __string_format('%s/%s_input', d, m[1])
} }
end end
@ -325,11 +323,10 @@ end
M.read_cpu_loads = function(cpu_loads) M.read_cpu_loads = function(cpu_loads)
local ncpus = #cpu_loads local ncpus = #cpu_loads
local i = 1
local iter = io.lines('/proc/stat') local iter = io.lines('/proc/stat')
iter() -- ignore first line iter() -- ignore first line
for ln in iter do for i = 1, ncpus do
if i > ncpus then break end local ln = iter()
local user, system, idle = __string_match(ln, '(%d+) %d+ (%d+) (%d+)', 5) local user, system, idle = __string_match(ln, '(%d+) %d+ (%d+) (%d+)', 5)
local active = user + system local active = user + system
local total = active + idle local total = active + idle
@ -339,7 +336,6 @@ M.read_cpu_loads = function(cpu_loads)
c.active_prev = active c.active_prev = active
c.total_prev = total c.total_prev = total
end end
i = i + 1
end end
return cpu_loads return cpu_loads
end end