X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=8c200bdd49787ee7b5960f1bff741eea1413d838;hb=cefd899fc3de0c29491332929cec445e0d459760;hp=ee16fc2fc97cb37fd2f5bd8f604d4cc1199cd71a;hpb=0648898e20d4fa769d5e7abd2591dab218888868;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index ee16fc2f..8c200bdd 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -109,7 +109,7 @@ struct lttng_kernel_type_array {
 
 struct lttng_kernel_type_sequence {
 	struct lttng_kernel_type_common parent;
-	const char *length_name;	/* Length field name. */
+	const char *length_name;	/* Length field name. If NULL, use previous field. */
 	const struct lttng_kernel_type_common *elem_type;
 	unsigned int alignment;		/* Alignment before elements. */
 	enum lttng_kernel_string_encoding encoding;
@@ -124,7 +124,7 @@ struct lttng_kernel_type_struct {
 
 struct lttng_kernel_type_variant {
 	struct lttng_kernel_type_common parent;
-	const char *tag_name;
+	const char *tag_name;		/* Tag field name. If NULL, use previous field. */
 	const struct lttng_kernel_event_field **choices; /* Array of pointers to fields. */
 	unsigned int nr_choices;
 	unsigned int alignment;
@@ -328,8 +328,7 @@ struct lttng_perf_counter_field {
 };
 
 struct lttng_probe_ctx {
-	struct lttng_kernel_event_recorder *event;
-	struct lttng_kernel_event_notifier *event_notifier; // Not sure if we will ever need it.
+	struct lttng_kernel_event_common *event;
 	uint8_t interruptible;
 };
 
@@ -364,7 +363,6 @@ struct lttng_kernel_event_desc {
 	const struct lttng_kernel_event_field **fields;	/* event payload */
 	unsigned int nr_fields;
 	struct module *owner;
-	void *event_notifier_callback;
 };
 
 struct lttng_kernel_probe_desc {
@@ -378,13 +376,13 @@ struct lttng_kernel_probe_desc {
 
 struct lttng_krp;				/* Kretprobe handling */
 
-enum lttng_bytecode_node_type {
-	LTTNG_BYTECODE_NODE_TYPE_FILTER,
-	LTTNG_BYTECODE_NODE_TYPE_CAPTURE,
+enum lttng_kernel_bytecode_type {
+	LTTNG_KERNEL_BYTECODE_TYPE_FILTER,
+	LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE,
 };
 
 struct lttng_bytecode_node {
-	enum lttng_bytecode_node_type type;
+	enum lttng_kernel_bytecode_type type;
 	struct list_head node;
 	struct lttng_enabler *enabler;
 	struct {
@@ -395,29 +393,16 @@ struct lttng_bytecode_node {
 	} bc;
 };
 
-/*
- * Bytecode interpreter return value masks.
- */
-enum lttng_bytecode_interpreter_ret {
-	LTTNG_INTERPRETER_DISCARD = 0,
-	LTTNG_INTERPRETER_RECORD_FLAG = (1ULL << 0),
-	/* Other bits are kept for future use. */
-};
-
 struct lttng_interpreter_output;
 
 struct lttng_bytecode_runtime {
 	/* Associated bytecode */
+	enum lttng_kernel_bytecode_type type;
 	struct lttng_bytecode_node *bc;
-	union {
-		uint64_t (*filter)(void *filter_data,
-				struct lttng_probe_ctx *lttng_probe_ctx,
-				const char *filter_stack_data);
-		uint64_t (*capture)(void *filter_data,
+	int (*interpreter_func)(struct lttng_bytecode_runtime *kernel_bytecode,
+				const char *interpreter_stack_data,
 				struct lttng_probe_ctx *lttng_probe_ctx,
-				const char *capture_stack_data,
-				struct lttng_interpreter_output *output);
-	} interpreter_funcs;
+				void *caller_ctx);
 	int link_failed;
 	struct list_head node;	/* list of bytecode runtime in event */
 	struct lttng_kernel_ctx *ctx;
@@ -432,10 +417,7 @@ struct lttng_enabler_ref {
 };
 
 struct lttng_uprobe_handler {
-	union {
-		struct lttng_kernel_event_recorder *event;
-		struct lttng_kernel_event_notifier *event_notifier;
-	} u;
+	struct lttng_kernel_event_common *event;
 	loff_t offset;
 	struct uprobe_consumer up_consumer;
 	struct list_head node;
@@ -461,6 +443,14 @@ enum lttng_syscall_abi {
 	LTTNG_SYSCALL_ABI_COMPAT,
 };
 
+/*
+ * Result of the run_filter() callback.
+ */
+enum lttng_kernel_event_filter_result {
+	LTTNG_KERNEL_EVENT_FILTER_ACCEPT = 0,
+	LTTNG_KERNEL_EVENT_FILTER_REJECT = 1,
+};
+
 struct lttng_kernel_event_common_private;
 
 enum lttng_kernel_event_type {
@@ -476,8 +466,9 @@ struct lttng_kernel_event_common {
 
 	int enabled;
 	int eval_filter;				/* Need to evaluate filters */
-	int (*run_filter)(struct lttng_kernel_event_common *event,
+	int (*run_filter)(const struct lttng_kernel_event_common *event,
 		const char *stack_data,
+		struct lttng_probe_ctx *probe_ctx,
 		void *filter_ctx);
 };
 
@@ -502,8 +493,8 @@ struct lttng_kernel_event_notifier {
 
 	int eval_capture;				/* Need to evaluate capture */
 	void (*notification_send)(struct lttng_kernel_event_notifier *event_notifier,
-		struct lttng_probe_ctx *probe_ctx,
 		const char *stack_data,
+		struct lttng_probe_ctx *probe_ctx,
 		struct lttng_kernel_notification_ctx *notif_ctx);
 };
 
@@ -571,8 +562,7 @@ struct lttng_channel_ops {
 	struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
 	int (*buffer_has_read_closed_stream)(struct channel *chan);
 	void (*buffer_read_close)(struct lib_ring_buffer *buf);
-	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
-			     uint32_t event_id);
+	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx);
 	void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
 	void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
 			    size_t len);
@@ -941,11 +931,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
 
 int lttng_channel_enable(struct lttng_channel *channel);
 int lttng_channel_disable(struct lttng_channel *channel);
-int lttng_event_enable(struct lttng_kernel_event_recorder *event);
-int lttng_event_disable(struct lttng_kernel_event_recorder *event);
-
-int lttng_event_notifier_enable(struct lttng_kernel_event_notifier *event_notifier);
-int lttng_event_notifier_disable(struct lttng_kernel_event_notifier *event_notifier);
+int lttng_event_enable(struct lttng_kernel_event_common *event);
+int lttng_event_disable(struct lttng_kernel_event_common *event);
 
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
@@ -1331,23 +1318,18 @@ void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_noti
 }
 #endif
 
-int lttng_event_add_callsite(struct lttng_kernel_event_recorder *event,
-	struct lttng_kernel_abi_event_callsite __user *callsite);
-
-int lttng_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
+int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
 	struct lttng_kernel_abi_event_callsite __user *callsite);
 
 #ifdef CONFIG_UPROBES
 int lttng_uprobes_register_event(const char *name,
 	int fd, struct lttng_kernel_event_recorder *event);
-int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_recorder *event,
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
 	struct lttng_kernel_abi_event_callsite __user *callsite);
 void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event);
 void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
 int lttng_uprobes_register_event_notifier(const char *name,
 	int fd, struct lttng_kernel_event_notifier *event_notifier);
-int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
-	struct lttng_kernel_abi_event_callsite __user *callsite);
 void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
 void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
 #else
@@ -1359,7 +1341,7 @@ int lttng_uprobes_register_event(const char *name,
 }
 
 static inline
-int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_recorder *event,
+int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
 	struct lttng_kernel_abi_event_callsite __user *callsite)
 {
 	return -ENOSYS;
@@ -1382,13 +1364,6 @@ int lttng_uprobes_register_event_notifier(const char *name,
 	return -ENOSYS;
 }
 
-static inline
-int lttng_uprobes_event_notifier_add_callsite(struct lttng_kernel_event_notifier *event_notifier,
-	struct lttng_kernel_abi_event_callsite __user *callsite)
-{
-	return -ENOSYS;
-}
-
 static inline
 void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
 {
@@ -1409,7 +1384,7 @@ int lttng_kretprobes_register(const char *name,
 		struct lttng_kernel_event_recorder *event_exit);
 void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event);
 void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event);
-int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_recorder *event,
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
 	int enable);
 #else
 static inline
@@ -1434,7 +1409,7 @@ void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event)
 }
 
 static inline
-int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_recorder *event,
+int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
 	int enable)
 {
 	return -ENOSYS;