X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-events.h;h=ab90bad3d842ed892847184852de4140115cddf9;hb=e763dbf5b5b1db76b2ee59ca72b2e5034bc47663;hp=d205cdb079ecfc88858b2b45270f0f5b118bb013;hpb=4e3c1b9b19e384d42f060576673d4c3f5453e8cb;p=lttng-modules.git

diff --git a/ltt-events.h b/ltt-events.h
index d205cdb0..ab90bad3 100644
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -1,3 +1,6 @@
+#ifndef _LTT_EVENTS_H
+#define _LTT_EVENTS_H
+
 /*
  * ltt-events.h
  *
@@ -7,9 +10,11 @@
  */
 
 #include <linux/list.h>
+#include "ltt-debugfs-abi.h"
 
 struct ltt_channel;
 struct ltt_session;
+struct lib_ring_buffer_ctx;
 
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
@@ -18,37 +23,77 @@ struct ltt_session;
 struct ltt_event {
 	unsigned int id;
 	struct ltt_channel *chan;
+	void *probe;
 	void *filter;
 	char *name;
+	enum instrum_type itype;
 	struct list_head list;		/* Event list */
 };
 
+struct ltt_channel_ops {
+	struct channel *(*channel_create)(const char *name,
+				struct ltt_session *session,
+				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);
+	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);
+};
+
 struct ltt_channel {
 	struct channel *chan;		/* Channel buffers */
 	/* Event ID management */
 	struct ltt_session *session;
-	atomic_t free_event_id;		/* Next event ID to allocate */
+	struct file *file;		/* File associated to channel */
+	unsigned int free_event_id;	/* Next event ID to allocate */
 	struct list_head list;		/* Channel list */
-	char name[PATH_MAX];
+	wait_queue_head_t notify_wait;	/* Channel addition notif. waitqueue */
+	struct ltt_channel_ops *ops;
 };
 
 struct ltt_session {
+	int active;			/* Is trace session 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 */
-	char name[PATH_MAX];
 };
 
-struct ltt_session *ltt_session_create(char *name);
-int ltt_session_destroy(struct ltt_session *session);
+struct ltt_transport {
+	char *name;
+	struct module *owner;
+	struct list_head node;
+	struct ltt_channel_ops ops;
+};
 
-struct ltt_channel *ltt_channel_create(struct ltt_session *session, char *name,
+struct ltt_session *ltt_session_create(void);
+int ltt_session_start(struct ltt_session *session);
+int ltt_session_stop(struct ltt_session *session);
+void ltt_session_destroy(struct ltt_session *session);
+
+struct ltt_channel *ltt_channel_create(struct ltt_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);
-int _ltt_channel_destroy(struct ltt_channel *chan);
+void _ltt_channel_destroy(struct ltt_channel *chan);
 
-struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
-				   void *filter);
+struct ltt_event *ltt_event_create(struct ltt_channel *chan,
+				   char *name,
+				   enum instrum_type itype,
+				   void *probe, void *filter);
 int _ltt_event_destroy(struct ltt_event *event);
+
+void ltt_transport_register(struct ltt_transport *transport);
+void ltt_transport_unregister(struct ltt_transport *transport);
+
+int ltt_debugfs_abi_init(void);
+void ltt_debugfs_abi_exit(void);
+
+#endif /* _LTT_EVENTS_H */