X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=230e393446735edcfaef947c274a39faa0d6f891;hb=HEAD;hp=dab3a0e1e5e8359b55a82e9090d9c2f4dc3b66ed;hpb=194da3304f45f2f9c6006d2f377cd4db5cb7123f;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index dab3a0e1..73f591fd 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -23,7 +23,6 @@
 #include <linux/seq_file.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
-#include <wrapper/file.h>
 #include <linux/uaccess.h>
 #include <linux/vmalloc.h>
 #include <linux/dmi.h>
@@ -47,9 +46,9 @@
 #include <lttng/utils.h>
 #include <ringbuffer/backend.h>
 #include <ringbuffer/frontend.h>
-#include <wrapper/time.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
 #include <linux/stdarg.h>
 #else
 #include <stdarg.h>
@@ -103,15 +102,9 @@ void synchronize_trace(void)
 	synchronize_sched();
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 #ifdef CONFIG_PREEMPT_RT_FULL
 	synchronize_rcu();
 #endif
-#else /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) */
-#ifdef CONFIG_PREEMPT_RT
-	synchronize_rcu();
-#endif
-#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) */
 }
 
 void lttng_lock_sessions(void)
@@ -1347,7 +1340,7 @@ void register_event(struct lttng_kernel_event_common *event)
 	desc = event->priv->desc;
 	switch (event->priv->instrumentation) {
 	case LTTNG_KERNEL_ABI_TRACEPOINT:
-		ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
+		ret = lttng_tracepoint_probe_register(desc->event_kname,
 						  desc->tp_class->probe_callback,
 						  event);
 		break;
@@ -1397,7 +1390,7 @@ void unregister_event(struct lttng_kernel_event_common *event)
 	desc = event_priv->desc;
 	switch (event_priv->instrumentation) {
 	case LTTNG_KERNEL_ABI_TRACEPOINT:
-		ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname,
+		ret = lttng_tracepoint_probe_unregister(event_priv->desc->event_kname,
 						  event_priv->desc->tp_class->probe_callback,
 						  event);
 		break;
@@ -1554,6 +1547,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 	}
 }
 
+static
 struct lttng_kernel_id_tracker *get_tracker(struct lttng_kernel_session *session,
 		enum tracker_type tracker_type)
 {
@@ -1769,7 +1763,7 @@ int lttng_session_list_tracker_ids(struct lttng_kernel_session *session,
 	struct seq_file *m;
 	int file_fd, ret;
 
-	file_fd = lttng_get_unused_fd();
+	file_fd = get_unused_fd_flags(0);
 	if (file_fd < 0) {
 		ret = file_fd;
 		goto fd_error;
@@ -2454,26 +2448,6 @@ void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *e
 	mutex_unlock(&sessions_mutex);
 }
 
-int lttng_event_notifier_enabler_enable(
-		struct lttng_event_notifier_enabler *event_notifier_enabler)
-{
-	mutex_lock(&sessions_mutex);
-	lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 1;
-	lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
-	mutex_unlock(&sessions_mutex);
-	return 0;
-}
-
-int lttng_event_notifier_enabler_disable(
-		struct lttng_event_notifier_enabler *event_notifier_enabler)
-{
-	mutex_lock(&sessions_mutex);
-	lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 0;
-	lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
-	mutex_unlock(&sessions_mutex);
-	return 0;
-}
-
 int lttng_event_notifier_enabler_attach_capture_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
 		struct lttng_kernel_abi_capture_bytecode __user *bytecode)
@@ -2825,6 +2799,7 @@ void lttng_metadata_end(struct lttng_kernel_session *session)
  * The content of the printf is printed as a single atomic metadata
  * transaction.
  */
+static
 int lttng_metadata_printf(struct lttng_kernel_session *session,
 			  const char *fmt, ...)
 {
@@ -3689,20 +3664,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);
 
@@ -4162,13 +4129,7 @@ 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;
-	ret = wrapper_get_pageblock_flags_mask_init();
 	if (ret)
 		return ret;
 	ret = lttng_probes_init();