mirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2026-06-12 01:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bind GPU panel to 5,6,7,8,9,0 and fully implement multi-GPU support

Browse Source
This commit is contained in:
romner-set
2023-05-19 16:42:32 +02:00
parent 22a463976d
commit 01acfd603e
8 changed files with 154 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/btop.cpp
View File

@@ -501,13 +501,17 @@ namespace Runner {
try {
//? GPU data collection
vector<Gpu::gpu_info> gpus;
if (
v_contains(conf.boxes, "gpu")
or Config::getS("cpu_graph_lower") == "default"
bool gpu_in_cpu_panel =
Config::getS("cpu_graph_lower") == "default"
or Config::getS("cpu_graph_lower").rfind("gpu-", 0) == 0
or Config::getS("cpu_graph_upper").rfind("gpu-", 0) == 0
or true
) {
or Config::getS("cpu_graph_upper").rfind("gpu-", 0) == 0;
vector<unsigned int> gpu_panels = {};
for (auto& box : conf.boxes)
if (box.rfind("gpu", 0) == 0)
gpu_panels.push_back(box.back()-'0');
if (gpu_in_cpu_panel or not gpu_panels.empty()) {
if (Global::debug) debug_timer("gpu", collect_begin);
gpus = Gpu::collect(conf.no_update);
}
@@ -541,15 +545,15 @@ namespace Runner {
}
}
//? GPU // TODO detailed panel
if (v_contains(conf.boxes, "gpu")) {
//? GPU
if (not gpu_panels.empty() and not gpus_ref.empty()) {
try {
if (Global::debug) debug_timer("gpu", draw_begin);
//? Draw box
if (not pause_output and not Gpu::gpu_names.empty())
output += Gpu::draw(gpus_ref, conf.force_redraw, conf.no_update);
if (not pause_output)
for (unsigned long i = 0; i < gpu_panels.size(); ++i)
output += Gpu::draw(gpus_ref[gpu_panels[i]], i, conf.force_redraw, conf.no_update);
if (Global::debug) debug_timer("gpu", draw_done);
}