Move alignment into event write callback

[lttng-modules.git] / src / lttng-context-ipc-ns.c

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index 113ffb750648c86048be062c21aa4eae9b309796..d5d0608f0bde307dcf21b96d68cc080e57d79ce5 100644 (file)
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/ipc_namespace.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/namespace.h>
@@ -23,7 +24,7 @@
        (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t ipc_ns_get_size(size_t offset)
+size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -33,9 +34,9 @@ size_t ipc_ns_get_size(size_t offset)
 }
 
 static
-void ipc_ns_record(struct lttng_kernel_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void ipc_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
+                struct lttng_kernel_channel_buffer *chan)
 {
        unsigned int ipc_ns_inum = 0;
 
@@ -49,14 +50,13 @@ void ipc_ns_record(struct lttng_kernel_ctx_field *field,
        if (current->nsproxy)
                ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
 
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns_inum));
-       chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum));
+       chan->ops->event_write(ctx, &ipc_ns_inum, sizeof(ipc_ns_inum), lttng_alignof(ipc_ns_inum));
 }
 
 static
-void ipc_ns_get_value(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void ipc_ns_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
        unsigned int ipc_ns_inum = 0;
 
@@ -70,7 +70,7 @@ void ipc_ns_get_value(struct lttng_kernel_ctx_field *field,
        if (current->nsproxy)
                ipc_ns_inum = current->nsproxy->ipc_ns->lttng_ns_inum;
 
-       value->s64 = ipc_ns_inum;
+       value->u.s64 = ipc_ns_inum;
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
@@ -78,7 +78,6 @@ static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
                false, false, false),
        ipc_ns_get_size,
-       NULL,
        ipc_ns_record,
        ipc_ns_get_value,
        NULL, NULL);