Skip to content
Snippets Groups Projects
Commit b24bce6d authored by Morris Jette's avatar Morris Jette
Browse files

No change in logic, just rename a variable

Change "sched_params" to "power_params" because that's what it contains.
parent 63c2214b
No related branches found
No related tags found
No related merge requests found
...@@ -171,18 +171,18 @@ uint32_t powercap_get_cluster_min_watts(void) ...@@ -171,18 +171,18 @@ uint32_t powercap_get_cluster_min_watts(void)
uint32_t powercap_get_cluster_current_cap(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; uint32_t cap_watts = 0;
sched_params = slurm_get_power_parameters(); power_params = slurm_get_power_parameters();
if (!sched_params) if (!power_params)
return cap_watts; return cap_watts;
if ((tmp_ptr = strstr(sched_params, "cap_watts=INFINITE"))) { if ((tmp_ptr = strstr(power_params, "cap_watts=INFINITE"))) {
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; 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); cap_watts = strtol(tmp_ptr + 10, &end_ptr, 10);
if ((end_ptr[0] == 'k') || (end_ptr[0] == 'K')) { if ((end_ptr[0] == 'k') || (end_ptr[0] == 'K')) {
cap_watts *= 1000; cap_watts *= 1000;
...@@ -190,7 +190,7 @@ uint32_t powercap_get_cluster_current_cap(void) ...@@ -190,7 +190,7 @@ uint32_t powercap_get_cluster_current_cap(void)
cap_watts *= 1000000; cap_watts *= 1000000;
} }
} }
xfree(sched_params); xfree(power_params);
return cap_watts; return cap_watts;
} }
...@@ -218,25 +218,25 @@ static void _strip_cap_watts(char *tmp_ptr) ...@@ -218,25 +218,25 @@ static void _strip_cap_watts(char *tmp_ptr)
int powercap_set_cluster_cap(uint32_t new_cap) 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(); power_params = slurm_get_power_parameters();
if (sched_params) { if (power_params) {
while ((tmp_ptr = strstr(sched_params, "cap_watts="))) { while ((tmp_ptr = strstr(power_params, "cap_watts="))) {
_strip_cap_watts(tmp_ptr); _strip_cap_watts(tmp_ptr);
} }
} }
if (sched_params && sched_params[0]) if (power_params && power_params[0])
sep = ","; sep = ",";
else else
sep = ""; sep = "";
if (new_cap == INFINITE) if (new_cap == INFINITE)
xstrfmtcat(sched_params, "%scap_watts=INFINITE", sep); xstrfmtcat(power_params, "%scap_watts=INFINITE", sep);
else else
xstrfmtcat(sched_params, "%scap_watts=%u", sep, new_cap); xstrfmtcat(power_params, "%scap_watts=%u", sep, new_cap);
slurm_set_power_parameters(sched_params); slurm_set_power_parameters(power_params);
power_g_reconfig(); power_g_reconfig();
xfree(sched_params); xfree(power_params);
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment