X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=share%2Fkernelcompat.h;h=b0c77e0972a66f8d03235494f4e5be72fcbc281a;hb=772030fed323e388da467735cf4b5e8781acb710;hp=6d7ebb023f0408252230b4a4d6a75a2324ccb0b3;hpb=bb07823d7dc174f7bd96d30843acfac7424dd0d2;p=ust.git

diff --git a/share/kernelcompat.h b/share/kernelcompat.h
index 6d7ebb0..b0c77e0 100644
--- a/share/kernelcompat.h
+++ b/share/kernelcompat.h
@@ -1,9 +1,16 @@
 #ifndef KERNELCOMPAT_H
 #define KERNELCOMPAT_H
 
-#include "compiler.h"
+#include <compiler.h>
+#include <kcompat.h>
 
 #include <string.h>
+#include <sys/time.h>
+
+/* FIXME: libkcompat must not define arch-specific local ops, as ust *must*
+ * fallback to the normal atomic ops. Fix things so we don't add them and
+ * break things accidentally.
+ */
 
 #define container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
@@ -38,14 +45,7 @@ static inline long IS_ERR(const void *ptr)
 }
 
 
-/* FIXED SIZE INTEGERS */
-
-#include <stdint.h>
-
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
+/* Min / Max */
 
 #define min_t(type, x, y) ({                    \
 	type __min1 = (x);                      \
@@ -63,29 +63,24 @@ typedef uint64_t u64;
 #include <pthread.h>
 
 #define DEFINE_MUTEX(m) pthread_mutex_t (m) = PTHREAD_MUTEX_INITIALIZER;
+#define DECLARE_MUTEX(m) extern pthread_mutex_t (m);
 
 #define mutex_lock(m) pthread_mutex_lock(m)
 
 #define mutex_unlock(m) pthread_mutex_unlock(m)
 
-/* SPINLOCKS */
-
-typedef int spinlock_t;
-
-#define spin_lock(a) /* nothing */
-#define spin_unlock(a) /* nothing */
-#define spin_lock_init(a) /* nothing */
-
 
 /* MALLOCATION */
 
 #include <stdlib.h>
 
 #define kmalloc(s, t) malloc(s)
-#define kzalloc(s, t) malloc(s)
+#define kzalloc(s, t) zmalloc(s)
 #define kfree(p) free((void *)p)
 #define kstrdup(s, t) strdup(s)
 
+#define zmalloc(s) calloc(1, s)
+
 #define GFP_KERNEL
 
 /* PRINTK */
@@ -93,133 +88,10 @@ typedef int spinlock_t;
 #include <stdio.h>
 #define printk(fmt, args...) printf(fmt, ## args)
 
-/* MEMORY BARRIERS */
-
-#define smp_rmb() do {} while(0)
-#define smp_wmb() do {} while(0)
-#define smp_mb() do {} while(0)
-#define smp_mb__after_atomic_inc() do {} while(0)
-
-#define read_barrier_depends() do {} while(0)
-#define smp_read_barrier_depends() do {} while(0)
-
-/* RCU */
-
-#define rcu_assign_pointer(a, b) do {} while(0)
-#define call_rcu_sched(a,b) do {} while(0)
-#define rcu_barrier_sched() do {} while(0)
-
-/* ATOMICITY */
-
-#include <signal.h>
-
-typedef struct { sig_atomic_t counter; } atomic_t;
-
-static inline int atomic_dec_and_test(atomic_t *p)
-{
-	(p->counter)--;
-	return !p->counter;
-}
-
-static inline void atomic_set(atomic_t *p, int v)
-{
-	p->counter=v;
-}
-
-static inline void atomic_inc(atomic_t *p)
-{
-	p->counter++;
-}
-
-static int atomic_read(atomic_t *p)
-{
-	return p->counter;
-}
-
-#define atomic_long_t atomic_t
-#define atomic_long_set atomic_set
-#define atomic_long_read atomic_read
-
-#include "asm.h"
-
-#define __xg(x) ((volatile long *)(x))
-
-#define cmpxchg(ptr, o, n)						\
-	((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o),	\
-				       (unsigned long)(n), sizeof(*(ptr))))
-
-static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
-				      unsigned long new, int size)
-{
-	unsigned long prev;
-	switch (size) {
-	case 1:
-		asm volatile("lock cmpxchgb %b1,%2"
-			     : "=a"(prev)
-			     : "q"(new), "m"(*__xg(ptr)), "0"(old)
-			     : "memory");
-		return prev;
-	case 2:
-		asm volatile("lock cmpxchgw %w1,%2"
-			     : "=a"(prev)
-			     : "r"(new), "m"(*__xg(ptr)), "0"(old)
-			     : "memory");
-		return prev;
-	case 4:
-		asm volatile("lock cmpxchgl %k1,%2"
-			     : "=a"(prev)
-			     : "r"(new), "m"(*__xg(ptr)), "0"(old)
-			     : "memory");
-		return prev;
-	case 8:
-		asm volatile("lock cmpxchgq %1,%2"
-			     : "=a"(prev)
-			     : "r"(new), "m"(*__xg(ptr)), "0"(old)
-			     : "memory");
-		return prev;
-	}
-	return old;
-}
-
-#define local_cmpxchg cmpxchg
-#define atomic_long_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))
-
-
-/* LOCAL OPS */
-
-typedef int local_t;
-
-static inline void local_inc(local_t *a)
-{
-	(*a)++;
-}
-
-static inline void local_set(local_t *a, int v)
-{
-	*a = v;
-}
-
-static inline void local_add(int v, local_t *a)
-{
-	*a += v;
-}
-
-static int local_add_return(int v, local_t *a)
-{
-	return *a += v;
-}
-
-static inline int local_read(local_t *a)
-{
-	return *a;
-}
-
 
 /* ATTRIBUTES */
 
 #define ____cacheline_aligned
-#define __init
-#define __exit
 
 /* MATH */
 
@@ -267,7 +139,7 @@ static __inline__ int get_count_order(unsigned int count)
 #define __ALIGN_MASK(x,mask)	(((x)+(mask))&~(mask))
 #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
 #define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-#define PAGE_MASK (PAGE_SIZE-1)
+#define PAGE_MASK (~(PAGE_SIZE-1))
 
 
 
@@ -280,17 +152,38 @@ static __inline__ int get_count_order(unsigned int count)
 
 static inline u64 trace_clock_read64(void)
 {
-	return 0LL;
+	uint32_t low;
+	uint32_t high;
+	uint64_t retval;
+	__asm__ volatile ("rdtsc\n" : "=a" (low), "=d" (high));
+
+	retval = high;
+	retval <<= 32;
+	return retval | low;
 }
 
-static inline unsigned int trace_clock_frequency(void)
+//static inline u64 trace_clock_read64(void)
+//{
+//	struct timeval tv;
+//	u64 retval;
+//
+//	gettimeofday(&tv, NULL);
+//	retval = tv.tv_sec;
+//	retval *= 1000000;
+//	retval += tv.tv_usec;
+//
+//	return retval;
+//}
+
+static inline u64 trace_clock_frequency(void)
 {
-	return 0LL;
+	return 1000000LL;
 }
 
 static inline u32 trace_clock_freq_scale(void)
 {
-	return 0;
+	return 1;
 }
 
+
 #endif /* KERNELCOMPAT_H */