shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

util: Declare a cleanup routine for a cpu_set_t

Browse Source 
Make use of it in config_parse_cpu_affinity2.

Tested by tweaking the `CPUAffinity' setting in /etc/systemd/system.conf
and reloading the daemon to confirm it is working as expected.

No regressions observed in test cases.
This commit is contained in:
Filipe Brandenburger 2015-08-30 20:46:27 -07:00
parent 4457c2279e
commit 4b40bc38b4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/basic/util.h
View File

@ -363,6 +363,9 @@ int fd_is_temporary_fs(int fd);
int pipe_eof(int fd); int pipe_eof(int fd);
DEFINE_TRIVIAL_CLEANUP_FUNC(cpu_set_t*, CPU_FREE);
#define _cleanup_cpu_free_ _cleanup_(CPU_FREEp)
cpu_set_t* cpu_set_malloc(unsigned *ncpus); cpu_set_t* cpu_set_malloc(unsigned *ncpus);
#define xsprintf(buf, fmt, ...) assert_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf)) #define xsprintf(buf, fmt, ...) assert_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf))

8
src/core/main.c
View File

@ -433,7 +433,7 @@ static int config_parse_cpu_affinity2(
void *data, void *data,
void *userdata) { void *userdata) {
cpu_set_t *c = NULL; _cleanup_cpu_free_ cpu_set_t *c = NULL;
unsigned ncpus = 0; unsigned ncpus = 0;
assert(filename); assert(filename);
@ -460,7 +460,6 @@ static int config_parse_cpu_affinity2(
if (r < 0 || cpu >= ncpus) { if (r < 0 || cpu >= ncpus) {
log_syntax(unit, LOG_ERR, filename, line, -r, log_syntax(unit, LOG_ERR, filename, line, -r,
"Failed to parse CPU affinity '%s'", rvalue); "Failed to parse CPU affinity '%s'", rvalue);
CPU_FREE(c);
return -EBADMSG; return -EBADMSG;
} }
@ -470,13 +469,10 @@ static int config_parse_cpu_affinity2(
log_syntax(unit, LOG_ERR, filename, line, EINVAL, log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Trailing garbage, ignoring."); "Trailing garbage, ignoring.");
if (c) { if (c)
if (sched_setaffinity(0, CPU_ALLOC_SIZE(ncpus), c) < 0) if (sched_setaffinity(0, CPU_ALLOC_SIZE(ncpus), c) < 0)
log_warning("Failed to set CPU affinity: %m"); log_warning("Failed to set CPU affinity: %m");
CPU_FREE(c);
}
return 0; return 0;
} }