X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=9d07d7ed08f0c96cbe8546859f62aa231278cf92;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=676d2869cbfa47c28050ee3a22f3d2200a6ab6bf;hpb=220fc9f4831368d5fe6a2c5d18c2b653c8c068e0;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 676d2869..9d07d7ed 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -25,13 +25,9 @@
 
 #define lttng_is_signed_type(type)	(((type) -1) < (type) 1)
 
-struct lttng_channel;
-struct lttng_session;
-struct lttng_metadata_cache;
-struct lib_ring_buffer_ctx;
-struct perf_event;
-struct perf_event_attr;
-struct lib_ring_buffer_config;
+struct lttng_kernel_channel_buffer;
+struct lttng_kernel_session;
+struct lttng_kernel_ring_buffer_ctx;
 
 /* Type description */
 
@@ -53,11 +49,6 @@ enum lttng_kernel_string_encoding {
 	NR_LTTNG_KERNEL_STRING_ENCODING,
 };
 
-enum channel_type {
-	PER_CPU_CHANNEL,
-	METADATA_CHANNEL,
-};
-
 struct lttng_kernel_enum_value {
 	unsigned long long value;
 	unsigned int signedness:1;
@@ -118,22 +109,23 @@ struct lttng_kernel_type_sequence {
 struct lttng_kernel_type_struct {
 	struct lttng_kernel_type_common parent;
 	unsigned int nr_fields;
-	const struct lttng_kernel_event_field **fields;	/* Array of pointers to fields. */
+	const struct lttng_kernel_event_field * const *fields;	/* Array of pointers to fields. */
 	unsigned int alignment;
 };
 
 struct lttng_kernel_type_variant {
 	struct lttng_kernel_type_common parent;
 	const char *tag_name;		/* Tag field name. If NULL, use previous field. */
-	const struct lttng_kernel_event_field **choices; /* Array of pointers to fields. */
+	const struct lttng_kernel_event_field * const *choices; /* Array of pointers to fields. */
 	unsigned int nr_choices;
 	unsigned int alignment;
 };
 
 struct lttng_kernel_enum_desc {
 	const char *name;
-	const struct lttng_kernel_enum_entry **entries;
+	const struct lttng_kernel_enum_entry * const *entries;
 	unsigned int nr_entries;
+	const struct lttng_kernel_probe_desc *probe_desc;
 };
 
 /* Event field description */
@@ -146,6 +138,10 @@ struct lttng_kernel_event_field {
 			nofilter:1;	/* do not consider for filter */
 };
 
+#ifndef PARAMS
+#define PARAMS(args...)	args
+#endif
+
 #define lttng_kernel_static_type_integer(_size, _alignment, _signedness, _byte_order, _base)		\
 	((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_integer, { \
 		.parent = {										\
@@ -211,15 +207,20 @@ struct lttng_kernel_event_field {
 		.encoding = lttng_kernel_string_encoding_##_encoding,					\
 	}))
 
-#define lttng_kernel_static_type_struct(_nr_fields, _fields, _alignment)				\
-	((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_struct, { \
+#define lttng_kernel_static_type_struct_init(_nr_fields, _fields, _alignment)				\
+	{												\
 		.parent = {										\
 			.type = lttng_kernel_type_struct,						\
 		},											\
 		.nr_fields = (_nr_fields),								\
 		.fields = _fields,									\
 		.alignment = (_alignment),								\
-	}))
+	}
+
+#define lttng_kernel_static_type_struct(_nr_fields, _fields, _alignment)				\
+	((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_struct, \
+		lttng_kernel_static_type_struct_init(_nr_fields, PARAMS(_fields), _alignment)			\
+	))
 
 #define lttng_kernel_static_type_variant(_nr_choices, _choices, _tag_name, _alignment)			\
 	((const struct lttng_kernel_type_common *) __LTTNG_COMPOUND_LITERAL(const struct lttng_kernel_type_variant, { \
@@ -297,54 +298,30 @@ struct lttng_kernel_probe_ctx {
 	uint8_t interruptible;
 };
 
+struct lttng_kernel_tracepoint_class {
+	void (*probe_callback)(void);
+	const struct lttng_kernel_event_field * const *fields;	/* event payload */
+	unsigned int nr_fields;
+	const struct lttng_kernel_probe_desc *probe_desc;
+};
+
 struct lttng_kernel_event_desc {
 	const char *event_name;		/* lttng-modules name */
 	const char *event_kname;	/* Linux kernel name (tracepoints) */
 	const struct lttng_kernel_probe_desc *probe_desc;
-	void (*probe_callback)(void);
-	const struct lttng_kernel_event_field **fields;	/* event payload */
-	unsigned int nr_fields;
+	const struct lttng_kernel_tracepoint_class *tp_class;
 	struct module *owner;
 };
 
 struct lttng_kernel_probe_desc {
 	const char *provider_name;
-	const struct lttng_kernel_event_desc **event_desc;
+	const struct lttng_kernel_event_desc * const *event_desc;
 	unsigned int nr_events;
 	struct list_head head;			/* chain registered probes */
 	struct list_head lazy_init_head;
 	int lazy;				/* lazy registration */
 };
 
-struct lttng_krp;				/* Kretprobe handling */
-
-struct lttng_uprobe_handler {
-	struct lttng_kernel_event_common *event;
-	loff_t offset;
-	struct uprobe_consumer up_consumer;
-	struct list_head node;
-};
-
-struct lttng_kprobe {
-	struct kprobe kp;
-	char *symbol_name;
-};
-
-struct lttng_uprobe {
-	struct inode *inode;
-	struct list_head head;
-};
-
-enum lttng_syscall_entryexit {
-	LTTNG_SYSCALL_ENTRY,
-	LTTNG_SYSCALL_EXIT,
-};
-
-enum lttng_syscall_abi {
-	LTTNG_SYSCALL_ABI_NATIVE,
-	LTTNG_SYSCALL_ABI_COMPAT,
-};
-
 /*
  * Result of the run_filter() callback.
  */
@@ -380,7 +357,7 @@ struct lttng_kernel_event_recorder {
 	struct lttng_kernel_event_common parent;
 	struct lttng_kernel_event_recorder_private *priv;	/* Private event record interface */
 
-	struct lttng_channel *chan;
+	struct lttng_kernel_channel_buffer *chan;
 };
 
 struct lttng_kernel_notification_ctx {
@@ -400,162 +377,47 @@ struct lttng_kernel_event_notifier {
 		struct lttng_kernel_notification_ctx *notif_ctx);
 };
 
-struct lttng_channel_ops {
-	struct channel *(*channel_create)(const char *name,
-				void *priv,
-				void *buf_addr,
-				size_t subbuf_size, size_t num_subbuf,
-				unsigned int switch_timer_interval,
-				unsigned int read_timer_interval);
-	void (*channel_destroy)(struct channel *chan);
-	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);
-	void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
-	void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
-			    size_t len);
-	void (*event_write_from_user)(struct lib_ring_buffer_ctx *ctx,
-				      const void *src, size_t len);
-	void (*event_memset)(struct lib_ring_buffer_ctx *ctx,
+struct lttng_kernel_channel_buffer_ops {
+	struct lttng_kernel_channel_buffer_ops_private *priv;	/* Private channel buffer ops interface. */
+
+	int (*event_reserve)(struct lttng_kernel_ring_buffer_ctx *ctx);
+	void (*event_commit)(struct lttng_kernel_ring_buffer_ctx *ctx);
+	void (*event_write)(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
+			    size_t len, size_t alignment);
+	void (*event_write_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
+				      const void *src, size_t len, size_t alignment);
+	void (*event_memset)(struct lttng_kernel_ring_buffer_ctx *ctx,
 			     int c, size_t len);
-	void (*event_strcpy)(struct lib_ring_buffer_ctx *ctx, const char *src,
+	void (*event_strcpy)(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
 			     size_t len);
-	void (*event_strcpy_from_user)(struct lib_ring_buffer_ctx *ctx,
+	void (*event_strcpy_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
 				       const char __user *src, size_t len);
-	/*
-	 * packet_avail_size returns the available size in the current
-	 * packet. Note that the size returned is only a hint, since it
-	 * may change due to concurrent writes.
-	 */
-	size_t (*packet_avail_size)(struct channel *chan);
-	wait_queue_head_t *(*get_writer_buf_wait_queue)(struct channel *chan, int cpu);
-	wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan);
-	int (*is_finalized)(struct channel *chan);
-	int (*is_disabled)(struct channel *chan);
-	int (*timestamp_begin) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *timestamp_begin);
-	int (*timestamp_end) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *timestamp_end);
-	int (*events_discarded) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *events_discarded);
-	int (*content_size) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *content_size);
-	int (*packet_size) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *packet_size);
-	int (*stream_id) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *stream_id);
-	int (*current_timestamp) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *ts);
-	int (*sequence_number) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			uint64_t *seq);
-	int (*instance_id) (const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer *bufb,
-			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;
-	struct list_head node;
-	struct lttng_channel_ops ops;
+	void (*lost_event_too_big)(struct lttng_kernel_channel_buffer *lttng_channel);
 };
 
-struct lttng_counter_transport {
-	char *name;
-	struct module *owner;
-	struct list_head node;
-	struct lttng_counter_ops ops;
+enum lttng_kernel_channel_type {
+	LTTNG_KERNEL_CHANNEL_TYPE_BUFFER = 0,
 };
 
-struct lttng_syscall_filter;
+struct lttng_kernel_channel_common_private;
+
+/* Use container_of() to get child. */
+struct lttng_kernel_channel_common {
+	struct lttng_kernel_channel_common_private *priv;	/* Private channel interface. */
 
-#define LTTNG_EVENT_HT_BITS		12
-#define LTTNG_EVENT_HT_SIZE		(1U << LTTNG_EVENT_HT_BITS)
+	enum lttng_kernel_channel_type type;
 
-struct lttng_event_ht {
-	struct hlist_head table[LTTNG_EVENT_HT_SIZE];
+	int enabled;
+	struct lttng_kernel_session *session;
 };
 
-#define LTTNG_EVENT_NOTIFIER_HT_BITS		12
-#define LTTNG_EVENT_NOTIFIER_HT_SIZE		(1U << LTTNG_EVENT_NOTIFIER_HT_BITS)
+struct lttng_kernel_channel_buffer_private;
 
-struct lttng_event_notifier_ht {
-	struct hlist_head table[LTTNG_EVENT_NOTIFIER_HT_SIZE];
-};
+struct lttng_kernel_channel_buffer {
+	struct lttng_kernel_channel_common parent;
+	struct lttng_kernel_channel_buffer_private *priv;
 
-struct lttng_channel {
-	unsigned int id;
-	struct channel *chan;		/* Channel buffers */
-	int enabled;
-	struct lttng_kernel_ctx *ctx;
-	/* Event ID management */
-	struct lttng_session *session;
-	struct file *file;		/* File associated to channel */
-	unsigned int free_event_id;	/* Next event ID to allocate */
-	struct list_head list;		/* Channel list */
-	struct lttng_channel_ops *ops;
-	struct lttng_transport *transport;
-	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_entry;
-	int syscall_all_exit;
-	unsigned int metadata_dumped:1,
-		sys_enter_registered:1,
-		sys_exit_registered:1,
-		tstate:1;		/* Transient enable state */
-};
-
-struct lttng_metadata_stream {
-	void *priv;			/* Ring buffer private data */
-	struct lttng_metadata_cache *metadata_cache;
-	unsigned int metadata_in;	/* Bytes read from the cache */
-	unsigned int metadata_out;	/* Bytes consumed from stream */
-	int finalized;			/* Has channel been finalized */
-	wait_queue_head_t read_wait;	/* Reader buffer-level wait queue */
-	struct list_head list;		/* Stream list */
-	struct lttng_transport *transport;
-	uint64_t version;		/* Current version of the metadata cache */
-	bool coherent;			/* Stream in a coherent state */
+	struct lttng_kernel_channel_buffer_ops *ops;
 };
 
 #define LTTNG_DYNAMIC_LEN_STACK_SIZE	128
@@ -568,410 +430,40 @@ struct lttng_dynamic_len_stack {
 DECLARE_PER_CPU(struct lttng_dynamic_len_stack, lttng_dynamic_len_stack);
 
 /*
- * struct lttng_id_tracker declared in header due to deferencing of *v
+ * struct lttng_kernel_id_tracker declared in header due to deferencing of *v
  * in RCU_INITIALIZER(v).
  */
 #define LTTNG_ID_HASH_BITS	6
 #define LTTNG_ID_TABLE_SIZE	(1 << LTTNG_ID_HASH_BITS)
 
-enum tracker_type {
-	TRACKER_PID,
-	TRACKER_VPID,
-	TRACKER_UID,
-	TRACKER_VUID,
-	TRACKER_GID,
-	TRACKER_VGID,
-
-	TRACKER_UNKNOWN,
-};
-
-struct lttng_id_tracker_rcu {
+struct lttng_kernel_id_tracker_rcu {
 	struct hlist_head id_hash[LTTNG_ID_TABLE_SIZE];
 };
 
-struct lttng_id_tracker {
-	struct lttng_session *session;
-	enum tracker_type tracker_type;
-	struct lttng_id_tracker_rcu *p;	/* RCU dereferenced. */
-};
+struct lttng_kernel_id_tracker {
+	struct lttng_kernel_id_tracker_private *priv;	/* Private API */
 
-struct lttng_id_hash_node {
-	struct hlist_node hlist;
-	int id;
+	struct lttng_kernel_id_tracker_rcu *p;	/* RCU dereferenced. */
 };
 
-struct lttng_session {
-	int active;			/* Is trace session active ? */
-	int been_active;		/* Has trace session been active ? */
-	struct file *file;		/* File associated to session */
-	struct list_head chan;		/* Channel list head */
-	struct list_head events;	/* Event list head */
-	struct list_head list;		/* Session list */
-	unsigned int free_chan_id;	/* Next chan ID to allocate */
-	uuid_le uuid;			/* Trace session unique ID */
-	struct lttng_metadata_cache *metadata_cache;
-	struct lttng_id_tracker pid_tracker;
-	struct lttng_id_tracker vpid_tracker;
-	struct lttng_id_tracker uid_tracker;
-	struct lttng_id_tracker vuid_tracker;
-	struct lttng_id_tracker gid_tracker;
-	struct lttng_id_tracker vgid_tracker;
-	unsigned int metadata_dumped:1,
-		tstate:1;		/* Transient enable state */
-	/* List of event enablers */
-	struct list_head enablers_head;
-	/* Hash table of events */
-	struct lttng_event_ht events_ht;
-	char name[LTTNG_KERNEL_ABI_SESSION_NAME_LEN];
-	char creation_time[LTTNG_KERNEL_ABI_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. */
-	struct list_head node;		/* event notifier group list */
-	struct list_head enablers_head; /* List of enablers */
-	struct list_head event_notifiers_head; /* List of event notifier */
-	struct lttng_event_notifier_ht event_notifiers_ht; /* Hash table of event notifiers */
-	struct lttng_channel_ops *ops;
-	struct lttng_transport *transport;
-	struct channel *chan;		/* Ring buffer channel for event notifier group. */
-	struct lib_ring_buffer *buf;	/* Ring buffer for event notifier group. */
-	wait_queue_head_t read_wait;
-	struct irq_work wakeup_pending;	/* Pending wakeup irq work. */
-	struct lttng_kernel_event_notifier *sc_unknown;	/* for unknown syscalls */
-	struct lttng_kernel_event_notifier *sc_compat_unknown;
-
-	struct lttng_syscall_filter *sc_filter;
-
-	struct hlist_head *event_notifier_syscall_dispatch;
-	struct hlist_head *event_notifier_compat_syscall_dispatch;
-	struct hlist_head *event_notifier_exit_syscall_dispatch;
-	struct hlist_head *event_notifier_exit_compat_syscall_dispatch;
-
-	struct hlist_head event_notifier_unknown_syscall_dispatch;
-	struct hlist_head event_notifier_compat_unknown_syscall_dispatch;
-	struct hlist_head event_notifier_exit_unknown_syscall_dispatch;
-	struct hlist_head event_notifier_exit_compat_unknown_syscall_dispatch;
-
-	int syscall_all_entry;
-	int syscall_all_exit;
-
-	unsigned int sys_enter_registered:1, sys_exit_registered:1;
-
-	struct lttng_counter *error_counter;
-	size_t error_counter_len;
-};
-
-struct lttng_metadata_cache {
-	char *data;			/* Metadata cache */
-	unsigned int cache_alloc;	/* Metadata allocated size (bytes) */
-	unsigned int metadata_written;	/* Number of bytes written in metadata cache */
-	atomic_t producing;		/* Metadata being produced (incomplete) */
-	struct kref refcount;		/* Metadata cache usage */
-	struct list_head metadata_stream;	/* Metadata stream list */
-	uuid_le uuid;			/* Trace session unique ID (copy) */
-	struct mutex lock;		/* Produce/consume lock */
-	uint64_t version;		/* Current version of the metadata */
-};
-
-void lttng_lock_sessions(void);
-void lttng_unlock_sessions(void);
-
-struct list_head *lttng_get_probe_list_head(void);
-
-int lttng_fix_pending_events(void);
-int lttng_fix_pending_event_notifiers(void);
-int lttng_session_active(void);
-bool lttng_event_notifier_active(void);
-
-struct lttng_session *lttng_session_create(void);
-int lttng_session_enable(struct lttng_session *session);
-int lttng_session_disable(struct lttng_session *session);
-void lttng_session_destroy(struct lttng_session *session);
-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_abi_counter_conf *error_counter_conf);
-void lttng_event_notifier_group_destroy(
-		struct lttng_event_notifier_group *event_notifier_group);
-
-struct lttng_channel *lttng_channel_create(struct lttng_session *session,
-				       const char *transport_name,
-				       void *buf_addr,
-				       size_t subbuf_size, size_t num_subbuf,
-				       unsigned int switch_timer_interval,
-				       unsigned int read_timer_interval,
-				       enum channel_type channel_type);
-struct lttng_channel *lttng_global_channel_create(struct lttng_session *session,
-				       int overwrite, void *buf_addr,
-				       size_t subbuf_size, size_t num_subbuf,
-				       unsigned int switch_timer_interval,
-				       unsigned int read_timer_interval);
-
-void lttng_metadata_channel_destroy(struct lttng_channel *chan);
-struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_channel *chan,
-				struct lttng_kernel_abi_event *event_param,
-				const struct lttng_kernel_event_desc *event_desc,
-				enum lttng_kernel_abi_instrumentation itype);
-struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_channel *chan,
-				struct lttng_kernel_abi_event *event_param,
-				const struct lttng_kernel_event_desc *event_desc,
-				enum lttng_kernel_abi_instrumentation itype);
-struct lttng_kernel_event_recorder *lttng_event_compat_old_create(struct lttng_channel *chan,
-		struct lttng_kernel_abi_old_event *old_event_param,
-		const struct lttng_kernel_event_desc *internal_desc);
-
-struct lttng_kernel_event_notifier *lttng_event_notifier_create(
-				const struct lttng_kernel_event_desc *event_notifier_desc,
-				uint64_t id,
-				uint64_t error_counter_idx,
-				struct lttng_event_notifier_group *event_notifier_group,
-				struct lttng_kernel_abi_event_notifier *event_notifier_param,
-				enum lttng_kernel_abi_instrumentation itype);
-struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
-				const struct lttng_kernel_event_desc *event_notifier_desc,
-				uint64_t id,
-				uint64_t error_counter_idx,
-				struct lttng_event_notifier_group *event_notifier_group,
-				struct lttng_kernel_abi_event_notifier *event_notifier_param,
-				enum lttng_kernel_abi_instrumentation itype);
-
-int lttng_channel_enable(struct lttng_channel *channel);
-int lttng_channel_disable(struct lttng_channel *channel);
-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);
-
-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);
-void lttng_abi_exit(void);
-void lttng_abi_compat_old_exit(void);
-
-int lttng_probe_register(struct lttng_kernel_probe_desc *desc);
-void lttng_probe_unregister(struct lttng_kernel_probe_desc *desc);
-const struct lttng_kernel_event_desc *lttng_event_desc_get(const char *name);
-void lttng_event_desc_put(const struct lttng_kernel_event_desc *desc);
-int lttng_probes_init(void);
-void lttng_probes_exit(void);
-
-int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
-		struct channel *chan, bool *coherent);
-
-int lttng_id_tracker_get_node_id(const struct lttng_id_hash_node *node);
-int lttng_id_tracker_empty_set(struct lttng_id_tracker *lf);
-void lttng_id_tracker_destroy(struct lttng_id_tracker *lf, bool rcu);
-bool lttng_id_tracker_lookup(struct lttng_id_tracker_rcu *p, int id);
-int lttng_id_tracker_add(struct lttng_id_tracker *lf, int id);
-int lttng_id_tracker_del(struct lttng_id_tracker *lf, int id);
-
-int lttng_session_track_id(struct lttng_session *session,
-		enum tracker_type tracker_type, int id);
-int lttng_session_untrack_id(struct lttng_session *session,
-		enum tracker_type tracker_type, int id);
-
-int lttng_session_list_tracker_ids(struct lttng_session *session,
-		enum tracker_type tracker_type);
-
-void lttng_clock_ref(void);
-void lttng_clock_unref(void);
-
-void lttng_free_event_filter_runtime(struct lttng_kernel_event_common *event);
-
-int lttng_probes_init(void);
-
-int lttng_logger_init(void);
-void lttng_logger_exit(void);
-
-extern int lttng_statedump_start(struct lttng_session *session);
-
-#ifdef CONFIG_KPROBES
-int lttng_kprobes_register_event(const char *name,
-		const char *symbol_name,
-		uint64_t offset,
-		uint64_t addr,
-		struct lttng_kernel_event_recorder *event);
-void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event);
-void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
-int lttng_kprobes_register_event_notifier(const char *symbol_name,
-		uint64_t offset,
-		uint64_t addr,
-		struct lttng_kernel_event_notifier *event_notifier);
-void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
-#else
-static inline
-int lttng_kprobes_register_event(const char *name,
-		const char *symbol_name,
-		uint64_t offset,
-		uint64_t addr,
-		struct lttng_kernel_event_recorder *event)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-int lttng_kprobes_register_event_notifier(const char *symbol_name,
-		uint64_t offset,
-		uint64_t addr,
-		struct lttng_kernel_event_notifier *event_notifier)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
-{
-}
-
-static inline
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
-{
-}
-#endif
+struct lttng_kernel_session_private;
 
-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_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);
-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
-static inline
-int lttng_uprobes_register_event(const char *name,
-	int fd, struct lttng_kernel_event_recorder *event)
-{
-	return -ENOSYS;
-}
-
-static inline
-int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
-	struct lttng_kernel_abi_event_callsite __user *callsite)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-int lttng_uprobes_register_event_notifier(const char *name,
-	int fd, struct lttng_kernel_event_notifier *event_notifier)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
-{
-}
-
-static inline
-void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
-{
-}
-#endif
+struct lttng_kernel_session {
+	struct lttng_kernel_session_private *priv;	/* Private session interface */
 
-#ifdef CONFIG_KRETPROBES
-int lttng_kretprobes_register(const char *name,
-		const char *symbol_name,
-		uint64_t offset,
-		uint64_t addr,
-		struct lttng_kernel_event_recorder *event_entry,
-		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_common *event,
-	int enable);
-#else
-static inline
-int lttng_kretprobes_register(const char *name,
-		const char *symbol_name,
-		uint64_t offset,
-		uint64_t addr,
-		struct lttng_kernel_event_recorder *event_entry,
-		struct lttng_kernel_event_recorder *event_exit)
-{
-	return -ENOSYS;
-}
-
-static inline
-void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
-	int enable)
-{
-	return -ENOSYS;
-}
-#endif
+	int active;			/* Is trace session active ? */
+
+	struct lttng_kernel_id_tracker pid_tracker;
+	struct lttng_kernel_id_tracker vpid_tracker;
+	struct lttng_kernel_id_tracker uid_tracker;
+	struct lttng_kernel_id_tracker vuid_tracker;
+	struct lttng_kernel_id_tracker gid_tracker;
+	struct lttng_kernel_id_tracker vgid_tracker;
+};
 
-int lttng_calibrate(struct lttng_kernel_abi_calibrate *calibrate);
+int lttng_kernel_probe_register(struct lttng_kernel_probe_desc *desc);
+void lttng_kernel_probe_unregister(struct lttng_kernel_probe_desc *desc);
 
-extern const struct file_operations lttng_tracepoint_list_fops;
-extern const struct file_operations lttng_syscall_list_fops;
+bool lttng_id_tracker_lookup(struct lttng_kernel_id_tracker_rcu *p, int id);
 
 #endif /* _LTTNG_EVENTS_H */