Changeset ffe4a87 in mainline

Timestamp:

2010-05-25T22:15:03Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e805e2f

Parents:

d7da4284

Message:

Add interfaces for testing the status of plain spinlocks and the IRQ spinlocks.

Note that because of the non-SMP version of spinlocks, the status must be
checked only in the affirmative manner. Instead of:

ASSERT(!spinlock_locked(…));

one needs to do:

ASSERT(spinlock_unlocked(…));

Otherwise the assertion will be hit on debug non-SMP kernels.

Location:

kernel/generic

Files:

• include/synch/spinlock.h (modified) (3 diffs)
• src/synch/spinlock.c (modified) (3 diffs)

kernel/generic/include/synch/spinlock.h

@@ -115 +115 @@
 extern void spinlock_lock_debug(spinlock_t *);
 extern void spinlock_unlock_debug(spinlock_t *);
+extern bool spinlock_locked(spinlock_t *);
+extern bool spinlock_unlocked(spinlock_t *);
 
 /** Unlock spinlock
@@ -177 +179 @@
 #define spinlock_trylock(lock)  (preemption_disable(), 1)
 #define spinlock_unlock(lock)   preemption_enable()
+#define spinlock_locked(lock)   1
+#define spinlock_unlocked(lock) 1
 
 #define DEADLOCK_PROBE_INIT(pname)
@@ -283 +287 @@
 extern void irq_spinlock_pass(irq_spinlock_t *, irq_spinlock_t *);
 extern void irq_spinlock_exchange(irq_spinlock_t *, irq_spinlock_t *);
+extern bool irq_spinlock_locked(irq_spinlock_t *);
+extern bool irq_spinlock_unlocked(irq_spinlock_t *);
 
 #endif

kernel/generic/src/synch/spinlock.c

@@ -128 +128 @@
 void spinlock_unlock_debug(spinlock_t *lock)
 {
-        ASSERT_SPINLOCK(atomic_get(&lock->val) != 0, lock);
+        ASSERT_SPINLOCK(spinlock_locked(lock), lock);
         
         /*
@@ -165 +165 @@
         
         return rc;
+}
+
+/** Find out whether the spinlock is currently locked.
+ *
+ * @param lock          Spinlock.
+ * @return              True if the spinlock is locked, false otherwise.
+ */
+bool spinlock_locked(spinlock_t *lock)
+{
+        return atomic_get(&lock->val) != 0;
+}
+
+/** Find out whether the spinlock is currently unlocked.
+ *
+ * @param lock          Spinlock.
+ * @return              True if the spinlock is not locked, false otherwise.
+ */
+bool spinlock_unlocked(spinlock_t *lock)
+{
+        return atomic_get(&lock->val) == 0;
 }
 
@@ -314 +334 @@
 }
 
+/** Find out whether the IRQ spinlock is currently locked.
+ *
+ * @param lock          IRQ spinlock.
+ * @return              True if the IRQ spinlock is locked, false otherwise.
+ */
+bool irq_spinlock_locked(irq_spinlock_t *ilock)
+{
+        return spinlock_locked(&ilock->lock);
+}
+
+/** Find out whether the IRQ spinlock is currently unlocked.
+ *
+ * @param lock          IRQ spinlock.
+ * @return              True if the IRQ spinlock is not locked, false otherwise.
+ */
+bool irq_spinlock_unlocked(irq_spinlock_t *ilock)
+{
+        return spinlock_unlocked(&ilock->lock);
+}
+
 /** @}
  */