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 LTTng tracer core
[lttng-modules.git]
/
src
/
lttng-events.c
diff --git
a/src/lttng-events.c
b/src/lttng-events.c
index 1bfa49433aaeae36d38bdcad278cd583f2e9971b..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
@@
-71,7
+75,7
@@
static void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_en
static void _lttng_event_destroy(struct lttng_kernel_event_common *event);
static void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan);
static void _lttng_event_destroy(struct lttng_kernel_event_common *event);
static void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan);
-static
int
_lttng_event_unregister(struct lttng_kernel_event_common *event);
+static
void
_lttng_event_unregister(struct lttng_kernel_event_common *event);
static
int _lttng_event_recorder_metadata_statedump(struct lttng_kernel_event_common *event);
static
static
int _lttng_event_recorder_metadata_statedump(struct lttng_kernel_event_common *event);
static
@@
-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)
@@
-360,10
+358,8
@@
void lttng_session_destroy(struct lttng_kernel_session *session)
ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
- list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node) {
- ret = _lttng_event_unregister(&event_recorder_priv->pub->parent);
- WARN_ON(ret);
- }
+ list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node)
+ _lttng_event_unregister(&event_recorder_priv->pub->parent);
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan_priv, &session->priv->chan, node) {
ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table);
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan_priv, &session->priv->chan, node) {
ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table);
@@
-410,10
+406,8
@@
void lttng_event_notifier_group_destroy(
WARN_ON(ret);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
WARN_ON(ret);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
- &event_notifier_group->event_notifiers_head, parent.node) {
- ret = _lttng_event_unregister(&event_notifier_priv->pub->parent);
- WARN_ON(ret);
- }
+ &event_notifier_group->event_notifiers_head, parent.node)
+ _lttng_event_unregister(&event_notifier_priv->pub->parent);
/* Wait for in-flight event notifier to complete */
synchronize_trace();
/* Wait for in-flight event notifier to complete */
synchronize_trace();
@@
-1268,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;
@@
-1337,20
+1327,19
@@
int lttng_kernel_counter_clear(struct lttng_counter *counter,
return counter->ops->counter_clear(counter->counter, dim_indexes);
}
return counter->ops->counter_clear(counter->counter, dim_indexes);
}
-/* Only used for tracepoints for now. */
+/* Only used for tracepoints
and system calls
for now. */
static
void register_event(struct lttng_kernel_event_common *event)
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
static
void register_event(struct lttng_kernel_event_common *event)
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event->priv->registered)
- return;
+ WARN_ON_ONCE(event->priv->registered);
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;
@@
-1383,23
+1372,24
@@
void register_event(struct lttng_kernel_event_common *event)
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
+ WARN_ON_ONCE(ret);
if (!ret)
event->priv->registered = 1;
}
if (!ret)
event->priv->registered = 1;
}
-int _lttng_event_unregister(struct lttng_kernel_event_common *event)
+static
+void unregister_event(struct lttng_kernel_event_common *event)
{
struct lttng_kernel_event_common_private *event_priv = event->priv;
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
{
struct lttng_kernel_event_common_private *event_priv = event->priv;
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (!event_priv->registered)
- return 0;
+ WARN_ON_ONCE(!event->priv->registered);
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;
@@
-1446,9
+1436,16
@@
int _lttng_event_unregister(struct lttng_kernel_event_common *event)
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
+ WARN_ON_ONCE(ret);
if (!ret)
event_priv->registered = 0;
if (!ret)
event_priv->registered = 0;
- return ret;
+}
+
+static
+void _lttng_event_unregister(struct lttng_kernel_event_common *event)
+{
+ if (event->priv->registered)
+ unregister_event(event);
}
/*
}
/*
@@
-1764,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;
@@
-2652,9
+2649,11
@@
void lttng_sync_event_list(struct list_head *event_enabler_list,
* Sync tracepoint registration with event enabled state.
*/
if (enabled) {
* Sync tracepoint registration with event enabled state.
*/
if (enabled) {
- register_event(event);
+ if (!event_priv->registered)
+ register_event(event);
} else {
} else {
- _lttng_event_unregister(event);
+ if (event_priv->registered)
+ unregister_event(event);
}
lttng_event_sync_filter_state(event);
}
lttng_event_sync_filter_state(event);
@@
-3682,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);
@@
-4155,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.025322 seconds
and
4
git commands to generate.