Ring buffer: use shmp (shared-memory pointers) for per-channel shm structures

[lttng-ust.git] / libust / tracer.h

diff --git a/libust/tracer.h b/libust/tracer.h
index 5d7d4f6181a310a9becef42752776349ff037f09..9fd626e8238110cbfecef07eac854b13dd9511bd 100644 (file)
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -27,8 +27,10 @@
 #include <sys/types.h>
 #include <stdarg.h>
 #include <ust/marker.h>
-#include <ust/probe.h>
+#include <ust/marker-internal.h>
+#include <ust/probe-internal.h>
 #include <ust/core.h>
+#include <ust/compat.h>
 #include "channels.h"
 #include "tracercore.h"
 #include "tracerconst.h"
@@ -103,9 +105,9 @@ struct ltt_active_ust_marker {
 
 struct ust_marker; //ust//
 extern void ltt_vtrace(const struct ust_marker *mdata, void *probe_data,
-       struct registers *regs, void *call_data, const char *fmt, va_list *args);
+       void *call_data, const char *fmt, va_list *args);
 extern void ltt_trace(const struct ust_marker *mdata, void *probe_data,
-       struct registers *regs, void *call_data, const char *fmt, ...);
+       void *call_data, const char *fmt, ...);
 
 /*
  * Unique ID assigned to each registered probe.
@@ -343,37 +345,6 @@ static __inline__ void ltt_write_trace_header(struct ust_trace *trace,
        header->freq_scale = trace->freq_scale;
 }
 
-#ifndef UST_VALGRIND
-
-static __inline__ int ust_get_cpu(void)
-{
-       int cpu;
-
-       cpu = sched_getcpu();
-       if (likely(cpu >= 0))
-               return cpu;
-       /*
-        * If getcpu(2) is not implemented in the Kernel use CPU 0 as fallback.
-        */
-       return 0;
-}
-
-#else  /* #else #ifndef UST_VALGRIND */
-
-static __inline__ int ust_get_cpu(void)
-{
-       /*
-        * Valgrind does not support the sched_getcpu() vsyscall.
-        * It causes it to detect a segfault in the program and stop it.
-        * So if we want to check libust with valgrind, we have to refrain
-        * from using this call. TODO: it would probably be better to return
-        * other values too, to better test it.
-        */
-       return 0;
-}
-
-#endif /* #else #ifndef UST_VALGRIND */
-
 /*
  * Size reserved for high priority events (interrupts, NMI, BH) at the end of a
  * nearly full buffer. User space won't use this last amount of space when in