Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-14 11:33:14 +00:00
Code Issues Releases Activity

Run clang-format.

Browse Source
This commit is contained in:
Brenden Matthews 2021-01-23 18:41:22 -06:00
parent 351a7a8d22
commit 05321f375a
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/nvidia.cc
View File

@ -40,19 +40,20 @@
* *
* Showcase (conky.conf): * Showcase (conky.conf):
* --==| NVIDIA | ==-- * --==| NVIDIA | ==--
* GPU ${nvidia gpufreq [target_id]}MHz (${nvidia gpufreqmin [target_id]}-${nvidia * GPU ${nvidia gpufreq [target_id]}MHz (${nvidia gpufreqmin
* gpufreqmax [target_id]}MHz) MEM ${nvidia memfreq [target_id]}MHz (${nvidia * [target_id]}-${nvidia gpufreqmax [target_id]}MHz) MEM ${nvidia memfreq
* memfreqmin [target_id]}-${nvidia memfreqmax [target_id]}MHz) MTR ${nvidia * [target_id]}MHz (${nvidia memfreqmin [target_id]}-${nvidia memfreqmax
* mtrfreq [target_id]}MHz (${nvidia mtrfreqmin [target_id]}-${nvidia mtrfreqmax * [target_id]}MHz) MTR ${nvidia mtrfreq [target_id]}MHz (${nvidia mtrfreqmin
* [target_id]}MHz) PERF Level ${nvidia perflevel [target_id]} (${nvidia * [target_id]}-${nvidia mtrfreqmax [target_id]}MHz) PERF Level ${nvidia
* perflevelmin [target_id]}-${nvidia perflevelmax [target_id]}), Mode: ${nvidia * perflevel [target_id]} (${nvidia perflevelmin [target_id]}-${nvidia
* perfmode [target_id]} VRAM ${nvidia memutil [target_id]}% (${nvidia memused * perflevelmax [target_id]}), Mode: ${nvidia perfmode [target_id]} VRAM
* [target_id]}MB/${nvidia memtotal [target_id]}MB) LOAD GPU ${nvidia gpuutil * ${nvidia memutil [target_id]}% (${nvidia memused [target_id]}MB/${nvidia
* [target_id]}%, RAM ${nvidia membwutil [target_id]}%, VIDEO ${nvidia videoutil * memtotal [target_id]}MB) LOAD GPU ${nvidia gpuutil [target_id]}%, RAM
* [target_id]}%, PCIe ${nvidia pcieutil [target_id]}% TEMP GPU ${nvidia gputemp * ${nvidia membwutil [target_id]}%, VIDEO ${nvidia videoutil [target_id]}%,
* PCIe ${nvidia pcieutil [target_id]}% TEMP GPU ${nvidia gputemp
* [target_id]}°C (${nvidia gputempthreshold [target_id]}°C max.), SYS ${nvidia * [target_id]}°C (${nvidia gputempthreshold [target_id]}°C max.), SYS ${nvidia
* ambienttemp [target_id]}°C FAN ${nvidia fanspeed [target_id]} RPM (${nvidia * ambienttemp [target_id]}°C FAN ${nvidia fanspeed [target_id]} RPM
* fanlevel [target_id]}%) * (${nvidia fanlevel [target_id]}%)
* *
* Miscellaneous: * Miscellaneous:
* OPENGL ${nvidia imagequality [target_id]} * OPENGL ${nvidia imagequality [target_id]}
@ -908,7 +909,7 @@ static int get_nvidia_string_value(TARGET_ID tid, ATTR_ID aid, char *token,
return value; return value;
} }
bool validate_target_id(Display* dpy, int target_id, ATTR_ID attribute) { bool validate_target_id(Display *dpy, int target_id, ATTR_ID attribute) {
// num_GPU and num_COOLER calculated only once based on the physical target // num_GPU and num_COOLER calculated only once based on the physical target
static int num_GPU = get_nvidia_target_count(dpy, TARGET_GPU) - 1; static int num_GPU = get_nvidia_target_count(dpy, TARGET_GPU) - 1;
static int num_COOLER = get_nvidia_target_count(dpy, TARGET_COOLER) - 1; static int num_COOLER = get_nvidia_target_count(dpy, TARGET_COOLER) - 1;
@ -955,12 +956,13 @@ void print_nvidia_value(struct text_object *obj, char *p,
str = nullptr; str = nullptr;
// Perform query if the query exists and isnt stupid // Perform query if the query exists and isnt stupid
if (nvs != nullptr && validate_target_id(dpy, nvs->target_id, nvs->attribute)) { if (nvs != nullptr &&
validate_target_id(dpy, nvs->target_id, nvs->attribute)) {
// Execute switch by query type // Execute switch by query type
switch (nvs->query) { switch (nvs->query) {
case QUERY_VALUE: case QUERY_VALUE:
value = get_nvidia_value(nvs->target, nvs->attribute, nvs->target_id, value = get_nvidia_value(nvs->target, nvs->attribute, nvs->target_id,
nvs->arg); nvs->arg);
break; break;
case QUERY_STRING: case QUERY_STRING:
str = get_nvidia_string(nvs->target, nvs->attribute, nvs->target_id, str = get_nvidia_string(nvs->target, nvs->attribute, nvs->target_id,
@ -973,8 +975,8 @@ void print_nvidia_value(struct text_object *obj, char *p,
case QUERY_SPECIAL: case QUERY_SPECIAL:
switch (nvs->attribute) { switch (nvs->attribute) {
case ATTR_PERF_MODE: case ATTR_PERF_MODE:
temp1 = get_nvidia_value(nvs->target, nvs->attribute, nvs->target_id, temp1 = get_nvidia_value(nvs->target, nvs->attribute,
nvs->arg); nvs->target_id, nvs->arg);
switch (temp1) { switch (temp1) {
case NV_CTRL_GPU_POWER_MIZER_MODE_ADAPTIVE: case NV_CTRL_GPU_POWER_MIZER_MODE_ADAPTIVE:
result = asprintf(&str, "Adaptive"); result = asprintf(&str, "Adaptive");
@ -997,15 +999,15 @@ void print_nvidia_value(struct text_object *obj, char *p,
case ATTR_MEM_FREE: case ATTR_MEM_FREE:
temp1 = get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id, temp1 = get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id,
nvs->arg); nvs->arg);
temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL, nvs->target_id, temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL,
nvs->arg); nvs->target_id, nvs->arg);
value = temp2 - temp1; value = temp2 - temp1;
break; break;
case ATTR_MEM_UTIL: case ATTR_MEM_UTIL:
temp1 = get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id, temp1 = get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id,
nvs->arg); nvs->arg);
temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL, nvs->target_id, temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL,
nvs->arg); nvs->target_id, nvs->arg);
value = ((float)temp1 * 100 / (float)temp2) + 0.5; value = ((float)temp1 * 100 / (float)temp2) + 0.5;
break; break;
default: default:
@ -1053,7 +1055,8 @@ double get_nvidia_barval(struct text_object *obj) {
// Convert query_result to a percentage using ((val-min)÷(max-min)×100)+0.5 if // Convert query_result to a percentage using ((val-min)÷(max-min)×100)+0.5 if
// needed. // needed.
if (nvs != nullptr && validate_target_id(dpy, nvs->target_id, nvs->attribute)) { if (nvs != nullptr &&
validate_target_id(dpy, nvs->target_id, nvs->attribute)) {
switch (nvs->attribute) { switch (nvs->attribute) {
case ATTR_UTILS_STRING: // one of the percentage utils (gpuutil, case ATTR_UTILS_STRING: // one of the percentage utils (gpuutil,
// membwutil, videoutil and pcieutil) // membwutil, videoutil and pcieutil)
@ -1063,15 +1066,15 @@ double get_nvidia_barval(struct text_object *obj) {
break; break;
case ATTR_MEM_UTIL: // memutil case ATTR_MEM_UTIL: // memutil
case ATTR_MEM_USED: case ATTR_MEM_USED:
temp1 = temp1 = get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id,
get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id, nvs->arg); nvs->arg);
temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL, nvs->target_id, temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL, nvs->target_id,
nvs->arg); nvs->arg);
value = ((float)temp1 * 100 / (float)temp2) + 0.5; value = ((float)temp1 * 100 / (float)temp2) + 0.5;
break; break;
case ATTR_MEM_FREE: // memfree case ATTR_MEM_FREE: // memfree
temp1 = temp1 = get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id,
get_nvidia_value(nvs->target, ATTR_MEM_USED, nvs->target_id, nvs->arg); nvs->arg);
temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL, nvs->target_id, temp2 = get_nvidia_value(nvs->target, ATTR_MEM_TOTAL, nvs->target_id,
nvs->arg); nvs->arg);
value = temp2 - temp1; value = temp2 - temp1;
@ -1086,8 +1089,8 @@ double get_nvidia_barval(struct text_object *obj) {
nvs->arg); nvs->arg);
break; break;
case ATTR_GPU_TEMP: // gputemp (calculate out of gputempthreshold) case ATTR_GPU_TEMP: // gputemp (calculate out of gputempthreshold)
temp1 = temp1 = get_nvidia_value(nvs->target, ATTR_GPU_TEMP, nvs->target_id,
get_nvidia_value(nvs->target, ATTR_GPU_TEMP, nvs->target_id, nvs->arg); nvs->arg);
temp2 = get_nvidia_value(nvs->target, ATTR_GPU_TEMP_THRESHOLD, temp2 = get_nvidia_value(nvs->target, ATTR_GPU_TEMP_THRESHOLD,
nvs->target_id, nvs->arg); nvs->target_id, nvs->arg);
value = ((float)temp1 * 100 / (float)temp2) + 0.5; value = ((float)temp1 * 100 / (float)temp2) + 0.5;
@ -1101,16 +1104,16 @@ double get_nvidia_barval(struct text_object *obj) {
value = ((float)temp1 * 100 / (float)temp2) + 0.5; value = ((float)temp1 * 100 / (float)temp2) + 0.5;
break; break;
case ATTR_GPU_FREQ: // gpufreq (calculate out of gpufreqmax) case ATTR_GPU_FREQ: // gpufreq (calculate out of gpufreqmax)
temp1 = temp1 = get_nvidia_value(nvs->target, ATTR_GPU_FREQ, nvs->target_id,
get_nvidia_value(nvs->target, ATTR_GPU_FREQ, nvs->target_id, nvs->arg); nvs->arg);
temp2 = get_nvidia_string_value(nvs->target, ATTR_PERFMODES_STRING, temp2 = get_nvidia_string_value(nvs->target, ATTR_PERFMODES_STRING,
(char *)"nvclockmax", SEARCH_MAX, (char *)"nvclockmax", SEARCH_MAX,
nvs->target_id, nvs->arg); nvs->target_id, nvs->arg);
value = ((float)temp1 * 100 / (float)temp2) + 0.5; value = ((float)temp1 * 100 / (float)temp2) + 0.5;
break; break;
case ATTR_MEM_FREQ: // memfreq (calculate out of memfreqmax) case ATTR_MEM_FREQ: // memfreq (calculate out of memfreqmax)
temp1 = temp1 = get_nvidia_value(nvs->target, ATTR_MEM_FREQ, nvs->target_id,
get_nvidia_value(nvs->target, ATTR_MEM_FREQ, nvs->target_id, nvs->arg); nvs->arg);
temp2 = get_nvidia_string_value(nvs->target, ATTR_PERFMODES_STRING, temp2 = get_nvidia_string_value(nvs->target, ATTR_PERFMODES_STRING,
(char *)"memclockmax", SEARCH_MAX, (char *)"memclockmax", SEARCH_MAX,
nvs->target_id, nvs->arg); nvs->target_id, nvs->arg);
@ -1135,8 +1138,8 @@ double get_nvidia_barval(struct text_object *obj) {
value = ((float)temp1 * 100 / (float)temp2) + 0.5; value = ((float)temp1 * 100 / (float)temp2) + 0.5;
break; break;
case ATTR_IMAGE_QUALITY: // imagequality case ATTR_IMAGE_QUALITY: // imagequality
value = get_nvidia_value(nvs->target, ATTR_IMAGE_QUALITY, nvs->target_id, value = get_nvidia_value(nvs->target, ATTR_IMAGE_QUALITY,
nvs->arg); nvs->target_id, nvs->arg);
break; break;
default: // Throw error if unsupported args are used default: // Throw error if unsupported args are used