#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);
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
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);
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();
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;
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;
- if (event->priv->registered)
- return;
+ WARN_ON_ONCE(event->priv->registered);
desc = event->priv->desc;
switch (event->priv->instrumentation) {
default:
WARN_ON_ONCE(1);
}
+ WARN_ON_ONCE(ret);
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;
- if (!event_priv->registered)
- return 0;
+ WARN_ON_ONCE(!event->priv->registered);
desc = event_priv->desc;
switch (event_priv->instrumentation) {
default:
WARN_ON_ONCE(1);
}
+ WARN_ON_ONCE(ret);
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);
}
/*
}
static
-void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler_common *event_enabler)
+void lttng_event_enabler_create_tracepoint_events_if_missing(struct lttng_event_enabler_common *event_enabler)
{
struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
struct lttng_kernel_probe_desc *probe_desc;
*/
list_for_each_entry(probe_desc, probe_list, head) {
for (i = 0; i < probe_desc->nr_events; i++) {
- int found = 0;
+ bool found = false;
struct hlist_head *head;
struct lttng_kernel_event_common *event;
struct lttng_kernel_event_common_private *event_priv;
*/
head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
- if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub))
- found = 1;
+ if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub)) {
+ found = true;
+ break;
+ }
}
if (found)
continue;
* We need to create an event for this event probe.
*/
event = _lttng_kernel_event_create(event_enabler, desc);
- if (!event) {
+ if (IS_ERR(event)) {
printk(KERN_INFO "LTTng: Unable to create event %s\n",
probe_desc->event_desc[i]->event_name);
}
}
}
-static
-void lttng_create_syscall_event_if_missing(struct lttng_event_enabler_common *event_enabler)
-{
- int ret;
-
- ret = lttng_syscalls_register_event(event_enabler);
- WARN_ON_ONCE(ret);
-}
-
/*
* Create event if it is missing and present in the list of tracepoint probes.
* Should be called with sessions mutex held.
*/
static
-void lttng_create_event_if_missing(struct lttng_event_enabler_common *event_enabler)
+void lttng_event_enabler_create_events_if_missing(struct lttng_event_enabler_common *event_enabler)
{
+ int ret;
+
switch (event_enabler->event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
- lttng_create_tracepoint_event_if_missing(event_enabler);
+ lttng_event_enabler_create_tracepoint_events_if_missing(event_enabler);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- lttng_create_syscall_event_if_missing(event_enabler);
+ ret = lttng_event_enabler_create_syscall_events_if_missing(event_enabler);
+ WARN_ON_ONCE(ret);
break;
default:
lttng_syscall_table_set_wildcard_all(event_enabler);
/* First ensure that probe events are created for this enabler. */
- lttng_create_event_if_missing(event_enabler);
+ lttng_event_enabler_create_events_if_missing(event_enabler);
/* Link the created event with its associated enabler. */
list_for_each_entry(event_priv, event_list_head, node) {
* Sync tracepoint registration with event enabled state.
*/
if (enabled) {
- register_event(event);
+ if (!event_priv->registered)
+ register_event(event);
} else {
- _lttng_event_unregister(event);
+ if (event_priv->registered)
+ unregister_event(event);
}
lttng_event_sync_filter_state(event);