Rename struct lib_ring_buffer_ctx to struct lttng_kernel_ring_buffer_ctx

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I81c3ef6dd226f2a27a32b303a096f60927462615

diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
index 9a80740881d812be7fa08bc50aa1c93c5a953738..6b4189770ee7686f17fb2d88373ce534c34106fb 100644 (file)
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -216,7 +216,7 @@ struct lttng_kernel_ctx_field {
        size_t (*get_size)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
                        size_t offset);
        void (*record)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                       struct lib_ring_buffer_ctx *ctx,
+                       struct lttng_kernel_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan);
        void (*get_value)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
                        struct lttng_ctx_value *value);

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 9cc552bc97add3f0d4e56d6938652f88abf20d2b..f852676b7ef0b5907055630d2daddedb46a5dba5 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -28,7 +28,7 @@
 struct lttng_channel;
 struct lttng_session;
 struct lttng_metadata_cache;
-struct lib_ring_buffer_ctx;
+struct lttng_kernel_ring_buffer_ctx;
 struct perf_event;
 struct perf_event_attr;
 struct lib_ring_buffer_config;
@@ -374,17 +374,17 @@ struct lttng_kernel_event_notifier {
 struct lttng_kernel_channel_buffer_ops {
        struct lttng_kernel_channel_buffer_ops_private *priv;   /* Private channel buffer ops interface. */
 
-       int (*event_reserve)(struct lib_ring_buffer_ctx *ctx);
-       void (*event_commit)(struct lib_ring_buffer_ctx *ctx);
-       void (*event_write)(struct lib_ring_buffer_ctx *ctx, const void *src,
+       int (*event_reserve)(struct lttng_kernel_ring_buffer_ctx *ctx);
+       void (*event_commit)(struct lttng_kernel_ring_buffer_ctx *ctx);
+       void (*event_write)(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
                            size_t len);
-       void (*event_write_from_user)(struct lib_ring_buffer_ctx *ctx,
+       void (*event_write_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
                                      const void *src, size_t len);
-       void (*event_memset)(struct lib_ring_buffer_ctx *ctx,
+       void (*event_memset)(struct lttng_kernel_ring_buffer_ctx *ctx,
                             int c, size_t len);
-       void (*event_strcpy)(struct lib_ring_buffer_ctx *ctx, const char *src,
+       void (*event_strcpy)(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
                             size_t len);
-       void (*event_strcpy_from_user)(struct lib_ring_buffer_ctx *ctx,
+       void (*event_strcpy_from_user)(struct lttng_kernel_ring_buffer_ctx *ctx,
                                       const char __user *src, size_t len);
 };
 

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index 8ddacaae0f32df6f402ecc0a3e4d09635f4f8e0d..b75a791ea4e3e88e17921c83fab2ffbb08adf49d 100644 (file)
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -1080,7 +1080,7 @@ static void __event_probe__##_name(_data_proto)                                           \
                struct lttng_kernel_event_recorder *__event_recorder =                  \
                        container_of(__event, struct lttng_kernel_event_recorder, parent); \
                struct lttng_channel *__chan = __event_recorder->chan;                  \
-               struct lib_ring_buffer_ctx __ctx;                                       \
+               struct lttng_kernel_ring_buffer_ctx __ctx;                              \
                ssize_t __event_len;                                                    \
                size_t __event_align;                                                   \
                int __ret;                                                              \

diff --git a/include/ringbuffer/backend.h b/include/ringbuffer/backend.h
index 5ceb4f1a26181a5f8b582ac7c7a5e5028cbfee9a..5f0fd96968ae27b08f03295231e0fa714ad5ccb1 100644 (file)
--- a/include/ringbuffer/backend.h
+++ b/include/ringbuffer/backend.h
@@ -72,7 +72,7 @@ lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb,
  */
 static inline __attribute__((always_inline))
 void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
-                          struct lib_ring_buffer_ctx *ctx,
+                          struct lttng_kernel_ring_buffer_ctx *ctx,
                           const void *src, size_t len)
 {
        struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
@@ -113,7 +113,7 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
  */
 static inline
 void lib_ring_buffer_memset(const struct lib_ring_buffer_config *config,
-                           struct lib_ring_buffer_ctx *ctx, int c, size_t len)
+                           struct lttng_kernel_ring_buffer_ctx *ctx, int c, size_t len)
 {
 
        struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
@@ -210,7 +210,7 @@ size_t lib_ring_buffer_do_strcpy_from_user_inatomic(const struct lib_ring_buffer
  */
 static inline
 void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
-                          struct lib_ring_buffer_ctx *ctx,
+                          struct lttng_kernel_ring_buffer_ctx *ctx,
                           const char *src, size_t len, int pad)
 {
        struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
@@ -268,7 +268,7 @@ void lib_ring_buffer_strcpy(const struct lib_ring_buffer_config *config,
  */
 static inline __attribute__((always_inline))
 void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config *config,
-                                   struct lib_ring_buffer_ctx *ctx,
+                                   struct lttng_kernel_ring_buffer_ctx *ctx,
                                    const void __user *src, size_t len)
 {
        struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
@@ -335,7 +335,7 @@ fill_buffer:
  */
 static inline
 void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_config *config,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                const void __user *src, size_t len, int pad)
 {
        struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;

diff --git a/include/ringbuffer/backend_internal.h b/include/ringbuffer/backend_internal.h
index 8a93ab07ad1fe6ca03111538c3c561341bf51ffe..9ab55e75bfcbc934a61b77000dcec1a87e2e2e1c 100644 (file)
--- a/include/ringbuffer/backend_internal.h
+++ b/include/ringbuffer/backend_internal.h
@@ -192,7 +192,7 @@ int subbuffer_id_check_index(const struct lib_ring_buffer_config *config,
 
 static inline
 void lib_ring_buffer_backend_get_pages(const struct lib_ring_buffer_config *config,
-                       struct lib_ring_buffer_ctx *ctx,
+                       struct lttng_kernel_ring_buffer_ctx *ctx,
                        struct lib_ring_buffer_backend_pages **backend_pages)
 {
        struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
@@ -216,7 +216,7 @@ void lib_ring_buffer_backend_get_pages(const struct lib_ring_buffer_config *conf
 static inline
 struct lib_ring_buffer_backend_pages *
        lib_ring_buffer_get_backend_pages_from_ctx(const struct lib_ring_buffer_config *config,
-               struct lib_ring_buffer_ctx *ctx)
+               struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        return ctx->priv.backend_pages;
 }

diff --git a/include/ringbuffer/config.h b/include/ringbuffer/config.h
index 9fc3f54ebf8de906a86a4c2ba9eb159d0b0aeb53..4ce36d18c9fa4af35ec633208616239396cdb51d 100644 (file)
--- a/include/ringbuffer/config.h
+++ b/include/ringbuffer/config.h
@@ -19,7 +19,7 @@
 struct lib_ring_buffer;
 struct channel;
 struct lib_ring_buffer_config;
-struct lib_ring_buffer_ctx;
+struct lttng_kernel_ring_buffer_ctx;
 struct lttng_kernel_ring_buffer_ctx_private;
 
 /*
@@ -36,7 +36,7 @@ struct lib_ring_buffer_client_cb {
        size_t (*record_header_size) (const struct lib_ring_buffer_config *config,
                                      struct channel *chan, size_t offset,
                                      size_t *pre_header_padding,
-                                     struct lib_ring_buffer_ctx *ctx,
+                                     struct lttng_kernel_ring_buffer_ctx *ctx,
                                      void *client_ctx);
 
        /* Slow path only, at subbuffer switch */
@@ -198,7 +198,7 @@ struct lttng_kernel_ring_buffer_ctx_private {
  * lib_ring_buffer_try_discard_reserve(), lib_ring_buffer_align_ctx() and
  * lib_ring_buffer_write().
  */
-struct lib_ring_buffer_ctx {
+struct lttng_kernel_ring_buffer_ctx {
        /* Private ring buffer context, set by reserve callback. */
        struct lttng_kernel_ring_buffer_ctx_private priv;
 
@@ -221,7 +221,7 @@ struct lib_ring_buffer_ctx {
  * @largest_align: largest alignment within data payload types
  */
 static inline
-void lib_ring_buffer_ctx_init(struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_ctx_init(struct lttng_kernel_ring_buffer_ctx *ctx,
                              void *client_priv,
                              size_t data_size, int largest_align,
                              struct lttng_kernel_probe_ctx *probe_ctx)
@@ -294,7 +294,7 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
  * @ctx: ring buffer context.
  */
 static inline
-void lib_ring_buffer_align_ctx(struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_align_ctx(struct lttng_kernel_ring_buffer_ctx *ctx,
                           size_t alignment)
 {
        ctx->priv.buf_offset += lib_ring_buffer_align(ctx->priv.buf_offset,

diff --git a/include/ringbuffer/frontend_api.h b/include/ringbuffer/frontend_api.h
index 1444e60adc1350234e405e164f8b8662654386c6..49f0eee27134f7e68b2f9e2613c254a7bcd4974a 100644 (file)
--- a/include/ringbuffer/frontend_api.h
+++ b/include/ringbuffer/frontend_api.h
@@ -70,7 +70,7 @@ void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
  */
 static inline
 int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
-                               struct lib_ring_buffer_ctx *ctx,
+                               struct lttng_kernel_ring_buffer_ctx *ctx,
                                void *client_ctx,
                                unsigned long *o_begin, unsigned long *o_end,
                                unsigned long *o_old, size_t *before_hdr_pad)
@@ -140,7 +140,7 @@ int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
 
 static inline
 int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
-                           struct lib_ring_buffer_ctx *ctx,
+                           struct lttng_kernel_ring_buffer_ctx *ctx,
                            void *client_ctx)
 {
        struct channel *chan = ctx->priv.chan;
@@ -229,7 +229,7 @@ void lib_ring_buffer_switch(const struct lib_ring_buffer_config *config,
  */
 static inline
 void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
-                           const struct lib_ring_buffer_ctx *ctx)
+                           const struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        struct channel *chan = ctx->priv.chan;
        struct lib_ring_buffer *buf = ctx->priv.buf;
@@ -301,7 +301,7 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
  */
 static inline
 int lib_ring_buffer_try_discard_reserve(const struct lib_ring_buffer_config *config,
-                                       const struct lib_ring_buffer_ctx *ctx)
+                                       const struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        struct lib_ring_buffer *buf = ctx->priv.buf;
        unsigned long end_offset = ctx->priv.pre_offset + ctx->priv.slot_size;

diff --git a/include/ringbuffer/frontend_internal.h b/include/ringbuffer/frontend_internal.h
index 680c65bb4f04e846d84150a093db35d45d6271bb..2624b4dc03683ff16a4eec4577488355398ecd93 100644 (file)
--- a/include/ringbuffer/frontend_internal.h
+++ b/include/ringbuffer/frontend_internal.h
@@ -134,7 +134,7 @@ int last_tsc_overflow(const struct lib_ring_buffer_config *config,
 #endif
 
 extern
-int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx,
+int lib_ring_buffer_reserve_slow(struct lttng_kernel_ring_buffer_ctx *ctx,
                void *client_ctx);
 
 extern

diff --git a/src/lib/ringbuffer/ring_buffer_frontend.c b/src/lib/ringbuffer/ring_buffer_frontend.c
index d9e64dff9d15eb616df6b5147f4f0b4ec557da1b..cd8d0aaa0b6fdf1708da881b1ee6c6de36e0c083 100644 (file)
--- a/src/lib/ringbuffer/ring_buffer_frontend.c
+++ b/src/lib/ringbuffer/ring_buffer_frontend.c
@@ -1997,7 +1997,7 @@ static
 int lib_ring_buffer_try_reserve_slow(struct lib_ring_buffer *buf,
                                     struct channel *chan,
                                     struct switch_offsets *offsets,
-                                    struct lib_ring_buffer_ctx *ctx,
+                                    struct lttng_kernel_ring_buffer_ctx *ctx,
                                     void *client_ctx)
 {
        const struct lib_ring_buffer_config *config = &chan->backend.config;
@@ -2172,7 +2172,7 @@ EXPORT_SYMBOL_GPL(lib_ring_buffer_lost_event_too_big);
  * -EIO for other errors, else returns 0.
  * It will take care of sub-buffer switching.
  */
-int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx,
+int lib_ring_buffer_reserve_slow(struct lttng_kernel_ring_buffer_ctx *ctx,
                void *client_ctx)
 {
        struct channel *chan = ctx->priv.chan;

diff --git a/src/lttng-context-callstack-legacy-impl.h b/src/lttng-context-callstack-legacy-impl.h
index 7d818e3833077a1527b592c126c11e0fbbca9dfb..0e59aa6d70b63657407f0269312d3c6bb8dc6e05 100644 (file)
--- a/src/lttng-context-callstack-legacy-impl.h
+++ b/src/lttng-context-callstack-legacy-impl.h
@@ -189,7 +189,7 @@ size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_kernel_probe_c
 
 static
 void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                       struct lib_ring_buffer_ctx *ctx,
+                       struct lttng_kernel_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan)
 {
        int cpu = ctx->priv.reserve_cpu;
@@ -209,7 +209,7 @@ void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *pr
 }
 static
 void lttng_callstack_sequence_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                       struct lib_ring_buffer_ctx *ctx,
+                       struct lttng_kernel_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan)
 {
        int cpu = ctx->priv.reserve_cpu;

diff --git a/src/lttng-context-callstack-stackwalk-impl.h b/src/lttng-context-callstack-stackwalk-impl.h
index 9c8f6d38f5d3052f764e6c87d24ef7e75b6d6af7..d3a57d86c110e7a67b37958208320f31458e3d7c 100644 (file)
--- a/src/lttng-context-callstack-stackwalk-impl.h
+++ b/src/lttng-context-callstack-stackwalk-impl.h
@@ -194,7 +194,7 @@ size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_kernel_probe_c
 
 static
 void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                       struct lib_ring_buffer_ctx *ctx,
+                       struct lttng_kernel_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan)
 {
        int cpu = ctx->priv.reserve_cpu;
@@ -215,7 +215,7 @@ void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *pr
 
 static
 void lttng_callstack_sequence_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                       struct lib_ring_buffer_ctx *ctx,
+                       struct lttng_kernel_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan)
 {
        int cpu = ctx->priv.reserve_cpu;

diff --git a/src/lttng-context-cgroup-ns.c b/src/lttng-context-cgroup-ns.c
index 5e8c615527e885ae1d45bd30b1e366f023108ab3..3588d9cd1e8344a4cb47fba6b168891ab1dab86b 100644 (file)
--- a/src/lttng-context-cgroup-ns.c
+++ b/src/lttng-context-cgroup-ns.c
@@ -36,7 +36,7 @@ size_t cgroup_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 
 static
 void cgroup_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int cgroup_ns_inum = 0;

diff --git a/src/lttng-context-cpu-id.c b/src/lttng-context-cpu-id.c
index 1fa32ac256f21dd55bcaf0caff3d2f2ea3100cd0..467aef95bb9165a2e87ecddd4a089deef686b7d6 100644 (file)
--- a/src/lttng-context-cpu-id.c
+++ b/src/lttng-context-cpu-id.c
@@ -28,7 +28,7 @@ size_t cpu_id_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 
 static
 void cpu_id_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        int cpu;

diff --git a/src/lttng-context-egid.c b/src/lttng-context-egid.c
index e1674fb820e05651cb9dba39ecf22a58315fcb61..902a57014528f7711efb12dc7b0e2bb1aa6bae02 100644 (file)
--- a/src/lttng-context-egid.c
+++ b/src/lttng-context-egid.c
@@ -30,7 +30,7 @@ size_t egid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void egid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        gid_t egid;

diff --git a/src/lttng-context-euid.c b/src/lttng-context-euid.c
index 855e2552ddca3a60126e30df42ce4c7ef1ab2c42..6076a3161ffd9ef0889923dfa4e358ff153a31c8 100644 (file)
--- a/src/lttng-context-euid.c
+++ b/src/lttng-context-euid.c
@@ -30,7 +30,7 @@ size_t euid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void euid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        uid_t euid;

diff --git a/src/lttng-context-gid.c b/src/lttng-context-gid.c
index 6d6110885416c5aa5abbf525cc5423f56d6ce36b..c1906e25ac998092171f41de997edab2d976dcf0 100644 (file)
--- a/src/lttng-context-gid.c
+++ b/src/lttng-context-gid.c
@@ -30,7 +30,7 @@ size_t gid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t
 
 static
 void gid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        gid_t gid;

diff --git a/src/lttng-context-hostname.c b/src/lttng-context-hostname.c
index b12ff0bcdd46b310e0834c4f361a264030e6f41a..c34ed5cd1a6814a3da7c1d1ae886cea6a5085557 100644 (file)
--- a/src/lttng-context-hostname.c
+++ b/src/lttng-context-hostname.c
@@ -30,7 +30,7 @@ size_t hostname_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, s
 
 static
 void hostname_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        struct nsproxy *nsproxy;

diff --git a/src/lttng-context-interruptible.c b/src/lttng-context-interruptible.c
index 971b8b0347b7c28b5c85123b2f6f0a2fa3deb31f..933b4d1fb4524a40e7068e0617e52f10092546c6 100644 (file)
--- a/src/lttng-context-interruptible.c
+++ b/src/lttng-context-interruptible.c
@@ -33,7 +33,7 @@ size_t interruptible_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_c
 
 static
 void interruptible_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        struct lttng_kernel_probe_ctx *lttng_probe_ctx = ctx->probe_ctx;

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index 3bc3ffcb0c31d57933ce38a28d4554eef14eadec..5a805f1e25e0223338d07addc9ad1076daf8539c 100644 (file)
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -35,7 +35,7 @@ size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 
 static
 void ipc_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int ipc_ns_inum = 0;

diff --git a/src/lttng-context-migratable.c b/src/lttng-context-migratable.c
index 82401138c8e2999942983b956990a9a79a5c65d0..ed5200ea4fd4017f8ef03ce6aabc12f2e4443c48 100644 (file)
--- a/src/lttng-context-migratable.c
+++ b/src/lttng-context-migratable.c
@@ -29,7 +29,7 @@ size_t migratable_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
 
 static
 void migratable_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        uint8_t migratable = !current->migrate_disable;

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index 0f97069999a81a2d067f4d81612fbc9b1099bafe..b58a151efd881fdcbaae28bfd23106b25681016c 100644 (file)
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -37,7 +37,7 @@ size_t mnt_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 
 static
 void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int mnt_ns_inum = 0;

diff --git a/src/lttng-context-need-reschedule.c b/src/lttng-context-need-reschedule.c
index 090e6e55aab2a950fb963928e576b462624fe9c0..0ceb6a5d2d6cd877be26c0c92f6fea4bd34cb52b 100644 (file)
--- a/src/lttng-context-need-reschedule.c
+++ b/src/lttng-context-need-reschedule.c
@@ -29,7 +29,7 @@ size_t need_reschedule_get_size(void *priv, struct lttng_kernel_probe_ctx *probe
 
 static
 void need_reschedule_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        uint8_t need_reschedule = test_tsk_need_resched(current);

diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c
index e0b4b4db3720a062e712bb21c26479b4bd61cdd5..54c28e0fc17a601e9ee302178ac702bdbe919823 100644 (file)
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -36,7 +36,7 @@ size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 
 static
 void net_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int net_ns_inum = 0;

diff --git a/src/lttng-context-nice.c b/src/lttng-context-nice.c
index 031d39d95143b696b9880aed07c41a742dfc9c61..fb698648521dea55ed9bdfe8ebb14ff813d7e536 100644 (file)
--- a/src/lttng-context-nice.c
+++ b/src/lttng-context-nice.c
@@ -28,7 +28,7 @@ size_t nice_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void nice_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        int nice;

diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c
index f3d7bdf1ce6a34857e28397ae08250ca7f2816b4..72e920afbba137fa138caa4a1b5ae9e5bb6bbc28 100644 (file)
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -32,7 +32,7 @@ size_t perf_counter_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ct
 
 static
 void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                        struct lib_ring_buffer_ctx *ctx,
+                        struct lttng_kernel_ring_buffer_ctx *ctx,
                         struct lttng_channel *chan)
 {
        struct lttng_perf_counter_field *perf_field = (struct lttng_perf_counter_field *) priv;

diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c
index d4ff5153c31f72595272cd9d4ba4bac2ae4ed238..4c5a3e1996481a65eb5026fcab71c42588ecea6c 100644 (file)
--- a/src/lttng-context-pid-ns.c
+++ b/src/lttng-context-pid-ns.c
@@ -35,7 +35,7 @@ size_t pid_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 
 static
 void pid_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        struct pid_namespace *ns;

diff --git a/src/lttng-context-pid.c b/src/lttng-context-pid.c
index b43503e682d2f29760a86d94425bf862621dafb9..5f5a65a79f19ce6117d849ba6ff810359f41b771 100644 (file)
--- a/src/lttng-context-pid.c
+++ b/src/lttng-context-pid.c
@@ -28,7 +28,7 @@ size_t pid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t
 
 static
 void pid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        pid_t pid;

diff --git a/src/lttng-context-ppid.c b/src/lttng-context-ppid.c
index c9a0d5c38db6e2421627a9bf18077e11a404f6aa..93cbc03c53e75a7f6b71b225473af383437eb274 100644 (file)
--- a/src/lttng-context-ppid.c
+++ b/src/lttng-context-ppid.c
@@ -29,7 +29,7 @@ size_t ppid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void ppid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        pid_t ppid;

diff --git a/src/lttng-context-preemptible.c b/src/lttng-context-preemptible.c
index 41b8ae5cd71471dbe6f2ea85ae6b234e6cd0ba0b..ac9aab5932e49ff6c59f09799ed643043e9cb99e 100644 (file)
--- a/src/lttng-context-preemptible.c
+++ b/src/lttng-context-preemptible.c
@@ -37,7 +37,7 @@ size_t preemptible_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx
 
 static
 void preemptible_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        int pc = preempt_count();

diff --git a/src/lttng-context-prio.c b/src/lttng-context-prio.c
index f8f18a83ee17a0a9515a0f137fc53b8364132293..97c0672c5f566b0b675625c323748a1f62bfbca3 100644 (file)
--- a/src/lttng-context-prio.c
+++ b/src/lttng-context-prio.c
@@ -55,7 +55,7 @@ size_t prio_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void prio_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-               struct lib_ring_buffer_ctx *ctx,
+               struct lttng_kernel_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
        int prio;

diff --git a/src/lttng-context-procname.c b/src/lttng-context-procname.c
index 22714946b437411bc2a83e5716b0242b2cf4cbb2..e2517bc665aafa9e0ccb6fd6cc083c7f29e0c2f3 100644 (file)
--- a/src/lttng-context-procname.c
+++ b/src/lttng-context-procname.c
@@ -34,7 +34,7 @@ size_t procname_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, s
  */
 static
 void procname_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        chan->ops->event_write(ctx, current->comm, sizeof(current->comm));

diff --git a/src/lttng-context-sgid.c b/src/lttng-context-sgid.c
index 9af1a4843792b6d85720cdcba86d3ac31f51de3e..23c594f0b73e7bad803aea1101f13c24cbab8d42 100644 (file)
--- a/src/lttng-context-sgid.c
+++ b/src/lttng-context-sgid.c
@@ -30,7 +30,7 @@ size_t sgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void sgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        gid_t sgid;

diff --git a/src/lttng-context-suid.c b/src/lttng-context-suid.c
index 916219eb555f6496f1efee45a8a1dcd110fdbd23..4d9b5af34ff74d07cfef20396cede5b69baa1d06 100644 (file)
--- a/src/lttng-context-suid.c
+++ b/src/lttng-context-suid.c
@@ -30,7 +30,7 @@ size_t suid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void suid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        uid_t suid;

diff --git a/src/lttng-context-tid.c b/src/lttng-context-tid.c
index 0b763fce1cc5f5807137a35d0eeb6d1c3c5d7431..9438cb63e6d5574a7ae9d970b9a8bafcea585bf9 100644 (file)
--- a/src/lttng-context-tid.c
+++ b/src/lttng-context-tid.c
@@ -28,7 +28,7 @@ size_t tid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t
 
 static
 void tid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        pid_t tid;

diff --git a/src/lttng-context-time-ns.c b/src/lttng-context-time-ns.c
index 0fceef476d6ea33a285fdfc2642376186faea1d6..e6300b5243eed293dcbe8590db6e05e69276b6c2 100644 (file)
--- a/src/lttng-context-time-ns.c
+++ b/src/lttng-context-time-ns.c
@@ -35,7 +35,7 @@ size_t time_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, si
 
 static
 void time_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int time_ns_inum = 0;

diff --git a/src/lttng-context-uid.c b/src/lttng-context-uid.c
index 9e17d5bc5d0af6f279ff252a70353a350ee1fd5d..434f7199ae6e24bdf0da86e287434e82330bf90a 100644 (file)
--- a/src/lttng-context-uid.c
+++ b/src/lttng-context-uid.c
@@ -30,7 +30,7 @@ size_t uid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t
 
 static
 void uid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        uid_t uid;

diff --git a/src/lttng-context-user-ns.c b/src/lttng-context-user-ns.c
index 4ca4df2fa47080add28efb838446101bf2d6e3e5..ae674667248c2129a6f139e1f061a2b94c0c171a 100644 (file)
--- a/src/lttng-context-user-ns.c
+++ b/src/lttng-context-user-ns.c
@@ -35,7 +35,7 @@ size_t user_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, si
 
 static
 void user_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int user_ns_inum = 0;

diff --git a/src/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c
index 1f6602150152809400ef8c43de7332b08bb7672b..35c4aded39cd10be8af2eb20161bc76d4fb2c613 100644 (file)
--- a/src/lttng-context-uts-ns.c
+++ b/src/lttng-context-uts-ns.c
@@ -35,7 +35,7 @@ size_t uts_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, siz
 
 static
 void uts_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        unsigned int uts_ns_inum = 0;

diff --git a/src/lttng-context-vegid.c b/src/lttng-context-vegid.c
index 3e43f6b0488eb4a8b70f9a89f1bc91a381fc0396..9c0108241192e79cc567756a363ad9acb96e8671 100644 (file)
--- a/src/lttng-context-vegid.c
+++ b/src/lttng-context-vegid.c
@@ -30,7 +30,7 @@ size_t vegid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size
 
 static
 void vegid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        gid_t vegid;

diff --git a/src/lttng-context-veuid.c b/src/lttng-context-veuid.c
index 965c3eecb3a4438f19e8a8d2b73a37b1b2f5446b..775c078b429ac7d50881772bd4b4ea76a2ff227f 100644 (file)
--- a/src/lttng-context-veuid.c
+++ b/src/lttng-context-veuid.c
@@ -30,7 +30,7 @@ size_t veuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size
 
 static
 void veuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        uid_t veuid;

diff --git a/src/lttng-context-vgid.c b/src/lttng-context-vgid.c
index 1a03dd1aeb8e49f89bcb20fa9871c9defdb9c21c..689f2708f34cbc3ca94acdeb32a155e64f7cd1e6 100644 (file)
--- a/src/lttng-context-vgid.c
+++ b/src/lttng-context-vgid.c
@@ -30,7 +30,7 @@ size_t vgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void vgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        gid_t vgid;

diff --git a/src/lttng-context-vpid.c b/src/lttng-context-vpid.c
index 83091db1782097391aa91b87e652648e49595076..6a01e431bbf2a6c006ee3335624fa4b003c6cb2b 100644 (file)
--- a/src/lttng-context-vpid.c
+++ b/src/lttng-context-vpid.c
@@ -28,7 +28,7 @@ size_t vpid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void vpid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        pid_t vpid;

diff --git a/src/lttng-context-vppid.c b/src/lttng-context-vppid.c
index 5b438840d496e910c3df5abc6a1febe9ac49e857..4d61fef0351098d25bca4729012269a3fbaf421f 100644 (file)
--- a/src/lttng-context-vppid.c
+++ b/src/lttng-context-vppid.c
@@ -29,7 +29,7 @@ size_t vppid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size
 
 static
 void vppid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                 struct lib_ring_buffer_ctx *ctx,
+                 struct lttng_kernel_ring_buffer_ctx *ctx,
                  struct lttng_channel *chan)
 {
        struct task_struct *parent;

diff --git a/src/lttng-context-vsgid.c b/src/lttng-context-vsgid.c
index f47f0d142216c59c77cd824f0d6c03d2b34b26d6..eb051f27a2763baa684a44112219370230fe4ddd 100644 (file)
--- a/src/lttng-context-vsgid.c
+++ b/src/lttng-context-vsgid.c
@@ -30,7 +30,7 @@ size_t vsgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size
 
 static
 void vsgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        gid_t vsgid;

diff --git a/src/lttng-context-vsuid.c b/src/lttng-context-vsuid.c
index 29ff30dcb84af52f84c1cc2d01d9a4809f0813af..8210e8f8026f445365cb5f13c0ac39c0bb09c600 100644 (file)
--- a/src/lttng-context-vsuid.c
+++ b/src/lttng-context-vsuid.c
@@ -30,7 +30,7 @@ size_t vsuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size
 
 static
 void vsuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        uid_t vsuid;

diff --git a/src/lttng-context-vtid.c b/src/lttng-context-vtid.c
index 4e22757725fb139181cdd78d97419f5db8a49e80..17c4bf6feb8da17a11ef231d3137f9800e051f03 100644 (file)
--- a/src/lttng-context-vtid.c
+++ b/src/lttng-context-vtid.c
@@ -28,7 +28,7 @@ size_t vtid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void vtid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        pid_t vtid;

diff --git a/src/lttng-context-vuid.c b/src/lttng-context-vuid.c
index 2ecc411e373d1f42d4ccee12899e097b69b958b3..2330991a050f26be90ec330c17c1fd022eca3796 100644 (file)
--- a/src/lttng-context-vuid.c
+++ b/src/lttng-context-vuid.c
@@ -30,7 +30,7 @@ size_t vuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_
 
 static
 void vuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
                 struct lttng_channel *chan)
 {
        uid_t vuid;

diff --git a/src/lttng-event-notifier-notification.c b/src/lttng-event-notifier-notification.c
index 0d4415dbd62195cb94cb740bc9a1fb13ada70835..1e4aa7772520afaf911870e5671669328620d85a 100644 (file)
--- a/src/lttng-event-notifier-notification.c
+++ b/src/lttng-event-notifier-notification.c
@@ -381,7 +381,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
                struct lttng_kernel_event_notifier *event_notifier)
 {
        struct lttng_event_notifier_group *event_notifier_group = event_notifier->priv->group;
-       struct lib_ring_buffer_ctx ctx;
+       struct lttng_kernel_ring_buffer_ctx ctx;
        struct lttng_kernel_abi_event_notifier_notification kernel_notif;
        size_t capture_buffer_content_len, reserve_size;
        int ret;

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 172513f3d0cff3c31ddc7c612ef64a28e7e7ba72..9d3631e4c055336f064042e6ebbd17ef2a00a772 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -2852,7 +2852,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
 int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
                struct channel *chan, bool *coherent)
 {
-       struct lib_ring_buffer_ctx ctx;
+       struct lttng_kernel_ring_buffer_ctx ctx;
        int ret = 0;
        size_t len, reserve_len;
 

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index 8fa62073005f315e129a5a2bd0c7576cbce1092c..1667095f6f3341569d07602eabb2666d6f96fe9d 100644 (file)
--- a/src/lttng-ring-buffer-client.h
+++ b/src/lttng-ring-buffer-client.h
@@ -89,7 +89,7 @@ size_t ctx_get_aligned_size(size_t offset, struct lttng_kernel_ctx *ctx,
 
 static inline
 void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
-               struct lttng_channel *chan, struct lib_ring_buffer_ctx *bufctx)
+               struct lttng_channel *chan, struct lttng_kernel_ring_buffer_ctx *bufctx)
 {
        int i;
        size_t offset = 0;
@@ -106,7 +106,7 @@ void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
 }
 
 static inline
-void ctx_record(struct lib_ring_buffer_ctx *bufctx,
+void ctx_record(struct lttng_kernel_ring_buffer_ctx *bufctx,
                struct lttng_channel *chan,
                struct lttng_kernel_ctx *ctx)
 {
@@ -137,7 +137,7 @@ static __inline__
 size_t record_header_size(const struct lib_ring_buffer_config *config,
                                 struct channel *chan, size_t offset,
                                 size_t *pre_header_padding,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 struct lttng_client_ctx *client_ctx)
 {
        struct lttng_channel *lttng_chan = channel_get_private(chan);
@@ -189,7 +189,7 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 
 static
 void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 uint32_t event_id);
 
 /*
@@ -203,7 +203,7 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
  */
 static __inline__
 void lttng_write_event_header(const struct lib_ring_buffer_config *config,
-                           struct lib_ring_buffer_ctx *ctx,
+                           struct lttng_kernel_ring_buffer_ctx *ctx,
                            uint32_t event_id)
 {
        struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
@@ -252,7 +252,7 @@ slow_path:
 
 static
 void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 uint32_t event_id)
 {
        struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
@@ -326,7 +326,7 @@ static
 size_t client_record_header_size(const struct lib_ring_buffer_config *config,
                                 struct channel *chan, size_t offset,
                                 size_t *pre_header_padding,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 void *client_ctx)
 {
        return record_header_size(config, chan, offset,
@@ -603,7 +603,7 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf)
 }
 
 static
-int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx)
+int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        struct lttng_kernel_event_recorder *event_recorder = ctx->client_priv;
        struct lttng_channel *lttng_chan = event_recorder->chan;
@@ -648,42 +648,42 @@ put:
 }
 
 static
-void lttng_event_commit(struct lib_ring_buffer_ctx *ctx)
+void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        lib_ring_buffer_commit(&client_config, ctx);
        lib_ring_buffer_put_cpu(&client_config);
 }
 
 static
-void lttng_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
+void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
                     size_t len)
 {
        lib_ring_buffer_write(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_write_from_user(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
                               const void __user *src, size_t len)
 {
        lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_memset(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_memset(struct lttng_kernel_ring_buffer_ctx *ctx,
                int c, size_t len)
 {
        lib_ring_buffer_memset(&client_config, ctx, c, len);
 }
 
 static
-void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src,
+void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
                size_t len)
 {
        lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
 }
 
 static
-void lttng_event_strcpy_from_user(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_strcpy_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
                const char __user *src, size_t len)
 {
        lib_ring_buffer_strcpy_from_user_inatomic(&client_config, ctx, src,

diff --git a/src/lttng-ring-buffer-event-notifier-client.h b/src/lttng-ring-buffer-event-notifier-client.h
index 3b9dbfb7e02b24739f3f2a8696103886b81af631..9f4382583be17d95cf162bd99c23230b48bc33bb 100644 (file)
--- a/src/lttng-ring-buffer-event-notifier-client.h
+++ b/src/lttng-ring-buffer-event-notifier-client.h
@@ -40,7 +40,7 @@ static inline
 size_t record_header_size(const struct lib_ring_buffer_config *config,
                                 struct channel *chan, size_t offset,
                                 size_t *pre_header_padding,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 void *client_ctx)
 {
        size_t orig_offset = offset;
@@ -67,7 +67,7 @@ static
 size_t client_record_header_size(const struct lib_ring_buffer_config *config,
                                 struct channel *chan, size_t offset,
                                 size_t *pre_header_padding,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 void *client_ctx)
 {
        return record_header_size(config, chan, offset,
@@ -288,7 +288,7 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf)
 
 static
 void lttng_write_event_notifier_header(const struct lib_ring_buffer_config *config,
-                           struct lib_ring_buffer_ctx *ctx)
+                           struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        uint32_t data_size;
 
@@ -302,7 +302,7 @@ void lttng_write_event_notifier_header(const struct lib_ring_buffer_config *conf
 }
 
 static
-int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx)
+int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        struct channel *chan = ctx->client_priv;
        int ret;
@@ -321,34 +321,34 @@ int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx)
 }
 
 static
-void lttng_event_commit(struct lib_ring_buffer_ctx *ctx)
+void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        lib_ring_buffer_commit(&client_config, ctx);
 }
 
 static
-void lttng_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
+void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
                     size_t len)
 {
        lib_ring_buffer_write(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_write_from_user(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
                               const void __user *src, size_t len)
 {
        lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_memset(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_memset(struct lttng_kernel_ring_buffer_ctx *ctx,
                int c, size_t len)
 {
        lib_ring_buffer_memset(&client_config, ctx, c, len);
 }
 
 static
-void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src,
+void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
                size_t len)
 {
        lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');

diff --git a/src/lttng-ring-buffer-metadata-client.h b/src/lttng-ring-buffer-metadata-client.h
index ab393c8e6abe097c361dd6429ff0078c9f3d2e12..ff39fb041e7325924271acd75f623b4da6e0f396 100644 (file)
--- a/src/lttng-ring-buffer-metadata-client.h
+++ b/src/lttng-ring-buffer-metadata-client.h
@@ -46,7 +46,7 @@ static inline
 size_t record_header_size(const struct lib_ring_buffer_config *config,
                                 struct channel *chan, size_t offset,
                                 size_t *pre_header_padding,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 void *client_ctx)
 {
        return 0;
@@ -63,7 +63,7 @@ static
 size_t client_record_header_size(const struct lib_ring_buffer_config *config,
                                 struct channel *chan, size_t offset,
                                 size_t *pre_header_padding,
-                                struct lib_ring_buffer_ctx *ctx,
+                                struct lttng_kernel_ring_buffer_ctx *ctx,
                                 void *client_ctx)
 {
        return 0;
@@ -301,7 +301,7 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf)
 }
 
 static
-int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx)
+int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        struct channel *chan = ctx->client_priv;
        int ret;
@@ -319,34 +319,34 @@ int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx)
 }
 
 static
-void lttng_event_commit(struct lib_ring_buffer_ctx *ctx)
+void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
        lib_ring_buffer_commit(&client_config, ctx);
 }
 
 static
-void lttng_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
+void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
                     size_t len)
 {
        lib_ring_buffer_write(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_write_from_user(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
                               const void __user *src, size_t len)
 {
        lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
 }
 
 static
-void lttng_event_memset(struct lib_ring_buffer_ctx *ctx,
+void lttng_event_memset(struct lttng_kernel_ring_buffer_ctx *ctx,
                int c, size_t len)
 {
        lib_ring_buffer_memset(&client_config, ctx, c, len);
 }
 
 static
-void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src,
+void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
                size_t len)
 {
        lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');

diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c
index 1db8be497557e9da6e9f850f919ba734dd2ef075..7c77c566b596896a8c063318a19aaae5f12fe6ff 100644 (file)
--- a/src/probes/lttng-kprobes.c
+++ b/src/probes/lttng-kprobes.c
@@ -60,7 +60,7 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs)
                struct lttng_kernel_event_recorder *event_recorder =
                        container_of(event, struct lttng_kernel_event_recorder, parent);
                struct lttng_channel *chan = event_recorder->chan;
-               struct lib_ring_buffer_ctx ctx;
+               struct lttng_kernel_ring_buffer_ctx ctx;
                int ret;
 
                lib_ring_buffer_ctx_init(&ctx, event_recorder, sizeof(data),

diff --git a/src/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c
index 30604b502415c7718d605d5ca3dae37579eb29ca..2677f8ab8abe77ce35adcf44a322a0df53546b76 100644 (file)
--- a/src/probes/lttng-kretprobes.c
+++ b/src/probes/lttng-kretprobes.c
@@ -75,7 +75,7 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi,
                struct lttng_kernel_event_recorder *event_recorder =
                        container_of(event, struct lttng_kernel_event_recorder, parent);
                struct lttng_channel *chan = event_recorder->chan;
-               struct lib_ring_buffer_ctx ctx;
+               struct lttng_kernel_ring_buffer_ctx ctx;
                int ret;
 
                payload.ip = (unsigned long) lttng_get_kretprobe(krpi)->kp.addr;

diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c
index 4f2504e91ff3bbcf36978311a356ac4d59ec48d8..0240aaca5d34762630a22fd64d705ed0855928e8 100644 (file)
--- a/src/probes/lttng-uprobes.c
+++ b/src/probes/lttng-uprobes.c
@@ -65,7 +65,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs *
                struct lttng_kernel_event_recorder *event_recorder =
                        container_of(event, struct lttng_kernel_event_recorder, parent);
                struct lttng_channel *chan = event_recorder->chan;
-               struct lib_ring_buffer_ctx ctx;
+               struct lttng_kernel_ring_buffer_ctx ctx;
                int ret;
 
                lib_ring_buffer_ctx_init(&ctx, event_recorder,