picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove support for deprecated /proc/self/oom_adj

Browse source
This commit is contained in:
Kay Sievers 2012-06-04 16:41:10 +02:00
parent d315bba6f6
commit 8600c525cb
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/dbus-execute.c
View file

@ -83,14 +83,6 @@ int bus_execute_append_oom_score_adjust(DBusMessageIter *i, const char *property
if (read_one_line_file("/proc/self/oom_score_adj", &t) >= 0) {
safe_atoi(t, &n);
free(t);
} else if (read_one_line_file("/proc/self/oom_adj", &t) >= 0) {
safe_atoi(t, &n);
free(t);
if (n == OOM_ADJUST_MAX)
n = OOM_SCORE_ADJ_MAX;
else
n = (n * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
}
}

19
src/core/execute.c
View file

@ -1129,22 +1129,9 @@ int exec_spawn(ExecCommand *command,
char_array_0(t);
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
&& errno != EACCES) {
err = -errno;
r = EXIT_OOM_ADJUST;
goto fail_child;
}
err = -errno;
r = EXIT_OOM_ADJUST;
goto fail_child;
}
}