projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: kallsyms wrapper on CONFIG_PPC64_ELF_ABI_V1
[lttng-modules.git]
/
src
/
lttng-events.c
diff --git
a/src/lttng-events.c
b/src/lttng-events.c
index 999080bc490f54be1b129094e32aa909b63fac85..e9b5687198a6cfd56cf6bb537086bb2a8360c0a9 100644
(file)
--- a/
src/lttng-events.c
+++ b/
src/lttng-events.c
@@
-28,6
+28,7
@@
#include <linux/vmalloc.h>
#include <linux/dmi.h>
#include <linux/vmalloc.h>
#include <linux/dmi.h>
+#include <wrapper/compiler_attributes.h>
#include <wrapper/uuid.h>
#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */
#include <wrapper/random.h>
#include <wrapper/uuid.h>
#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */
#include <wrapper/random.h>
@@
-48,6
+49,12
@@
#include <ringbuffer/frontend.h>
#include <wrapper/time.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
static LIST_HEAD(sessions);
#define METADATA_CACHE_DEFAULT_SIZE 4096
static LIST_HEAD(sessions);
@@
-71,8
+78,8
@@
static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier
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_recorder *event);
-static
int
_lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier);
+static
void
_lttng_event_unregister(struct lttng_kernel_event_recorder *event);
+static
void
_lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier);
static
int _lttng_event_metadata_statedump(struct lttng_kernel_session *session,
struct lttng_kernel_channel_buffer *chan,
static
int _lttng_event_metadata_statedump(struct lttng_kernel_session *session,
struct lttng_kernel_channel_buffer *chan,
@@
-93,7
+100,8
@@
int _lttng_field_statedump(struct lttng_kernel_session *session,
void synchronize_trace(void)
{
void synchronize_trace(void)
{
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0))
synchronize_rcu();
#else
synchronize_sched();
synchronize_rcu();
#else
synchronize_sched();
@@
-362,10
+370,8
@@
void lttng_session_destroy(struct lttng_kernel_session *session)
ret = lttng_syscalls_unregister_channel(chan_priv->pub);
WARN_ON(ret);
}
ret = lttng_syscalls_unregister_channel(chan_priv->pub);
WARN_ON(ret);
}
- list_for_each_entry(event_recorder_priv, &session->priv->events, node) {
- ret = _lttng_event_unregister(event_recorder_priv->pub);
- WARN_ON(ret);
- }
+ list_for_each_entry(event_recorder_priv, &session->priv->events, node)
+ _lttng_event_unregister(event_recorder_priv->pub);
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan_priv, &session->priv->chan, node) {
ret = lttng_syscalls_destroy_event(chan_priv->pub);
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan_priv, &session->priv->chan, node) {
ret = lttng_syscalls_destroy_event(chan_priv->pub);
@@
-413,10
+419,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, node) {
- ret = _lttng_event_notifier_unregister(event_notifier_priv->pub);
- WARN_ON(ret);
- }
+ &event_notifier_group->event_notifiers_head, node)
+ _lttng_event_notifier_unregister(event_notifier_priv->pub);
/* Wait for in-flight event notifier to complete */
synchronize_trace();
/* Wait for in-flight event notifier to complete */
synchronize_trace();
@@
-658,12
+662,14
@@
int lttng_event_enable(struct lttng_kernel_event_common *event)
goto end;
}
switch (event->priv->instrumentation) {
goto end;
}
switch (event->priv->instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
ret = -EINVAL;
break;
case LTTNG_KERNEL_ABI_SYSCALL:
ret = -EINVAL;
break;
- case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_UPROBE:
WRITE_ONCE(event->enabled, 1);
break;
case LTTNG_KERNEL_ABI_UPROBE:
WRITE_ONCE(event->enabled, 1);
break;
@@
-672,8
+678,10
@@
int lttng_event_enable(struct lttng_kernel_event_common *event)
ret = lttng_kretprobes_event_enable_state(event, 1);
break;
ret = lttng_kretprobes_event_enable_state(event, 1);
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ 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;
@@
-718,12
+726,14
@@
int lttng_event_disable(struct lttng_kernel_event_common *event)
goto end;
}
switch (event->priv->instrumentation) {
goto end;
}
switch (event->priv->instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
ret = -EINVAL;
break;
case LTTNG_KERNEL_ABI_SYSCALL:
ret = -EINVAL;
break;
- case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_UPROBE:
WRITE_ONCE(event->enabled, 0);
break;
case LTTNG_KERNEL_ABI_UPROBE:
WRITE_ONCE(event->enabled, 0);
break;
@@
-732,8
+742,10
@@
int lttng_event_disable(struct lttng_kernel_event_common *event)
ret = lttng_kretprobes_event_enable_state(event, 0);
break;
ret = lttng_kretprobes_event_enable_state(event, 0);
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ 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;
@@
-872,15
+884,20
@@
struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
event_name = event_desc->event_name;
break;
event_name = event_desc->event_name;
break;
- case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_UPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
event_name = event_param->name;
break;
case LTTNG_KERNEL_ABI_SYSCALL:
event_name = event_param->name;
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ 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;
@@
-1092,8
+1109,10
@@
struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
WARN_ON_ONCE(!ret);
break;
WARN_ON_ONCE(!ret);
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ 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;
@@
-1140,15
+1159,20
@@
struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
event_name = event_desc->event_name;
break;
event_name = event_desc->event_name;
break;
- case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_UPROBE:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
event_name = event_notifier_param->event.name;
break;
case LTTNG_KERNEL_ABI_SYSCALL:
event_name = event_notifier_param->event.name;
break;
- case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_fallthrough;
+ 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;
@@
-1295,9
+1319,12
@@
struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
WARN_ON_ONCE(!ret);
break;
WARN_ON_ONCE(!ret);
break;
- case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_fallthrough;
+ 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;
@@
-1407,8
+1434,7
@@
void register_event(struct lttng_kernel_event_recorder *event_recorder)
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event_recorder->priv->parent.registered)
- return;
+ WARN_ON_ONCE(event_recorder->priv->parent.registered);
desc = event_recorder->priv->parent.desc;
switch (event_recorder->priv->parent.instrumentation) {
desc = event_recorder->priv->parent.desc;
switch (event_recorder->priv->parent.instrumentation) {
@@
-1422,14
+1448,18
@@
void register_event(struct lttng_kernel_event_recorder *event_recorder)
ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder);
break;
ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder);
break;
- case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_UPROBE:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_KRETPROBE:
ret = 0;
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
ret = 0;
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_NOOP:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-1440,14
+1470,14
@@
void register_event(struct lttng_kernel_event_recorder *event_recorder)
/*
* Only used internally at session destruction.
*/
/*
* Only used internally at session destruction.
*/
-int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
+static
+void unregister_event(struct lttng_kernel_event_recorder *event_recorder)
{
struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent;
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
{
struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent;
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) {
desc = event_priv->desc;
switch (event_priv->instrumentation) {
@@
-1480,13
+1510,21
@@
int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
ret = 0;
break;
ret = 0;
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION:
+ lttng_fallthrough;
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_recorder *event_recorder)
+{
+ if (event_recorder->priv->parent.registered)
+ unregister_event(event_recorder);
}
/* Only used for tracepoints for now. */
}
/* Only used for tracepoints for now. */
@@
-1496,8
+1534,7
@@
void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event_notifier->priv->parent.registered)
- return;
+ WARN_ON_ONCE(event_notifier->priv->parent.registered);
desc = event_notifier->priv->parent.desc;
switch (event_notifier->priv->parent.instrumentation) {
desc = event_notifier->priv->parent.desc;
switch (event_notifier->priv->parent.instrumentation) {
@@
-1511,14
+1548,18
@@
void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
break;
ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
break;
- case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_UPROBE:
ret = 0;
break;
case LTTNG_KERNEL_ABI_UPROBE:
ret = 0;
break;
- case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_FUNCTION:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_NOOP:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-1527,14
+1568,12
@@
void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
}
static
}
static
-int _lttng_event_notifier_unregister(
- struct lttng_kernel_event_notifier *event_notifier)
+int unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (!event_notifier->priv->parent.registered)
- return 0;
+ WARN_ON_ONCE(!event_notifier->priv->parent.registered);
desc = event_notifier->priv->parent.desc;
switch (event_notifier->priv->parent.instrumentation) {
desc = event_notifier->priv->parent.desc;
switch (event_notifier->priv->parent.instrumentation) {
@@
-1558,9
+1597,12
@@
int _lttng_event_notifier_unregister(
ret = lttng_syscall_filter_disable_event_notifier(event_notifier);
break;
ret = lttng_syscall_filter_disable_event_notifier(event_notifier);
break;
- case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_FUNCTION:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_NOOP:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-1569,6
+1611,13
@@
int _lttng_event_notifier_unregister(
return ret;
}
return ret;
}
+static
+void _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier)
+{
+ if (event_notifier->priv->parent.registered)
+ unregister_event_notifier(event_notifier);
+}
+
/*
* Only used internally at session destruction.
*/
/*
* Only used internally at session destruction.
*/
@@
-1613,8
+1662,10
@@
void _lttng_event_destroy(struct lttng_kernel_event_common *event)
lttng_uprobes_destroy_event_private(event_recorder);
break;
lttng_uprobes_destroy_event_private(event_recorder);
break;
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_NOOP:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-1646,9
+1697,12
@@
void _lttng_event_destroy(struct lttng_kernel_event_common *event)
lttng_uprobes_destroy_event_notifier_private(event_notifier);
break;
lttng_uprobes_destroy_event_notifier_private(event_notifier);
break;
- case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
- case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
- case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_FUNCTION:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_NOOP:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-2712,7
+2766,8
@@
void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
int nr_filters = 0;
switch (event_recorder_priv->parent.instrumentation) {
int nr_filters = 0;
switch (event_recorder_priv->parent.instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
/* Enable events */
list_for_each_entry(enabler_ref,
case LTTNG_KERNEL_ABI_SYSCALL:
/* Enable events */
list_for_each_entry(enabler_ref,
@@
-2741,9
+2796,11
@@
void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
* state.
*/
if (enabled) {
* state.
*/
if (enabled) {
- register_event(event_recorder);
+ if (!event_recorder_priv->parent.registered)
+ register_event(event_recorder);
} else {
} else {
- _lttng_event_unregister(event_recorder);
+ if (event_recorder_priv->parent.registered)
+ _lttng_event_unregister(event_recorder);
}
/* Check if has enablers without bytecode enabled */
}
/* Check if has enablers without bytecode enabled */
@@
-2806,7
+2863,8
@@
void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
int nr_filters = 0, nr_captures = 0;
switch (event_notifier_priv->parent.instrumentation) {
int nr_filters = 0, nr_captures = 0;
switch (event_notifier_priv->parent.instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
/* Enable event_notifiers */
list_for_each_entry(enabler_ref,
case LTTNG_KERNEL_ABI_SYSCALL:
/* Enable event_notifiers */
list_for_each_entry(enabler_ref,
@@
-2833,7
+2891,7
@@
void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
register_event_notifier(event_notifier);
} else {
if (event_notifier_priv->parent.registered)
register_event_notifier(event_notifier);
} else {
if (event_notifier_priv->parent.registered)
-
_lttng_event_notifier_unregist
er(event_notifier);
+
unregister_event_notifi
er(event_notifier);
}
/* Check if has enablers without bytecode enabled */
}
/* Check if has enablers without bytecode enabled */
@@
-2880,7
+2938,7
@@
void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
* was written and a negative value on error.
*/
int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
* was written and a negative value on error.
*/
int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
- struct channel *chan, bool *coherent)
+ struct
lttng_kernel_ring_buffer_
channel *chan, bool *coherent)
{
struct lttng_kernel_ring_buffer_ctx ctx;
int ret = 0;
{
struct lttng_kernel_ring_buffer_ctx ctx;
int ret = 0;
@@
-2924,7
+2982,7
@@
int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
}
stream->transport->ops.event_write(&ctx,
stream->metadata_cache->data + stream->metadata_in,
}
stream->transport->ops.event_write(&ctx,
stream->metadata_cache->data + stream->metadata_in,
- reserve_len);
+ reserve_len
, 1
);
stream->transport->ops.event_commit(&ctx);
stream->metadata_in += reserve_len;
if (reserve_len < len)
stream->transport->ops.event_commit(&ctx);
stream->metadata_in += reserve_len;
if (reserve_len < len)
@@
-3876,7
+3934,7
@@
int print_escaped_ctf_string(struct lttng_kernel_session *session, const char *s
if (ret)
goto error;
/* We still print the current char */
if (ret)
goto error;
/* We still print the current char */
- /* Fallthrough */
+ lttng_fallthrough;
default:
ret = lttng_metadata_printf(session, "%c", cur);
break;
default:
ret = lttng_metadata_printf(session, "%c", cur);
break;
@@
-4362,6
+4420,9
@@
static int __init lttng_events_init(void)
#else
"");
#endif
#else
"");
#endif
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+ printk(KERN_NOTICE "LTTng: Experimental bitwise enum enabled.\n");
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
return 0;
error_hotplug:
return 0;
error_hotplug:
This page took
0.032318 seconds
and
4
git commands to generate.