Rename ringbuffer-context.h to ust-ringbuffer-context.h

For naming consistency of public headers.

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

diff --git a/include/Makefile.am b/include/Makefile.am
index 042f9e00e663f2d5e94684d5d7de7b3d4f8313b6..287fe13dafa842a1f26b7e059dba0abd30f7aed4 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,7 +21,7 @@ nobase_include_HEADERS = \
        lttng/ust-compiler.h \
        lttng/ust-fork.h \
        lttng/ust-endian.h \
-       lttng/ringbuffer-context.h \
+       lttng/ust-ringbuffer-context.h \
        lttng/ust-utils.h \
        lttng/ust-error.h \
        lttng/tracef.h \

diff --git a/include/lttng/ringbuffer-context.h b/include/lttng/ringbuffer-context.h
deleted file mode 100644 (file)
index a31e80e..0000000
--- a/include/lttng/ringbuffer-context.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2010-2021 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Ring buffer context header.
- */
-
-#ifndef _LTTNG_RING_BUFFER_CONTEXT_H
-#define _LTTNG_RING_BUFFER_CONTEXT_H
-
-#include <errno.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <urcu/arch.h>
-#include <string.h>
-
-#include <lttng/ust-tracer.h>
-#include <lttng/ust-utils.h>
-#include <lttng/ust-compiler.h>
-
-struct lttng_ust_ring_buffer;
-struct lttng_ust_ring_buffer_channel;
-struct lttng_ust_ring_buffer_ctx;
-struct lttng_ust_ring_buffer_ctx_private;
-
-/*
- * ring buffer context
- *
- * IMPORTANT: this structure is part of the ABI between the probe and
- * UST. Fields need to be only added at the end, never reordered, never
- * removed.
- *
- * The field @struct_size should be used to determine the size of the
- * structure. It should be queried before using additional fields added
- * at the end of the structure.
- */
-struct lttng_ust_ring_buffer_ctx {
-       uint32_t struct_size;                   /* Size of this structure. */
-
-       void *client_priv;                      /* Ring buffer client private data */
-       size_t data_size;                       /* size of payload */
-       int largest_align;                      /*
-                                                * alignment of the largest element
-                                                * in the payload
-                                                */
-       void *ip;                               /* caller ip address */
-
-       /* Private ring buffer context, set by reserve callback. */
-       struct lttng_ust_ring_buffer_ctx_private *priv;
-
-       /* End of base ABI. Fields below should be used after checking struct_size. */
-};
-
-/**
- * lttng_ust_ring_buffer_ctx_init - initialize ring buffer context
- * @ctx: ring buffer context to initialize
- * @client_priv: client private data
- * @data_size: size of record data payload
- * @largest_align: largest alignment within data payload types
- * @ip: caller ip address
- */
-static inline
-void lttng_ust_ring_buffer_ctx_init(struct lttng_ust_ring_buffer_ctx *ctx,
-                                       void *client_priv, size_t data_size, int largest_align,
-                                       void *ip)
-       lttng_ust_notrace;
-static inline
-void lttng_ust_ring_buffer_ctx_init(struct lttng_ust_ring_buffer_ctx *ctx,
-                                       void *client_priv, size_t data_size, int largest_align,
-                                       void *ip)
-{
-       ctx->struct_size = sizeof(struct lttng_ust_ring_buffer_ctx);
-       ctx->client_priv = client_priv;
-       ctx->data_size = data_size;
-       ctx->largest_align = largest_align;
-       ctx->ip = ip;
-       ctx->priv = NULL;
-}
-
-/*
- * We need to define LTTNG_UST_RING_BUFFER_ALIGN_ATTR so it is known early at
- * compile-time. We have to duplicate the "config->align" information and the
- * definition here because config->align is used both in the slow and fast
- * paths, but LTTNG_UST_RING_BUFFER_ALIGN_ATTR is only available for the client
- * code.
- */
-#ifdef LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
-
-# define LTTNG_UST_RING_BUFFER_ALIGN_ATTR      /* Default arch alignment */
-
-/*
- * lttng_ust_ring_buffer_align - Calculate the offset needed to align the type.
- * @align_drift:  object offset from an "alignment"-aligned address.
- * @size_of_type: Must be non-zero, power of 2.
- */
-static inline
-unsigned int lttng_ust_ring_buffer_align(size_t align_drift, size_t size_of_type)
-       lttng_ust_notrace;
-static inline
-unsigned int lttng_ust_ring_buffer_align(size_t align_drift, size_t size_of_type)
-{
-       return lttng_ust_offset_align(align_drift, size_of_type);
-}
-
-#else
-
-# define LTTNG_UST_RING_BUFFER_ALIGN_ATTR __attribute__((packed))
-
-/*
- * lttng_ust_ring_buffer_align - Calculate the offset needed to align the type.
- * @align_drift:  object offset from an "alignment"-aligned address.
- * @size_of_type: Must be non-zero, power of 2.
- */
-static inline
-unsigned int lttng_ust_ring_buffer_align(size_t align_drift, size_t size_of_type)
-       lttng_ust_notrace;
-static inline
-unsigned int lttng_ust_ring_buffer_align(size_t align_drift __attribute__((unused)),
-               size_t size_of_type __attribute__((unused)))
-{
-       /*
-        * On architectures with efficient unaligned memory access, the content
-        * of the ringbuffer is packed and so the offset is always zero.
-        */
-       return 0;
-}
-
-#endif
-
-#endif /* _LTTNG_RING_BUFFER_CONTEXT_H */

diff --git a/include/lttng/ust-ringbuffer-context.h b/include/lttng/ust-ringbuffer-context.h
new file mode 100644 (file)
index 0000000..133d802
--- /dev/null
+++ b/include/lttng/ust-ringbuffer-context.h
@@ -0,0 +1,131 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2010-2021 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Ring buffer context header.
+ */
+
+#ifndef _LTTNG_UST_RING_BUFFER_CONTEXT_H
+#define _LTTNG_UST_RING_BUFFER_CONTEXT_H
+
+#include <errno.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <urcu/arch.h>
+#include <string.h>
+
+#include <lttng/ust-tracer.h>
+#include <lttng/ust-utils.h>
+#include <lttng/ust-compiler.h>
+
+struct lttng_ust_ring_buffer;
+struct lttng_ust_ring_buffer_channel;
+struct lttng_ust_ring_buffer_ctx;
+struct lttng_ust_ring_buffer_ctx_private;
+
+/*
+ * ring buffer context
+ *
+ * IMPORTANT: this structure is part of the ABI between the probe and
+ * UST. Fields need to be only added at the end, never reordered, never
+ * removed.
+ *
+ * The field @struct_size should be used to determine the size of the
+ * structure. It should be queried before using additional fields added
+ * at the end of the structure.
+ */
+struct lttng_ust_ring_buffer_ctx {
+       uint32_t struct_size;                   /* Size of this structure. */
+
+       void *client_priv;                      /* Ring buffer client private data */
+       size_t data_size;                       /* size of payload */
+       int largest_align;                      /*
+                                                * alignment of the largest element
+                                                * in the payload
+                                                */
+       void *ip;                               /* caller ip address */
+
+       /* Private ring buffer context, set by reserve callback. */
+       struct lttng_ust_ring_buffer_ctx_private *priv;
+
+       /* End of base ABI. Fields below should be used after checking struct_size. */
+};
+
+/**
+ * lttng_ust_ring_buffer_ctx_init - initialize ring buffer context
+ * @ctx: ring buffer context to initialize
+ * @client_priv: client private data
+ * @data_size: size of record data payload
+ * @largest_align: largest alignment within data payload types
+ * @ip: caller ip address
+ */
+static inline
+void lttng_ust_ring_buffer_ctx_init(struct lttng_ust_ring_buffer_ctx *ctx,
+                                       void *client_priv, size_t data_size, int largest_align,
+                                       void *ip)
+       lttng_ust_notrace;
+static inline
+void lttng_ust_ring_buffer_ctx_init(struct lttng_ust_ring_buffer_ctx *ctx,
+                                       void *client_priv, size_t data_size, int largest_align,
+                                       void *ip)
+{
+       ctx->struct_size = sizeof(struct lttng_ust_ring_buffer_ctx);
+       ctx->client_priv = client_priv;
+       ctx->data_size = data_size;
+       ctx->largest_align = largest_align;
+       ctx->ip = ip;
+       ctx->priv = NULL;
+}
+
+/*
+ * We need to define LTTNG_UST_RING_BUFFER_ALIGN_ATTR so it is known early at
+ * compile-time. We have to duplicate the "config->align" information and the
+ * definition here because config->align is used both in the slow and fast
+ * paths, but LTTNG_UST_RING_BUFFER_ALIGN_ATTR is only available for the client
+ * code.
+ */
+#ifdef LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
+
+# define LTTNG_UST_RING_BUFFER_ALIGN_ATTR      /* Default arch alignment */
+
+/*
+ * lttng_ust_ring_buffer_align - Calculate the offset needed to align the type.
+ * @align_drift:  object offset from an "alignment"-aligned address.
+ * @size_of_type: Must be non-zero, power of 2.
+ */
+static inline
+unsigned int lttng_ust_ring_buffer_align(size_t align_drift, size_t size_of_type)
+       lttng_ust_notrace;
+static inline
+unsigned int lttng_ust_ring_buffer_align(size_t align_drift, size_t size_of_type)
+{
+       return lttng_ust_offset_align(align_drift, size_of_type);
+}
+
+#else
+
+# define LTTNG_UST_RING_BUFFER_ALIGN_ATTR __attribute__((packed))
+
+/*
+ * lttng_ust_ring_buffer_align - Calculate the offset needed to align the type.
+ * @align_drift:  object offset from an "alignment"-aligned address.
+ * @size_of_type: Must be non-zero, power of 2.
+ */
+static inline
+unsigned int lttng_ust_ring_buffer_align(size_t align_drift, size_t size_of_type)
+       lttng_ust_notrace;
+static inline
+unsigned int lttng_ust_ring_buffer_align(size_t align_drift __attribute__((unused)),
+               size_t size_of_type __attribute__((unused)))
+{
+       /*
+        * On architectures with efficient unaligned memory access, the content
+        * of the ringbuffer is packed and so the offset is always zero.
+        */
+       return 0;
+}
+
+#endif
+
+#endif /* _LTTNG_UST_RING_BUFFER_CONTEXT_H */

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 28684092bde07213a1fcbe9be5990f0c582a96dc..ea0e9564f66a66b09131dbf9cdbca8b5f0c0ac54 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -10,7 +10,7 @@
 #include <urcu/compiler.h>
 #include <urcu/rculist.h>
 #include <lttng/ust-events.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include <lttng/ust-arch.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/tracepoint.h>

diff --git a/src/common/ringbuffer/backend_internal.h b/src/common/ringbuffer/backend_internal.h
index 96561b034c862820efdb89109ed1e037c755ee0b..9ce9d1405662a150a55737c54746d208115ed2b2 100644 (file)
--- a/src/common/ringbuffer/backend_internal.h
+++ b/src/common/ringbuffer/backend_internal.h
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <urcu/compiler.h>
 
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "ringbuffer-config.h"
 #include "backend_types.h"
 #include "frontend_types.h"

diff --git a/src/common/ringbuffer/frontend_internal.h b/src/common/ringbuffer/frontend_internal.h
index 8ec90dbc447dc4d5258991e94a7edb26a6f934bf..9655a19f3c957274b5e7297dade667028a779190 100644 (file)
--- a/src/common/ringbuffer/frontend_internal.h
+++ b/src/common/ringbuffer/frontend_internal.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "ringbuffer-config.h"
 #include "backend_types.h"
 #include "backend_internal.h"

diff --git a/src/common/ringbuffer/frontend_types.h b/src/common/ringbuffer/frontend_types.h
index e368c734e13a3d17617333c959aa7eb0d52bbbd9..5765579769cc84d50b9031f7985e62f27abbd6d2 100644 (file)
--- a/src/common/ringbuffer/frontend_types.h
+++ b/src/common/ringbuffer/frontend_types.h
@@ -18,7 +18,7 @@
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
 
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "ringbuffer-config.h"
 #include "common/logging.h"
 #include "backend_types.h"

diff --git a/src/common/ringbuffer/ring_buffer_backend.c b/src/common/ringbuffer/ring_buffer_backend.c
index c880c9d610011ffff3fbe5396b98c6e0c3908896..5a9987428d59a1b8bd6a3e6830b2fbf42a6a555b 100644 (file)
--- a/src/common/ringbuffer/ring_buffer_backend.c
+++ b/src/common/ringbuffer/ring_buffer_backend.c
@@ -12,7 +12,7 @@
 #include <limits.h>
 
 #include <lttng/ust-utils.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "ringbuffer-config.h"
 #include "vatomic.h"

diff --git a/src/common/ringbuffer/ring_buffer_frontend.c b/src/common/ringbuffer/ring_buffer_frontend.c
index 924d685224d0b5df32affcb231fb4b5d8a0b8f47..5a9117f6ef053736e12952874cdbc0a3e44cb1c4 100644 (file)
--- a/src/common/ringbuffer/ring_buffer_frontend.c
+++ b/src/common/ringbuffer/ring_buffer_frontend.c
@@ -53,7 +53,7 @@
 #include "common/macros.h"
 
 #include <lttng/ust-utils.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "smp.h"
 #include "ringbuffer-config.h"

diff --git a/src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.c b/src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.c
index 1562ab0a3eebc2afbcc602687bca4af6d0a4af38..6f6d0e0696b354fcfe05a0154b5142ef329a3fec 100644 (file)
--- a/src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.c
+++ b/src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <lttng/ust-events.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include <common/ust-context-provider.h>
 
 #include "common/macros.h"

diff --git a/src/lib/lttng-ust/lttng-context-cgroup-ns.c b/src/lib/lttng-ust/lttng-context-cgroup-ns.c
index 1d5abc2d4d08843b2647d290389ebdbac0d58e45..7e992d86c6b4852b3c779c2973c51ef46e704858 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-cgroup-ns.c
+++ b/src/lib/lttng-ust/lttng-context-cgroup-ns.c
@@ -17,7 +17,7 @@
 #include <lttng/ust-tracer.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "lttng-tracer-core.h"

diff --git a/src/lib/lttng-ust/lttng-context-cpu-id.c b/src/lib/lttng-ust/lttng-context-cpu-id.c
index 9ade4dfbf0ebc6fab14ef5a990d83010ef1cc6d2..f1455ea1b4248cc8f8ccc22bc6f030d5d3c4df29 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-cpu-id.c
+++ b/src/lib/lttng-ust/lttng-context-cpu-id.c
@@ -20,7 +20,7 @@
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include "lib/lttng-ust/getcpu.h"
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 

diff --git a/src/lib/lttng-ust/lttng-context-ip.c b/src/lib/lttng-ust/lttng-context-ip.c
index 9cf72eb2baf9142f6fece4a51d10ed1cfb7e66be..2a652913547007ed5d6efb7c4a13fcf2085e8810 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-ip.c
+++ b/src/lib/lttng-ust/lttng-context-ip.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 

diff --git a/src/lib/lttng-ust/lttng-context-ipc-ns.c b/src/lib/lttng-ust/lttng-context-ipc-ns.c
index f37252cd81f36f40fd59da0d8d8f84dd6f7362da..d6206bd4c4f84d5bb7cca8c828cbae31283244b0 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-ipc-ns.c
+++ b/src/lib/lttng-ust/lttng-context-ipc-ns.c
@@ -17,7 +17,7 @@
 #include <lttng/ust-tracer.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "lttng-tracer-core.h"

diff --git a/src/lib/lttng-ust/lttng-context-mnt-ns.c b/src/lib/lttng-ust/lttng-context-mnt-ns.c
index 4cd552e77b68fa49037b42b500d65ffe50a973f4..e7b32e6498c7ccf6953b4651c15757247c37186f 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-mnt-ns.c
+++ b/src/lib/lttng-ust/lttng-context-mnt-ns.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/ns.h"

diff --git a/src/lib/lttng-ust/lttng-context-net-ns.c b/src/lib/lttng-ust/lttng-context-net-ns.c
index af80eab544302603d60426103888fa84e4b53992..5a8086f431e4c04162e48b63bdae3a7e9d64becf 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-net-ns.c
+++ b/src/lib/lttng-ust/lttng-context-net-ns.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
 

diff --git a/src/lib/lttng-ust/lttng-context-perf-counters.c b/src/lib/lttng-ust/lttng-context-perf-counters.c
index e1ce489030b688b3c529af2eb21c068cd7ce9756..e6833ecdf53d8ed16c042d853a522396eb816d58 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-perf-counters.c
+++ b/src/lib/lttng-ust/lttng-context-perf-counters.c
@@ -21,7 +21,7 @@
 #include <lttng/ust-arch.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include <urcu/system.h>
 #include <urcu/arch.h>
 #include <urcu/rculist.h>

diff --git a/src/lib/lttng-ust/lttng-context-pid-ns.c b/src/lib/lttng-ust/lttng-context-pid-ns.c
index a67b0e3b1d98d8245ae40440a00f04ca9c512bc8..f8e5aa4f4cec12e3810d673bacc019ab20ddc068 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-pid-ns.c
+++ b/src/lib/lttng-ust/lttng-context-pid-ns.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/ns.h"

diff --git a/src/lib/lttng-ust/lttng-context-procname.c b/src/lib/lttng-ust/lttng-context-procname.c
index 09484d85e95a4e28402bb7bfa20d6b1be406bcb2..093b50c7c1444b60d791fee756b883b0c195d365 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-procname.c
+++ b/src/lib/lttng-ust/lttng-context-procname.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include <urcu/tls-compat.h>
 #include <assert.h>
 #include "common/compat/pthread.h"

diff --git a/src/lib/lttng-ust/lttng-context-pthread-id.c b/src/lib/lttng-ust/lttng-context-pthread-id.c
index f6f8d76815c0c133d273fd5e6831dc11491aa205..8a608c247ca0612a5bc4dd5db2a2ab2042ca96bd 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-pthread-id.c
+++ b/src/lib/lttng-ust/lttng-context-pthread-id.c
@@ -12,7 +12,7 @@
 #include <pthread.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 

diff --git a/src/lib/lttng-ust/lttng-context-time-ns.c b/src/lib/lttng-ust/lttng-context-time-ns.c
index ea3acc21bfb2bb9b1818c53b49f6ccd9744566be..328d9e08b05f75cbb83be4d57f1a5108e40cd9e8 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-time-ns.c
+++ b/src/lib/lttng-ust/lttng-context-time-ns.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
 #include "lttng-tracer-core.h"

diff --git a/src/lib/lttng-ust/lttng-context-user-ns.c b/src/lib/lttng-ust/lttng-context-user-ns.c
index 70c0b3e301cbfcc237fb4ad135c477ee9af5539f..ab49e34cd0d39405dd2785fe67fb4fe7e502d7ed 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-user-ns.c
+++ b/src/lib/lttng-ust/lttng-context-user-ns.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/ns.h"

diff --git a/src/lib/lttng-ust/lttng-context-uts-ns.c b/src/lib/lttng-ust/lttng-context-uts-ns.c
index 3266b553ffa5a5eba159c00c3bc351f6f0547a83..9ca666eb7a8468904be71632cdb6be02e2c50a8b 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-uts-ns.c
+++ b/src/lib/lttng-ust/lttng-context-uts-ns.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
 

diff --git a/src/lib/lttng-ust/lttng-context-vegid.c b/src/lib/lttng-ust/lttng-context-vegid.c
index b8b23ab743c7440cb863dc9170695167443a9b7c..9fcd43ec823f79e9b71b15939b94fdd05fdfdc1f 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vegid.c
+++ b/src/lib/lttng-ust/lttng-context-vegid.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/creds.h"

diff --git a/src/lib/lttng-ust/lttng-context-veuid.c b/src/lib/lttng-ust/lttng-context-veuid.c
index a351284f1ce31758db66aa4f681cde39a4474ffd..201ee2f35fa9146262343ab26515bcbd27528170 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-veuid.c
+++ b/src/lib/lttng-ust/lttng-context-veuid.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/creds.h"

diff --git a/src/lib/lttng-ust/lttng-context-vgid.c b/src/lib/lttng-ust/lttng-context-vgid.c
index 93f65e800d6eaa20b00aab0c81d53d82f57288fc..312580e3832db3b652f23dbf5b903f2253406379 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vgid.c
+++ b/src/lib/lttng-ust/lttng-context-vgid.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/creds.h"

diff --git a/src/lib/lttng-ust/lttng-context-vpid.c b/src/lib/lttng-ust/lttng-context-vpid.c
index 37d607f8c79cd6e2e8dbc68104a3df907b4a727e..47b5a8e17e18ad3e6259f79d09ff62aa3460b8c9 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vpid.c
+++ b/src/lib/lttng-ust/lttng-context-vpid.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 

diff --git a/src/lib/lttng-ust/lttng-context-vsgid.c b/src/lib/lttng-ust/lttng-context-vsgid.c
index 1363265c4c2655f2a7522cbff72cfd7aba4b1122..e05e680d503d0960fd008de234258d4265505328 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vsgid.c
+++ b/src/lib/lttng-ust/lttng-context-vsgid.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/creds.h"

diff --git a/src/lib/lttng-ust/lttng-context-vsuid.c b/src/lib/lttng-ust/lttng-context-vsuid.c
index c679a26d0232ae4e128614f0bc99ccf6a58cd2f8..ee2f022b6b2af94fc325b8d2cf6be2b4f03fc61b 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vsuid.c
+++ b/src/lib/lttng-ust/lttng-context-vsuid.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/creds.h"

diff --git a/src/lib/lttng-ust/lttng-context-vtid.c b/src/lib/lttng-ust/lttng-context-vtid.c
index ff91002dcb55a7400644d3dd36c5c3dfe6e635ac..732a82057770833fa74ba72e25f0bc39a464480b 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vtid.c
+++ b/src/lib/lttng-ust/lttng-context-vtid.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
 

diff --git a/src/lib/lttng-ust/lttng-context-vuid.c b/src/lib/lttng-ust/lttng-context-vuid.c
index 8f40aae4f6d98b52129e46d36d8f58f5c43ca7f0..3e72d05e97917745395aa32587ac83b97d2813ae 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-vuid.c
+++ b/src/lib/lttng-ust/lttng-context-vuid.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "common/creds.h"

diff --git a/src/lib/lttng-ust/lttng-tracer-core.h b/src/lib/lttng-ust/lttng-tracer-core.h
index df4857b93db9f88f5ffc714301a79e9a23fe9d48..ade4636a7bee7fc78f1067e7ca58fa41eee586e9 100644 (file)
--- a/src/lib/lttng-ust/lttng-tracer-core.h
+++ b/src/lib/lttng-ust/lttng-tracer-core.h
@@ -13,7 +13,7 @@
 #include <urcu/arch.h>
 #include <urcu/list.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include "common/logging.h"
 
 struct lttng_ust_session;

diff --git a/tests/compile/test-app-ctx/hello.c b/tests/compile/test-app-ctx/hello.c
index a8c40451b2754aa8ecafb2029ad2dbfbfb79f583..be63ecbc2dcfe1ef2a3c2af53a9ecbbc8f0674dc 100644 (file)
--- a/tests/compile/test-app-ctx/hello.c
+++ b/tests/compile/test-app-ctx/hello.c
@@ -29,7 +29,7 @@ struct mmsghdr;
 #include "ust_tests_hello.h"
 
 #include <lttng/ust-events.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 /* Internal header. */
 #include <common/ust-context-provider.h>