Changeset 23684b7 in mainline for arch/amd64

Timestamp:

2006-03-22T17:21:15Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d71007e

Parents:

45fb65c

Message:

Define atomic_t only once in atomic.h
Change the encapsulated counter type to long so that it supports negative values as well.

Location:

arch/amd64

Files:

• include/atomic.h (modified) (5 diffs)
• src/proc/scheduler.c (modified) (1 diff)

arch/amd64/include/atomic.h

@@ -33 +33 @@
 #include <arch/barrier.h>
 #include <preemption.h>
-
-typedef struct { volatile __u64 count; } atomic_t;
-
-static inline void atomic_set(atomic_t *val, __u64 i)
-{
-        val->count = i;
-}
-
-static inline __u64 atomic_get(atomic_t *val)
-{
-        return val->count;
-}
+#include <typedefs.h>
 
 static inline void atomic_inc(atomic_t *val) {
@@ -62 +51 @@
 }
 
-static inline count_t atomic_postinc(atomic_t *val) 
+static inline long atomic_postinc(atomic_t *val) 
 {
-        count_t r;
+        long r;
 
         __asm__ volatile (
@@ -75 +64 @@
 }
 
-static inline count_t atomic_postdec(atomic_t *val) 
+static inline long atomic_postdec(atomic_t *val) 
 {
-        count_t r;
+        long r;
         
         __asm__ volatile (
@@ -104 +93 @@
 
 
-/** AMD64 specific fast spinlock */
+/** amd64 specific fast spinlock */
 static inline void atomic_lock_arch(atomic_t *val)
 {
@@ -117 +106 @@
                 "mov %0, %1;"
                 "testq %1, %1;"
-                "jnz 0b;"       /* Leightweight looping on locked spinlock */
+                "jnz 0b;"       /* Lightweight looping on locked spinlock */
                 
                 "incq %1;"      /* now use the atomic operation */

arch/amd64/src/proc/scheduler.c

@@ -34 +34 @@
 #include <arch/asm.h>
 #include <arch/debugger.h>
+#include <print.h>
 
-#include <print.h>
 void before_thread_runs_arch(void)
 {