X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents.h;h=9cc552bc97add3f0d4e56d6938652f88abf20d2b;hb=4a399b764e79f280a434da2201a5c3e30490aa9e;hp=942622fabc6a0c91a785156a70a7e7d95d4bb9b9;hpb=e4a26d6bbfd9693708d9ae988827b576460c3741;p=lttng-modules.git

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 942622fa..9cc552bc 100644
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -316,35 +316,6 @@ struct lttng_kernel_probe_desc {
 	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.
  */
@@ -400,17 +371,9 @@ 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);
+struct lttng_kernel_channel_buffer_ops {
+	struct lttng_kernel_channel_buffer_ops_private *priv;	/* Private channel buffer ops interface. */
+
 	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,
@@ -423,43 +386,6 @@ struct lttng_channel_ops {
 			     size_t len);
 	void (*event_strcpy_from_user)(struct lib_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 {
@@ -488,7 +414,7 @@ struct lttng_transport {
 	char *name;
 	struct module *owner;
 	struct list_head node;
-	struct lttng_channel_ops ops;
+	struct lttng_kernel_channel_buffer_ops ops;
 };
 
 struct lttng_counter_transport {
@@ -524,7 +450,7 @@ struct lttng_channel {
 	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_kernel_channel_buffer_ops *ops;
 	struct lttng_transport *transport;
 	struct hlist_head *sc_table;	/* for syscall tracing */
 	struct hlist_head *compat_sc_table;
@@ -641,7 +567,7 @@ struct lttng_event_notifier_group {
 	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_kernel_channel_buffer_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. */
@@ -671,154 +597,9 @@ struct lttng_event_notifier_group {
 	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);
+int lttng_kernel_probe_register(struct lttng_kernel_probe_desc *desc);
+void lttng_kernel_probe_unregister(struct lttng_kernel_probe_desc *desc);
 
-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);
-
-int lttng_calibrate(struct lttng_kernel_abi_calibrate *calibrate);
-
-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_id_tracker_rcu *p, int id);
 
 #endif /* _LTTNG_EVENTS_H */