X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=share%2Fkernelcompat.h;h=052f7688bb9f36d804529eca4ca65176fc04c428;hb=1ae7f0744f280e97ab1a2adc548b8fd9f2cb21a4;hp=5bd8e87503f22ecf30b3d2d170f77c5e3e15b13b;hpb=b6bf28ecd4c07e7865d340f1600a35d6edc05ec8;p=lttng-ust.git

diff --git a/share/kernelcompat.h b/share/kernelcompat.h
index 5bd8e875..052f7688 100644
--- a/share/kernelcompat.h
+++ b/share/kernelcompat.h
@@ -1,6 +1,8 @@
 #ifndef KERNELCOMPAT_H
 #define KERNELCOMPAT_H
 
+#include <kcompat.h>
+
 #include "compiler.h"
 
 #include <string.h>
@@ -14,6 +16,7 @@
 #define KERN_INFO ""
 #define KERN_ERR ""
 #define KERN_ALERT ""
+#define KERN_WARNING ""
 
 /* ERROR OPS */
 
@@ -39,12 +42,12 @@ static inline long IS_ERR(const void *ptr)
 
 /* FIXED SIZE INTEGERS */
 
-#include <stdint.h>
+//#include <stdint.h>
 
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
+//typedef uint8_t u8;
+//typedef uint16_t u16;
+//typedef uint32_t u32;
+//typedef uint64_t u64;
 
 #define min_t(type, x, y) ({                    \
 	type __min1 = (x);                      \
@@ -62,20 +65,34 @@ 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 */
 
 #include <stdio.h>
@@ -83,26 +100,20 @@ typedef uint64_t u64;
 
 /* 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)
+#include "urcu.h"
+#define call_rcu_sched(a,b) b(a); synchronize_rcu()
+#define rcu_barrier_sched() do {} while(0) /* this nop is ok if call_rcu_sched does a synchronize_rcu() */
+#define rcu_read_lock_sched_notrace() rcu_read_lock()
+#define rcu_read_unlock_sched_notrace() rcu_read_unlock()
 
 /* ATOMICITY */
 
 #include <signal.h>
 
-typedef struct { sig_atomic_t counter; } atomic_t;
-
 static inline int atomic_dec_and_test(atomic_t *p)
 {
 	(p->counter)--;
@@ -124,9 +135,64 @@ static int atomic_read(atomic_t *p)
 	return p->counter;
 }
 
-/* CACHE */
+#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))))
+
+//#define local_cmpxchg cmpxchg
+#define local_cmpxchg(l, o, n) (cmpxchg(&((l)->a.counter), (o), (n)))
+
+#define atomic_long_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))
+
+
+/* LOCAL OPS */
+
+//typedef int local_t;
+typedef struct
+{
+	atomic_long_t a;
+} local_t;
+
+
+static inline void local_inc(local_t *l)
+{
+	(l->a.counter)++;
+}
+
+static inline void local_set(local_t *l, int v)
+{
+	l->a.counter = v;
+}
+
+static inline void local_add(int v, local_t *l)
+{
+	l->a.counter += v;
+}
+
+static int local_add_return(int v, local_t *l)
+{
+	return l->a.counter += v;
+}
+
+static inline int local_read(local_t *l)
+{
+	return l->a.counter;
+}
+
+
+/* ATTRIBUTES */
 
 #define ____cacheline_aligned
+#define __init
+#define __exit
 
 /* MATH */
 
@@ -166,25 +232,69 @@ static __inline__ int get_count_order(unsigned int count)
 }
 
 
+
+
+#include <unistd.h>
+
+#define ALIGN(x,a)		__ALIGN_MASK(x,(typeof(x))(a)-1)
+#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)
+
+
+
+
 /* ARRAYS */
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 /* TRACE CLOCK */
 
+//ust// static inline u64 trace_clock_read64(void)
+//ust// {
+//ust// 	uint32_t low;
+//ust// 	uint32_t high;
+//ust// 	uint64_t retval;
+//ust// 	__asm__ volatile ("rdtsc\n" : "=a" (low), "=d" (high));
+//ust// 
+//ust// 	retval = high;
+//ust// 	retval <<= 32;
+//ust// 	return retval | low;
+//ust// }
+
 static inline u64 trace_clock_read64(void)
 {
-	return 0LL;
+	struct timeval tv;
+	u64 retval;
+
+	gettimeofday(&tv, NULL);
+	retval = tv.tv_sec;
+	retval *= 1000000;
+	retval += tv.tv_usec;
+
+	return retval;
 }
 
-static inline unsigned int trace_clock_frequency(void)
+static inline u64 trace_clock_frequency(void)
 {
-	return 0LL;
+	return 1000000LL;
 }
 
 static inline u32 trace_clock_freq_scale(void)
 {
-	return 0;
+	return 1;
 }
 
+
+/* LISTS */
+
+#define list_add_rcu list_add
+#define list_for_each_entry_rcu list_for_each_entry
+
+
+#define EXPORT_SYMBOL_GPL(a) /*nothing*/
+
+#define smp_processor_id() (-1)
+
 #endif /* KERNELCOMPAT_H */