Changeset 1d432f9 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2010-05-31T22:33:44Z (14 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.

File:

• kernel/generic/src/proc/task.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;