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

ENH update graphics for optimus-manager

This commit is contained in:
Nathan Dwarshuis 2020-01-30 23:48:02 -05:00
parent fa0ad15c70
commit 45a3903144
1 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
drawing/Graphics.lua
View File

@ -8,7 +8,6 @@ local LabelPlot = require 'LabelPlot'
local Util = require 'Util' local Util = require 'Util'
local __tonumber = tonumber local __tonumber = tonumber
local __string_find = string.find
local __string_match = string.match local __string_match = string.match
local _MODULE_Y_ = 145 local _MODULE_Y_ = 145
@ -178,7 +177,7 @@ glob will be of the form:
<gpu_freq>,<mem_freq> <gpu_freq>,<mem_freq>
graphics=<gpu_util>, memory=<mem_util>, video=<vid_util>, PCIe=<pci_util> graphics=<gpu_util>, memory=<mem_util>, video=<vid_util>, PCIe=<pci_util>
--]] --]]
local NV_QUERY = 'optirun nvidia-settings -c :8 -t'.. local NV_QUERY = 'nvidia-settings -t'..
' -q UsedDedicatedGPUMemory'.. ' -q UsedDedicatedGPUMemory'..
' -q TotalDedicatedGPUMemory'.. ' -q TotalDedicatedGPUMemory'..
' -q ThermalSensorReading'.. ' -q ThermalSensorReading'..
@ -194,63 +193,57 @@ local NV_REGEX = '(%d+)\n'..
local NA = 'N/A' local NA = 'N/A'
local nvidia_off = function(cr) local nvidia_off = function(cr)
CriticalText.set(internal_temp.value, cr, NA, false) CriticalText.set(internal_temp.value, cr, NA, false)
TextColumn.set(clock_speed.values, cr, 1, NA) TextColumn.set(clock_speed.values, cr, 1, NA)
TextColumn.set(clock_speed.values, cr, 2, NA) TextColumn.set(clock_speed.values, cr, 2, NA)
Text.set(gpu_util.value, cr, NA) Text.set(gpu_util.value, cr, NA)
Text.set(mem_util.value, cr, NA) Text.set(mem_util.value, cr, NA)
Text.set(vid_util.value, cr, NA) Text.set(vid_util.value, cr, NA)
LabelPlot.update(gpu_util.plot, 0) LabelPlot.update(gpu_util.plot, 0)
LabelPlot.update(mem_util.plot, 0) LabelPlot.update(mem_util.plot, 0)
LabelPlot.update(vid_util.plot, 0) LabelPlot.update(vid_util.plot, 0)
end end
local gpu_bus_ctrl = '/sys/bus/pci/devices/0000:01:00.0/power/control'
local update = function(cr) local update = function(cr)
-- check if bbswitch is on if Util.read_file(gpu_bus_ctrl, nil, '*l') == 'on' then
if Util.read_file('/proc/acpi/bbswitch', '.+%s+(%u+)') == 'ON' then local nvidia_settings_glob = Util.execute_cmd(NV_QUERY)
if nvidia_settings_glob == '' then
Text.set(status.value, cr, 'Error')
nvidia_off(cr)
else
Text.set(status.value, cr, 'On')
-- bbswitch might be on, but only because conky is constantly querying local used_memory, total_memory, temp_reading, gpu_frequency,
-- it and there appears to be some lag between closing all optirun memory_frequency, gpu_utilization, vid_utilization
-- processes and flipping bbswitch off. If bbswitch is on and there are = __string_match(nvidia_settings_glob, NV_REGEX)
-- no optirun processes, we call this "Mixed." In this case we don't
-- check anything (to allow bbswitch to actually switch off) and set all
-- values to N/A and 0.
if not __string_find(Util.execute_cmd('ps -A -o comm'), 'optirun') then
Text.set(status.value, cr, 'Mixed')
nvidia_off(cr)
else
Text.set(status.value, cr, 'On')
local nvidia_settings_glob = Util.execute_cmd(NV_QUERY)
local used_memory, total_memory, temp_reading, gpu_frequency, local is_critical = false
memory_frequency, gpu_utilization, vid_utilization if __tonumber(temp_reading) > 80 then is_critical = true end
= __string_match(nvidia_settings_glob, NV_REGEX)
local is_critical = false CriticalText.set(internal_temp.value, cr, temp_reading..'°C', is_critical)
if __tonumber(temp_reading) > 80 then is_critical = true end
CriticalText.set(internal_temp.value, cr, temp_reading..'°C', is_critical) TextColumn.set(clock_speed.values, cr, 1, gpu_frequency..' Mhz')
TextColumn.set(clock_speed.values, cr, 2, memory_frequency..' Mhz')
TextColumn.set(clock_speed.values, cr, 1, gpu_frequency..' Mhz') local percent_used_memory = used_memory / total_memory
TextColumn.set(clock_speed.values, cr, 2, memory_frequency..' Mhz')
local percent_used_memory = used_memory / total_memory Text.set(gpu_util.value, cr, gpu_utilization..'%')
Text.set(mem_util.value, cr, Util.round(percent_used_memory * 100)..'%')
Text.set(vid_util.value, cr, vid_utilization..'%')
Text.set(gpu_util.value, cr, gpu_utilization..'%') LabelPlot.update(gpu_util.plot, gpu_utilization * 0.01)
Text.set(mem_util.value, cr, Util.round(percent_used_memory * 100)..'%') LabelPlot.update(mem_util.plot, percent_used_memory)
Text.set(vid_util.value, cr, vid_utilization..'%') LabelPlot.update(vid_util.plot, vid_utilization * 0.01)
end
LabelPlot.update(gpu_util.plot, gpu_utilization * 0.01) else
LabelPlot.update(mem_util.plot, percent_used_memory) Text.set(status.value, cr, 'Off')
LabelPlot.update(vid_util.plot, vid_utilization * 0.01) nvidia_off(cr)
end end
else
Text.set(status.value, cr, 'Off')
nvidia_off(cr)
end
end end
_MODULE_Y_ = nil _MODULE_Y_ = nil
@ -297,13 +290,13 @@ local draw_dynamic = function(cr)
Text.draw(status.value, cr) Text.draw(status.value, cr)
Text.draw(internal_temp.value, cr) Text.draw(internal_temp.value, cr)
TextColumn.draw(clock_speed.values, cr) TextColumn.draw(clock_speed.values, cr)
Text.draw(gpu_util.value, cr) Text.draw(gpu_util.value, cr)
LabelPlot.draw_dynamic(gpu_util.plot, cr) LabelPlot.draw_dynamic(gpu_util.plot, cr)
Text.draw(mem_util.value, cr) Text.draw(mem_util.value, cr)
LabelPlot.draw_dynamic(mem_util.plot, cr) LabelPlot.draw_dynamic(mem_util.plot, cr)
Text.draw(vid_util.value, cr) Text.draw(vid_util.value, cr)
LabelPlot.draw_dynamic(vid_util.plot, cr) LabelPlot.draw_dynamic(vid_util.plot, cr)
end end