X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=share%2Fkernelcompat.h;h=3c23ac99477b8d95e4c367b59f58d7c95daf4834;hb=4268fdcdcb96f72e945f52b9f94f6ad841e297c9;hp=aa3d0facba17f8333148d409e1500eb99ac0eaf6;hpb=59b161cdfcaad93fee295add37090a3d991e7aa8;p=ust.git

diff --git a/share/kernelcompat.h b/share/kernelcompat.h
index aa3d0fa..3c23ac9 100644
--- a/share/kernelcompat.h
+++ b/share/kernelcompat.h
@@ -1,16 +1,27 @@
 #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);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})
 
-#define KERN_DEBUG
-#define KERN_NOTICE
+#define KERN_DEBUG ""
+#define KERN_NOTICE ""
+#define KERN_INFO ""
+#define KERN_ERR ""
+#define KERN_ALERT ""
+#define KERN_WARNING ""
 
 /* ERROR OPS */
 
@@ -34,78 +45,147 @@ static inline long IS_ERR(const void *ptr)
 }
 
 
-/* FIXED SIZE INTEGERS */
+/* Min / Max */
+
+#define min_t(type, x, y) ({                    \
+	type __min1 = (x);                      \
+	type __min2 = (y);                      \
+	__min1 < __min2 ? __min1: __min2; })
 
-#include <stdint.h>
+#define max_t(type, x, y) ({                    \
+	type __max1 = (x);                      \
+	type __max2 = (y);                      \
+	__max1 > __max2 ? __max1: __max2; })
 
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
 
+/* MUTEXES */
 
 #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)
 
 
+/* 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)
 
-#include <stdio.h>
-#define printk(fmt, args...) printf(fmt, ## args)
+#define GFP_KERNEL
 
+/* PRINTK */
 
-/* MEMORY BARRIERS */
+#include <stdio.h>
+#define printk(fmt, args...) printf(fmt, ## args)
 
-#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)
+/* ATTRIBUTES */
 
-/* RCU */
+#define ____cacheline_aligned
+#define __init
+#define __exit
 
-#define rcu_assign_pointer(a, b) do {} while(0)
+/* MATH */
 
-/* ATOMICITY */
-#include <signal.h>
+static inline unsigned int hweight32(unsigned int w)
+{
+	unsigned int res = w - ((w >> 1) & 0x55555555);
+	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+	res = (res + (res >> 4)) & 0x0F0F0F0F;
+	res = res + (res >> 8);
+	return (res + (res >> 16)) & 0x000000FF;
+}
 
-typedef struct { sig_atomic_t counter; } atomic_t;
+static inline int fls(int x)
+{
+        int r;
+//ust// #ifdef CONFIG_X86_CMOV
+        asm("bsrl %1,%0\n\t"
+            "cmovzl %2,%0"
+            : "=&r" (r) : "rm" (x), "rm" (-1));
+//ust// #else
+//ust//         asm("bsrl %1,%0\n\t"
+//ust//             "jnz 1f\n\t"
+//ust//             "movl $-1,%0\n"
+//ust//             "1:" : "=r" (r) : "rm" (x));
+//ust// #endif
+        return r + 1;
+}
 
-static inline int atomic_dec_and_test(atomic_t *p)
+static __inline__ int get_count_order(unsigned int count)
 {
-	(p->counter)--;
-	return !p->counter;
+	int order;
+	
+	order = fls(count) - 1;
+	if (count & (count - 1))
+		order++;
+	return order;
 }
 
-static inline void atomic_set(atomic_t *p, int v)
+
+
+
+#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)
 {
-	p->counter=v;
+	struct timeval tv;
+	u64 retval;
+
+	gettimeofday(&tv, NULL);
+	retval = tv.tv_sec;
+	retval *= 1000000;
+	retval += tv.tv_usec;
+
+	return retval;
 }
 
-static inline void atomic_inc(atomic_t *p)
+static inline u64 trace_clock_frequency(void)
 {
-	p->counter++;
+	return 1000000LL;
 }
 
-static int atomic_read(atomic_t *p)
+static inline u32 trace_clock_freq_scale(void)
 {
-	return p->counter;
+	return 1;
 }
 
-/* CACHE */
-#define ____cacheline_aligned
 
 #endif /* KERNELCOMPAT_H */