kprobes support: fix handling of event description

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

diff --git a/ltt-events.h b/ltt-events.h
index cc8e8097836dadcd8bf93f7f7d586eca3181a40a..030ffe02356189b792ebb7b41850eeb115043e54 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -10,6 +10,8 @@
  */
 
 #include <linux/list.h>
+#include <linux/uuid.h>
+#include <linux/kprobes.h>
 #include "ltt-debugfs-abi.h"
 
 struct ltt_channel;
@@ -46,7 +48,7 @@ struct lttng_enum_entry {
            .u.basic.integer =                                  \
                {                                               \
                  .size = sizeof(_type),                        \
-                 .alignment = __alignof__(_type),              \
+                 .alignment = ltt_alignof(_type) * CHAR_BIT,   \
                  .signedness = is_signed_type(_type),          \
                  .reverse_byte_order = _byte_order != __BYTE_ORDER,    \
                },                                              \
@@ -102,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 {
@@ -127,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,
@@ -146,6 +154,12 @@ struct ltt_channel_ops {
        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);
 };
 
@@ -159,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 {
@@ -171,6 +185,7 @@ struct ltt_session {
        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;
 };
 
@@ -201,11 +216,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);
@@ -217,5 +230,14 @@ 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);
+
+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 */