diff options
Diffstat (limited to 'src/core/load-fragment.c')
| -rw-r--r-- | src/core/load-fragment.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 7c5b49c85b..6403e41113 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2465,7 +2465,7 @@ int config_parse_cpu_quota( void *userdata) { CGroupContext *c = data; - int r; + double percent; assert(filename); assert(lvalue); @@ -2473,30 +2473,22 @@ int config_parse_cpu_quota( if (isempty(rvalue)) { c->cpu_quota_per_sec_usec = (usec_t) -1; - c->cpu_quota_usec = (usec_t) -1; return 0; } - if (endswith(rvalue, "%")) { - double percent; - - if (sscanf(rvalue, "%lf%%", &percent) != 1 || percent <= 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, "CPU quota '%s' invalid. Ignoring.", rvalue); - return 0; - } + if (!endswith(rvalue, "%")) { - c->cpu_quota_per_sec_usec = (usec_t) (percent * USEC_PER_SEC / 100); - c->cpu_quota_usec = (usec_t) -1; - } else { - r = parse_sec(rvalue, &c->cpu_quota_usec); - if (r < 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, "CPU quota '%s' invalid. Ignoring.", rvalue); - return 0; - } + log_syntax(unit, LOG_ERR, filename, line, EINVAL, "CPU quota '%s' not ending in '%%'. Ignoring.", rvalue); + return 0; + } - c->cpu_quota_per_sec_usec = (usec_t) -1; + if (sscanf(rvalue, "%lf%%", &percent) != 1 || percent <= 0) { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, "CPU quota '%s' invalid. Ignoring.", rvalue); + return 0; } + c->cpu_quota_per_sec_usec = (usec_t) (percent * USEC_PER_SEC / 100); + return 0; } |