diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-04-26 18:14:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-05-25 16:02:00 +0200 |
| commit | 12f64221b0af5a9380a840ebeb897c2cd6cff955 (patch) | |
| tree | 21a5e28261495ac0680bc46b680b5cc5fc71ce2f /src/test/test-cgroup-unit-default.c | |
| parent | 8ddba3f266a1deae3826a80e2d148909b7902020 (diff) | |
| download | systemd-12f64221b0af5a9380a840ebeb897c2cd6cff955.tar.gz | |
core: add UNIT_GET_SLICE() helper
In a later commit we intend to move the slice logic to use proper
dependencies instead of a "UnitRef" object. This preparatory commit
drops direct use of the slice UnitRef object for a static inline
function UNIT_GET_SLICE() that is both easier to grok, and allows us to
easily replace its internal implementation later on.
Diffstat (limited to 'src/test/test-cgroup-unit-default.c')
| -rw-r--r-- | src/test/test-cgroup-unit-default.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c index b03f6ff12e..225d138e41 100644 --- a/src/test/test-cgroup-unit-default.c +++ b/src/test/test-cgroup-unit-default.c @@ -91,28 +91,28 @@ static int test_default_memory_low(void) { assert_se(manager_load_startable_unit_or_warn(m, "dml.slice", NULL, &dml) >= 0); assert_se(manager_load_startable_unit_or_warn(m, "dml-passthrough.slice", NULL, &dml_passthrough) >= 0); - assert_se(UNIT_DEREF(dml_passthrough->slice) == dml); + assert_se(UNIT_GET_SLICE(dml_passthrough) == dml); assert_se(manager_load_startable_unit_or_warn(m, "dml-passthrough-empty.service", NULL, &dml_passthrough_empty) >= 0); - assert_se(UNIT_DEREF(dml_passthrough_empty->slice) == dml_passthrough); + assert_se(UNIT_GET_SLICE(dml_passthrough_empty) == dml_passthrough); assert_se(manager_load_startable_unit_or_warn(m, "dml-passthrough-set-dml.service", NULL, &dml_passthrough_set_dml) >= 0); - assert_se(UNIT_DEREF(dml_passthrough_set_dml->slice) == dml_passthrough); + assert_se(UNIT_GET_SLICE(dml_passthrough_set_dml) == dml_passthrough); assert_se(manager_load_startable_unit_or_warn(m, "dml-passthrough-set-ml.service", NULL, &dml_passthrough_set_ml) >= 0); - assert_se(UNIT_DEREF(dml_passthrough_set_ml->slice) == dml_passthrough); + assert_se(UNIT_GET_SLICE(dml_passthrough_set_ml) == dml_passthrough); assert_se(manager_load_startable_unit_or_warn(m, "dml-override.slice", NULL, &dml_override) >= 0); - assert_se(UNIT_DEREF(dml_override->slice) == dml); + assert_se(UNIT_GET_SLICE(dml_override) == dml); assert_se(manager_load_startable_unit_or_warn(m, "dml-override-empty.service", NULL, &dml_override_empty) >= 0); - assert_se(UNIT_DEREF(dml_override_empty->slice) == dml_override); + assert_se(UNIT_GET_SLICE(dml_override_empty) == dml_override); assert_se(manager_load_startable_unit_or_warn(m, "dml-discard.slice", NULL, &dml_discard) >= 0); - assert_se(UNIT_DEREF(dml_discard->slice) == dml); + assert_se(UNIT_GET_SLICE(dml_discard) == dml); assert_se(manager_load_startable_unit_or_warn(m, "dml-discard-empty.service", NULL, &dml_discard_empty) >= 0); - assert_se(UNIT_DEREF(dml_discard_empty->slice) == dml_discard); + assert_se(UNIT_GET_SLICE(dml_discard_empty) == dml_discard); assert_se(manager_load_startable_unit_or_warn(m, "dml-discard-set-ml.service", NULL, &dml_discard_set_ml) >= 0); - assert_se(UNIT_DEREF(dml_discard_set_ml->slice) == dml_discard); + assert_se(UNIT_GET_SLICE(dml_discard_set_ml) == dml_discard); - root = UNIT_DEREF(dml->slice); - assert_se(!UNIT_ISSET(root->slice)); + assert_se(root = UNIT_GET_SLICE(dml)); + assert_se(!UNIT_GET_SLICE(root)); assert_se(unit_get_ancestor_memory_low(root) == CGROUP_LIMIT_MIN); |