diff options
author | WaLyong Cho <walyong.cho@samsung.com> | 2016-06-07 23:26:42 +0900 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-06-30 13:54:10 +0100 |
commit | 2fe59f1892825ced87c45ae25d9f5795b1d735b6 (patch) | |
tree | 19c7eb274f456340c434d419bfa89e9ef07234d7 | |
parent | e0f26388f7536f0d5f618194469826c2bad9401b (diff) | |
download | dbus-2fe59f1892825ced87c45ae25d9f5795b1d735b6.tar.gz |
activation: set children oom_score_adj to 0
If dbus is running as systemd service, dbus daemon is running with
oom_score_adj -900 by OOMScoreAdjust=-900. And children will also have
same value with dbus daemon.
To avoid this, set the child itself values after fork () to 0.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32851
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r-- | dbus/dbus-spawn.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index ddd254dc..45f3d87d 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -1354,6 +1354,26 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p, } else if (grandchild_pid == 0) { +#ifdef __linux__ + int fd = -1; + +#ifdef O_CLOEXEC + fd = open ("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC); +#endif + + if (fd < 0) + { + fd = open ("/proc/self/oom_score_adj", O_WRONLY); + _dbus_fd_set_close_on_exec (fd); + } + + if (fd >= 0) + { + if (write (fd, "0", sizeof (char)) < 0) + _dbus_warn ("writing oom_score_adj error: %s\n", strerror (errno)); + _dbus_close (fd, NULL); + } +#endif /* Go back to ignoring SIGPIPE, since it's evil */ signal (SIGPIPE, SIG_IGN); |