wrapper: remove tracepoint wrapper

[lttng-modules.git] / lttng-events.c

diff --git a/lttng-events.c b/lttng-events.c
index aa0f2e2abc3fa9632f16353f374d5aa5bb2ad8dd..c16cff803d94d3ef0b0fec1717a2dcb452682054 100644 (file)
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -31,7 +31,6 @@
 #include <linux/vmalloc.h>
 
 #include <wrapper/random.h>
-#include <wrapper/tracepoint.h>
 #include <wrapper/list.h>
 #include <wrapper/types.h>
 #include <lttng-kernel-version.h>
@@ -40,9 +39,9 @@
 #include <lttng-abi-old.h>
 #include <lttng-endian.h>
 #include <lttng-string-utils.h>
+#include <lttng-tracepoint.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/time.h>
 
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
@@ -823,9 +822,9 @@ void register_event(struct lttng_event *event)
        desc = event->desc;
        switch (event->instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               ret = lttng_wrapper_tracepoint_probe_register(desc->kname,
-                                                 desc->probe_callback,
-                                                 event);
+               ret = lttng_tracepoint_probe_register(desc->kname,
+                                               desc->probe_callback,
+                                               event);
                break;
        case LTTNG_KERNEL_SYSCALL:
                ret = lttng_syscall_filter_enable(event->chan,
@@ -859,7 +858,7 @@ int _lttng_event_unregister(struct lttng_event *event)
        desc = event->desc;
        switch (event->instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
+               ret = lttng_tracepoint_probe_unregister(event->desc->kname,
                                                  event->desc->probe_callback,
                                                  event);
                break;
@@ -2511,20 +2510,12 @@ int64_t measure_clock_offset(void)
        uint64_t tcf = trace_clock_freq();
        int64_t offset;
        unsigned long flags;
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
        struct timespec64 rts = { 0, 0 };
-#else
-       struct timespec rts = { 0, 0 };
-#endif
 
        /* Disable interrupts to increase correlation precision. */
        local_irq_save(flags);
        monotonic[0] = trace_clock_read64();
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
        ktime_get_real_ts64(&rts);
-#else
-       getnstimeofday(&rts);
-#endif
        monotonic[1] = trace_clock_read64();
        local_irq_restore(flags);
 
@@ -2946,9 +2937,6 @@ static int __init lttng_events_init(void)
 {
        int ret;
 
-       ret = wrapper_lttng_fixup_sig(THIS_MODULE);
-       if (ret)
-               return ret;
        ret = wrapper_get_pfnblock_flags_mask_init();
        if (ret)
                return ret;