Fix teardown event vs session

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

diff --git a/ltt-events.h b/ltt-events.h
index e10c66c8f2d92460b8e3684107554e68a9486995..d07f1c879d2d44e4a1fa76cf6da372e723d7b527 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 */
 
@@ -112,10 +114,30 @@ struct lttng_event_field {
        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;
 };
 
@@ -220,13 +242,11 @@ 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,
                                   struct lttng_kernel_event *event_param,
                                   void *filter);
-int ltt_event_unregister(struct ltt_event *event);
 
 void ltt_transport_register(struct ltt_transport *transport);
 void ltt_transport_unregister(struct ltt_transport *transport);
@@ -241,12 +261,29 @@ 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;
+}
+
+static inline
+void lttng_kprobes_unregister(struct ltt_event *event)
+{
+}
+#endif
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 int lttng_ftrace_register(const char *name,
@@ -259,7 +296,7 @@ int lttng_ftrace_register(const char *name,
                          const char *symbol_name,
                          struct ltt_event *event)
 {
-       return 0;
+       return -ENOSYS;
 }
 
 static inline