Changeset 2d3ddad in mainline for kernel/generic/src/proc

Timestamp:

2010-06-08T21:08:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f80c77

Parents:

c992538a

Message:

Add more *_locked() assertions.

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (2 diffs)
• thread.c (modified) (2 diffs)

kernel/generic/src/proc/scheduler.c

@@ -379 +379 @@
  * switch to a new thread.
  *
- * Assume THREAD->lock is held.
- *
  */
 void scheduler_separated_stack(void)
@@ -388 +386 @@
         as_t *old_as = AS;
         
+        ASSERT(!THREAD || irq_spinlock_locked(&THREAD->lock));
         ASSERT(CPU != NULL);
         

kernel/generic/src/proc/thread.c

@@ -371 +371 @@
  *
  * Detach thread from all queues, cpus etc. and destroy it.
- * Assume thread->lock is held!
  *
  * @param thread  Thread to be destroyed.
@@ -380 +379 @@
 void thread_destroy(thread_t *thread, bool irq_res)
 {
+        ASSERT(irq_spinlock_locked(&thread->lock));
         ASSERT((thread->state == Exiting) || (thread->state == Lingering));
         ASSERT(thread->task);