2018-08-05 11:22:07 -04:00
|
|
|
local M = {}
|
|
|
|
|
2017-07-19 00:36:15 -04:00
|
|
|
local CompoundDial = require 'CompoundDial'
|
|
|
|
local Line = require 'Line'
|
|
|
|
local Table = require 'Table'
|
2017-07-19 00:43:44 -04:00
|
|
|
local Util = require 'Util'
|
2021-07-05 23:27:43 -04:00
|
|
|
local Common = require 'Common'
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2017-07-19 00:36:15 -04:00
|
|
|
local CORETEMP_PATH = '/sys/devices/platform/coretemp.0/hwmon/hwmon%i/%s'
|
|
|
|
|
|
|
|
local NUM_PHYSICAL_CORES = 4
|
|
|
|
local NUM_THREADS_PER_CORE = 2
|
|
|
|
|
|
|
|
local NUM_ROWS = 5
|
2018-08-04 17:54:34 -04:00
|
|
|
|
2020-01-28 20:06:56 -05:00
|
|
|
local HWP_PATHS = {}
|
|
|
|
|
|
|
|
for i = 1, NUM_ROWS do
|
|
|
|
HWP_PATHS[i] = '/sys/devices/system/cpu/cpu' .. i ..
|
|
|
|
'/cpufreq/energy_performance_preference'
|
|
|
|
end
|
|
|
|
|
2018-08-04 17:54:34 -04:00
|
|
|
local TABLE_CONKY = {}
|
2017-07-19 00:36:15 -04:00
|
|
|
|
|
|
|
for r = 1, NUM_ROWS do
|
2018-08-04 17:54:34 -04:00
|
|
|
TABLE_CONKY[r] = {}
|
|
|
|
TABLE_CONKY[r].pid = '${top pid '..r..'}'
|
|
|
|
TABLE_CONKY[r].cpu = '${top cpu '..r..'}'
|
2017-07-19 00:36:15 -04:00
|
|
|
end
|
|
|
|
|
2017-10-23 02:40:12 -04:00
|
|
|
local _MODULE_Y_ = 614
|
2017-07-19 00:36:15 -04:00
|
|
|
local _DIAL_INNER_RADIUS_ = 30
|
|
|
|
local _DIAL_OUTER_RADIUS_ = 42
|
|
|
|
local _DIAL_SPACING_ = 1
|
|
|
|
local _SEPARATOR_SPACING_ = 20
|
2017-10-23 02:40:12 -04:00
|
|
|
local _TEXT_SPACING_ = 22
|
2017-07-19 00:36:15 -04:00
|
|
|
local _PLOT_SECTION_BREAK_ = 23
|
|
|
|
local _PLOT_HEIGHT_ = 56
|
|
|
|
local _TABLE_SECTION_BREAK_ = 20
|
|
|
|
local _TABLE_HEIGHT_ = 114
|
|
|
|
|
|
|
|
local _create_core_ = function(cores, id, x, y)
|
2018-01-05 23:36:50 -05:00
|
|
|
local conky_loads = {}
|
|
|
|
local conky_freqs = {}
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2018-01-05 23:36:50 -05:00
|
|
|
for c = 0, NUM_PHYSICAL_CORES * NUM_THREADS_PER_CORE - 1 do
|
|
|
|
if Util.read_file('/sys/devices/system/cpu/cpu'..c..'/topology/core_id', nil, '*n') == id then
|
|
|
|
table.insert(conky_loads, '${cpu cpu'..(c+1)..'}')
|
|
|
|
table.insert(conky_freqs, '${freq '..c..'}')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local hwmon_index = -1
|
|
|
|
while Util.read_file(string.format(CORETEMP_PATH, hwmon_index, 'name'), nil, '*l') ~= 'coretemp' do
|
|
|
|
hwmon_index = hwmon_index + 1
|
|
|
|
end
|
|
|
|
|
|
|
|
cores[id +1] = {
|
2021-07-08 22:57:35 -04:00
|
|
|
-- dials = _G_Widget_.CompoundDial{
|
|
|
|
-- x = x,
|
|
|
|
-- y = y,
|
|
|
|
-- inner_radius = _DIAL_INNER_RADIUS_,
|
|
|
|
-- outer_radius = _DIAL_OUTER_RADIUS_,
|
|
|
|
-- spacing = _DIAL_SPACING_,
|
|
|
|
-- num_dials = NUM_THREADS_PER_CORE,
|
|
|
|
-- critical_limit = 0.8,
|
|
|
|
-- critical_pattern = _G_Patterns_.INDICATOR_FG_CRITICAL,
|
|
|
|
-- dial_pattern = _G_Patterns_.INDICATOR_FG_PRIMARY,
|
|
|
|
-- arc_pattern = _G_Patterns_.INDICATOR_BG
|
|
|
|
-- },
|
|
|
|
dials = _G_Widget_.CompoundDial(
|
2021-07-09 23:19:26 -04:00
|
|
|
_G_Widget_.make_semicircle(
|
|
|
|
_G_Widget_.make_point(x, y),
|
|
|
|
_DIAL_OUTER_RADIUS_,
|
|
|
|
90,
|
|
|
|
360
|
|
|
|
),
|
2021-07-08 22:57:35 -04:00
|
|
|
_G_Patterns_.INDICATOR_BG,
|
|
|
|
_G_Patterns_.INDICATOR_FG_PRIMARY,
|
|
|
|
_G_Patterns_.INDICATOR_FG_CRITICAL,
|
|
|
|
0.8,
|
|
|
|
_DIAL_INNER_RADIUS_,
|
|
|
|
_DIAL_SPACING_,
|
|
|
|
NUM_THREADS_PER_CORE
|
|
|
|
),
|
2021-07-05 23:27:43 -04:00
|
|
|
text_ring = Common.initTextRing(
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
_DIAL_INNER_RADIUS_ - 2,
|
2021-07-10 19:07:45 -04:00
|
|
|
'%s°C',
|
2021-07-06 19:32:18 -04:00
|
|
|
90
|
2021-07-05 23:27:43 -04:00
|
|
|
),
|
2018-01-05 23:36:50 -05:00
|
|
|
coretemp_path = string.format(CORETEMP_PATH, hwmon_index, 'temp'..(id + 2)..'_input'),
|
|
|
|
conky_loads = conky_loads,
|
|
|
|
conky_freqs = conky_freqs
|
|
|
|
}
|
2017-07-19 00:36:15 -04:00
|
|
|
end
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
local header = Common.Header(
|
|
|
|
_G_INIT_DATA_.LEFT_X,
|
|
|
|
_MODULE_Y_,
|
|
|
|
_G_INIT_DATA_.SECTION_WIDTH,
|
|
|
|
'PROCESSOR'
|
|
|
|
)
|
2017-07-19 00:36:15 -04:00
|
|
|
|
|
|
|
--we assume that this cpu has 4 physical cores with 2 logical each
|
|
|
|
local cores = {}
|
|
|
|
|
|
|
|
for c = 0, NUM_PHYSICAL_CORES - 1 do
|
2018-01-05 23:36:50 -05:00
|
|
|
local dial_x = _G_INIT_DATA_.LEFT_X + _DIAL_OUTER_RADIUS_ +
|
2017-07-19 00:36:15 -04:00
|
|
|
(_G_INIT_DATA_.SECTION_WIDTH - 2 * _DIAL_OUTER_RADIUS_) * c / 3
|
2018-01-05 23:36:50 -05:00
|
|
|
local dial_y = header.bottom_y + _DIAL_OUTER_RADIUS_
|
|
|
|
_create_core_(cores, c, dial_x, dial_y)
|
2017-07-19 00:36:15 -04:00
|
|
|
end
|
|
|
|
|
2020-01-28 20:06:56 -05:00
|
|
|
local _HWP_Y_ = header.bottom_y + _DIAL_OUTER_RADIUS_ * 2 + _PLOT_SECTION_BREAK_
|
2017-07-19 00:36:15 -04:00
|
|
|
|
2020-01-28 20:06:56 -05:00
|
|
|
local _FREQ_Y_ = _HWP_Y_ + _TEXT_SPACING_
|
2017-10-23 02:40:12 -04:00
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
local cpu_status = Common.initTextRows(
|
|
|
|
_G_INIT_DATA_.LEFT_X,
|
|
|
|
_HWP_Y_,
|
|
|
|
_G_INIT_DATA_.SECTION_WIDTH,
|
|
|
|
_TEXT_SPACING_,
|
|
|
|
{'HWP Preference', 'Ave Freq'}
|
|
|
|
)
|
2017-10-23 02:40:12 -04:00
|
|
|
|
|
|
|
local _SEP_Y_ = _FREQ_Y_ + _SEPARATOR_SPACING_
|
2017-07-19 00:36:15 -04:00
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
local separator = Common.initSeparator(
|
|
|
|
_G_INIT_DATA_.LEFT_X,
|
|
|
|
_SEP_Y_,
|
|
|
|
_G_INIT_DATA_.SECTION_WIDTH
|
|
|
|
)
|
2017-07-19 00:36:15 -04:00
|
|
|
|
|
|
|
local _LOAD_Y_ = _SEP_Y_ + _SEPARATOR_SPACING_
|
|
|
|
|
|
|
|
local _PLOT_Y_ = _LOAD_Y_ + _PLOT_SECTION_BREAK_
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
local total_load = Common.initPercentPlot(
|
|
|
|
_G_INIT_DATA_.LEFT_X,
|
|
|
|
_LOAD_Y_,
|
|
|
|
_G_INIT_DATA_.SECTION_WIDTH,
|
|
|
|
_PLOT_HEIGHT_,
|
|
|
|
_PLOT_SECTION_BREAK_,
|
|
|
|
"Total Load"
|
|
|
|
)
|
|
|
|
|
|
|
|
local tbl = Common.initTable(
|
|
|
|
_G_INIT_DATA_.LEFT_X,
|
|
|
|
_PLOT_Y_ + _PLOT_HEIGHT_ + _TABLE_SECTION_BREAK_,
|
|
|
|
_G_INIT_DATA_.SECTION_WIDTH,
|
|
|
|
_TABLE_HEIGHT_,
|
|
|
|
NUM_ROWS,
|
|
|
|
{'Name', 'PID', 'CPU (%)'}
|
|
|
|
)
|
2017-07-19 00:36:15 -04:00
|
|
|
|
|
|
|
local update = function(cr)
|
2018-01-05 23:36:50 -05:00
|
|
|
local conky = Util.conky
|
|
|
|
|
|
|
|
local load_sum = 0
|
|
|
|
local freq_sum = 0
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2018-01-05 23:36:50 -05:00
|
|
|
for c = 1, NUM_PHYSICAL_CORES do
|
|
|
|
local core = cores[c]
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2018-01-05 23:36:50 -05:00
|
|
|
local conky_loads = core.conky_loads
|
|
|
|
local conky_freqs = core.conky_freqs
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2018-01-05 23:36:50 -05:00
|
|
|
for t = 1, NUM_THREADS_PER_CORE do
|
|
|
|
local percent = Util.conky_numeric(conky_loads[t]) * 0.01
|
|
|
|
CompoundDial.set(core.dials, t, percent)
|
|
|
|
load_sum = load_sum + percent
|
|
|
|
|
|
|
|
freq_sum = freq_sum + Util.conky_numeric(conky_freqs[t])
|
|
|
|
end
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.text_ring_set(core.text_ring, cr,
|
|
|
|
Util.round_to_string(
|
|
|
|
0.001 * Util.read_file(core.coretemp_path, nil, '*n')))
|
2018-01-05 23:36:50 -05:00
|
|
|
end
|
|
|
|
|
2020-01-28 20:06:56 -05:00
|
|
|
-- read HWP of first cpu, then test all others to see if they match
|
|
|
|
local hwp_pref = Util.read_file(HWP_PATHS[1], nil, "*l")
|
|
|
|
local mixed = nil
|
|
|
|
local i = 2
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2020-01-28 20:06:56 -05:00
|
|
|
while not mixed and i <= #HWP_PATHS do
|
|
|
|
if hwp_pref ~= Util.read_file(HWP_PATHS[i], nil, '*l') then
|
|
|
|
mixed = 0
|
|
|
|
end
|
|
|
|
i = i + 1
|
|
|
|
end
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
local hwp_val = "Unknown"
|
2020-01-28 20:06:56 -05:00
|
|
|
if mixed then
|
2021-07-05 23:27:43 -04:00
|
|
|
hwp_val = "Mixed"
|
2020-01-28 20:06:56 -05:00
|
|
|
elseif hwp_pref == "power" then
|
2021-07-05 23:27:43 -04:00
|
|
|
hwp_val = "Power"
|
2020-01-28 20:06:56 -05:00
|
|
|
elseif hwp_pref == "balance_power" then
|
2021-07-05 23:27:43 -04:00
|
|
|
hwp_val = "Bal. Power"
|
2020-01-28 20:06:56 -05:00
|
|
|
elseif hwp_pref == "balance_performance" then
|
2021-07-05 23:27:43 -04:00
|
|
|
hwp_val = "Bal. Performance"
|
2020-01-28 20:06:56 -05:00
|
|
|
elseif hwp_pref == "performance" then
|
2021-07-05 23:27:43 -04:00
|
|
|
hwp_val = "Performance"
|
2020-01-28 20:06:56 -05:00
|
|
|
elseif hwp_pref == "default" then
|
2021-07-05 23:27:43 -04:00
|
|
|
hwp_val = "Default"
|
2020-01-28 20:06:56 -05:00
|
|
|
end
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.text_rows_set(cpu_status, cr, 1, hwp_val)
|
|
|
|
Common.text_rows_set(cpu_status, cr, 2,
|
|
|
|
Util.round_to_string(freq_sum / NUM_PHYSICAL_CORES / NUM_THREADS_PER_CORE) .. ' MHz')
|
2018-01-05 23:36:50 -05:00
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.percent_plot_set(total_load, cr, load_sum / NUM_PHYSICAL_CORES / NUM_THREADS_PER_CORE * 100)
|
2018-01-05 23:36:50 -05:00
|
|
|
|
2018-08-04 17:54:34 -04:00
|
|
|
for r = 1, NUM_ROWS do
|
2019-10-12 10:33:32 -04:00
|
|
|
local pid = conky(TABLE_CONKY[r].pid, '(%d+)') -- may have leading spaces
|
2019-09-01 15:34:10 -04:00
|
|
|
if pid ~= '' then
|
|
|
|
local cpu = conky(TABLE_CONKY[r].cpu)
|
2019-10-12 11:42:44 -04:00
|
|
|
local comm = Util.read_file('/proc/'..pid..'/comm', '(%C+)')
|
2019-09-01 15:34:10 -04:00
|
|
|
Table.set(tbl, cr, 1, r, comm)
|
|
|
|
Table.set(tbl, cr, 2, r, pid)
|
|
|
|
Table.set(tbl, cr, 3, r, cpu)
|
|
|
|
end
|
2018-01-05 23:36:50 -05:00
|
|
|
end
|
2017-07-19 00:36:15 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
_MODULE_Y_ = nil
|
|
|
|
_DIAL_INNER_RADIUS_ = nil
|
|
|
|
_DIAL_OUTER_RADIUS_ = nil
|
|
|
|
_DIAL_SPACING_ = nil
|
|
|
|
_TEXT_Y_OFFSET_ = nil
|
|
|
|
_SEPARATOR_SPACING_ = nil
|
2017-10-23 02:40:12 -04:00
|
|
|
_TEXT_SPACING_ = nil
|
2017-07-19 00:36:15 -04:00
|
|
|
_PLOT_SECTION_BREAK_ = nil
|
|
|
|
_PLOT_HEIGHT_ = nil
|
|
|
|
_TABLE_SECTION_BREAK_ = nil
|
|
|
|
_TABLE_HEIGHT_ = nil
|
|
|
|
_create_core_ = nil
|
2017-10-23 02:40:12 -04:00
|
|
|
_FREQ_Y_ = nil
|
2017-07-19 00:36:15 -04:00
|
|
|
_LOAD_Y_ = nil
|
|
|
|
_SEP_Y_ = nil
|
2020-01-28 20:06:56 -05:00
|
|
|
_HWP_Y_ = nil
|
2017-07-19 00:36:15 -04:00
|
|
|
_PLOT_Y_ = nil
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
M.draw_static = function(cr)
|
|
|
|
Common.drawHeader(cr, header)
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2018-08-05 11:35:00 -04:00
|
|
|
for c = 1, NUM_PHYSICAL_CORES do
|
|
|
|
local this_core = cores[c]
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.text_ring_draw_static(this_core.text_ring, cr)
|
2018-08-05 14:45:41 -04:00
|
|
|
CompoundDial.draw_static(this_core.dials, cr)
|
2018-08-05 11:35:00 -04:00
|
|
|
end
|
2018-08-05 11:22:07 -04:00
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.text_rows_draw_static(cpu_status, cr)
|
2018-08-05 11:35:00 -04:00
|
|
|
Line.draw(separator, cr)
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.percent_plot_draw_static(total_load, cr)
|
2018-08-05 11:56:11 -04:00
|
|
|
|
|
|
|
Table.draw_static(tbl, cr)
|
2018-08-05 11:22:07 -04:00
|
|
|
end
|
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
M.draw_dynamic = function(cr)
|
2018-01-05 23:36:50 -05:00
|
|
|
update(cr)
|
|
|
|
|
2018-08-05 11:08:37 -04:00
|
|
|
for c = 1, NUM_PHYSICAL_CORES do
|
2018-08-05 11:35:00 -04:00
|
|
|
local this_core = cores[c]
|
2018-08-05 14:45:41 -04:00
|
|
|
CompoundDial.draw_dynamic(this_core.dials, cr)
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.text_ring_draw_dynamic(this_core.text_ring, cr)
|
2018-08-05 11:08:37 -04:00
|
|
|
end
|
2018-01-05 23:36:50 -05:00
|
|
|
|
2021-07-05 23:27:43 -04:00
|
|
|
Common.text_rows_draw_dynamic(cpu_status, cr)
|
|
|
|
Common.percent_plot_draw_dynamic(total_load, cr)
|
2019-09-01 15:34:10 -04:00
|
|
|
|
2018-08-05 11:56:11 -04:00
|
|
|
Table.draw_dynamic(tbl, cr)
|
2017-07-19 00:36:15 -04:00
|
|
|
end
|
|
|
|
|
2018-08-05 11:22:07 -04:00
|
|
|
return M
|