summaryrefslogtreecommitdiff
path: root/src/shared/bus-util.c
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2015-11-28 16:49:13 +0000
committerEvgeny Vereshchagin <evvers@ya.ru>2015-11-30 21:28:16 +0000
commit147f6858abb7b177f28a536caff89e0a6be214c5 (patch)
treecf2a135c30a842c9ebf0b65d1bd4f6986ecacd85 /src/shared/bus-util.c
parent68a8f17775aef3303848b1ab5c5eff45945285c5 (diff)
core: expose soft limits on the bus
This is a follow-up for https://github.com/systemd/systemd/pull/1994 See https://github.com/systemd/systemd/pull/1994#issuecomment-160087219
Diffstat (limited to 'src/shared/bus-util.c')
-rw-r--r--src/shared/bus-util.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 6c24150326..de4c4367ca 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -2365,23 +2365,28 @@ int bus_property_get_rlimit(
struct rlimit *rl;
uint64_t u;
rlim_t x;
+ const char *is_soft;
assert(bus);
assert(reply);
assert(userdata);
+ is_soft = endswith(property, "Soft");
rl = *(struct rlimit**) userdata;
if (rl)
- x = rl->rlim_max;
+ x = is_soft ? rl->rlim_cur : rl->rlim_max;
else {
struct rlimit buf = {};
int z;
+ const char *s;
+
+ s = is_soft ? strndupa(property, is_soft - property) : property;
- z = rlimit_from_string(strstr(property, "Limit"));
+ z = rlimit_from_string(strstr(s, "Limit"));
assert(z >= 0);
getrlimit(z, &buf);
- x = buf.rlim_max;
+ x = is_soft ? buf.rlim_cur : buf.rlim_max;
}
/* rlim_t might have different sizes, let's map