Changeset bb252ca in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2010-05-02T20:58:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4872160

Parents:

4ce914d4 (diff), 1624aae (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 the scheduler fix.

File:

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

kernel/generic/src/proc/thread.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -409 +409 @@
 
         /*
-         * t is guaranteed to be the very last thread of its task.
-         * It is safe to destroy the task.
+         * Drop the reference to the containing task.
          */
-        if (atomic_predec(&t->task->refcount) == 0)
-                task_destroy(t->task);
+        task_release(t->task);
         
         slab_free(thread_slab, t);
@@ -436 +434 @@
         spinlock_lock(&task->lock);
 
-        atomic_inc(&task->refcount);
+        /* Hold a reference to the task. */
+        task_hold(task);
 
         /* Must not count kbox thread into lifecount */