X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-cgroup-ns.c;h=27659db8334e92adcc8dbbc2bfa9da71402020a2;hb=refs%2Fheads%2Fmaster;hp=0bc345c5f9c9d3c2d1ef58b7dd898260434450c8;hpb=2dc781e02eb156a76554ada092a181ab2916db57;p=lttng-modules.git diff --git a/src/lttng-context-cgroup-ns.c b/src/lttng-context-cgroup-ns.c index 0bc345c5..27659db8 100644 --- a/src/lttng-context-cgroup-ns.c +++ b/src/lttng-context-cgroup-ns.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #if defined(CONFIG_CGROUPS) && \ @@ -25,7 +24,7 @@ LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0)) static -size_t cgroup_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t cgroup_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -35,9 +34,9 @@ size_t cgroup_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t } static -void cgroup_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, - struct lib_ring_buffer_ctx *ctx, - struct lttng_channel *chan) +void cgroup_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 cgroup_ns_inum = 0; @@ -49,15 +48,14 @@ void cgroup_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, * namespaces, just dereference the pointers. */ if (current->nsproxy) - cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum; + cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum; - lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns_inum)); - chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum)); + chan->ops->event_write(ctx, &cgroup_ns_inum, sizeof(cgroup_ns_inum), lttng_alignof(cgroup_ns_inum)); } static void cgroup_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 cgroup_ns_inum = 0; @@ -70,7 +68,7 @@ void cgroup_ns_get_value(void *priv, * namespaces, just dereference the pointers. */ if (current->nsproxy) - cgroup_ns_inum = current->nsproxy->cgroup_ns->lttng_ns_inum; + cgroup_ns_inum = current->nsproxy->cgroup_ns->ns.inum; value->u.s64 = cgroup_ns_inum; } @@ -78,7 +76,7 @@ void cgroup_ns_get_value(void *priv, static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field( lttng_kernel_static_event_field("cgroup_ns", lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10), - false, false, false), + false, false), cgroup_ns_get_size, cgroup_ns_record, cgroup_ns_get_value,