Changeset 7dd56f1 in mainline

Timestamp:

2005-08-07T23:14:14Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

511b45f

Parents:

60f760a0

Message:

Add memory barriers into spinlock_*().
Implement CS_{ENTER|LEAVE}_BARRIER() for IA-32 (no-op).
Provide incomplete CS_{ENTER|LEAVE}_BARRIER() macros for IA-64 and MIPS as well.

Small changes here and there.

Files:

• arch/ia32/include/barrier.h (added)
• arch/ia64/include/barrier.h (added)
• arch/mips/include/barrier.h (added)
• src/synch/rwlock.c (modified) (2 diffs)
• src/synch/spinlock.c (modified) (4 diffs)

src/synch/rwlock.c

@@ -1 @@
-/*
- * Reader/Writer locks
- */
-
 /*
  * Copyright (C) 2001-2004 Jakub Jermar
@@ -29 +25 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/*
+ * Reader/Writer locks
  */
 

src/synch/spinlock.c

@@ -30 +30 @@
 
 #include <arch/atomic.h>
+#include <arch/barrier.h>
 #include <synch/spinlock.h>
 
@@ -51 +52 @@
                 }
         }
+        CS_ENTER_BARRIER();
 
 }
@@ -61 +63 @@
          */
         spinlock_arch(&sl->val);
+        CS_ENTER_BARRIER();
 }
 #endif
@@ -66 +69 @@
 int spinlock_trylock(spinlock_t *sl)
 {
-        return !test_and_set(&sl->val);
+        int rc;
+        
+        rc = !test_and_set(&sl->val);
+        CS_ENTER_BARRIER();
+        
+        return rc;
 }
 
 void spinlock_unlock(spinlock_t *sl)
 {
+        CS_LEAVE_BARRIER();
         sl->val = 0;
 }