Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
b24bce6d
Commit
b24bce6d
authored
8 years ago
by
Morris Jette
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/slurmctld/powercapping.c
+16
-16
16 additions, 16 deletions
src/slurmctld/powercapping.c
with
16 additions
and
16 deletions
src/slurmctld/powercapping.c
+
16
−
16
View file @
b24bce6d
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment