diff --git a/src/slurmctld/powercapping.c b/src/slurmctld/powercapping.c index 3b63521e130712cbecffd32983a9b95201efb68e..8f0312e6a146c7af651ee611254907c25e4e6d0e 100644 --- a/src/slurmctld/powercapping.c +++ b/src/slurmctld/powercapping.c @@ -171,18 +171,18 @@ uint32_t powercap_get_cluster_min_watts(void) uint32_t powercap_get_cluster_current_cap(void) { - char *end_ptr = NULL, *sched_params, *tmp_ptr; + char *end_ptr = NULL, *power_params, *tmp_ptr; uint32_t cap_watts = 0; - sched_params = slurm_get_power_parameters(); - if (!sched_params) + power_params = slurm_get_power_parameters(); + if (!power_params) return cap_watts; - if ((tmp_ptr = strstr(sched_params, "cap_watts=INFINITE"))) { + if ((tmp_ptr = strstr(power_params, "cap_watts=INFINITE"))) { cap_watts = INFINITE; - } else if ((tmp_ptr = strstr(sched_params, "cap_watts=UNLIMITED"))) { + } else if ((tmp_ptr = strstr(power_params, "cap_watts=UNLIMITED"))) { cap_watts = INFINITE; - } else if ((tmp_ptr = strstr(sched_params, "cap_watts="))) { + } else if ((tmp_ptr = strstr(power_params, "cap_watts="))) { cap_watts = strtol(tmp_ptr + 10, &end_ptr, 10); if ((end_ptr[0] == 'k') || (end_ptr[0] == 'K')) { cap_watts *= 1000; @@ -190,7 +190,7 @@ uint32_t powercap_get_cluster_current_cap(void) cap_watts *= 1000000; } } - xfree(sched_params); + xfree(power_params); return cap_watts; } @@ -218,25 +218,25 @@ static void _strip_cap_watts(char *tmp_ptr) int powercap_set_cluster_cap(uint32_t new_cap) { - char *sched_params, *sep, *tmp_ptr; + char *power_params, *sep, *tmp_ptr; - sched_params = slurm_get_power_parameters(); - if (sched_params) { - while ((tmp_ptr = strstr(sched_params, "cap_watts="))) { + power_params = slurm_get_power_parameters(); + if (power_params) { + while ((tmp_ptr = strstr(power_params, "cap_watts="))) { _strip_cap_watts(tmp_ptr); } } - if (sched_params && sched_params[0]) + if (power_params && power_params[0]) sep = ","; else sep = ""; if (new_cap == INFINITE) - xstrfmtcat(sched_params, "%scap_watts=INFINITE", sep); + xstrfmtcat(power_params, "%scap_watts=INFINITE", sep); else - xstrfmtcat(sched_params, "%scap_watts=%u", sep, new_cap); - slurm_set_power_parameters(sched_params); + xstrfmtcat(power_params, "%scap_watts=%u", sep, new_cap); + slurm_set_power_parameters(power_params); power_g_reconfig(); - xfree(sched_params); + xfree(power_params); return 0; }