X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=7fa41ac18d1664b7d409cd287d7202cd6af53418;hb=3b82c4e1b18900cc7ad4045b9173cabfaa498852;hp=f4c9212c4384fe58462948f7af869f702adee919;hpb=60206944ca1ab9c7b2c8519324e07e1a76a8f936;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index f4c9212c..7fa41ac1 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -234,6 +234,7 @@ enum lttng_event_type {
 
 enum lttng_bytecode_node_type {
 	LTTNG_BYTECODE_NODE_TYPE_FILTER,
+	LTTNG_BYTECODE_NODE_TYPE_CAPTURE,
 };
 
 struct lttng_bytecode_node {
@@ -257,6 +258,8 @@ enum lttng_bytecode_interpreter_ret {
 	/* Other bits are kept for future use. */
 };
 
+struct lttng_interpreter_output;
+
 struct lttng_bytecode_runtime {
 	/* Associated bytecode */
 	struct lttng_bytecode_node *bc;
@@ -264,6 +267,10 @@ struct lttng_bytecode_runtime {
 		uint64_t (*filter)(void *filter_data,
 				struct lttng_probe_ctx *lttng_probe_ctx,
 				const char *filter_stack_data);
+		uint64_t (*capture)(void *filter_data,
+				struct lttng_probe_ctx *lttng_probe_ctx,
+				const char *capture_stack_data,
+				struct lttng_interpreter_output *output);
 	} interpreter_funcs;
 	int link_failed;
 	struct list_head node;	/* list of bytecode runtime in event */
@@ -331,6 +338,7 @@ struct lttng_event {
 		struct {
 			enum lttng_syscall_entryexit entryexit;
 			enum lttng_syscall_abi abi;
+			struct hlist_node node;			/* chain registered syscall event */
 		} syscall;
 	} u;
 	struct list_head list;		/* Event list in session */
@@ -349,6 +357,7 @@ struct lttng_event {
 struct lttng_event_notifier {
 	enum lttng_event_type evtype;	/* First field. */
 	uint64_t user_token;
+	uint64_t error_counter_index;
 	int enabled;
 	int registered;			/* has reg'd tracepoint probe */
 	const struct lttng_event_desc *desc;
@@ -373,9 +382,13 @@ struct lttng_event_notifier {
 	struct hlist_node hlist;	/* session ht of event_notifiers */
 	/* list of struct lttng_bytecode_runtime, sorted by seqnum */
 	struct list_head filter_bytecode_runtime_head;
+	size_t num_captures;
+	struct list_head capture_bytecode_runtime_head;
 	int has_enablers_without_bytecode;
 
-	void (*send_notification)(struct lttng_event_notifier *event_notifier);
+	void (*send_notification)(struct lttng_event_notifier *event_notifier,
+			struct lttng_probe_ctx *lttng_probe_ctx,
+			const char *interpreter_stack_data);
 	struct lttng_event_notifier_group *group; /* Weak ref */
 };
 
@@ -393,7 +406,7 @@ struct lttng_enabler {
 
 	enum lttng_enabler_format_type format_type;
 
-	/* head list of struct lttng_ust_filter_bytecode_node */
+	/* head list of struct lttng_bytecode_node */
 	struct list_head filter_bytecode_head;
 
 	struct lttng_kernel_event event_param;
@@ -415,10 +428,16 @@ struct lttng_event_enabler {
 
 struct lttng_event_notifier_enabler {
 	struct lttng_enabler base;
+	uint64_t error_counter_index;
 	struct list_head node;	/* List of event_notifier enablers */
 	struct lttng_event_notifier_group *group;
+
+	/* head list of struct lttng_bytecode_node */
+	struct list_head capture_bytecode_head;
+	uint64_t num_captures;
 };
 
+
 static inline
 struct lttng_enabler *lttng_event_enabler_as_enabler(
 		struct lttng_event_enabler *event_enabler)
@@ -496,6 +515,28 @@ struct lttng_channel_ops {
 			uint64_t *id);
 };
 
+struct lttng_counter_ops {
+	struct lib_counter *(*counter_create)(size_t nr_dimensions,
+			const size_t *max_nr_elem,	/* for each dimension */
+			int64_t global_sum_step);
+	void (*counter_destroy)(struct lib_counter *counter);
+	int (*counter_add)(struct lib_counter *counter, const size_t *dimension_indexes,
+			int64_t v);
+	/*
+	 * counter_read reads a specific cpu's counter if @cpu >= 0, or
+	 * the global aggregation counter if @cpu == -1.
+	 */
+	int (*counter_read)(struct lib_counter *counter, const size_t *dimension_indexes, int cpu,
+			 int64_t *value, bool *overflow, bool *underflow);
+	/*
+	 * counter_aggregate returns the total sum of all per-cpu counters and
+	 * the global aggregation counter.
+	 */
+	int (*counter_aggregate)(struct lib_counter *counter, const size_t *dimension_indexes,
+			int64_t *value, bool *overflow, bool *underflow);
+	int (*counter_clear)(struct lib_counter *counter, const size_t *dimension_indexes);
+};
+
 struct lttng_transport {
 	char *name;
 	struct module *owner;
@@ -503,6 +544,13 @@ struct lttng_transport {
 	struct lttng_channel_ops ops;
 };
 
+struct lttng_counter_transport {
+	char *name;
+	struct module *owner;
+	struct list_head node;
+	struct lttng_counter_ops ops;
+};
+
 struct lttng_syscall_filter;
 
 #define LTTNG_EVENT_HT_BITS		12
@@ -531,18 +579,19 @@ struct lttng_channel {
 	struct list_head list;		/* Channel list */
 	struct lttng_channel_ops *ops;
 	struct lttng_transport *transport;
-	struct lttng_event **sc_table;	/* for syscall tracing */
-	struct lttng_event **compat_sc_table;
-	struct lttng_event **sc_exit_table;	/* for syscall exit tracing */
-	struct lttng_event **compat_sc_exit_table;
-	struct lttng_event *sc_unknown;	/* for unknown syscalls */
-	struct lttng_event *sc_compat_unknown;
-	struct lttng_event *sc_exit_unknown;
-	struct lttng_event *compat_sc_exit_unknown;
+	struct hlist_head *sc_table;	/* for syscall tracing */
+	struct hlist_head *compat_sc_table;
+	struct hlist_head *sc_exit_table;	/* for syscall exit tracing */
+	struct hlist_head *compat_sc_exit_table;
+	struct hlist_head sc_unknown;	/* for unknown syscalls */
+	struct hlist_head sc_compat_unknown;
+	struct hlist_head sc_exit_unknown;
+	struct hlist_head compat_sc_exit_unknown;
 	struct lttng_syscall_filter *sc_filter;
 	int header_type;		/* 0: unset, 1: compact, 2: large */
 	enum channel_type channel_type;
-	int syscall_all;
+	int syscall_all_entry;
+	int syscall_all_exit;
 	unsigned int metadata_dumped:1,
 		sys_enter_registered:1,
 		sys_exit_registered:1,
@@ -630,6 +679,14 @@ struct lttng_session {
 	char creation_time[LTTNG_KERNEL_SESSION_CREATION_TIME_ISO8601_LEN];
 };
 
+struct lttng_counter {
+	struct file *file;		/* File associated to counter. */
+	struct file *owner;
+	struct lttng_counter_transport *transport;
+	struct lib_counter *counter;
+	struct lttng_counter_ops *ops;
+};
+
 struct lttng_event_notifier_group {
 	struct file *file;		/* File associated to event notifier group */
 	struct file *notif_file;	/* File used to expose notifications to userspace. */
@@ -714,7 +771,23 @@ int lttng_session_metadata_regenerate(struct lttng_session *session);
 int lttng_session_statedump(struct lttng_session *session);
 void metadata_cache_destroy(struct kref *kref);
 
+struct lttng_counter *lttng_kernel_counter_create(
+		const char *counter_transport_name, size_t number_dimensions,
+		const size_t *dimensions_sizes);
+int lttng_kernel_counter_read(struct lttng_counter *counter,
+		const size_t *dimension_indexes, int32_t cpu,
+		int64_t *val, bool *overflow, bool *underflow);
+int lttng_kernel_counter_aggregate(struct lttng_counter *counter,
+		const size_t *dimension_indexes, int64_t *val,
+		bool *overflow, bool *underflow);
+int lttng_kernel_counter_clear(struct lttng_counter *counter,
+		const size_t *dimension_indexes);
+
+
 struct lttng_event_notifier_group *lttng_event_notifier_group_create(void);
+int lttng_event_notifier_group_create_error_counter(
+		struct file *event_notifier_group_file,
+		const struct lttng_kernel_counter_conf *error_counter_conf);
 void lttng_event_notifier_group_destroy(
 		struct lttng_event_notifier_group *event_notifier_group);
 
@@ -750,6 +823,7 @@ struct lttng_event *lttng_event_compat_old_create(struct lttng_channel *chan,
 struct lttng_event_notifier *lttng_event_notifier_create(
 				const struct lttng_event_desc *event_notifier_desc,
 				uint64_t id,
+				uint64_t error_counter_idx,
 				struct lttng_event_notifier_group *event_notifier_group,
 				struct lttng_kernel_event_notifier *event_notifier_param,
 				void *filter,
@@ -757,6 +831,7 @@ struct lttng_event_notifier *lttng_event_notifier_create(
 struct lttng_event_notifier *_lttng_event_notifier_create(
 				const struct lttng_event_desc *event_notifier_desc,
 				uint64_t id,
+				uint64_t error_counter_idx,
 				struct lttng_event_notifier_group *event_notifier_group,
 				struct lttng_kernel_event_notifier *event_notifier_param,
 				void *filter,
@@ -773,6 +848,9 @@ int lttng_event_notifier_disable(struct lttng_event_notifier *event_notifier);
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
 
+void lttng_counter_transport_register(struct lttng_counter_transport *transport);
+void lttng_counter_transport_unregister(struct lttng_counter_transport *transport);
+
 void synchronize_trace(void);
 int lttng_abi_init(void);
 int lttng_abi_compat_old_init(void);
@@ -811,8 +889,8 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 		struct lttng_enabler *enabler);
 
 #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS)
-int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter);
-int lttng_syscalls_unregister_event(struct lttng_channel *chan);
+int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, void *filter);
+int lttng_syscalls_unregister_channel(struct lttng_channel *chan);
 int lttng_syscalls_destroy_event(struct lttng_channel *chan);
 int lttng_syscall_filter_enable_event(
 		struct lttng_channel *chan,
@@ -829,17 +907,17 @@ int lttng_syscalls_register_event_notifier(
 		void *filter);
 int lttng_syscals_create_matching_event_notifiers(
 		struct lttng_event_notifier_enabler *event_notifier_enabler, void *filter);
-int lttng_syscalls_unregister_event_notifier(struct lttng_event_notifier_group *group);
+int lttng_syscalls_unregister_event_notifier_group(struct lttng_event_notifier_group *group);
 int lttng_syscall_filter_enable_event_notifier(struct lttng_event_notifier *event_notifier);
 int lttng_syscall_filter_disable_event_notifier(struct lttng_event_notifier *event_notifier);
 #else
 static inline int lttng_syscalls_register_event(
-		struct lttng_channel *chan, void *filter)
+		struct lttng_event_enabler *event_enabler, void *filter)
 {
 	return -ENOSYS;
 }
 
-static inline int lttng_syscalls_unregister_event(struct lttng_channel *chan)
+static inline int lttng_syscalls_unregister_channel(struct lttng_channel *chan)
 {
 	return 0;
 }
@@ -873,7 +951,7 @@ static inline int lttng_syscalls_register_event_notifier(
 	return -ENOSYS;
 }
 
-static inline int lttng_syscalls_unregister_event_notifier(
+static inline int lttng_syscalls_unregister_event_notifier_group(
 		struct lttng_event_notifier_group *group)
 {
 	return 0;
@@ -900,6 +978,9 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event
 int lttng_event_notifier_enabler_attach_filter_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
 		struct lttng_kernel_filter_bytecode __user *bytecode);
+int lttng_event_notifier_enabler_attach_capture_bytecode(
+		struct lttng_event_notifier_enabler *event_notifier_enabler,
+		struct lttng_kernel_capture_bytecode __user *bytecode);
 
 void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
 		struct lttng_ctx *ctx,