projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop support for kernels < 4.4 from rpc instrumentation
[lttng-modules.git]
/
src
/
lttng-events.c
diff --git
a/src/lttng-events.c
b/src/lttng-events.c
index 2b4b1039803222cf0e383ad943c6dc991cc1dcb1..113ccad0516e15afa80b6b3d904c13e3544cdf90 100644
(file)
--- 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 <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>
#include <linux/uaccess.h>
#include <linux/vmalloc.h>
#include <linux/dmi.h>
@@
-47,7
+46,12
@@
#include <lttng/utils.h>
#include <ringbuffer/backend.h>
#include <ringbuffer/frontend.h>
#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))
+#include <linux/stdarg.h>
+#else
+#include <stdarg.h>
+#endif
#define METADATA_CACHE_DEFAULT_SIZE 4096
#define METADATA_CACHE_DEFAULT_SIZE 4096
@@
-97,15
+101,9
@@
void synchronize_trace(void)
synchronize_sched();
#endif
synchronize_sched();
#endif
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
#ifdef CONFIG_PREEMPT_RT_FULL
synchronize_rcu();
#endif
#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)
}
void lttng_lock_sessions(void)
@@
-1264,10
+1262,6
@@
struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_
WARN_ON_ONCE(!ret);
break;
WARN_ON_ONCE(!ret);
break;
- case LTTNG_KERNEL_ABI_FUNCTION:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_NOOP:
- lttng_fallthrough;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
@@
-1345,7
+1339,7
@@
void register_event(struct lttng_kernel_event_common *event)
desc = event->priv->desc;
switch (event->priv->instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
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;
desc->tp_class->probe_callback,
event);
break;
@@
-1395,7
+1389,7
@@
void unregister_event(struct lttng_kernel_event_common *event)
desc = event_priv->desc;
switch (event_priv->instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
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;
event_priv->desc->tp_class->probe_callback,
event);
break;
@@
-1767,7
+1761,7
@@
int lttng_session_list_tracker_ids(struct lttng_kernel_session *session,
struct seq_file *m;
int file_fd, ret;
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;
if (file_fd < 0) {
ret = file_fd;
goto fd_error;
@@
-3687,20
+3681,12
@@
int64_t measure_clock_offset(void)
uint64_t tcf = trace_clock_freq();
int64_t offset;
unsigned long flags;
uint64_t tcf = trace_clock_freq();
int64_t offset;
unsigned long flags;
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
struct timespec64 rts = { 0, 0 };
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();
/* 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);
ktime_get_real_ts64(&rts);
-#else
- getnstimeofday(&rts);
-#endif
monotonic[1] = trace_clock_read64();
local_irq_restore(flags);
monotonic[1] = trace_clock_read64();
local_irq_restore(flags);
@@
-4160,13
+4146,7
@@
static int __init lttng_events_init(void)
{
int ret;
{
int ret;
- ret = wrapper_lttng_fixup_sig(THIS_MODULE);
- if (ret)
- return ret;
ret = wrapper_get_pfnblock_flags_mask_init();
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();
if (ret)
return ret;
ret = lttng_probes_init();
This page took
0.025611 seconds
and
4
git commands to generate.