Add CPU hotplug notifier for ltt debugfs ABI, add pollwait exclusive wrapper

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

diff --git a/ltt-events.h b/ltt-events.h
index 1a5b5d5cf6c196252458ae18ec65d8fb57637baf..9c6fcac31a7a9207ad718be60a733c365755111c 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -7,6 +7,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Holds LTTng per-session event registry.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/list.h>
@@ -118,13 +120,16 @@ struct lttng_event_field {
 };
 
 struct lttng_ctx_field {
-       const char *name;
-       struct lttng_type type;
-       void *callback;
+       struct lttng_event_field event_field;
+       size_t (*get_size)(size_t offset);
+       void (*record)(struct lttng_ctx_field *field,
+                      struct lib_ring_buffer_ctx *ctx,
+                      struct ltt_channel *chan);
        union {
                struct {
                        struct perf_event **e;  /* per-cpu array */
-                       struct list_head head;
+                       struct notifier_block nb;
+                       int hp_enable;
                        struct perf_event_attr *attr;
                } perf_counter;
        } u;
@@ -161,6 +166,7 @@ struct ltt_event {
        struct ltt_channel *chan;
        const struct lttng_event_desc *desc;
        void *filter;
+       struct lttng_ctx *ctx;
        enum lttng_kernel_instrumentation instrumentation;
        union {
                struct {
@@ -196,18 +202,20 @@ struct ltt_channel_ops {
         * 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);
+       wait_queue_head_t *(*get_reader_wait_queue)(struct channel *chan);
+       wait_queue_head_t *(*get_hp_wait_queue)(struct channel *chan);
+       int (*is_finalized)(struct channel *chan);
 };
 
 struct ltt_channel {
        unsigned int id;
        struct channel *chan;           /* Channel buffers */
+       struct lttng_ctx *ctx;
        /* Event ID management */
        struct ltt_session *session;
        struct file *file;              /* File associated to channel */
        unsigned int free_event_id;     /* Next event ID to allocate */
        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;
@@ -215,6 +223,7 @@ struct ltt_channel {
 
 struct ltt_session {
        int active;                     /* Is trace session active ? */
+       int been_active;                /* Has trace session been active ? */
        struct file *file;              /* File associated to session */
        struct ltt_channel *metadata;   /* Metadata channel */
        struct list_head chan;          /* Channel list head */
@@ -266,7 +275,17 @@ void ltt_event_put(const struct lttng_event_desc *desc);
 int ltt_probes_init(void);
 void ltt_probes_exit(void);
 struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx);
+void lttng_remove_context_field(struct lttng_ctx **ctx,
+                               struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);
+int lttng_add_pid_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_comm_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_prio_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_nice_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_perf_counter_to_ctx(uint32_t type,
+                                 uint64_t config,
+                                 const char *name,
+                                 struct lttng_ctx **ctx);
 
 #ifdef CONFIG_KPROBES
 int lttng_kprobes_register(const char *name,