X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-events.h;h=45d459d47f39af0187763a38d75e5283652f1987;hb=0d1a681e2c2521edea85e8748c7be35a60c73155;hp=a5eab5b8b7ca1fecf5ed681282be8a1b08aee123;hpb=1ec3f75aca46d4196d4d7dbbbe0b791f663203f1;p=lttng-modules.git

diff --git a/ltt-events.h b/ltt-events.h
index a5eab5b8..45d459d4 100644
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -11,6 +11,7 @@
 
 #include <linux/list.h>
 #include <linux/uuid.h>
+#include <linux/kprobes.h>
 #include "ltt-debugfs-abi.h"
 
 struct ltt_channel;
@@ -31,8 +32,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,
 };
 
@@ -41,7 +43,7 @@ struct lttng_enum_entry {
 	const char *string;
 };
 
-#define __type_integer(_type, _byte_order)			\
+#define __type_integer(_type, _byte_order, _base)		\
 	{							\
 	    .atype = atype_integer,				\
 	    .u.basic.integer =					\
@@ -50,6 +52,8 @@ struct lttng_enum_entry {
 		  .alignment = ltt_alignof(_type) * CHAR_BIT,	\
 		  .signedness = is_signed_type(_type),		\
 		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
+		  .base = _base,				\
+		  .encoding = lttng_encode_none,		\
 		},						\
 	}							\
 
@@ -58,6 +62,8 @@ struct lttng_integer_type {
 	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 {
@@ -103,13 +109,19 @@ struct lttng_enum {
 
 struct lttng_event_field {
 	const char *name;
-	const struct lttng_type type;
+	struct lttng_type type;
 };
 
-struct lttng_event_desc {
+struct lttng_event_ctx {
 	const struct lttng_event_field *fields;
+	unsigned int nr_fields;
+};
+
+struct lttng_event_desc {
 	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;
 };
 
@@ -128,14 +140,23 @@ struct ltt_event {
 	struct ltt_channel *chan;
 	const struct lttng_event_desc *desc;
 	void *filter;
-	enum instrum_type itype;
+	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,
@@ -166,8 +187,8 @@ 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;
-	int header_type:2;		/* 0: unset, 1: compact, 2: large */
 };
 
 struct ltt_session {
@@ -209,11 +230,9 @@ 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);
+int ltt_event_unregister(struct ltt_event *event);
 
 void ltt_transport_register(struct ltt_transport *transport);
 void ltt_transport_unregister(struct ltt_transport *transport);
@@ -228,4 +247,46 @@ void ltt_event_put(const struct lttng_event_desc *desc);
 int ltt_probes_init(void);
 void ltt_probes_exit(void);
 
+#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);
+#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;
+}
+
+void lttng_kprobes_unregister(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);
+#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)
+{
+}
+#endif
 #endif /* _LTT_EVENTS_H */