projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename all arch primitives with prefix caa_
[urcu.git]
/
tests
/
api_x86.h
diff --git
a/tests/api_x86.h
b/tests/api_x86.h
index eba0613d45682206c246a88c2bf7a38a824c9915..03654329a670ca8e72d197f83dd83bfaadc3e3b7 100644
(file)
--- a/
tests/api_x86.h
+++ b/
tests/api_x86.h
@@
-76,7
+76,7
@@
* Machine parameters.
*/
* Machine parameters.
*/
-/* #define CACHE_LINE_SIZE 64 */
+/* #define CA
A_CA
CHE_LINE_SIZE 64 */
#define ____cacheline_internodealigned_in_smp \
__attribute__((__aligned__(1 << 6)))
#define ____cacheline_internodealigned_in_smp \
__attribute__((__aligned__(1 << 6)))
@@
-312,10
+312,10
@@
__asm__ __volatile__(LOCK_PREFIX "orl %0,%1" \
: : "r" (mask),"m" (*(addr)) : "memory")
/* Atomic operations are already serializing on x86 */
: : "r" (mask),"m" (*(addr)) : "memory")
/* Atomic operations are already serializing on x86 */
-#define smp_mb__before_atomic_dec() barrier()
-#define smp_mb__after_atomic_dec() barrier()
-#define smp_mb__before_atomic_inc() barrier()
-#define smp_mb__after_atomic_inc() barrier()
+#define smp_mb__before_atomic_dec()
cmm_
barrier()
+#define smp_mb__after_atomic_dec()
cmm_
barrier()
+#define smp_mb__before_atomic_inc()
cmm_
barrier()
+#define smp_mb__after_atomic_inc()
cmm_
barrier()
#endif //0
#endif //0
@@
-352,20
+352,13
@@
__asm__ __volatile__(LOCK_PREFIX "orl %0,%1" \
#include <sys/param.h>
/* #include "atomic.h" */
#include <sys/param.h>
/* #include "atomic.h" */
-/*
- * Compiler magic.
- */
-#define container_of(ptr, type, member) ({ \
- const typeof( ((type *)0)->member ) *__mptr = (ptr); \
- (type *)( (char *)__mptr - offsetof(type,member) );})
-
/*
* Default machine parameters.
*/
/*
* Default machine parameters.
*/
-#ifndef CACHE_LINE_SIZE
-/* #define CACHE_LINE_SIZE 128 */
-#endif /* #ifndef CACHE_LINE_SIZE */
+#ifndef CA
A_CA
CHE_LINE_SIZE
+/* #define CA
A_CA
CHE_LINE_SIZE 128 */
+#endif /* #ifndef CA
A_CA
CHE_LINE_SIZE */
/*
* Exclusive locking primitives.
/*
* Exclusive locking primitives.
@@
-565,7
+558,7
@@
long long get_microseconds(void)
#define DEFINE_PER_THREAD(type, name) \
struct { \
__typeof__(type) v \
#define DEFINE_PER_THREAD(type, name) \
struct { \
__typeof__(type) v \
- __attribute__((__aligned__(CACHE_LINE_SIZE))); \
+ __attribute__((__aligned__(CA
A_CA
CHE_LINE_SIZE))); \
} __per_thread_##name[NR_THREADS];
#define DECLARE_PER_THREAD(type, name) extern DEFINE_PER_THREAD(type, name)
} __per_thread_##name[NR_THREADS];
#define DECLARE_PER_THREAD(type, name) extern DEFINE_PER_THREAD(type, name)
@@
-599,7
+592,7
@@
long long get_microseconds(void)
#define DEFINE_PER_CPU(type, name) \
struct { \
__typeof__(type) v \
#define DEFINE_PER_CPU(type, name) \
struct { \
__typeof__(type) v \
- __attribute__((__aligned__(CACHE_LINE_SIZE))); \
+ __attribute__((__aligned__(CA
A_CA
CHE_LINE_SIZE))); \
} __per_cpu_##name[NR_CPUS]
#define DECLARE_PER_CPU(type, name) extern DEFINE_PER_CPU(type, name)
} __per_cpu_##name[NR_CPUS]
#define DECLARE_PER_CPU(type, name) extern DEFINE_PER_CPU(type, name)
@@
-713,10
+706,6
@@
static void smp_init(void)
#define LIST_POISON1 ((void *) 0x00100100)
#define LIST_POISON2 ((void *) 0x00200200)
#define LIST_POISON1 ((void *) 0x00100100)
#define LIST_POISON2 ((void *) 0x00200200)
-#define container_of(ptr, type, member) ({ \
- const typeof( ((type *)0)->member ) *__mptr = (ptr); \
- (type *)( (char *)__mptr - offsetof(type,member) );})
-
#if 0
/*
#if 0
/*
@@
-1045,7
+1034,7
@@
static inline void list_splice_tail_init(struct list_head *list,
* @member: the name of the list_struct within the struct.
*/
#define list_entry(ptr, type, member) \
* @member: the name of the list_struct within the struct.
*/
#define list_entry(ptr, type, member) \
- container_of(ptr, type, member)
+ c
aa_c
ontainer_of(ptr, type, member)
/**
* list_first_entry - get the first element from a list
/**
* list_first_entry - get the first element from a list
@@
-1347,7
+1336,7
@@
static inline void hlist_move_list(struct hlist_head *old,
old->first = NULL;
}
old->first = NULL;
}
-#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
+#define hlist_entry(ptr, type, member) c
aa_c
ontainer_of(ptr,type,member)
#define hlist_for_each(pos, head) \
for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
#define hlist_for_each(pos, head) \
for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
This page took
0.024267 seconds
and
4
git commands to generate.