diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-31 01:33:39 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-31 01:33:43 +0200 |
| commit | dd6c17b1595ff8a78ebae6cf571fd222c80bfd17 (patch) | |
| tree | 1c3409f81d533008deeb3725b27b1f2de57e204a /src/execute.c | |
| parent | 71916d3fff97c6026b5e8bb2c8e4169ab14dc3ad (diff) | |
exec: replace OOMAdjust= by OOMScoreAdjust= to follow new kernel interface
This replaces OOMAdjust= by OOMScoreAdjust= in the config files,
breaking compatibility with older unit files. However, this keeps compat
with older kernels which lack the new OOM rework.
Diffstat (limited to 'src/execute.c')
| -rw-r--r-- | src/execute.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/execute.c b/src/execute.c index 2443d9c74d..755b4700fc 100644 --- a/src/execute.c +++ b/src/execute.c @@ -36,6 +36,7 @@ #include <pwd.h> #include <sys/mount.h> #include <linux/fs.h> +#include <linux/oom.h> #ifdef HAVE_PAM #include <security/pam_appl.h> @@ -52,6 +53,7 @@ #include "namespace.h" #include "tcpwrap.h" #include "exit-status.h" +#include "missing.h" /* This assumes there is a 'tty' group */ #define TTY_MODE 0620 @@ -1066,15 +1068,27 @@ int exec_spawn(ExecCommand *command, goto fail; } - if (context->oom_adjust_set) { + if (context->oom_score_adjust_set) { char t[16]; - snprintf(t, sizeof(t), "%i", context->oom_adjust); + snprintf(t, sizeof(t), "%i", context->oom_score_adjust); char_array_0(t); - if (write_one_line_file("/proc/self/oom_adj", t) < 0) { - r = EXIT_OOM_ADJUST; - goto fail; + if (write_one_line_file("/proc/self/oom_score_adj", t) < 0) { + /* Compatibility with Linux <= 2.6.35 */ + + int adj; + + adj = (context->oom_score_adjust * -OOM_DISABLE) / OOM_SCORE_ADJ_MAX; + adj = CLAMP(adj, OOM_DISABLE, OOM_ADJUST_MAX); + + snprintf(t, sizeof(t), "%i", adj); + char_array_0(t); + + if (write_one_line_file("/proc/self/oom_adj", t) < 0) { + r = EXIT_OOM_ADJUST; + goto fail; + } } } @@ -1461,10 +1475,10 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) { "%sNice: %i\n", prefix, c->nice); - if (c->oom_adjust_set) + if (c->oom_score_adjust_set) fprintf(f, - "%sOOMAdjust: %i\n", - prefix, c->oom_adjust); + "%sOOMScoreAdjust: %i\n", + prefix, c->oom_score_adjust); for (i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) |