Merge lp:~sforshee/powerd/hash-iterator into lp:powerd

[Seth Forshee]

Change hash usage to use iterators instead of g_hash_table_foreach()

Change hash usage to use iterators instead of g_hash_table_foreach()

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Matt Fischer (mfisch)]

Looks cleaner

review: Approve

=== modified file 'src/display-request.c'
--- src/display-request.c	2013-07-17 22:39:08 +0000
+++ src/display-request.c	2013-07-23 20:50:35 +0000
@@ -356,25 +356,26 @@
     return TRUE;
 }
 
-static void add_request_to_builder(gpointer key, gpointer value, gpointer data)
-{
-    struct display_request_internal *ireq = value;
-    struct powerd_display_request *req = &ireq->req;
-    GVariantBuilder *builder = data;
-    char cookie_str[UUID_STR_LEN];
-
-    uuid_unparse(req->cookie, 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);
-}
-
 static int build_display_request_list(GVariantBuilder *builder)
 {
+    GHashTableIter iter;
+    gpointer key, value;
+    int count = 0;
+
+    g_hash_table_iter_init(&iter, display_request_hash);
     powerd_debug("Display state requests:");
-    g_hash_table_foreach(display_request_hash, add_request_to_builder, builder);
-    return g_hash_table_size(display_request_hash);
+    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);
+        count++;
+    }
+    return count;
 }
 
 gboolean handle_list_display_requests(PowerdSource *obj,
@@ -422,17 +423,6 @@
     g_hash_table_destroy(display_request_hash);
 }
 
-static void
-find_uuids_by_owner_iter(gpointer key, gpointer value, gpointer data)
-{
-    struct display_request_internal *dri = (struct display_request_internal*)value;
-    struct UuidListForOwner *ulfo = (struct UuidListForOwner *)data;
-
-    if (!strcmp(ulfo->owner,dri->owner)) {
-        ulfo->uuids = g_slist_append(ulfo->uuids, key);
-    }
-}
-
 /*
  * Callers may use this to clear all requests that the specified owner
  * is holding. This is used when the owner drops off of dbus
@@ -440,27 +430,17 @@
 void
 clear_disp_state_by_owner(const char *owner)
 {
-    struct UuidListForOwner ulfo = { 0, };
-    GSList *iter = NULL;
-    char cookie_str[UUID_STR_LEN];
-
-    if (owner == NULL) {
-        return;
-    }
-
-    ulfo.owner = owner;
-
-    g_hash_table_foreach(display_request_hash, find_uuids_by_owner_iter, &ulfo);
-
-    if (ulfo.uuids) {
-        powerd_debug("%d display requests to remove due to dbus vanishing",
-            g_slist_length(ulfo.uuids));
-        for (iter = ulfo.uuids; iter; iter = iter->next) {
-            /* XXX: For debug, remove later */
-            uuid_unparse(iter->data, cookie_str);
-            powerd_debug("removing %s", cookie_str);
-            remove_request(iter->data);
+    GHashTableIter iter;
+    gpointer key, value;
+
+    g_hash_table_iter_init(&iter, display_request_hash);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        struct display_request_internal *ireq = value;
+        if (!strcmp(owner, ireq->owner)) {
+            __remove_request(&ireq->req);
+            powerd_dbus_name_watch_remove(ireq->owner);
+            g_hash_table_iter_remove(&iter);
         }
-        g_slist_free(ulfo.uuids);
     }
+    update_internal_state();
 }

=== modified file 'src/power-request.c'
--- src/power-request.c	2013-07-02 16:37:37 +0000
+++ src/power-request.c	2013-07-23 20:50:35 +0000
@@ -153,22 +153,6 @@
     return state > POWERD_SYS_STATE_SUSPEND && state < POWERD_NUM_POWER_STATES;
 }
 
-static void
-list_request(gpointer key, gpointer value, gpointer data)
-{
-    struct SysStateRequest *sr = (struct SysStateRequest *)value;
-    GVariantBuilder *builder = (GVariantBuilder *)data;
-    char cookie_str[UUID_STR_LEN];
-
-    /* XXX: For debug, remove later */
-    uuid_unparse(sr->cookie, cookie_str);
-    powerd_debug("  Owner: %s, Cookie: %s, State: %s (%d)",
-                 sr->owner, cookie_str, state_to_string(sr->state), sr->state);
-
-    if (builder)
-        g_variant_builder_add(builder, "(si)", sr->owner, sr->state);
-}
-
 /*
  * Must only be called from main loop.
  *
@@ -179,12 +163,23 @@
 static guint
 list_sys_requests_internal(GVariantBuilder *builder)
 {
+    GHashTableIter iter;
+    gpointer key, value;
     guint count = 0;
 
+    g_hash_table_iter_init(&iter, state_request_hash);
     powerd_debug("System state requests:");
-    g_hash_table_foreach(state_request_hash, list_request, builder);
-    count = g_hash_table_size(state_request_hash);
-
+    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);
+        count++;
+    }
     return count;
 }
 
@@ -279,6 +274,12 @@
     return TRUE;
 }
 
+static void __clear_sys_request(struct SysStateRequest *req)
+{
+    powerd_dbus_name_watch_remove(req->owner);
+    state_request_count[req->state - 1] -= 1;
+}
+
 /* Must only be called from main loop */
 static int
 clear_sys_state_worker(gpointer data)
@@ -286,7 +287,6 @@
     unsigned char *uuid = data;
     struct SysStateRequest *sr;
     int found = FALSE;
-    enum SysPowerStates state;
 
     /*
      * This involves two lookups into the hash, one to find the
@@ -297,18 +297,14 @@
      */
     sr = g_hash_table_lookup(state_request_hash, uuid);
     if (sr) {
-        state = sr->state;
         /* We need to remove it from our watch hash before we remove it
          * from the state hash or the sr->owner memory will be freed
          * before we try to use it.
          */
-        powerd_dbus_name_watch_remove(sr->owner);
+        __clear_sys_request(sr);
         found = g_hash_table_remove(state_request_hash, uuid);
         if (!found)
             powerd_warn("State request found on lookup but not on remove");
-        else {
-            state_request_count[state - 1] -= 1;
-        }
     }
 
     return found;
@@ -614,17 +610,6 @@
     g_queue_clear(&queued_state_changes);
 }
 
-static void
-find_uuids_by_owner_iter(gpointer key, gpointer value, gpointer data)
-{
-    struct SysStateRequest *sr = (struct SysStateRequest *)value;
-    struct UuidListForOwner *ulfo = (struct UuidListForOwner *)data;
-
-    if (!strcmp(ulfo->owner,sr->owner)) {
-        ulfo->uuids = g_slist_append(ulfo->uuids, key);
-    }
-}
-
 /*
  * Callers may use this to clear all requests that the specified owner
  * is holding. This is used when the owner drops off of dbus
@@ -632,28 +617,16 @@
 void
 clear_sys_state_by_owner(const char *owner)
 {
-    struct UuidListForOwner ulfo = { 0, };
-    GSList *iter = NULL;
-    char cookie_str[UUID_STR_LEN];
-
-
-    if (owner == NULL) {
-        return;
-    }
-
-    ulfo.owner = owner;
-
-    g_hash_table_foreach(state_request_hash, find_uuids_by_owner_iter, &ulfo);
-
-    if (ulfo.uuids) {
-        powerd_debug("%d sys requests to remove due to dbus vanishing",
-            g_slist_length(ulfo.uuids));
-        for (iter = ulfo.uuids; iter; iter = iter->next) {
-            /* XXX: For debug, remove later */
-            uuid_unparse(iter->data, cookie_str);
-            powerd_debug("removing %s", cookie_str);
-            clear_sys_state_internal(iter->data);
+    GHashTableIter iter;
+    gpointer key, value;
+
+    g_hash_table_iter_init(&iter, state_request_hash);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        struct SysStateRequest *req = value;
+        if (!strcmp(owner, req->owner)) {
+            __clear_sys_request(req);
+            g_hash_table_iter_remove(&iter);
         }
-        g_slist_free(ulfo.uuids);
     }
+    update_system_state();
 }

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-07-18 17:24:47 +0000
+++ src/powerd-internal.h	2013-07-23 20:50:35 +0000
@@ -51,11 +51,6 @@
     uint ref_count;
 };
 
-struct UuidListForOwner {
-    const char *owner;
-    GSList *uuids;
-};
-
 void powerd_shutdown(void);
 void powerd_exit(int exit_code);
 void powerd_reset_activity_timer(int add);