Rename "tsc" to "timestamp"

[lttng-modules.git] / src / lttng-context-vppid.c

diff --git a/src/lttng-context-vppid.c b/src/lttng-context-vppid.c
index 1ff182c3bee5d5b775a141767cfcfc39a77c1e92..c6f9646dbfae3d1dcdb77b12901063748f1efa4c 100644 (file)
--- a/src/lttng-context-vppid.c
+++ b/src/lttng-context-vppid.c
@@ -12,12 +12,13 @@
 #include <linux/sched.h>
 #include <linux/syscalls.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
 #include <lttng/tracer.h>
 
 static
-size_t vppid_get_size(size_t offset)
+size_t vppid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -27,9 +28,9 @@ size_t vppid_get_size(size_t offset)
 }
 
 static
-void vppid_record(struct lttng_ctx_field *field,
-                 struct lib_ring_buffer_ctx *ctx,
-                 struct lttng_channel *chan)
+void vppid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                 struct lttng_kernel_ring_buffer_ctx *ctx,
+                 struct lttng_kernel_channel_buffer *chan)
 {
        struct task_struct *parent;
        pid_t vppid;
@@ -54,14 +55,13 @@ void vppid_record(struct lttng_ctx_field *field,
        else
                vppid = task_tgid_vnr(parent);
        rcu_read_unlock();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vppid));
-       chan->ops->event_write(ctx, &vppid, sizeof(vppid));
+       chan->ops->event_write(ctx, &vppid, sizeof(vppid), lttng_alignof(vppid));
 }
 
 static
-void vppid_get_value(struct lttng_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void vppid_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
        struct task_struct *parent;
        pid_t vppid;
@@ -86,33 +86,26 @@ void vppid_get_value(struct lttng_ctx_field *field,
        else
                vppid = task_tgid_vnr(parent);
        rcu_read_unlock();
-       value->s64 = vppid;
+       value->u.s64 = vppid;
 }
 
-int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx)
+static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
+       lttng_kernel_static_event_field("vppid",
+               lttng_kernel_static_type_integer_from_type(pid_t, __BYTE_ORDER, 10),
+               false, false),
+       vppid_get_size,
+       vppid_record,
+       vppid_get_value,
+       NULL, NULL);
+
+int lttng_add_vppid_to_ctx(struct lttng_kernel_ctx **ctx)
 {
-       struct lttng_ctx_field *field;
+       int ret;
 
-       field = lttng_append_context(ctx);
-       if (!field)
-               return -ENOMEM;
-       if (lttng_find_context(*ctx, "vppid")) {
-               lttng_remove_context_field(ctx, field);
+       if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
                return -EEXIST;
-       }
-       field->event_field.name = "vppid";
-       field->event_field.type.type = lttng_kernel_type_integer;
-       field->event_field.type.u.integer.size = sizeof(pid_t) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(pid_t);
-       field->event_field.type.u.integer.reverse_byte_order = 0;
-       field->event_field.type.u.integer.base = 10;
-       field->event_field.type.u.integer.encoding = lttng_encode_none;
-       field->get_size = vppid_get_size;
-       field->record = vppid_record;
-       field->get_value = vppid_get_value;
-       lttng_context_update(*ctx);
+       ret = lttng_kernel_context_append(ctx, ctx_field);
        wrapper_vmalloc_sync_mappings();
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vppid_to_ctx);