X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-pid-ns.c;h=fdf91bb889113092552c8988f8426bd922edf796;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=1c3cc2bc7e6b8e1a35777bab70a6a7b86c717fe0;hpb=437d5aa59380583ce1cd14d394a53b398be1275d;p=lttng-modules.git diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c index 1c3cc2bc..fdf91bb8 100644 --- a/src/lttng-context-pid-ns.c +++ b/src/lttng-context-pid-ns.c @@ -24,7 +24,7 @@ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) static -size_t pid_ns_get_size(size_t offset) +size_t pid_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -34,9 +34,9 @@ size_t pid_ns_get_size(size_t offset) } static -void pid_ns_record(struct lttng_kernel_ctx_field *field, - struct lib_ring_buffer_ctx *ctx, - struct lttng_channel *chan) +void pid_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, + struct lttng_kernel_ring_buffer_ctx *ctx, + struct lttng_kernel_channel_buffer *chan) { struct pid_namespace *ns; unsigned int pid_ns_inum = 0; @@ -51,14 +51,13 @@ void pid_ns_record(struct lttng_kernel_ctx_field *field, if (ns) pid_ns_inum = ns->lttng_ns_inum; - lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns_inum)); - chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum)); + chan->ops->event_write(ctx, &pid_ns_inum, sizeof(pid_ns_inum), lttng_alignof(pid_ns_inum)); } static -void pid_ns_get_value(struct lttng_kernel_ctx_field *field, - struct lttng_probe_ctx *lttng_probe_ctx, - union lttng_ctx_value *value) +void pid_ns_get_value(void *priv, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, + struct lttng_ctx_value *value) { struct pid_namespace *ns; unsigned int pid_ns_inum = 0; @@ -73,7 +72,7 @@ void pid_ns_get_value(struct lttng_kernel_ctx_field *field, if (ns) pid_ns_inum = ns->lttng_ns_inum; - value->s64 = pid_ns_inum; + value->u.s64 = pid_ns_inum; } static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field( @@ -81,7 +80,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), pid_ns_get_size, - NULL, pid_ns_record, pid_ns_get_value, NULL, NULL);