Changeset 2d3ddad in mainline

Timestamp:

2010-06-08T21:08:44Z (14 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

Files:

• mm/slab.c (modified) (4 diffs)
• proc/scheduler.c (modified) (2 diffs)
• proc/thread.c (modified) (2 diffs)

kernel/generic/src/mm/slab.c

@@ -405 +405 @@
 /** Find full magazine, set it as current and return it
  *
- * Assume cpu_magazine lock is held
- *
  */
 static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
@@ -412 +410 @@
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
         slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last;
+
+        ASSERT(spinlock_locked(&cache->mag_cache[CPU->id].lock));
         
         if (cmag) { /* First try local CPU magazines */
@@ -467 +467 @@
  * or NULL if no empty magazine is available and cannot be allocated
  *
- * Assume mag_cache[CPU->id].lock is held
- *
  * We have 2 magazines bound to processor.
  * First try the current.
@@ -480 +478 @@
         slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last;
         
+        ASSERT(spinlock_locked(&cache->mag_cache[CPU->id].lock));
+
         if (cmag) {
                 if (cmag->busy < cmag->size)

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);