Changeset dd0c8a0 in mainline for uspace/srv/ns/task.c

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/ns/task.c (modified) (5 diffs)

uspace/srv/ns/task.c

@@ -179 +179 @@
         
 loop:
-        list_foreach(pending_wait, cur) {
-                pending_wait_t *pr = list_get_instance(cur, pending_wait_t, link);
-                
+        list_foreach(pending_wait, link, pending_wait_t, pr) {
                 ht_link_t *link = hash_table_find(&task_hash_table, &pr->id);
                 if (!link)
@@ -198 +196 @@
                 
                 hash_table_remove(&task_hash_table, &pr->id);
-                list_remove(cur);
+                list_remove(&pr->link);
                 free(pr);
                 goto loop;
@@ -208 +206 @@
         sysarg_t retval;
         task_exit_t texit;
+        bool remove = false;
         
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
@@ -235 +234 @@
         }
         
-        hash_table_remove_item(&task_hash_table, link);
+        remove = true;
         retval = EOK;
         
@@ -243 +242 @@
                 ipc_answer_2(callid, retval, texit, ht->retval);
         }
+        if (remove)
+                hash_table_remove_item(&task_hash_table, link);
 }