X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-events.h;h=b9bb3bb95d8bba919729afabd17f135a76fe9791;hb=979133c547728a541098dd7051e1e72ab7631788;hp=344b6fd1e037b2bf73e0f173f975d1ff98646bbc;hpb=85a9ca7ff30ef892e5865c5541fd11f6c6de33a3;p=lttng-modules.git

diff --git a/ltt-events.h b/ltt-events.h
index 344b6fd1..b9bb3bb9 100644
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -10,11 +10,18 @@
  */
 
 #include <linux/list.h>
+#include <linux/uuid.h>
+#include <linux/kprobes.h>
 #include "ltt-debugfs-abi.h"
 
+#undef is_signed_type
+#define is_signed_type(type)		(((type)(-1)) < 0)
+
 struct ltt_channel;
 struct ltt_session;
 struct lib_ring_buffer_ctx;
+struct perf_event;
+struct perf_event_attr;
 
 /* Type description */
 
@@ -30,8 +37,9 @@ enum 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,
+	lttng_encode_none = 0,
+	lttng_encode_UTF8 = 1,
+	lttng_encode_ASCII = 2,
 	NR_STRING_ENCODINGS,
 };
 
@@ -40,51 +48,104 @@ struct lttng_enum_entry {
 	const char *string;
 };
 
-struct lttng_enum {
-	const struct lttng_enum_entry *entries;
-	unsigned int len;
+#define __type_integer(_type, _byte_order, _base, _encoding)	\
+	{							\
+	    .atype = atype_integer,				\
+	    .u.basic.integer =					\
+		{						\
+		  .size = sizeof(_type) * CHAR_BIT,		\
+		  .alignment = ltt_alignof(_type) * CHAR_BIT,	\
+		  .signedness = is_signed_type(_type),		\
+		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
+		  .base = _base,				\
+		  .encoding = lttng_encode_##_encoding,		\
+		},						\
+	}							\
+
+struct lttng_integer_type {
+	unsigned int size;		/* in bits */
+	unsigned short alignment;	/* in bits */
+	unsigned int signedness:1;
+	unsigned int reverse_byte_order:1;
+	unsigned int base;		/* 2, 8, 10, 16, for pretty print */
+	enum lttng_string_encodings encoding;
+};
+
+union _lttng_basic_type {
+	struct lttng_integer_type integer;
+	struct {
+		const char *name;
+	} enumeration;
+	struct {
+		enum lttng_string_encodings encoding;
+	} string;
+};
+
+struct lttng_basic_type {
+	enum abstract_types atype;
+	union {
+		union _lttng_basic_type basic;
+	} u;
 };
 
 struct lttng_type {
 	enum abstract_types atype;
-	const char *name;
 	union {
+		union _lttng_basic_type basic;
 		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;
+			struct lttng_basic_type elem_type;
 			unsigned int length;		/* num. elems. */
 		} array;
 		struct {
-			const char *elem_type;
-			const char *length_type;
+			struct lttng_basic_type length_type;
+			struct lttng_basic_type elem_type;
 		} sequence;
-		struct {
-			enum lttng_string_encodings encoding;
-		} string;
 	} u;
-} __attribute__((packed));
+};
+
+struct lttng_enum {
+	const char *name;
+	struct lttng_type container_type;
+	const struct lttng_enum_entry *entries;
+	unsigned int len;
+};
 
 /* Event field description */
 
 struct lttng_event_field {
 	const char *name;
-	const struct lttng_type type;
+	struct lttng_type type;
+};
+
+struct lttng_ctx_field {
+	struct lttng_event_field event_field;
+	size_t (*get_size)(size_t offset);
+	void (*record)(struct lttng_ctx_field *field,
+		       struct lib_ring_buffer_ctx *ctx,
+		       struct ltt_channel *chan);
+	union {
+		struct {
+			struct perf_event **e;	/* per-cpu array */
+			struct list_head head;
+			struct perf_event_attr *attr;
+		} perf_counter;
+	} u;
+	void (*destroy)(struct lttng_ctx_field *field);
+};
+
+struct lttng_ctx {
+	struct lttng_ctx_field *fields;
+	unsigned int nr_fields;
+	unsigned int allocated_fields;
 };
 
 struct lttng_event_desc {
-	const struct lttng_event_field *fields;
 	const char *name;
 	void *probe_callback;
+	const struct lttng_event_ctx *ctx;	/* context */
+	const struct lttng_event_field *fields;	/* event payload */
 	unsigned int nr_fields;
+	struct module *owner;
 };
 
 struct lttng_probe_desc {
@@ -102,13 +163,24 @@ struct ltt_event {
 	struct ltt_channel *chan;
 	const struct lttng_event_desc *desc;
 	void *filter;
-	enum instrum_type itype;
+	struct lttng_ctx *ctx;
+	enum lttng_kernel_instrumentation instrumentation;
+	union {
+		struct {
+			struct kprobe kp;
+			char *symbol_name;
+		} kprobe;
+		struct {
+			char *symbol_name;
+		} ftrace;
+	} u;
 	struct list_head list;		/* Event list */
+	int metadata_dumped:1;
 };
 
 struct ltt_channel_ops {
 	struct channel *(*channel_create)(const char *name,
-				struct ltt_session *session,
+				struct ltt_channel *ltt_chan,
 				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
@@ -116,14 +188,24 @@ struct ltt_channel_ops {
 	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);
+	int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
+			     uint32_t event_id);
 	void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
 	void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *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_reader_wait_queue)(struct ltt_channel *chan);
 };
 
 struct ltt_channel {
+	unsigned int id;
 	struct channel *chan;		/* Channel buffers */
+	struct lttng_ctx *ctx;
 	/* Event ID management */
 	struct ltt_session *session;
 	struct file *file;		/* File associated to channel */
@@ -131,14 +213,21 @@ struct ltt_channel {
 	struct list_head list;		/* Channel list */
 	wait_queue_head_t notify_wait;	/* Channel addition notif. waitqueue */
 	struct ltt_channel_ops *ops;
+	int header_type;		/* 0: unset, 1: compact, 2: large */
+	int metadata_dumped:1;
 };
 
 struct ltt_session {
 	int active;			/* Is trace session active ? */
+	int been_active;		/* Has trace session been active ? */
 	struct file *file;		/* File associated to session */
+	struct ltt_channel *metadata;	/* Metadata channel */
 	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 */
+	int metadata_dumped:1;
 };
 
 struct ltt_transport {
@@ -164,15 +253,10 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 				       size_t subbuf_size, size_t num_subbuf,
 				       unsigned int switch_timer_interval,
 				       unsigned int read_timer_interval);
-void _ltt_channel_destroy(struct ltt_channel *chan);
 
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
-				   char *name,
-				   enum instrum_type itype,
-				   const struct lttng_event_desc *event_desc,
+				   struct lttng_kernel_event *event_param,
 				   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);
@@ -184,5 +268,71 @@ int ltt_probe_register(struct lttng_probe_desc *desc);
 void ltt_probe_unregister(struct lttng_probe_desc *desc);
 const struct lttng_event_desc *ltt_event_get(const char *name);
 void ltt_event_put(const struct lttng_event_desc *desc);
+int ltt_probes_init(void);
+void ltt_probes_exit(void);
+struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx);
+void lttng_destroy_context(struct lttng_ctx *ctx);
+int lttng_add_pid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_comm_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_prio_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_nice_to_ctx(struct lttng_ctx **ctx);
+
+#ifdef CONFIG_KPROBES
+int lttng_kprobes_register(const char *name,
+		const char *symbol_name,
+		uint64_t offset,
+		uint64_t addr,
+		struct ltt_event *event);
+void lttng_kprobes_unregister(struct ltt_event *event);
+void lttng_kprobes_destroy_private(struct ltt_event *event);
+#else
+static inline
+int lttng_kprobes_register(const char *name,
+		const char *symbol_name,
+		uint64_t offset,
+		uint64_t addr,
+		struct ltt_event *event)
+{
+	return -ENOSYS;
+}
+
+static inline
+void lttng_kprobes_unregister(struct ltt_event *event)
+{
+}
+
+static inline
+void lttng_kprobes_destroy_private(struct ltt_event *event)
+{
+}
+#endif
+
+#ifdef CONFIG_DYNAMIC_FTRACE
+int lttng_ftrace_register(const char *name,
+			  const char *symbol_name,
+			  struct ltt_event *event);
+void lttng_ftrace_unregister(struct ltt_event *event);
+void lttng_ftrace_destroy_private(struct ltt_event *event);
+#else
+static inline
+int lttng_ftrace_register(const char *name,
+			  const char *symbol_name,
+			  struct ltt_event *event)
+{
+	return -ENOSYS;
+}
+
+static inline
+void lttng_ftrace_unregister(struct ltt_event *event)
+{
+}
+
+static inline
+void lttng_ftrace_destroy_private(struct ltt_event *event)
+{
+}
+#endif
+
+extern const struct file_operations lttng_tracepoint_list_fops;
 
 #endif /* _LTT_EVENTS_H */