IntenseWebs/tuxclocker
3
0
Fork 0
mirror of https://github.com/Lurkki14/tuxclocker.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

readable/nvidia: use tc_readable_result_create() in returning values from nodes

Browse Source
This commit is contained in:
jussi 2019-11-11 13:07:58 +02:00
parent f200fae8f4
commit 59806ae2ff
1 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/modules/readable/nvidia_linux.c
View File

@ -54,6 +54,8 @@ static callback_map *callback_map_new_copy(const callback_map *map) {
return new_map; return new_map;
} }
// Local functions // Local functions
void generate_readable_tree(); void generate_readable_tree();
void add_temp_item(tc_readable_node_t *parent, nvmlDevice_t dev, callback_map *map); void add_temp_item(tc_readable_node_t *parent, nvmlDevice_t dev, callback_map *map);
@ -247,64 +249,44 @@ void add_clock_items(tc_readable_node_t *parent, callback_map *map) {
tc_readable_result_t get_temp(const tc_readable_node_t *node) { tc_readable_result_t get_temp(const tc_readable_node_t *node) {
// Find the data mapped to the node // Find the data mapped to the node
callback_map *map = (callback_map*) tc_bin_node_find_value(root_search_node, node); callback_map *map = (callback_map*) tc_bin_node_find_value(root_search_node, node);
const enum tc_data_types type = TC_TYPE_UINT;
tc_readable_result_t res; bool success = false;
res.valid = false; if (!map || map->map_type != MAP_BASE) {
return tc_readable_result_create(type, NULL, success);
if (!map) {
return res;
} }
uint32_t reading;
uint32_t temp; if (nvmlDeviceGetPowerUsage(map->base_map.dev, &reading) == NVML_SUCCESS) {
if (nvmlDeviceGetTemperature(map->base_map.dev, NVML_TEMPERATURE_GPU, &temp) != NVML_SUCCESS) { success = true;
return res;
} }
res.valid = true; uint64_t val = reading;
res.data.data_type = TC_TYPE_UINT; return tc_readable_result_create(type, &val, success);
res.data.uint_value = temp;
return res;
} }
tc_readable_result_t get_power(const tc_readable_node_t *node) { tc_readable_result_t get_power(const tc_readable_node_t *node) {
const enum tc_data_types type = TC_TYPE_UINT;
bool success = false;
callback_map *map = (callback_map*) tc_bin_node_find_value(root_search_node, node); callback_map *map = (callback_map*) tc_bin_node_find_value(root_search_node, node);
if (!map || map->map_type != MAP_BASE) {
tc_readable_result_t res; return tc_readable_result_create(type, NULL, success);
res.valid = false;
if (!map) {
return res;
} }
uint32_t reading;
uint32_t power; if (nvmlDeviceGetPowerUsage(map->base_map.dev, &reading) == NVML_SUCCESS) {
if (nvmlDeviceGetPowerUsage(map->base_map.dev, &power) != NVML_SUCCESS) { success = true;
return res;
} }
uint64_t val = reading;
res.valid = true; return tc_readable_result_create(type, &val, success);
res.data.data_type = TC_TYPE_UINT;
res.data.uint_value = power;
return res;
} }
tc_readable_result_t get_clock(const tc_readable_node_t *node) { tc_readable_result_t get_clock(const tc_readable_node_t *node) {
tc_readable_result_t res; bool success = false;
res.valid = false;
callback_map *map = (callback_map*) tc_bin_node_find_value(root_search_node, node); callback_map *map = (callback_map*) tc_bin_node_find_value(root_search_node, node);
if (!map || map->map_type != MAP_CLOCK) { if (!map || map->map_type != MAP_CLOCK) {
return res; return tc_readable_result_create(TC_TYPE_UINT, NULL, success);
} }
uint32_t reading; uint32_t reading;
if (nvmlDeviceGetClockInfo(map->base_map.dev, map->clock_type, &reading) != NVML_SUCCESS) { if (nvmlDeviceGetClockInfo(map->base_map.dev, map->clock_type, &reading) == NVML_SUCCESS) {
return res; success = true;
} }
res.valid = true; uint64_t val = reading;
res.data.data_type = TC_TYPE_UINT; return tc_readable_result_create(TC_TYPE_UINT, &val, success);
res.data.uint_value = reading;
return res;
} }