SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core,test: use parse_cpu_set()

Browse Source 
As it is defined as
```
static inline int parse_cpu_set(const char *rvalue, CPUSet *cpu_set){
        return parse_cpu_set_full(rvalue, cpu_set, false, NULL, NULL, 0, NULL);
}
```
This commit is contained in:
Yu Watanabe
2025-06-24 00:20:20 +09:00
parent c4afb3c3e3
commit 168351eee7
3 changed files with 24 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/cgroup.c
+1 -1
View File
@@ -4161,7 +4161,7 @@ int unit_get_cpuset(Unit *u, CPUSet *cpus, const char *name) {
if (r < 0)
return r;
return parse_cpu_set_full(v, cpus, false, NULL, NULL, 0, NULL);
return parse_cpu_set(v, cpus);
}
CGroupRuntime* cgroup_runtime_new(void) {
src/core/execute-serialize.c
+4 -32
View File
@@ -494,56 +494,28 @@ static int exec_cgroup_context_deserialize(CGroupContext *c, FILE *f) {
if (c->cpuset_cpus.set)
return -EINVAL; /* duplicated */
r = parse_cpu_set_full(
val,
&c->cpuset_cpus,
/* warn= */ false,
/* unit= */ NULL,
/* filename= */ NULL,
/* line= */ 0,
/* lvalue= */ NULL);
r = parse_cpu_set(val, &c->cpuset_cpus);
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-cgroup-context-startup-allowed-cpus="))) {
if (c->startup_cpuset_cpus.set)
return -EINVAL; /* duplicated */
r = parse_cpu_set_full(
val,
&c->startup_cpuset_cpus,
/* warn= */ false,
/* unit= */ NULL,
/* filename= */ NULL,
/* line= */ 0,
/* lvalue= */ NULL);
r = parse_cpu_set(val, &c->startup_cpuset_cpus);
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-cgroup-context-allowed-memory-nodes="))) {
if (c->cpuset_mems.set)
return -EINVAL; /* duplicated */
r = parse_cpu_set_full(
val,
&c->cpuset_mems,
/* warn= */ false,
/* unit= */ NULL,
/* filename= */ NULL,
/* line= */ 0,
/* lvalue= */ NULL);
r = parse_cpu_set(val, &c->cpuset_mems);
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-cgroup-context-startup-allowed-memory-nodes="))) {
if (c->startup_cpuset_mems.set)
return -EINVAL; /* duplicated */
r = parse_cpu_set_full(
val,
&c->startup_cpuset_mems,
/* warn= */ false,
/* unit= */ NULL,
/* filename= */ NULL,
/* line= */ 0,
/* lvalue= */ NULL);
r = parse_cpu_set(val, &c->startup_cpuset_mems);
if (r < 0)
return r;
} else if ((val = startswith(l, "exec-cgroup-context-io-weight="))) {
src/test/test-cpu-set-util.c
+19 -19
View File
@@ -44,14 +44,14 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Single value */
ASSERT_OK(parse_cpu_set_full("0", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0", &c));
ASSERT_CPUSET_COUNT(c, 1);
ASSERT_CPUSET_ISSET(c, 0);
ASSERT_CPUSET_STRING(c, "0", "0", "1");
cpu_set_reset(&c);
/* Simple range (from CPUAffinity example) */
ASSERT_OK(parse_cpu_set_full("1 2 4", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("1 2 4", &c));
ASSERT_CPUSET_COUNT(c, 3);
ASSERT_CPUSET_ISSET(c, 1);
ASSERT_CPUSET_ISSET(c, 2);
@@ -60,7 +60,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* A more interesting range */
ASSERT_OK(parse_cpu_set_full("0 1 2 3 8 9 10 11", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0 1 2 3 8 9 10 11", &c));
ASSERT_CPUSET_COUNT(c, 8);
for (unsigned i = 0; i < 4; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -70,7 +70,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Quoted strings */
ASSERT_OK(parse_cpu_set_full("8 '9' 10 \"11\"", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("8 '9' 10 \"11\"", &c));
ASSERT_CPUSET_COUNT(c, 4);
for (unsigned i = 8; i < 12; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -78,7 +78,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Use commas as separators */
ASSERT_OK(parse_cpu_set_full("0,1,2,3 8,9,10,11", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0,1,2,3 8,9,10,11", &c));
ASSERT_CPUSET_COUNT(c, 8);
for (unsigned i = 0; i < 4; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -88,7 +88,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Commas with spaces (and trailing comma, space) */
ASSERT_OK(parse_cpu_set_full("0, 1, 2, 3, 4, 5, 6, 7, 63, ", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0, 1, 2, 3, 4, 5, 6, 7, 63, ", &c));
ASSERT_CPUSET_COUNT(c, 9);
for (unsigned i = 0; i < 8; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -97,7 +97,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Ranges */
ASSERT_OK(parse_cpu_set_full("0-3,8-11", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0-3,8-11", &c));
ASSERT_CPUSET_COUNT(c, 8);
for (unsigned i = 0; i < 4; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -106,7 +106,7 @@ TEST(parse_cpu_set) {
ASSERT_CPUSET_STRING(c, "0 1 2 3 8 9 10 11", "0-3 8-11", "f0f");
cpu_set_reset(&c);
ASSERT_OK(parse_cpu_set_full("36-39,44-47", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("36-39,44-47", &c));
ASSERT_CPUSET_COUNT(c, 8);
for (unsigned i = 36; i < 40; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -115,7 +115,7 @@ TEST(parse_cpu_set) {
ASSERT_CPUSET_STRING(c, "36 37 38 39 44 45 46 47", "36-39 44-47", "f0f0,00000000");
cpu_set_reset(&c);
ASSERT_OK(parse_cpu_set_full("64-71", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("64-71", &c));
ASSERT_CPUSET_COUNT(c, 8);
for (unsigned i = 64; i < 72; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -123,7 +123,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Ranges with trailing comma, space */
ASSERT_OK(parse_cpu_set_full("0-3 8-11, ", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0-3 8-11, ", &c));
ASSERT_CPUSET_COUNT(c, 8);
for (unsigned i = 0; i < 4; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -133,13 +133,13 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Negative range (returns empty cpu_set) */
ASSERT_OK(parse_cpu_set_full("3-0", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("3-0", &c));
ASSERT_CPUSET_COUNT(c, 0);
ASSERT_CPUSET_STRING(c, "", "", "0");
cpu_set_reset(&c);
/* Overlapping ranges */
ASSERT_OK(parse_cpu_set_full("0-7 4-11", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0-7 4-11", &c));
ASSERT_CPUSET_COUNT(c, 12);
for (unsigned i = 0; i < 12; i++)
ASSERT_CPUSET_ISSET(c, i);
@@ -147,7 +147,7 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Mix ranges and individual CPUs */
ASSERT_OK(parse_cpu_set_full("0,2 4-11", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("0,2 4-11", &c));
ASSERT_CPUSET_COUNT(c, 10);
ASSERT_CPUSET_ISSET(c, 0);
ASSERT_CPUSET_ISSET(c, 2);
@@ -157,23 +157,23 @@ TEST(parse_cpu_set) {
cpu_set_reset(&c);
/* Garbage */
ASSERT_ERROR(parse_cpu_set_full("0 1 2 3 garbage", &c, true, NULL, "fake", 1, "CPUAffinity"), EINVAL);
ASSERT_ERROR(parse_cpu_set("0 1 2 3 garbage", &c), EINVAL);
ASSERT_CPUSET_EMPTY(c);
/* Range with garbage */
ASSERT_ERROR(parse_cpu_set_full("0-3 8-garbage", &c, true, NULL, "fake", 1, "CPUAffinity"), EINVAL);
ASSERT_ERROR(parse_cpu_set("0-3 8-garbage", &c), EINVAL);
ASSERT_CPUSET_EMPTY(c);
/* Empty string */
ASSERT_OK(parse_cpu_set_full("", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("", &c));
ASSERT_CPUSET_EMPTY(c); /* empty string returns NULL */
/* Runaway quoted string */
ASSERT_ERROR(parse_cpu_set_full("0 1 2 3 \"4 5 6 7 ", &c, true, NULL, "fake", 1, "CPUAffinity"), EINVAL);
ASSERT_ERROR(parse_cpu_set("0 1 2 3 \"4 5 6 7 ", &c), EINVAL);
ASSERT_CPUSET_EMPTY(c);
/* Maximum allocation */
ASSERT_OK(parse_cpu_set_full("8000-8191", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("8000-8191", &c));
ASSERT_CPUSET_COUNT(c, 192);
_cleanup_free_ char *expected_str = NULL;
@@ -206,7 +206,7 @@ TEST(parse_cpu_set_extend) {
TEST(cpu_set_to_from_dbus) {
_cleanup_(cpu_set_reset) CPUSet c = {}, c2 = {};
ASSERT_OK_POSITIVE(parse_cpu_set_extend("1 3 8 100-200", &c, true, NULL, "fake", 1, "CPUAffinity"));
ASSERT_OK(parse_cpu_set("1 3 8 100-200", &c));
ASSERT_CPUSET_COUNT(c, 104);
_cleanup_free_ char *expected_str = strdup("1 3 8");