Merge lp:~sforshee/powerd/add-name-arg into lp:powerd

[Seth Forshee]

Add "name" argument to dbus request APIs to help in debugging power problems

Add "name" argument to dbus request APIs to help in debugging power problems

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/powerd-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/54/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/100/rebuild

review: Approve (continuous-integration)

[Matt Fischer (mfisch)]

434 - if (req->owner)
435 - g_free((gpointer)req->owner);
436 + g_free((gpointer)req->name);
437 + g_free((gpointer)req->owner);

546 - if (sr->owner) {
547 - g_free(sr->owner);
548 - sr->owner = NULL;
549 - }
550 + g_free((gpointer)sr->name);
551 + g_free((gpointer)sr->owner);

Why remove the check and set to NULL?

Also should we modify the tests to ensure a name and owner are set? I assume it's impossible not to be, but it does help validate that list*Requests is working.

review: Needs Information

[Seth Forshee (sforshee)]

On Mon, Jul 29, 2013 at 07:04:29PM -0000, Matthew Fischer wrote:
> Review: Needs Information
>
> 434 - if (req->owner)
> 435 - g_free((gpointer)req->owner);
> 436 + g_free((gpointer)req->name);
> 437 + g_free((gpointer)req->owner);
>
> 546 - if (sr->owner) {
> 547 - g_free(sr->owner);
> 548 - sr->owner = NULL;
> 549 - }
> 550 + g_free((gpointer)sr->name);
> 551 + g_free((gpointer)sr->owner);
>
> Why remove the check and set to NULL?

Because it should never be null. We either strdup the dbus owner string
or else strdup a hard-coded "internal" string.

sr is free right after freeing the strings, so setting to NULL is
unnecessary.

> Also should we modify the tests to ensure a name and owner are set? I assume it's impossible not to be, but it does help validate that list*Requests is working.

We can't make a test to set owner to NULL, as the owner string isn't
passed as an argument over the dbus API.

I tried adding a test with name == NULL, but it doesn't work. I get the
output below. Rather than getting NULL, handle_request_sys_state() gets
a pointer to a string which contains "[Invalid UTF-8]". So I'm not
really sure how to test it.

Test: requestSysState(NULL, POWERD_SYS_STATE_ACTIVE, &cookie) == FALSE

(process:2526): GLib-CRITICAL **: g_variant_new_string: assertion
'string != NULL' failed
    result: FAILED

[Matt Fischer (mfisch)]

Approve

review: Approve

=== modified file 'cli/client-test.c'
--- cli/client-test.c	2013-07-24 20:02:49 +0000
+++ cli/client-test.c	2013-07-29 16:08:44 +0000
@@ -174,7 +174,7 @@
     test_data.ack_delay = 0;
     reset_test_state();
     test_data.ack_timeout_id = g_timeout_add(5000, ack_timeout_handler, NULL);
-    requestSysState(test_data.state, &test_data.cookie);
+    requestSysState("ack-test", test_data.state, &test_data.cookie);
     return FALSE;
 }
 
@@ -207,7 +207,7 @@
     test_data.state = POWERD_SYS_STATE_ACTIVE;
     test_data.ack_delay = -1;
     test_data.ack_timeout_id = g_timeout_add(5000, ack_timeout_handler, NULL);
-    requestSysState(test_data.state, &test_data.cookie);
+    requestSysState("no-ack-test", test_data.state, &test_data.cookie);
     return FALSE;
 }
 
@@ -231,7 +231,7 @@
     test_data.state = POWERD_SYS_STATE_SUSPEND;
     test_data.ack_delay = 0;
     test_data.ack_timeout_id = g_timeout_add(5000, ack_timeout_handler, NULL);
-    requestSysState(POWERD_SYS_STATE_ACTIVE, &test_data.cookie);
+    requestSysState("bad-ack-test", POWERD_SYS_STATE_ACTIVE, &test_data.cookie);
     return FALSE;
 }
 
 
=== modified file 'cli/powerd-cli.c'
--- cli/powerd-cli.c	2013-07-23 20:43:37 +0000
+++ cli/powerd-cli.c	2013-07-29 16:08:44 +0000
@@ -45,12 +45,14 @@
 const char *powerd_cli_bus_name;
 
 struct PublicSysRequest {
-    const gchar *owner;
+    const char *name;
+    const char *owner;
     int state;
 };
 
 struct PublicDispRequest {
-    const gchar *owner;
+    const char *name;
+    const char *owner;
     enum powerd_display_state state;
     guint32 flags;
 };
@@ -93,7 +95,7 @@
 }
 
 gboolean
-requestSysState(int state,
+requestSysState(const char *name, int state,
         powerd_cookie_t *cookie)
 {
     GVariant *ret = NULL;
@@ -108,7 +110,7 @@
 
     ret = g_dbus_proxy_call_sync(powerd_proxy,
             "requestSysState",
-            g_variant_new("(i)", state),
+            g_variant_new("(si)", name, state),
             G_DBUS_CALL_FLAGS_NONE,
             -1,
             NULL,
@@ -133,7 +135,7 @@
 }
 
 static gboolean
-requestDisplayState(struct PublicDispRequest pdr,
+requestDisplayState(struct PublicDispRequest pdr, const char *name,
         powerd_cookie_t *cookie)
 {
     GVariant *ret = NULL;
@@ -148,7 +150,7 @@
 
     ret = g_dbus_proxy_call_sync(powerd_proxy,
             "requestDisplayState",
-            g_variant_new("(iu)", pdr.state, pdr.flags),
+            g_variant_new("(siu)", name, pdr.state, pdr.flags),
             G_DBUS_CALL_FLAGS_NONE,
             -1,
             NULL,
@@ -193,7 +195,7 @@
             NULL,
             &error);
     if (!ret) {
-        cli_warn("requestDisplayState failed: %s", error->message);
+        cli_warn("updateDisplayState failed: %s", error->message);
         g_error_free(error);
         return FALSE;
     }
@@ -223,10 +225,11 @@
         g_error_free(error);
     }
     else {
-        g_variant_get(ret, "(a(si))", &iter);
+        g_variant_get(ret, "(a(ssi))", &iter);
         while ((item = g_variant_iter_next_value (iter))) {
-            g_variant_get_child (item, 0, "s", &psr.owner);
-            g_variant_get_child (item, 1, "i", &psr.state);
+            g_variant_get_child (item, 0, "s", &psr.name);
+            g_variant_get_child (item, 1, "s", &psr.owner);
+            g_variant_get_child (item, 2, "i", &psr.state);
             g_array_append_val(retarray, psr);
             g_variant_unref(item);
         }
@@ -246,7 +249,8 @@
     } else {
         for (i = 0; i < requests->len; i++) {
             psr = &g_array_index(requests, struct PublicSysRequest, i);
-            printf("  Owner: %s, State: %d\n", psr->owner, psr->state);
+            printf("  Name: %s, Owner: %s, State: %d\n", psr->name,
+                   psr->owner, psr->state);
         }
     }
 }
@@ -272,11 +276,12 @@
         g_error_free(error);
     }
     else {
-        g_variant_get(ret, "(a(siu))", &iter);
+        g_variant_get(ret, "(a(ssiu))", &iter);
         while ((item = g_variant_iter_next_value (iter))) {
-            g_variant_get_child(item, 0, "s", &pdr.owner);
-            g_variant_get_child(item, 1, "i", &pdr.state);
-            g_variant_get_child(item, 2, "u", &pdr.flags);
+            g_variant_get_child(item, 0, "s", &pdr.name);
+            g_variant_get_child(item, 1, "s", &pdr.owner);
+            g_variant_get_child(item, 2, "i", &pdr.state);
+            g_variant_get_child(item, 3, "u", &pdr.flags);
             g_array_append_val(retarray, pdr);
             g_variant_unref(item);
         }
@@ -296,8 +301,8 @@
     } else {
         for (i = 0; i < requests->len; i++) {
             pdr = &g_array_index(requests, struct PublicDispRequest, i);
-            printf("  Owner: %s, State: %d, Flags: %#08x\n",
-                   pdr->owner, pdr->state, pdr->flags);
+            printf("  Name: %s, Owner: %s, State: %d, Flags: %#08x\n",
+                   pdr->name, pdr->owner, pdr->state, pdr->flags);
         }
     }
 }
@@ -436,7 +441,7 @@
     main_loop = g_main_loop_new (NULL, FALSE);
 
     // Hold active state request as long we're running tests
-    requestSysState(POWERD_SYS_STATE_ACTIVE, &main_cookie);
+    requestSysState("main-req", POWERD_SYS_STATE_ACTIVE, &main_cookie);
 
     ret = g_spawn_async_with_pipes(NULL, argv, NULL,
         G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
@@ -466,10 +471,13 @@
     silence_errors(TRUE);
 
     // Hold active state request as long we're running tests
-    requestSysState(POWERD_SYS_STATE_ACTIVE, &main_cookie);
+    requestSysState("main-req", POWERD_SYS_STATE_ACTIVE, &main_cookie);
 
-    for (i = 0; i < TEST_NUM_SYS_REQUESTS; i++)
-        do_test(requestSysState(POWERD_SYS_STATE_ACTIVE, &cookies[i]) == TRUE);
+    for (i = 0; i < TEST_NUM_SYS_REQUESTS; i++) {
+        char name[16];
+        snprintf(name, sizeof(name), "test-cookie-%d", i);
+        do_test(requestSysState(name, POWERD_SYS_STATE_ACTIVE, &cookies[i]) == TRUE);
+    }
 
     // Make sure we have at least NUM_REQUESTS + 1
     requests = listSysRequests();
@@ -501,11 +509,11 @@
     g_array_free(requests, TRUE);
 
     //cannot request the suspend state, this will fail
-    do_test(requestSysState(POWERD_SYS_STATE_SUSPEND, &cookie) == FALSE);
+    do_test(requestSysState("test-cookie", POWERD_SYS_STATE_SUSPEND, &cookie) == FALSE);
     //invalid values
-    do_test(requestSysState(-1, &cookie) == FALSE);
-    do_test(requestSysState(POWERD_NUM_POWER_STATES, &cookie) == FALSE);
-    do_test(requestSysState(POWERD_NUM_POWER_STATES+1, &cookie) == FALSE);
+    do_test(requestSysState("test-cookie", -1, &cookie) == FALSE);
+    do_test(requestSysState("test-cookie", POWERD_NUM_POWER_STATES, &cookie) == FALSE);
+    do_test(requestSysState("test-cookie", POWERD_NUM_POWER_STATES+1, &cookie) == FALSE);
 
     //cleanup
     do_test(clearSysState(main_cookie) == TRUE);
@@ -527,15 +535,17 @@
     silence_errors(TRUE);
 
     // Hold active state request as long we're running tests
-    requestSysState(POWERD_SYS_STATE_ACTIVE, &main_cookie);
+    requestSysState("main-req", POWERD_SYS_STATE_ACTIVE, &main_cookie);
 
     for (i = 0; i < TEST_NUM_DISP_REQUESTS; i++) {
+        char name[16];
+        snprintf(name, sizeof(name), "disp-test-%d", i);
         pdr.state = state++;
         pdr.flags = 0;
         if (bright) {
             pdr.flags |= POWERD_DISPLAY_FLAG_BRIGHT;
         }
-        do_test(requestDisplayState(pdr, &cookies[i]) == TRUE);
+        do_test(requestDisplayState(pdr, name, &cookies[i]) == TRUE);
         if (state >= POWERD_NUM_DISPLAY_STATES) {
             state = 0;
         }
@@ -567,19 +577,19 @@
 
     //invalid values
     pdr.state = -1;
-    do_test(requestDisplayState(pdr, &cookie) == FALSE);
+    do_test(requestDisplayState(pdr, "disp-test", &cookie) == FALSE);
 
     pdr.state = POWERD_NUM_DISPLAY_STATES;
-    do_test(requestDisplayState(pdr, &cookie) == FALSE);
+    do_test(requestDisplayState(pdr, "disp-test", &cookie) == FALSE);
 
     pdr.state = POWERD_DISPLAY_STATE_ON;
     pdr.flags = 0xdeadbeef;
-    do_test(requestDisplayState(pdr, &cookie) == FALSE);
+    do_test(requestDisplayState(pdr, "disp-test", &cookie) == FALSE);
 
     // updateDisplayState tests
     pdr.state = POWERD_DISPLAY_STATE_ON;
     pdr.flags = 0;
-    do_test(requestDisplayState(pdr, &cookie) == TRUE);
+    do_test(requestDisplayState(pdr, "disp-test", &cookie) == TRUE);
 
     // update with same state should be okay
     do_test(updateDisplayState(pdr, cookie) == TRUE);
@@ -798,12 +808,12 @@
         g_array_free(requests, TRUE);
     }
     else if (!strcmp(argv[1],"active-nc")) {
-        requestSysState(POWERD_SYS_STATE_ACTIVE,&cookie);
+        requestSysState("active-nc", POWERD_SYS_STATE_ACTIVE,&cookie);
         printf("Power State requested, cookie is %s\n", cookie);
         return 0;
     }
     else if (!strcmp(argv[1],"active")) {
-        requestSysState(POWERD_SYS_STATE_ACTIVE,&cookie);
+        requestSysState("active", POWERD_SYS_STATE_ACTIVE,&cookie);
         printf("Power State requested, cookie is %s.\nPress ctrl-c to exit.\n",
             cookie);
         pause();  /* wait for SIGINT */
@@ -820,7 +830,7 @@
             usage(argv[0]);
             return -1;
         }
-        requestDisplayState(pdr,&cookie);
+        requestDisplayState(pdr, "disp-test", &cookie);
         printf("Display State requested, cookie is %s.\nPress ctrl-c to exit.\n",
             cookie);
         pause();  /* wait for SIGINT */
@@ -885,14 +895,14 @@
         // This printf is read by the parent
         printf("DBUSNAME: %s\n", bus_name);
         // Grab some requests so we can see that they get cleared later
-        requestSysState(POWERD_SYS_STATE_ACTIVE,&cookie);
-        requestSysState(POWERD_SYS_STATE_ACTIVE,&cookie);
-        requestSysState(POWERD_SYS_STATE_ACTIVE,&cookie);
+        requestSysState("dbusnametest1", POWERD_SYS_STATE_ACTIVE,&cookie);
+        requestSysState("dbusnametest2", POWERD_SYS_STATE_ACTIVE,&cookie);
+        requestSysState("dbusnametest3", POWERD_SYS_STATE_ACTIVE,&cookie);
         pdr.state = POWERD_DISPLAY_STATE_DONT_CARE;
         pdr.flags = 0;
-        requestDisplayState(pdr, &cookie);
-        requestDisplayState(pdr, &cookie);
-        requestDisplayState(pdr, &cookie);
+        requestDisplayState(pdr, "dbusnametest1", &cookie);
+        requestDisplayState(pdr, "dbusnametest2", &cookie);
+        requestDisplayState(pdr, "dbusnametest3", &cookie);
         g_object_unref(bus);
         // Exit here without cleanup
         return 0;
 
=== modified file 'cli/powerd-cli.h'
--- cli/powerd-cli.h	2013-07-23 20:43:37 +0000
+++ cli/powerd-cli.h	2013-07-29 16:08:44 +0000
@@ -35,7 +35,7 @@
 #define cli_warn(f, a...)   do { if (!silent_errors) g_warning(f, ##a); } while (0)
 #define cli_debug(f, a...)  g_debug(f, ##a)
 
-gboolean requestSysState(int state, powerd_cookie_t *cookie);
+gboolean requestSysState(const char *name, int state, powerd_cookie_t *cookie);
 gboolean clearSysState(powerd_cookie_t cookie);
 void powerd_cli_client_test(GDBusProxy *proxy);
 
 
=== modified file 'data/com.canonical.powerd.xml'
--- data/com.canonical.powerd.xml	2013-07-24 14:39:08 +0000
+++ data/com.canonical.powerd.xml	2013-07-29 16:08:44 +0000
@@ -5,6 +5,7 @@
 
     <!-- Functions -->
     <method name="requestSysState">
+      <arg type="s" name="name" direction="in" />
       <arg type="i" name="state" direction="in" />
       <arg type="s" name="cookie" direction="out" />
     </method>
@@ -14,6 +15,7 @@
     </method>
 
     <method name="requestDisplayState">
+      <arg type="s" name="name" direction="in" />
       <arg type="i" name="state" direction="in" />
       <arg type="u" name="flags" direction="in" />
       <arg type="s" name="cookie" direction="out" />
@@ -43,11 +45,11 @@
 
     <!-- for debug/testing -->
     <method name="listSysRequests">
-      <arg type="a(si)" name="requestList" direction="out" />
+      <arg type="a(ssi)" name="requestList" direction="out" />
     </method>
 
     <method name="listDisplayRequests">
-      <arg type="a(siu)" name="requestList" direction="out" />
+      <arg type="a(ssiu)" name="requestList" direction="out" />
     </method>
 
     <!-- Signals -->
 
=== modified file 'src/display-request.c'
--- src/display-request.c	2013-07-19 23:09:47 +0000
+++ src/display-request.c	2013-07-29 16:08:44 +0000
@@ -35,6 +35,7 @@
 
 struct display_request_internal {
     struct powerd_display_request req;
+    const char *name;
     const char *owner;
 };
 
@@ -183,7 +184,7 @@
  * the struct will be copied into internally-managed storage.
  */
 static int __powerd_add_display_request(struct powerd_display_request *request,
-                                        const char *owner)
+                                        const char *name, const char *owner)
 {
     struct display_request_internal *hash_req;
 
@@ -204,6 +205,7 @@
     uuid_generate(request->cookie);
     hash_req = g_new(struct display_request_internal, 1);
     hash_req->req = *request;
+    hash_req->name = g_strdup(name);
     hash_req->owner = g_strdup(owner);
     powerd_run_mainloop_sync(add_request_worker, hash_req);
     return 0;
@@ -213,14 +215,14 @@
  * @request need not refer to persistent memory, as the data from
  * the struct will be copied into internally-managed storage.
  */
-int powerd_add_display_request(struct powerd_display_request *request)
+int powerd_add_display_request(struct powerd_display_request *request,
+                               const char *name)
 {
-    if (!request) {
-        powerd_warn("powerd_add_display_request() called with request == NULL");
+    if (!request || !name) {
+        powerd_warn("powerd_add_display_request() called with invalid args");
         return -EINVAL;
     }
-
-    return __powerd_add_display_request(request, "internal");
+    return __powerd_add_display_request(request, name, "internal");
 }
 
 static int update_request_worker(gpointer data)
@@ -255,7 +257,7 @@
 
 gboolean handle_add_display_request(PowerdSource *obj,
                                     GDBusMethodInvocation *invocation,
-                                    int state, guint32 flags)
+                                    const char *name, int state, guint32 flags)
 {
     struct powerd_display_request req;
     const char *owner;
@@ -271,7 +273,7 @@
     req.state = state;
     req.flags = flags;
 
-    ret = __powerd_add_display_request(&req, owner);
+    ret = __powerd_add_display_request(&req, name, owner);
     if (ret) {
         g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR,
                                               G_DBUS_ERROR_INVALID_ARGS,
@@ -363,16 +365,11 @@
     int count = 0;
 
     g_hash_table_iter_init(&iter, display_request_hash);
-    powerd_debug("Display state requests:");
     while (g_hash_table_iter_next(&iter, &key, &value)) {
-        unsigned char *uuid = key;
         struct display_request_internal *ireq = value;
         struct powerd_display_request *req = &ireq->req;
-        char cookie_str[UUID_STR_LEN];
-        uuid_unparse(uuid, cookie_str);
-        powerd_debug("  owner: %s, cookie: %s, state: %d, flags: %#08x",
-                     ireq->owner, cookie_str, req->state, req->flags);
-        g_variant_builder_add(builder, "(siu)", ireq->owner, req->state, req->flags);
+        g_variant_builder_add(builder, "(ssiu)", ireq->name, ireq->owner,
+                              req->state, req->flags);
         count++;
     }
     return count;
@@ -385,13 +382,13 @@
     GVariantBuilder *builder;
     int count;
 
-    builder = g_variant_builder_new(G_VARIANT_TYPE("a(siu)"));
+    builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssiu)"));
     count = build_display_request_list(builder);
     if (count > 0) {
         list = g_variant_builder_end(builder);
     } else {
         g_variant_builder_clear(builder);
-        list = g_variant_new_array(G_VARIANT_TYPE("(siu)"), NULL, 0);
+        list = g_variant_new_array(G_VARIANT_TYPE("(ssiu)"), NULL, 0);
     }
 
     tuple = g_variant_new_tuple(&list, 1);
@@ -406,8 +403,8 @@
 {
     struct display_request_internal *req = data;
 
-    if (req->owner)
-        g_free((gpointer)req->owner);
+    g_free((gpointer)req->name);
+    g_free((gpointer)req->owner);
     g_free(req);
 }
 
 
=== modified file 'src/display.c'
--- src/display.c	2013-07-18 20:58:16 +0000
+++ src/display.c	2013-07-29 16:08:44 +0000
@@ -166,7 +166,8 @@
     case POWERD_DISPLAY_STATE_ON:
         if (actual_screen_state != POWERD_DISPLAY_STATE_ON) {
             powerd_debug("Requesting active state internally");
-            ret = request_sys_state_internal(POWERD_SYS_STATE_ACTIVE,
+            ret = request_sys_state_internal("display-request",
+                                             POWERD_SYS_STATE_ACTIVE,
                                              &internal_request_cookie, NULL);
             if (!ret)
                 powerd_warn("Request for active state failed");
 
=== modified file 'src/power-request.c'
--- src/power-request.c	2013-07-24 14:39:08 +0000
+++ src/power-request.c	2013-07-29 16:08:44 +0000
@@ -39,7 +39,8 @@
 #define NOTIFICATION_TIMEOUT_MSECS 2000
 
 struct SysStateRequest {
-    gchar *owner;
+    const char *name;
+    const char *owner;
     uuid_t cookie;
     enum SysPowerStates state;
 };
@@ -170,16 +171,10 @@
     guint count = 0;
 
     g_hash_table_iter_init(&iter, state_request_hash);
-    powerd_debug("System state requests:");
     while (g_hash_table_iter_next(&iter, &key, &value)) {
-        unsigned char *uuid = key;
         struct SysStateRequest *req = value;
-        char cookie_str[UUID_STR_LEN];
-        uuid_unparse(uuid, cookie_str);
-        powerd_debug("  Owner: %s, Cookie: %s, State: %s (%d)",
-                req->owner, cookie_str, state_to_string(req->state),
-                req->state);
-        g_variant_builder_add(builder, "(si)", req->owner, req->state);
+        g_variant_builder_add(builder, "(ssi)", req->name, req->owner,
+                              req->state);
         count++;
     }
     return count;
@@ -193,14 +188,14 @@
     GVariantBuilder *builder;
     guint count = 0;
 
-    builder = g_variant_builder_new(G_VARIANT_TYPE("a(si)"));
+    builder = g_variant_builder_new(G_VARIANT_TYPE("a(ssi)"));
     count = list_sys_requests_internal(builder);
     if (count>0) {
         list = g_variant_builder_end(builder);
     }
     else {
         g_variant_builder_clear(builder);
-        list = g_variant_new_array(G_VARIANT_TYPE("(si)"), NULL, 0);
+        list = g_variant_new_array(G_VARIANT_TYPE("(ssi)"), NULL, 0);
     }
     tuple = g_variant_new_tuple(&list,1);
     g_dbus_method_invocation_return_value(invocation, tuple);
@@ -220,7 +215,8 @@
 
 /* Note: owner is NULL for internal usage */
 gboolean
-request_sys_state_internal(int state, uuid_t *cookie, const gchar *owner)
+request_sys_state_internal(const char *name, int state, uuid_t *cookie,
+                           const gchar *owner)
 {
     struct SysStateRequest *sr = NULL;
 
@@ -236,6 +232,7 @@
     }
 
     sr = g_new(struct SysStateRequest, 1);
+    sr->name = g_strdup(name);
     sr->state = (enum SysPowerStates)state;
     if (owner) {
         sr->owner = g_strdup(owner);
@@ -252,7 +249,8 @@
 }
 
 gboolean
-handle_request_sys_state (PowerdSource *obj, GDBusMethodInvocation *invocation, int state)
+handle_request_sys_state(PowerdSource *obj, GDBusMethodInvocation *invocation,
+			 const char *name, int state)
 {
     gboolean retval;
     const char *owner;
@@ -263,7 +261,7 @@
     powerd_debug("handle_requestSysState from %s - %s (%d)", owner,
                  state_to_string(state), state);
 
-    retval = request_sys_state_internal(state, &cookie, owner);
+    retval = request_sys_state_internal(name, state, &cookie, owner);
     if (retval == TRUE) {
         powerd_debug("handle_requestSysState - SUCCESS");
         uuid_unparse(cookie, ext_cookie);
@@ -620,10 +618,8 @@
 static void sys_state_request_destroy(gpointer data)
 {
     struct SysStateRequest *sr = (struct SysStateRequest *)data;
-    if (sr->owner) {
-        g_free(sr->owner);
-        sr->owner = NULL;
-    }
+    g_free((gpointer)sr->name);
+    g_free((gpointer)sr->owner);
     g_free(sr);
 }
 
 
=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-07-24 14:39:08 +0000
+++ src/powerd-internal.h	2013-07-29 16:08:44 +0000
@@ -74,14 +74,15 @@
 void powerd_display_clear_override(enum powerd_override_reason reason);
 
 /* Display request functions */
-int powerd_add_display_request(struct powerd_display_request *request);
+int powerd_add_display_request(struct powerd_display_request *request,
+                               const char *name);
 int powerd_update_display_request(struct powerd_display_request *request);
 int powerd_remove_display_request(uuid_t cookie);
 void display_request_init(void);
 void display_request_deinit(void);
 gboolean handle_add_display_request(PowerdSource *obj,
                                     GDBusMethodInvocation *invocation,
-                                    int state, guint32 flags);
+                                    const char *name, int state, guint32 flags);
 gboolean handle_update_display_request(PowerdSource *obj,
                                        GDBusMethodInvocation *invocation,
                                        const gchar *ext_cookie, int state,
@@ -97,12 +98,13 @@
 gboolean handle_list_sys_requests(PowerdSource *obj,
                                   GDBusMethodInvocation *invocation);
 gboolean handle_request_sys_state(PowerdSource *obj,
-                                  GDBusMethodInvocation *invocation, int state);
+                                  GDBusMethodInvocation *invocation,
+                                  const char *name, int state);
 gboolean handle_clear_sys_state(PowerdSource *obj,
                                 GDBusMethodInvocation *invocation,
                                 gchar *cookie);
-gboolean request_sys_state_internal(int state, uuid_t *cookie,
-                                    const gchar *owner);
+gboolean request_sys_state_internal(const char *name, int state,
+                                    uuid_t *cookie, const char *owner);
 gboolean clear_sys_state_internal(uuid_t cookie);
 void power_request_transition_acked(void);
 void update_system_state(void);
 
=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-07-23 14:42:07 +0000
+++ src/powerd.cpp	2013-07-29 16:08:44 +0000
@@ -217,7 +217,8 @@
             activity_timer_req.flags |= POWERD_DISPLAY_FLAG_BRIGHT;
 
         if (activity_timer_screen_state == SCREEN_STATE_OFF)
-            ret = powerd_add_display_request(&activity_timer_req);
+            ret = powerd_add_display_request(&activity_timer_req,
+                                             "activity-timer");
         else
             ret = powerd_update_display_request(&activity_timer_req);
 
@@ -347,14 +348,14 @@
             if (!strcmp(prop_value,"active")) {
                 if (!alerted) {
                     //call is active, enable sensor
-                    if (powerd_add_display_request(&prox_sensor_req))
+                    if (powerd_add_display_request(&prox_sensor_req, "prox-sensor"))
                         powerd_warn("Request to use proximity sensor failed");
                 }
             }
             if (!strcmp(prop_value,"alerting")) {
                 alerted = TRUE;
                 //call is altering, enable sensor
-                if (powerd_add_display_request(&prox_sensor_req))
+                if (powerd_add_display_request(&prox_sensor_req, "prox-sensor"))
                     powerd_warn("Request to use proximity sensor failed");
             }
             else if (!strcmp(prop_value,"disconnected")) {