Changeset 13108f24 in mainline

Timestamp:

2010-04-29T19:23:09Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bcb6f27

Parents:

c050399

Message:

Split spinlock_unlock() into a debug and non-debug version.

The non-debug version, spinlock_unlock_nondebug(), will likely get inlined just
as its counterpart spinlock_lock_arch(). It will not do any sanity checking.

The debug version, spinlock_unlock_debug(), will, on the other hand, not be
inlined, aiding thus the readibility of the generated assembly code. It will be
easier to spot the corresponding spinlock_lock_debug() and
spinlock_unlock_debug() pairs. It is meant to perform thorough sanity checking.

Location:

kernel/generic

Files:

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

kernel/generic/include/synch/spinlock.h

@@ -77 +77 @@
         }
 
-#define spinlock_lock(lock)  spinlock_lock_debug(lock)
+#define spinlock_lock(lock)     spinlock_lock_debug((lock))
+#define spinlock_unlock(lock)   spinlock_unlock_debug((lock))
 
 #else
@@ -91 +92 @@
         }
 
-#define spinlock_lock(lock)  atomic_lock_arch(&(lock)->val)
+#define spinlock_lock(lock)     atomic_lock_arch(&(lock)->val)
+#define spinlock_unlock(lock)   spinlock_unlock_nondebug((lock))
 
 #endif
@@ -104 +106 @@
 extern int spinlock_trylock(spinlock_t *lock);
 extern void spinlock_lock_debug(spinlock_t *lock);
+extern void spinlock_unlock_debug(spinlock_t *lock);
 
 /** Unlock spinlock
  *
- * Unlock spinlock.
+ * Unlock spinlock for non-debug kernels.
  *
  * @param sl Pointer to spinlock_t structure.
  */
-static inline void spinlock_unlock(spinlock_t *lock)
+static inline void spinlock_unlock_nondebug(spinlock_t *lock)
 {
-        ASSERT(atomic_get(&lock->val) != 0);
-        
         /*
          * Prevent critical section code from bleeding out this way down.

kernel/generic/src/synch/spinlock.c

@@ -120 +120 @@
 }
 
+/** Unlock spinlock
+ *
+ * Unlock spinlock.
+ *
+ * @param sl Pointer to spinlock_t structure.
+ */
+void spinlock_unlock_debug(spinlock_t *lock)
+{
+        ASSERT(atomic_get(&lock->val) != 0);
+        
+        /*
+         * Prevent critical section code from bleeding out this way down.
+         */
+        CS_LEAVE_BARRIER();
+        
+        atomic_set(&lock->val, 0);
+        preemption_enable();
+}
+
 #endif