X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-execute.c;h=3cb09c2dbf57c00336c576f95ef0d2d0b576e8f0;hb=4ac9236fa14696db3e8a650a083a238eca9b9ae9;hp=a41b63992b774dce502399fd402275f2d5574281;hpb=82c121a4754a9d405b07c75796e329942af2ccc5;p=elogind.git diff --git a/src/dbus-execute.c b/src/dbus-execute.c index a41b63992..3cb09c2db 100644 --- a/src/dbus-execute.c +++ b/src/dbus-execute.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -26,11 +26,47 @@ #include "dbus-execute.h" #include "missing.h" #include "ioprio.h" +#include "strv.h" + +DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_execute_append_kill_mode, kill_mode, KillMode); DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_execute_append_input, exec_input, ExecInput); DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_execute_append_output, exec_output, ExecOutput); -int bus_execute_append_oom_adjust(Manager *m, DBusMessageIter *i, const char *property, void *data) { +int bus_execute_append_env_files(Manager *m, DBusMessageIter *i, const char *property, void *data) { + char **env_files = data, **j; + DBusMessageIter sub, sub2; + + assert(m); + assert(i); + assert(property); + + if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sb)", &sub)) + return -ENOMEM; + + STRV_FOREACH(j, env_files) { + dbus_bool_t b = false; + char *fn = *j; + + if (fn[0] == '-') { + b = true; + fn++; + } + + if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &fn) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &b) || + !dbus_message_iter_close_container(&sub, &sub2)) + return -ENOMEM; + } + + if (!dbus_message_iter_close_container(i, &sub)) + return -ENOMEM; + + return 0; +} + +int bus_execute_append_oom_score_adjust(Manager *m, DBusMessageIter *i, const char *property, void *data) { ExecContext *c = data; int32_t n; @@ -39,15 +75,23 @@ int bus_execute_append_oom_adjust(Manager *m, DBusMessageIter *i, const char *pr assert(property); assert(c); - if (c->oom_adjust_set) - n = c->oom_adjust; + if (c->oom_score_adjust_set) + n = c->oom_score_adjust; else { char *t; n = 0; - if (read_one_line_file("/proc/self/oom_adj", &t) >= 0) { + 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; } } @@ -153,7 +197,7 @@ int bus_execute_append_affinity(Manager *m, DBusMessageIter *i, const char *prop assert(property); assert(c); - if (!(dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "y", &sub))) + if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "y", &sub)) return -ENOMEM; if (c->cpuset) @@ -170,7 +214,7 @@ int bus_execute_append_affinity(Manager *m, DBusMessageIter *i, const char *prop return 0; } -int bus_execute_append_timer_slack_ns(Manager *m, DBusMessageIter *i, const char *property, void *data) { +int bus_execute_append_timer_slack_nsec(Manager *m, DBusMessageIter *i, const char *property, void *data) { ExecContext *c = data; uint64_t u; @@ -179,8 +223,8 @@ int bus_execute_append_timer_slack_ns(Manager *m, DBusMessageIter *i, const char assert(property); assert(c); - if (c->timer_slack_ns_set) - u = (uint64_t) c->timer_slack_ns_set; + if (c->timer_slack_nsec_set) + u = (uint64_t) c->timer_slack_nsec; else u = (uint64_t) prctl(PR_GET_TIMERSLACK); @@ -190,6 +234,24 @@ int bus_execute_append_timer_slack_ns(Manager *m, DBusMessageIter *i, const char return 0; } +int bus_execute_append_capability_bs(Manager *m, DBusMessageIter *i, const char *property, void *data) { + ExecContext *c = data; + uint64_t normal, inverted; + + assert(m); + assert(i); + assert(property); + assert(c); + + /* We store this negated internally, to match the kernel, bu + * we expose it normalized. */ + + normal = *(uint64_t*) data; + inverted = ~normal; + + return bus_property_append_uint64(m, i, property, &inverted); +} + int bus_execute_append_capabilities(Manager *m, DBusMessageIter *i, const char *property, void *data) { ExecContext *c = data; char *t = NULL; @@ -206,11 +268,13 @@ int bus_execute_append_capabilities(Manager *m, DBusMessageIter *i, const char * else s = ""; - if (!t) + if (!s) return -ENOMEM; b = dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &s); - cap_free(t); + + if (t) + cap_free(t); if (!b) return -ENOMEM; @@ -246,3 +310,56 @@ int bus_execute_append_rlimits(Manager *m, DBusMessageIter *i, const char *prope return 0; } + +int bus_execute_append_command(Manager *m, DBusMessageIter *i, const char *property, void *data) { + ExecCommand *c = data; + DBusMessageIter sub, sub2, sub3; + + assert(m); + assert(i); + assert(property); + + if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sasbttuii)", &sub)) + return -ENOMEM; + + LIST_FOREACH(command, c, c) { + char **l; + uint32_t pid; + int32_t code, status; + + if (!c->path) + continue; + + if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &c->path) || + !dbus_message_iter_open_container(&sub2, DBUS_TYPE_ARRAY, "s", &sub3)) + return -ENOMEM; + + STRV_FOREACH(l, c->argv) + if (!dbus_message_iter_append_basic(&sub3, DBUS_TYPE_STRING, l)) + return -ENOMEM; + + pid = (uint32_t) c->exec_status.pid; + code = (int32_t) c->exec_status.code; + status = (int32_t) c->exec_status.status; + + if (!dbus_message_iter_close_container(&sub2, &sub3) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_BOOLEAN, &c->ignore) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.realtime) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.start_timestamp.monotonic) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.exit_timestamp.realtime) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &c->exec_status.exit_timestamp.monotonic) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT32, &pid) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_INT32, &code) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_INT32, &status)) + return -ENOMEM; + + if (!dbus_message_iter_close_container(&sub, &sub2)) + return -ENOMEM; + } + + if (!dbus_message_iter_close_container(i, &sub)) + return -ENOMEM; + + return 0; +}