Rename "tsc" to "timestamp"

[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 1c8adf4962502b840fabb4d9e0488c6159632df7..ad6d6d2af24a32296e06e5d67bcdaa6f18e082f1 100644 (file)
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -9,22 +9,21 @@
  *
  */
 
+#ifdef CONFIG_NET_NS
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #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>
 #include <lttng/tracer.h>
 
-#if defined(CONFIG_NET_NS) && \
-       (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
-
 static
-size_t net_ns_get_size(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 +33,9 @@ size_t net_ns_get_size(size_t offset)
 }
 
 static
-void net_ns_record(struct lttng_kernel_ctx_field *field,
-                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;
 
@@ -48,16 +47,15 @@ void net_ns_record(struct lttng_kernel_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
+               net_ns_inum = current->nsproxy->net_ns->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(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void net_ns_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
        unsigned int net_ns_inum = 0;
 
@@ -69,17 +67,16 @@ void net_ns_get_value(struct lttng_kernel_ctx_field *field,
         * namespaces, just dereference the pointers.
         */
        if (current->nsproxy)
-               net_ns_inum = current->nsproxy->net_ns->lttng_ns_inum;
+               net_ns_inum = current->nsproxy->net_ns->ns.inum;
 
-       value->s64 = net_ns_inum;
+       value->u.s64 = net_ns_inum;
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("net_ns",
                lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        net_ns_get_size,
-       NULL,
        net_ns_record,
        net_ns_get_value,
        NULL, NULL);