X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=4ddf4a77774a89d22ff74bdf5f3e7dd96e0c93c8;hb=5987e66c2cba50425d775ce587dd763244373e16;hp=d3532b3dfc13e7c42378177be040f174c0b9d3f0;hpb=c3fb484e598a4c08aa096901b611af7311ad77ca;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index d3532b3d..4ddf4a77 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -49,6 +49,12 @@
 #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);
@@ -71,7 +77,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 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
@@ -360,10 +366,8 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
 		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);
@@ -410,10 +414,8 @@ void lttng_event_notifier_group_destroy(
 	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();
@@ -1337,15 +1339,14 @@ int lttng_kernel_counter_clear(struct lttng_counter *counter,
 	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) {
@@ -1383,18 +1384,19 @@ void register_event(struct lttng_kernel_event_common *event)
 	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) {
@@ -1446,9 +1448,16 @@ int _lttng_event_unregister(struct lttng_kernel_event_common *event)
 	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);
 }
 
 /*
@@ -2079,7 +2088,7 @@ void lttng_event_enabler_create_tracepoint_events_if_missing(struct lttng_event_
 	 */
 	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;
@@ -2093,8 +2102,10 @@ void lttng_event_enabler_create_tracepoint_events_if_missing(struct lttng_event_
 			 */
 			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;
@@ -2650,9 +2661,11 @@ void lttng_sync_event_list(struct list_head *event_enabler_list,
 		 * 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);