From 4afbccded23f5144e39a7f7b243393799186ba39 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Sun, 28 Sep 2014 22:13:07 -0400

Subject: [PATCH] core/swap: advertise Discard over dbus

---

 src/core/dbus-swap.c | 24 ++++++++++++++++++++++++

 1 file changed, 24 insertions(+)

diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c

index 93eae53c29..c854716b48 100644

--- a/src/core/dbus-swap.c

+++ b/src/core/dbus-swap.c

@@ -55,12 +55,36 @@ static int property_get_priority(

         return sd_bus_message_append(reply, "i", p);

 }

+static int property_get_discard(

+                sd_bus *bus,

+                const char *path,

+                const char *interface,

+                const char *property,

+                sd_bus_message *reply,

+                void *userdata,

+                sd_bus_error *error) {

+

+        Swap *s = SWAP(userdata);

+        const char *p;

+

+        assert(bus);

+        assert(reply);

+        assert(s);

+

+        if (s->from_fragment)

+                p = s->parameters_fragment.discard ?: "none";

+        else

+                p = "none";

+        return sd_bus_message_append(reply, "s", p);

+}

+

 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, swap_result, SwapResult);

 const sd_bus_vtable bus_swap_vtable[] = {

         SD_BUS_VTABLE_START(0),

         SD_BUS_PROPERTY("What", "s", NULL, offsetof(Swap, what), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

         SD_BUS_PROPERTY("Priority", "i", property_get_priority, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

+        SD_BUS_PROPERTY("Discard", "s", property_get_discard, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

         SD_BUS_PROPERTY("TimeoutUSec", "t", bus_property_get_usec, offsetof(Swap, timeout_usec), SD_BUS_VTABLE_PROPERTY_CONST),

         SD_BUS_PROPERTY("ControlPID", "u", bus_property_get_pid, offsetof(Swap, control_pid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Swap, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),