LTTng performance monitoring counters integration (work in progress)

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

diff --git a/ltt-events.h b/ltt-events.h
index 42e12c0af19172c6ddc5f67b44cbf73b0d851edd..0b4638975cd718fc9e5e01885ed5f1ed89e03f1e 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -17,6 +17,8 @@
 struct ltt_channel;
 struct ltt_session;
 struct lib_ring_buffer_ctx;
+struct perf_event;
+struct perf_event_attr;
 
 /* Type description */
 
@@ -32,8 +34,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,
 };
 
@@ -42,7 +45,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 =                                  \
@@ -51,6 +54,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,                \
                },                                              \
        }                                                       \
 
@@ -59,6 +64,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 {
@@ -104,13 +111,33 @@ struct lttng_enum {
 
 struct lttng_event_field {
        const char *name;
-       const struct lttng_type type;
+       struct lttng_type type;
+};
+
+struct lttng_ctx_field {
+       const char *name;
+       struct lttng_type type;
+       void *callback;
+       union {
+               struct {
+                       struct perf_event **e;  /* per-cpu array */
+                       struct list_head head;
+                       struct perf_event_attr *attr;
+               } perf_counter;
+       } u;
+};
+
+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;
 };
 
@@ -135,6 +162,9 @@ struct ltt_event {
                        struct kprobe kp;
                        char *symbol_name;
                } kprobe;
+               struct {
+                       char *symbol_name;
+               } ftrace;
        } u;
        struct list_head list;          /* Event list */
        int metadata_dumped:1;
@@ -217,7 +247,6 @@ void _ltt_channel_destroy(struct ltt_channel *chan);
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
                                   char *name,
                                   struct lttng_kernel_event *event_param,
-                                  const struct lttng_event_desc *event_desc,
                                   void *filter);
 int ltt_event_unregister(struct ltt_event *event);
 
@@ -234,6 +263,46 @@ void ltt_event_put(const struct lttng_event_desc *desc);
 int ltt_probes_init(void);
 void ltt_probes_exit(void);
 
-void lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs);
+#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 */