X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=b4c5372ae1f9266e9e851992f33059d7544bea90;hb=99f52fcce5865809584c1e022bca1409702ea292;hp=80de505056fe8a265d06c02f43717c92934fc0ea;hpb=99d223adfae9b68800e91bda470c92acb14efae6;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 80de5050..b4c5372a 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -356,6 +356,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;
@@ -426,6 +427,7 @@ 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;
 
@@ -512,6 +514,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;
@@ -519,6 +543,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
@@ -646,6 +677,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. */
@@ -730,7 +769,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);
 
@@ -766,6 +821,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,
@@ -773,6 +829,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,
@@ -789,6 +846,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);