X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt-events.h;h=9e0ad2d74784c6696be40827e9dce816b1ae4a34;hb=c0edae1dda4cc03efda4790b57db0c3f9684486f;hp=165e616ac8306f20992f4e494da045441bfb97a4;hpb=baf2099544522f85e52c830b13aa45601ff15204;p=lttng-modules.git

diff --git a/ltt-events.h b/ltt-events.h
index 165e616a..9e0ad2d7 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,13 +10,11 @@
  */
 
 #include <linux/list.h>
+#include "ltt-debugfs-abi.h"
 
 struct ltt_channel;
 struct ltt_session;
-
-enum instrum_type itype {
-	INSTRUM_TRACEPOINTS,
-};
+struct lib_ring_buffer_ctx;
 
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
@@ -29,33 +30,155 @@ struct ltt_event {
 	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;
+	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_transport {
+	char *name;
+	struct module *owner;
+	struct list_head node;
+	struct ltt_channel_ops ops;
+};
+
+/* Type description */
+
+/* Update the astract_types name table in lttng-types.c along with this enum */
+enum abstract_types {
+	atype_integer,
+	atype_enum,
+	atype_array,
+	atype_sequence,
+	atype_string,
+	NR_ABSTRACT_TYPES,
+};
+
+/* Update the string_encodings name table in lttng-types.c along with this enum */
+enum lttng_string_encodings {
+	lttng_encode_UTF8 = 0,
+	lttng_encode_ASCII = 1,
+	NR_STRING_ENCODINGS,
+};
+
+struct lttng_enum_entry {
+	unsigned long long start, end;	/* start and end are inclusive */
+	const char *string;
+};
+
+struct lttng_enum {
+	const struct lttng_enum_entry *entries;
+	unsigned int len;
+};
+
+struct lttng_type {
+	enum abstract_types atype;
+	const char *name;
+	union {
+		struct {
+			unsigned int size;		/* in bits */
+			unsigned short alignment;	/* in bits */
+			unsigned int signedness:1;
+			unsigned int reverse_byte_order:1;
+		} integer;
+		struct {
+			const char *parent_type;
+			const struct lttng_enum def;
+		} enumeration;
+		struct {
+			const char *elem_type;
+			unsigned int length;		/* num. elems. */
+		} array;
+		struct {
+			const char *elem_type;
+			const char *length_type;
+		} sequence;
+		struct {
+			enum lttng_string_encodings encoding;
+		} string;
+	} u;
+} __attribute__((packed));
+
+/* Event field description */
+
+struct lttng_event_field {
+	const char *name;
+	const struct lttng_type type;
+};
+
+struct lttng_event_desc {
+	const struct lttng_event_field *fields;
+	const char *name;
+	void *probe_callback;
+	unsigned int nr_fields;
 };
 
 struct ltt_session *ltt_session_create(void);
-int ltt_session_destroy(struct ltt_session *session);
+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,
+				       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);
+struct ltt_channel *ltt_global_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,
+				   enum instrum_type itype,
+				   void *probe, void *filter);
+int _ltt_event_unregister(struct ltt_event *event);
+void _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);
+
+int ltt_probe_register(const char *name, void *cb);
+void ltt_probe_unregister(const char *name);
+void *ltt_probe_get(const char *name);
+void ltt_probe_put(void *cb);
+int ltt_probes_init(void);
+void ltt_probes_exit(void);
 
-struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
-				   void *filter);
-int _ltt_event_destroy(struct ltt_event *event);
+#endif /* _LTT_EVENTS_H */