Move alignment into event write callback

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

diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c
index a1a8d6dd7695a9fa9549dd5353358b09eea333d7..2d8994afd614fa26457064cd3739cf7a964743a7 100644 (file)
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -15,6 +15,7 @@
 #include <linux/nsproxy.h>
 #include <net/net_namespace.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <wrapper/namespace.h>
@@ -24,7 +25,7 @@
        (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
 
 static
-size_t net_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -34,9 +35,9 @@ size_t net_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off
 }
 
 static
-void net_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void net_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 net_ns_inum = 0;
 
@@ -50,13 +51,12 @@ void net_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx,
        if (current->nsproxy)
                net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
 
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(net_ns_inum));
-       chan->ops->event_write(ctx, &net_ns_inum, sizeof(net_ns_inum));
+       chan->ops->event_write(ctx, &net_ns_inum, sizeof(net_ns_inum), lttng_alignof(net_ns_inum));
 }
 
 static
 void net_ns_get_value(void *priv,
-               struct lttng_probe_ctx *lttng_probe_ctx,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
                struct lttng_ctx_value *value)
 {
        unsigned int net_ns_inum = 0;