Changeset c842f04 in mainline

Timestamp:

2005-09-01T09:19:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3b9572

Parents:

f944715

Message:

Preemption work.
Instrument spinlock functions with preemption_disable() and preemption_enable() calls.

Files:

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

include/synch/spinlock.h

@@ -32 +32 @@
 #include <arch/types.h>
 #include <typedefs.h>
+#include <preemption.h>
 
 #ifdef __SMP__
@@ -49 +50 @@
 
 #define spinlock_initialize(x)
-#define spinlock_lock(x)
-#define spinlock_trylock(x) 1
-#define spinlock_unlock(x)
+#define spinlock_lock(x)                preemption_disable()
+#define spinlock_trylock(x)             (preemption_disable(), 1)
+#define spinlock_unlock(x)              preemption_enable()
 
 #endif

src/synch/spinlock.c

@@ -32 +32 @@
 #include <arch/barrier.h>
 #include <synch/spinlock.h>
+#include <preemption.h>
 #include <print.h>
 
@@ -47 +48 @@
         __address caller = ((__u32 *) &sl)[-1];
 
+        preemption_disable();
         while (test_and_set(&sl->val)) {
                 if (i++ > 300000) {
@@ -59 +61 @@
 void spinlock_lock(spinlock_t *sl)
 {
+        preemption_disable();
+
         /*
          * Each architecture has its own efficient/recommended
@@ -72 +76 @@
         int rc;
         
+        preemption_disable();
         rc = !test_and_set(&sl->val);
         CS_ENTER_BARRIER();
+
+        if (!rc)
+                preemption_enable();
         
         return rc;
@@ -82 +90 @@
         CS_LEAVE_BARRIER();
         sl->val = 0;
+        preemption_enable();
 }