kprobes support: fix handling of event description

[lttng-modules.git] / ltt-events.h

diff --git a/ltt-events.h b/ltt-events.h
index 0911a5ef300a1311d0ef6c2ec1a83ac6255b385d..030ffe02356189b792ebb7b41850eeb115043e54 100644 (file)
--- 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;
@@ -103,7 +104,7 @@ struct lttng_enum {
 
 struct lttng_event_field {
        const char *name;
-       const struct lttng_type type;
+       struct lttng_type type;
 };
 
 struct lttng_event_desc {
@@ -128,14 +129,20 @@ 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;
+       } 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 +173,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,8 +216,7 @@ 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);
 
@@ -227,4 +233,11 @@ void ltt_event_put(const struct lttng_event_desc *desc);
 int ltt_probes_init(void);
 void ltt_probes_exit(void);
 
+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);
+
 #endif /* _LTT_EVENTS_H */