diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-05 18:08:15 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-05 21:05:49 +0100 |
| commit | b7737f520276528bb96d32d83b6349d2eef1003a (patch) | |
| tree | d7fa14cad1df0c796eec1ed455d93cfe07f7bd0b | |
| parent | f7d2991539635b25ab1005887e1502dd8b98f18d (diff) | |
| download | systemd-b7737f520276528bb96d32d83b6349d2eef1003a.tar.gz | |
core/dbus-cgroup: drop unnecessary parens
'mask' is a macro parameter, so it cannot have commas. We don't need to
parenthesize.
| -rw-r--r-- | src/core/cgroup.c | 2 | ||||
| -rw-r--r-- | src/core/cgroup.h | 4 | ||||
| -rw-r--r-- | src/core/dbus-cgroup.c | 6 | ||||
| -rw-r--r-- | src/core/load-fragment.c | 5 | ||||
| -rw-r--r-- | src/core/manager.c | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 9aa3fadecc..91b3b2913b 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -127,7 +127,7 @@ void cgroup_context_init(CGroupContext *c) { .blockio_weight = CGROUP_BLKIO_WEIGHT_INVALID, .startup_blockio_weight = CGROUP_BLKIO_WEIGHT_INVALID, - .tasks_max = (TasksMax) { CGROUP_LIMIT_MAX }, + .tasks_max = TASKS_MAX_UNSET, }; } diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 8f7d19ad4f..0be985be60 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -16,8 +16,10 @@ typedef struct TasksMax { uint64_t scale; } TasksMax; +#define TASKS_MAX_UNSET ((TasksMax) { UINT64_MAX }) + static inline bool tasks_max_isset(const TasksMax *tasks_max) { - return tasks_max->value != CGROUP_LIMIT_MAX || tasks_max->scale != 0; + return tasks_max->value != UINT64_MAX || tasks_max->scale != 0; } uint64_t tasks_max_scale(const TasksMax *tasks_max); diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index 01f9039660..f0c8a70a66 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -619,7 +619,7 @@ static int bus_cgroup_set_boolean( \ if (!UNIT_WRITE_FLAGS_NOOP(flags)) { \ *p = v; \ - unit_invalidate_cgroup(u, (mask)); \ + unit_invalidate_cgroup(u, mask); \ \ if (v == (val)) \ unit_write_settingf(u, flags, name, \ @@ -656,7 +656,7 @@ static int bus_cgroup_set_boolean( \ if (!UNIT_WRITE_FLAGS_NOOP(flags)) { \ *p = v; \ - unit_invalidate_cgroup(u, (mask)); \ + unit_invalidate_cgroup(u, mask); \ \ if (v == CGROUP_LIMIT_MAX) \ unit_write_settingf(u, flags, name, \ @@ -695,7 +695,7 @@ static int bus_cgroup_set_boolean( const char *e; \ \ *p = v; \ - unit_invalidate_cgroup(u, (mask)); \ + unit_invalidate_cgroup(u, mask); \ \ /* Chop off suffix */ \ assert_se(e = endswith(name, "Scale")); \ diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 8e33c83398..74a2d29986 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3263,17 +3263,18 @@ int config_parse_tasks_max( void *data, void *userdata) { + const Unit *u = userdata; TasksMax *tasks_max = data; uint64_t v; int r; if (isempty(rvalue)) { - *tasks_max = (TasksMax) {}; + *tasks_max = u ? u->manager->default_tasks_max : TASKS_MAX_UNSET; return 0; } if (streq(rvalue, "infinity")) { - *tasks_max = (TasksMax) { CGROUP_LIMIT_MAX }; + *tasks_max = TASKS_MAX_UNSET; return 0; } diff --git a/src/core/manager.c b/src/core/manager.c index 71078abfa5..9dd8fd5413 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -762,7 +762,7 @@ int manager_new(UnitFileScope scope, ManagerTestRunFlags test_run_flags, Manager .default_timer_accuracy_usec = USEC_PER_MINUTE, .default_memory_accounting = MEMORY_ACCOUNTING_DEFAULT, .default_tasks_accounting = true, - .default_tasks_max = (TasksMax) { UINT64_MAX }, + .default_tasks_max = TASKS_MAX_UNSET, .default_timeout_start_usec = DEFAULT_TIMEOUT_USEC, .default_timeout_stop_usec = DEFAULT_TIMEOUT_USEC, .default_restart_usec = DEFAULT_RESTART_USEC, |