commit c620f095fef62114ffdc6c0ed0749c56b5e817b8
author Colin Cross <ccross@android.com> Fri Jun 14 00:44:17 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 14 00:44:18 2013 +0000
tree 24e13b4017aad130ec3ccc67c06d8f81c2cee75f
parent 6ef0dfecca9fde5abe15ceea30e0615897d7b374
parent e9ab162f30e88d5d9f8a9264d83745b8c3f381ad

Merge "init: prevent action being added to the action_queue twice"

init/init_parser.c

diff --git a/init/init_parser.c b/init/init_parser.c
index beb9188..686640e 100644
--- a/init/init_parser.c
+++ b/init/init_parser.c
@@ -571,6 +571,7 @@
     act = calloc(1, sizeof(*act));
     act->name = name;
     list_init(&act->commands);
+    list_init(&act->qlist);
 
     cmd = calloc(1, sizeof(*cmd));
     cmd->func = func;
@@ -583,7 +584,9 @@
 
 void action_add_queue_tail(struct action *act)
 {
-    list_add_tail(&action_queue, &act->qlist);
+    if (list_empty(&act->qlist)) {
+        list_add_tail(&action_queue, &act->qlist);
+    }
 }
 
 struct action *action_remove_queue_head(void)
@@ -594,6 +597,7 @@
         struct listnode *node = list_head(&action_queue);
         struct action *act = node_to_item(node, struct action, qlist);
         list_remove(node);
+        list_init(node);
         return act;
     }
 }
@@ -825,6 +829,7 @@
     act = calloc(1, sizeof(*act));
     act->name = args[1];
     list_init(&act->commands);
+    list_init(&act->qlist);
     list_add_tail(&action_list, &act->alist);
         /* XXX add to hash */
     return act;