summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClement Tsang <34804052+ClementTsang@users.noreply.github.com>2023-11-20 07:30:57 +0000
committerGitHub <noreply@github.com>2023-11-20 02:30:57 -0500
commit10a37c263a436a176cd82b5e2a688882acbd99f4 (patch)
treee6fddeabe781844523eb17d1b50f1e12168e4a79
parente4a6e751ec60f0f2363e0a3493a4f15c1ddc1d85 (diff)
change: small gpu proc changes (#1325)
* other: use consistent casing with Mem/Mem% in processes for GPU cols * other: remove mem check for GPU enable check
-rw-r--r--src/options.rs2
-rw-r--r--src/widgets/process_table/proc_widget_column.rs8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/options.rs b/src/options.rs
index 031b3cc4..a4d55047 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -433,7 +433,7 @@ pub fn build_app(
use_cpu: used_widget_set.get(&Cpu).is_some() || used_widget_set.get(&BasicCpu).is_some(),
use_mem,
use_cache: use_mem && get_enable_cache_memory(matches, config),
- use_gpu: use_mem && get_enable_gpu(matches, config),
+ use_gpu: get_enable_gpu(matches, config),
use_net: used_widget_set.get(&Net).is_some() || used_widget_set.get(&BasicNet).is_some(),
use_proc: used_widget_set.get(&Proc).is_some(),
use_disk: used_widget_set.get(&Disk).is_some(),
diff --git a/src/widgets/process_table/proc_widget_column.rs b/src/widgets/process_table/proc_widget_column.rs
index ca32b0e3..e68cad94 100644
--- a/src/widgets/process_table/proc_widget_column.rs
+++ b/src/widgets/process_table/proc_widget_column.rs
@@ -91,9 +91,9 @@ impl ColumnHeader for ProcColumn {
ProcColumn::User => "User",
ProcColumn::Time => "Time",
#[cfg(feature = "gpu")]
- ProcColumn::GpuMem => "GMEM",
+ ProcColumn::GpuMem => "GMem",
#[cfg(feature = "gpu")]
- ProcColumn::GpuMemPercent => "GMEM%",
+ ProcColumn::GpuMemPercent => "GMem%",
#[cfg(feature = "gpu")]
ProcColumn::GpuUtilPercent => "GPU%",
}
@@ -117,9 +117,9 @@ impl ColumnHeader for ProcColumn {
ProcColumn::User => "User",
ProcColumn::Time => "Time",
#[cfg(feature = "gpu")]
- ProcColumn::GpuMem => "GMEM",
+ ProcColumn::GpuMem => "GMem",
#[cfg(feature = "gpu")]
- ProcColumn::GpuMemPercent => "GMEM%",
+ ProcColumn::GpuMemPercent => "GMem%",
#[cfg(feature = "gpu")]
ProcColumn::GpuUtilPercent => "GPU%",
}