X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents-internal.h;h=ef1bed28432008fed28c1d2dbc8541f482644a38;hb=039f9a2305408e45513f4209968f22d4059407b9;hp=2bf0eb9a7c0d007147bb4f1699312fbe38112ff8;hpb=83006ee0d75381816540c339e5dda7aba72fafa3;p=lttng-modules.git

diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
index 2bf0eb9a..ef1bed28 100644
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -79,6 +79,7 @@ struct lttng_kernel_event_common_private {
 	struct list_head filter_bytecode_runtime_head;
 
 	struct hlist_node hlist_node;			/* node in events hash table */
+	struct list_head node;				/* node in event list */
 
 	enum lttng_kernel_abi_instrumentation instrumentation;
 	/* Selected by instrumentation */
@@ -102,7 +103,6 @@ struct lttng_kernel_event_recorder_private {
 	struct lttng_kernel_event_common_private parent;
 
 	struct lttng_kernel_event_recorder *pub;	/* Public event interface */
-	struct list_head node;				/* Event recorder list */
 	struct lttng_kernel_ctx *ctx;
 	unsigned int id;
 	unsigned int metadata_dumped:1;
@@ -115,7 +115,6 @@ struct lttng_kernel_event_notifier_private {
 	struct lttng_event_notifier_group *group;	/* weak ref */
 	size_t num_captures;				/* Needed to allocate the msgpack array. */
 	uint64_t error_counter_index;
-	struct list_head node;				/* Event notifier list */
 	struct list_head capture_bytecode_runtime_head;
 };
 
@@ -237,20 +236,19 @@ struct lttng_event_enabler_common {
 	unsigned int enabled:1;
 
 	uint64_t user_token;		/* User-provided token. */
+
+	struct list_head node;		/* list of enablers */
+	bool published;			/* published in list. */
 };
 
 struct lttng_event_recorder_enabler {
 	struct lttng_event_enabler_common parent;
-	struct list_head node;		/* per-session list of enablers */
-	bool published;			/* published in per-session list. */
 	struct lttng_kernel_channel_buffer *chan;
 };
 
 struct lttng_event_notifier_enabler {
 	struct lttng_event_enabler_common parent;
 	uint64_t error_counter_index;
-	struct list_head node;	/* List of event_notifier enablers */
-	bool published;		/* published in group list. */
 	struct lttng_event_notifier_group *group;
 
 	/* head list of struct lttng_kernel_bytecode_node */
@@ -615,6 +613,27 @@ struct lttng_event_ht *lttng_get_event_ht_from_enabler(struct lttng_event_enable
 	}
 }
 
+static inline
+struct list_head *lttng_get_event_list_head_from_enabler(struct lttng_event_enabler_common *event_enabler)
+{
+	switch (event_enabler->enabler_type) {
+	case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+	{
+		struct lttng_event_recorder_enabler *event_recorder_enabler =
+			container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+		return &event_recorder_enabler->chan->parent.session->priv->events;
+	}
+	case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+	{
+		struct lttng_event_notifier_enabler *event_notifier_enabler =
+			container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+		return &event_notifier_enabler->group->event_notifiers_head;
+	}
+	default:
+		return NULL;
+	}
+}
+
 int lttng_context_init(void);
 void lttng_context_exit(void);
 int lttng_kernel_context_append(struct lttng_kernel_ctx **ctx_p,
@@ -817,8 +836,16 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common
 		struct lttng_kernel_abi_filter_bytecode __user *bytecode);
 void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler);
 
-int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+bool lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
 		struct lttng_event_enabler_common *enabler);
+bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler,
+		struct lttng_kernel_event_common *event);
+bool lttng_event_enabler_desc_match_event(struct lttng_event_enabler_common *event_enabler,
+		const struct lttng_kernel_event_desc *desc,
+		struct lttng_kernel_event_common *event);
+bool lttng_event_enabler_event_name_match_event(struct lttng_event_enabler_common *event_enabler,
+		const char *event_name,
+		struct lttng_kernel_event_common *event);
 
 void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_desc,
 		struct lttng_kernel_ctx *ctx,
@@ -826,7 +853,7 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des
 		struct list_head *enabler_bytecode_runtime_head);
 
 #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS)
-int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler);
+int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *event_enabler);
 int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event);
 int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event);
 
@@ -835,8 +862,10 @@ int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *sysc
 
 long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table,
 		struct lttng_kernel_abi_syscall_mask __user *usyscall_mask);
+
+void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler);
 #else
-static inline int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler)
+static inline int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *event_enabler)
 {
 	return -ENOSYS;
 }
@@ -872,6 +901,9 @@ static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_ev
 	return -ENOSYS;
 }
 
+static inline void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler)
+{
+}
 #endif
 
 #ifdef CONFIG_KPROBES