diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-05-22 11:53:12 +0900 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-05-22 11:53:12 +0900 |
| commit | 9a0549093332880df47c4218209ce126b8586835 (patch) | |
| tree | 3f929d8ef12b580f5c6ed91b7316bbbac4d4a299 /src/core/main.c | |
| parent | 609e002e78e79ef2bf9d6a6ea22bda215abbbb14 (diff) | |
cgroups: simplify CPUQuota= logic
Only accept cpu quota values in percentages, get rid of period
definition.
It's not clear whether the CFS period controllable per-cgroup even has a
future in the kernel, hence let's simplify all this, hardcode the period
to 100ms and only accept percentage based quota values.
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c index c1b0ffd9bb..74c50f51be 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -109,7 +109,6 @@ static struct rlimit *arg_default_rlimit[_RLIMIT_MAX] = {}; static uint64_t arg_capability_bounding_set_drop = 0; static nsec_t arg_timer_slack_nsec = (nsec_t) -1; static usec_t arg_default_timer_accuracy_usec = 1 * USEC_PER_MINUTE; -static usec_t arg_default_cpu_quota_period_usec = 100 * USEC_PER_MSEC; static Set* arg_syscall_archs = NULL; static FILE* arg_serialization = NULL; static bool arg_default_cpu_accounting = false; @@ -684,7 +683,6 @@ static int parse_config_file(void) { #endif { "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec }, { "Manager", "DefaultTimerAccuracySec", config_parse_sec, 0, &arg_default_timer_accuracy_usec }, - { "Manager", "DefaultCPUQuotaPeriodSec", config_parse_sec, 0, &arg_default_cpu_quota_period_usec }, { "Manager", "DefaultStandardOutput", config_parse_output, 0, &arg_default_std_output }, { "Manager", "DefaultStandardError", config_parse_output, 0, &arg_default_std_error }, { "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec }, @@ -1619,7 +1617,6 @@ int main(int argc, char *argv[]) { m->confirm_spawn = arg_confirm_spawn; m->default_timer_accuracy_usec = arg_default_timer_accuracy_usec; - m->default_cpu_quota_period_usec = arg_default_cpu_quota_period_usec; m->default_std_output = arg_default_std_output; m->default_std_error = arg_default_std_error; m->default_restart_usec = arg_default_restart_usec; |