Changeset 25a76ab8 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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:

• kernel/generic/src/proc/task.c (modified) (3 diffs)

kernel/generic/src/proc/task.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -210 +210 @@
         btree_create(&ta->futexes);
         
+        /*
+         * Get a reference to the address space.
+         */
+        as_hold(ta->as);
+
         ipl = interrupts_disable();
-        atomic_inc(&as->refcount);
         spinlock_lock(&tasks_lock);
         ta->taskid = ++task_counter;
@@ -250 +254 @@
          * Drop our reference to the address space.
          */
-        if (atomic_predec(&t->as->refcount) == 0) 
-                as_destroy(t->as);
+        as_release(t->as);
         
         slab_free(task_slab, t);
-        TASK = NULL;
+}
+
+/** Hold a reference to a task.
+ *
+ * Holding a reference to a task prevents destruction of that task.
+ *
+ * @param t             Task to be held.
+ */
+void task_hold(task_t *t)
+{
+        atomic_inc(&t->refcount);
+}
+
+/** Release a reference to a task.
+ *
+ * The last one to release a reference to a task destroys the task.
+ *
+ * @param t             Task to be released.
+ */
+void task_release(task_t *t)
+{
+        if ((atomic_predec(&t->refcount)) == 0)
+                task_destroy(t);
 }