From 1a8052d9949b8e1063d6278b2517a6e6c84e8640 Mon Sep 17 00:00:00 2001 From: Stephanie Brink Date: Tue, 7 Nov 2023 11:38:37 -0800 Subject: [PATCH] minor formatting --- src/examples/CMakeLists.txt | 2 +- .../variorum-get-node-power-json-example.c | 2 -- .../variorum-get-node-thermal-json-example.c | 1 - src/variorum/AMD_GPU/amd_gpu_power_features.c | 17 +++++++---------- src/variorum/AMD_GPU/instinctGPU.c | 2 -- src/variorum/IBM/Power9.c | 2 -- src/variorum/IBM/ibm_power_features.c | 7 ++----- src/variorum/Intel/Intel_06_3E.c | 1 - src/variorum/Intel/Intel_06_9E.h | 1 + src/variorum/Intel/config_intel.c | 1 - src/variorum/Intel/thermal_features.c | 4 ++-- src/variorum/Intel/thermal_features.h | 2 +- src/variorum/Nvidia_GPU/Volta.c | 2 -- src/variorum/Nvidia_GPU/config_nvidia.c | 3 ++- .../Nvidia_GPU/nvidia_gpu_power_features.c | 2 -- src/variorum/variorum.c | 2 +- 16 files changed, 17 insertions(+), 34 deletions(-) diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index 861c418b4..bcb464b3b 100644 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -18,7 +18,7 @@ set(BASIC_EXAMPLES variorum-enable-turbo-example variorum-get-node-power-json-example variorum-get-node-power-domain-info-json-example - variorum-get-node-thermal-json-example + variorum-get-node-thermal-json-example variorum-integration-using-json-example variorum-get-topology-info-example variorum-monitoring-to-file-example diff --git a/src/examples/variorum-get-node-power-json-example.c b/src/examples/variorum-get-node-power-json-example.c index 10e7bbfe5..38342e1a9 100644 --- a/src/examples/variorum-get-node-power-json-example.c +++ b/src/examples/variorum-get-node-power-json-example.c @@ -54,7 +54,6 @@ int main(int argc, char **argv) } ret = variorum_get_node_power_json(&s); - if (ret != 0) { printf("First run: JSON get node power failed!\n"); @@ -65,7 +64,6 @@ int main(int argc, char **argv) /* Print the entire JSON object */ puts(s); - #ifdef SECOND_RUN for (i = 0; i < size; i++) { diff --git a/src/examples/variorum-get-node-thermal-json-example.c b/src/examples/variorum-get-node-thermal-json-example.c index 86511e4a6..5d0895dc2 100644 --- a/src/examples/variorum-get-node-thermal-json-example.c +++ b/src/examples/variorum-get-node-thermal-json-example.c @@ -10,7 +10,6 @@ #include #include - int main(int argc, char **argv) { int ret; diff --git a/src/variorum/AMD_GPU/amd_gpu_power_features.c b/src/variorum/AMD_GPU/amd_gpu_power_features.c index 82de65657..549378fb3 100644 --- a/src/variorum/AMD_GPU/amd_gpu_power_features.c +++ b/src/variorum/AMD_GPU/amd_gpu_power_features.c @@ -273,6 +273,7 @@ void get_thermals_data(int chipid, int total_sockets, int verbose, FILE *output) static int init = 0; static struct timeval start; struct timeval now; + int i; gethostname(hostname, 1024); @@ -316,8 +317,7 @@ void get_thermals_data(int chipid, int total_sockets, int verbose, FILE *output) gettimeofday(&now, NULL); - for (int i = chipid * gpus_per_socket; - i < (chipid + 1) * gpus_per_socket; i++) + for (i = chipid * gpus_per_socket; i < (chipid + 1) * gpus_per_socket; i++) { int64_t temp_val = -1; double temp_val_flt = -1.0; @@ -381,7 +381,6 @@ void get_thermals_data(int chipid, int total_sockets, int verbose, FILE *output) void get_thermals_json(int chipid, int total_sockets, json_t *output) { - rsmi_status_t ret; uint32_t num_devices; int gpus_per_socket; @@ -413,7 +412,7 @@ void get_thermals_json(int chipid, int total_sockets, json_t *output) char socketid[12]; snprintf(socketid, 12, "socket_%d", chipid); - //check if socket object is in node object + // check if socket object is in node object json_t *socket_obj = json_object_get(output, socketid); if (socket_obj == NULL) { @@ -421,12 +420,12 @@ void get_thermals_json(int chipid, int total_sockets, json_t *output) json_object_set_new(output, socketid, socket_obj); } - //gerneral gpu object + // general gpu object json_t *gpu_obj = json_object(); json_object_set_new(socket_obj, "GPU", gpu_obj); - for (int i = chipid * gpus_per_socket; - i < (chipid + 1) * gpus_per_socket; i++) + int i; + for (i = chipid * gpus_per_socket; i < (chipid + 1) * gpus_per_socket; i++) { int64_t temp_val = -1; double temp_val_flt = -1.0; @@ -443,11 +442,10 @@ void get_thermals_json(int chipid, int total_sockets, json_t *output) temp_val_flt = (double)(temp_val / (1000)); // Convert to Celcius. - //gpu entry + // gpu entry char gpuid[32]; snprintf(gpuid, 32, "temp_celsius_gpu_%d", i); json_object_set_new(gpu_obj, gpuid, json_real(temp_val_flt)); - } ret = rsmi_shut_down(); @@ -459,7 +457,6 @@ void get_thermals_json(int chipid, int total_sockets, json_t *output) getenv("HOSTNAME"), __FILE__, __FUNCTION__, __LINE__); } - } void get_clocks_data(int chipid, int total_sockets, int verbose, FILE *output) diff --git a/src/variorum/AMD_GPU/instinctGPU.c b/src/variorum/AMD_GPU/instinctGPU.c index 2ec951d0c..403f3fa43 100644 --- a/src/variorum/AMD_GPU/instinctGPU.c +++ b/src/variorum/AMD_GPU/instinctGPU.c @@ -79,7 +79,6 @@ int amd_gpu_instinct_get_thermals(int verbose) int amd_gpu_instinct_get_thermals_json(json_t *get_thermal_obj) { - char *val = getenv("VARIORUM_LOG"); if (val != NULL && atoi(val) == 1) { @@ -97,7 +96,6 @@ int amd_gpu_instinct_get_thermals_json(json_t *get_thermal_obj) } return 0; - } int amd_gpu_instinct_get_clocks(int verbose) diff --git a/src/variorum/IBM/Power9.c b/src/variorum/IBM/Power9.c index 25297263b..a2528f874 100644 --- a/src/variorum/IBM/Power9.c +++ b/src/variorum/IBM/Power9.c @@ -502,7 +502,6 @@ int ibm_cpu_p9_get_node_thermal_json(json_t *get_thermal_obj) lseek(fd, iter * OCC_SENSOR_DATA_BLOCK_SIZE, SEEK_SET); buf = malloc(OCC_SENSOR_DATA_BLOCK_SIZE); - if (!buf) { printf("Failed to allocate\n"); @@ -532,7 +531,6 @@ int ibm_cpu_p9_get_node_thermal_json(json_t *get_thermal_obj) close(fd); return 0; - } int ibm_cpu_p9_get_node_power_domain_info_json(char **get_domain_obj_str) diff --git a/src/variorum/IBM/ibm_power_features.c b/src/variorum/IBM/ibm_power_features.c index 25f1d2e39..6cef1255d 100644 --- a/src/variorum/IBM/ibm_power_features.c +++ b/src/variorum/IBM/ibm_power_features.c @@ -460,6 +460,7 @@ void json_get_thermal_sensors(int chipid, json_t *node_obj, const void *buf) { struct occ_sensor_data_header *hb; struct occ_sensor_name *md; + int i; hb = (struct occ_sensor_data_header *)(uint64_t)buf; md = (struct occ_sensor_name *)((uint64_t)hb + be32toh(hb->names_offset)); @@ -483,9 +484,8 @@ void json_get_thermal_sensors(int chipid, json_t *node_obj, const void *buf) json_t *mem_obj = json_object(); json_object_set_new(cpu_obj, "Mem", mem_obj); - for (int i = 0; i < be16toh(hb->nr_sensors); i++) + for (i = 0; i < be16toh(hb->nr_sensors); i++) { - uint32_t offset = be32toh(md[i].reading_offset); uint32_t scale = be32toh(md[i].scale_factor); uint64_t sample = 0; @@ -515,8 +515,5 @@ void json_get_thermal_sensors(int chipid, json_t *node_obj, const void *buf) json_object_set_new(mem_obj, mem_temp, json_integer(sample * TO_FP(scale))); } - } - - } diff --git a/src/variorum/Intel/Intel_06_3E.c b/src/variorum/Intel/Intel_06_3E.c index d45ba41b4..468a92163 100644 --- a/src/variorum/Intel/Intel_06_3E.c +++ b/src/variorum/Intel/Intel_06_3E.c @@ -477,7 +477,6 @@ int intel_cpu_fm_06_3e_get_node_power_domain_info_json(char *get_domain_obj_str = json_dumps(get_domain_obj, 0); json_decref(get_domain_obj); return 0; - } int intel_cpu_fm_06_3e_get_thermals_json(json_t *get_thermal_obj) diff --git a/src/variorum/Intel/Intel_06_9E.h b/src/variorum/Intel/Intel_06_9E.h index acbc81032..228dadafb 100644 --- a/src/variorum/Intel/Intel_06_9E.h +++ b/src/variorum/Intel/Intel_06_9E.h @@ -111,4 +111,5 @@ int intel_cpu_fm_06_9e_cap_best_effort_node_power_limit(int node_power_limit); int intel_cpu_fm_06_9e_get_frequencies(void); int intel_cpu_fm_06_9e_get_thermals_json(json_t *get_thermal_obj); + #endif diff --git a/src/variorum/Intel/config_intel.c b/src/variorum/Intel/config_intel.c index 81ca32fec..be491b64f 100644 --- a/src/variorum/Intel/config_intel.c +++ b/src/variorum/Intel/config_intel.c @@ -216,7 +216,6 @@ int set_intel_func_ptrs(int idx) intel_cpu_fm_06_4f_get_frequencies; g_platform[idx].variorum_get_thermals_json = intel_cpu_fm_06_4f_get_thermals_json; - } // Skylake 06_55 else if (*g_platform[idx].arch_id == FM_06_55) diff --git a/src/variorum/Intel/thermal_features.c b/src/variorum/Intel/thermal_features.c index a9a35649a..29613e022 100644 --- a/src/variorum/Intel/thermal_features.c +++ b/src/variorum/Intel/thermal_features.c @@ -6,14 +6,14 @@ #include #include #include -#include +#include #include +#include #include #include #include #include -#include #ifdef LIBJUSTIFY_FOUND #include diff --git a/src/variorum/Intel/thermal_features.h b/src/variorum/Intel/thermal_features.h index 820afbcda..1853fb1ce 100644 --- a/src/variorum/Intel/thermal_features.h +++ b/src/variorum/Intel/thermal_features.h @@ -284,7 +284,7 @@ int print_verbose_therm_temp_reading(FILE *writedest, off_t msr_pkg_therm_stat, off_t msr_temp_target); -/// #brief set json object string with temperature data +/// @brief set json object string with temperature data int get_therm_temp_reading_json(json_t *get_thermal_object, off_t msr_therm_stat, off_t msr_pkg_therm_stat, diff --git a/src/variorum/Nvidia_GPU/Volta.c b/src/variorum/Nvidia_GPU/Volta.c index aeb3a6080..dbfa352e8 100644 --- a/src/variorum/Nvidia_GPU/Volta.c +++ b/src/variorum/Nvidia_GPU/Volta.c @@ -69,8 +69,6 @@ int volta_get_thermals_json(json_t *get_thermal_obj) } return 0; - - } int volta_get_clocks(int long_ver) diff --git a/src/variorum/Nvidia_GPU/config_nvidia.c b/src/variorum/Nvidia_GPU/config_nvidia.c index 1dabca664..693058e96 100644 --- a/src/variorum/Nvidia_GPU/config_nvidia.c +++ b/src/variorum/Nvidia_GPU/config_nvidia.c @@ -33,7 +33,8 @@ int set_nvidia_func_ptrs(int idx) /* Initialize control interfaces */ g_platform[idx].variorum_cap_each_gpu_power_limit = volta_cap_each_gpu_power_limit; - g_platform[idx].variorum_get_thermals_json = volta_get_thermals_json; + g_platform[idx].variorum_get_thermals_json = + volta_get_thermals_json; } else { diff --git a/src/variorum/Nvidia_GPU/nvidia_gpu_power_features.c b/src/variorum/Nvidia_GPU/nvidia_gpu_power_features.c index f59d3ccf0..edc72eba9 100644 --- a/src/variorum/Nvidia_GPU/nvidia_gpu_power_features.c +++ b/src/variorum/Nvidia_GPU/nvidia_gpu_power_features.c @@ -195,7 +195,6 @@ void nvidia_gpu_get_thermal_json(int chipid, json_t *output) for (d = chipid * (int)m_gpus_per_socket; d < (chipid + 1) * (int)m_gpus_per_socket; ++d) { - nvmlDeviceGetTemperature(m_unit_devices_file_desc[d], NVML_TEMPERATURE_GPU, &gpu_temp); @@ -204,7 +203,6 @@ void nvidia_gpu_get_thermal_json(int chipid, json_t *output) snprintf(device_id, 32, "temp_celsius_gpu_%d", d); json_object_set_new(gpu_obj, device_id, json_integer(gpu_temp)); } - } void nvidia_gpu_get_power_limits_data(int chipid, int verbose, FILE *output) diff --git a/src/variorum/variorum.c b/src/variorum/variorum.c index 35bf3c6be..dcc546ba8 100644 --- a/src/variorum/variorum.c +++ b/src/variorum/variorum.c @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include #include #include