Rename struct channel to struct lttng_kernel_ring_buffer_channel

[lttng-modules.git] / include / ringbuffer / frontend_types.h

diff --git a/include/ringbuffer/frontend_types.h b/include/ringbuffer/frontend_types.h
index d5c4916b79b5113f7fdfb6c48733f8d16a040061..a671c33bfb86dce6bdb61bec0c4f0655781fcea2 100644 (file)
--- a/include/ringbuffer/frontend_types.h
+++ b/include/ringbuffer/frontend_types.h
@@ -13,10 +13,11 @@
 #define _LIB_RING_BUFFER_FRONTEND_TYPES_H
 
 #include <linux/kref.h>
+#include <linux/irq_work.h>
 #include <ringbuffer/config.h>
 #include <ringbuffer/backend_types.h>
 #include <lttng/prio_heap.h>   /* For per-CPU read-side iterator */
-#include <lttng-cpuhotplug.h>
+#include <lttng/cpuhotplug.h>
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -40,7 +41,7 @@ struct channel_iter {
 };
 
 /* channel: collection of per-cpu ring buffers. */
-struct channel {
+struct lttng_kernel_ring_buffer_channel {
        atomic_t record_disabled;
        unsigned long commit_count_mask;        /*
                                                 * Commit count mask, removing
@@ -53,7 +54,7 @@ struct channel {
 
        unsigned long switch_timer_interval;    /* Buffer flush (jiffies) */
        unsigned long read_timer_interval;      /* Reader wakeup (jiffies) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
        struct lttng_cpuhp_node cpuhp_prepare;
        struct lttng_cpuhp_node cpuhp_online;
        struct lttng_cpuhp_node cpuhp_iter_online;
@@ -66,6 +67,7 @@ struct channel {
        struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
        wait_queue_head_t read_wait;            /* reader wait queue */
        wait_queue_head_t hp_wait;              /* CPU hotplug wait queue */
+       struct irq_work wakeup_pending;         /* Pending wakeup irq work */
        int finalized;                          /* Has channel been finalized */
        struct channel_iter iter;               /* Channel read-side iterator */
        struct kref ref;                        /* Reference count */
@@ -146,6 +148,7 @@ struct lib_ring_buffer {
        union v_atomic records_overrun; /* Number of overwritten records */
        wait_queue_head_t read_wait;    /* reader buffer-level wait queue */
        wait_queue_head_t write_wait;   /* writer buffer-level wait queue (for metadata only) */
+       struct irq_work wakeup_pending;         /* Pending wakeup irq work */
        int finalized;                  /* buffer has been finalized */
        struct timer_list switch_timer; /* timer for periodical switch */
        struct timer_list read_timer;   /* timer for read poll */
@@ -161,12 +164,12 @@ struct lib_ring_buffer {
 };
 
 static inline
-void *channel_get_private(struct channel *chan)
+void *channel_get_private(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return chan->backend.priv;
 }
 
-void lib_ring_buffer_lost_event_too_big(struct channel *chan);
+void lib_ring_buffer_lost_event_too_big(struct lttng_kernel_ring_buffer_channel *chan);
 
 /*
  * Issue warnings and disable channels upon internal error.
@@ -175,14 +178,14 @@ void lib_ring_buffer_lost_event_too_big(struct channel *chan);
  */
 #define CHAN_WARN_ON(c, cond)                                          \
        ({                                                              \
-               struct channel *__chan;                                 \
+               struct lttng_kernel_ring_buffer_channel *__chan;        \
                int _____ret = unlikely(cond);                          \
                if (_____ret) {                                         \
                        if (__same_type(*(c), struct channel_backend))  \
                                __chan = container_of((void *) (c),     \
-                                                       struct channel, \
+                                                       struct lttng_kernel_ring_buffer_channel, \
                                                        backend);       \
-                       else if (__same_type(*(c), struct channel))     \
+                       else if (__same_type(*(c), struct lttng_kernel_ring_buffer_channel)) \
                                __chan = (void *) (c);                  \
                        else                                            \
                                BUG_ON(1);                              \