X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-unit.c;h=fe876b3ffe69316604b2342fe4c17c8044a19ee9;hb=cc98b3025eeb89addb76a27390cb2baca4eab8b9;hp=0850fb3d4682797d846dd6eed329d928bad6e5b3;hpb=96aad8d15a324d0e956a4e5653a11a67b209b41a;p=elogind.git

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 0850fb3d4..fe876b3ff 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -207,7 +207,7 @@ static int property_get_unit_file_state(
         assert(reply);
         assert(u);
 
-        return sd_bus_message_append(reply, "s", unit_file_state_to_string(unit_get_unit_file_preset(u)));
+        return sd_bus_message_append(reply, "s", unit_file_state_to_string(unit_get_unit_file_state(u)));
 }
 
 static int property_get_can_start(
@@ -638,10 +638,46 @@ static int property_get_slice(
         return sd_bus_message_append(reply, "s", unit_slice_name(u));
 }
 
+static int property_get_current_memory(
+                sd_bus *bus,
+                const char *path,
+                const char *interface,
+                const char *property,
+                sd_bus_message *reply,
+                void *userdata,
+                sd_bus_error *error) {
+
+        Unit *u = userdata;
+        uint64_t sz = (uint64_t) -1;
+        int r;
+
+        assert(bus);
+        assert(reply);
+        assert(u);
+
+        if (u->cgroup_path &&
+            (u->cgroup_realized_mask & CGROUP_MEMORY)) {
+                _cleanup_free_ char *v = NULL;
+
+                r = cg_get_attribute("memory", u->cgroup_path, "memory.usage_in_bytes", &v);
+                if (r < 0 && r != -ENOENT)
+                        log_unit_warning_errno(u->id, r, "Couldn't read memory.usage_in_bytes attribute: %m");
+
+                if (v) {
+                        r = safe_atou64(v, &sz);
+                        if (r < 0)
+                                log_unit_warning_errno(u->id, r, "Failed to parse memory.usage_in_bytes attribute: %m");
+                }
+        }
+
+        return sd_bus_message_append(reply, "t", sz);
+}
+
 const sd_bus_vtable bus_unit_cgroup_vtable[] = {
         SD_BUS_VTABLE_START(0),
         SD_BUS_PROPERTY("Slice", "s", property_get_slice, 0, 0),
         SD_BUS_PROPERTY("ControlGroup", "s", NULL, offsetof(Unit, cgroup_path), 0),
+        SD_BUS_PROPERTY("MemoryCurrent", "t", property_get_current_memory, 0, 0),
         SD_BUS_VTABLE_END
 };