Changeset 53f9821 in mainline for generic/include/synch/spinlock.h

Timestamp:

2006-03-20T20:32:17Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

018d957e

Parents:

9d3e185

Message:

Cleanup of spinlocks, now compiles both ia32 and amd64 with
and without DEBUG_SPINLOCKS. Made spinlocks inline.
Moved syscall_handler to generic (it was identical for ia32,amd64 & mips32).
Made slightly faster syscall for ia32.
Made better interrupt routines for ia32.
Allow not saving non-scratch registers during interrupt on ia32,amd64,mips32.
Aligned interrupt handlers on ia32,amd64, this should prevent problems
with different instruction lengths.

File:

• generic/include/synch/spinlock.h (modified) (2 diffs)

generic/include/synch/spinlock.h

@@ -34 +34 @@
 #include <preemption.h>
 #include <arch/atomic.h>
+#include <debug.h>
 
 #ifdef CONFIG_SMP
@@ -67 +68 @@
 
 extern void spinlock_initialize(spinlock_t *sl, char *name);
-extern void spinlock_lock(spinlock_t *sl);
 extern int spinlock_trylock(spinlock_t *sl);
-extern void spinlock_unlock(spinlock_t *sl);
+extern void spinlock_lock_debug(spinlock_t *sl);
+
+#ifdef CONFIG_DEBUG_SPINLOCK
+#  define spinlock_lock(x) spinlock_lock_debug(x)
+#else
+#  define spinlock_lock(x) atomic_lock_arch(&(x)->val)
+#endif
+
+/** Unlock spinlock
+ *
+ * Unlock spinlock.
+ *
+ * @param sl Pointer to spinlock_t structure.
+ */
+static inline void spinlock_unlock(spinlock_t *sl)
+{
+        ASSERT(atomic_get(&sl->val) != 0);
+
+        /*
+         * Prevent critical section code from bleeding out this way down.
+         */
+        CS_LEAVE_BARRIER();
+        
+        atomic_set(&sl->val,0);
+        preemption_enable();
+}
 
 #else