Changeset 1d432f9 in mainline for kernel/generic/src/proc

Timestamp:

2010-05-31T22:33:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

179d052

Parents:

3a2b636

Message:

Reflect assumptions about lock and interrupt state in functions themselves.

Location:

kernel/generic/src/proc

Files:

• task.c (modified) (3 diffs)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/task.c

@@ -351 +351 @@
 task_t *task_find_by_id(task_id_t id)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(irq_spinlock_locked(&tasks_lock));
+
         avltree_node_t *node =
             avltree_search(&tasks_tree, (avltree_key_t) id);
@@ -362 +365 @@
 /** Get accounting data of given task.
  *
- * Note that task lock of 't' must be already held and interrupts must be
+ * Note that task lock of 'task' must be already held and interrupts must be
  * already disabled.
  *
@@ -372 +375 @@
 void task_get_accounting(task_t *task, uint64_t *ucycles, uint64_t *kcycles)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(irq_spinlock_locked(&task->lock));
+
         /* Accumulated values of task */
         uint64_t uret = task->ucycles;

kernel/generic/src/proc/thread.c

@@ -683 +683 @@
 bool thread_exists(thread_t *thread)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(irq_spinlock_locked(&threads_lock));
+
         avltree_node_t *node =
             avltree_search(&threads_tree, (avltree_key_t) ((uintptr_t) thread));
@@ -700 +703 @@
 {
         uint64_t time = get_cycle();
+
+        ASSERT(interrupts_disabled());
+        ASSERT(irq_spinlock_locked(&THREAD->lock));
         
         if (user)
@@ -735 +741 @@
 thread_t *thread_find_by_id(thread_id_t thread_id)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(irq_spinlock_locked(&threads_lock));
+
         thread_iterator_t iterator;