fix: refactor contexts for type description structures

The 'preemptible' and 'migratable' contexts were not refactored along
the others in :

  commit 437d5aa59380583ce1cd14d394a53b398be1275d
  Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  Date:   Wed Apr 7 14:52:27 2021 -0400

    Refactoring: type description structures

Change-Id: I8a228c0ff982a4aded27b055baae1f5efec29164
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/lttng-context-migratable.c b/src/lttng-context-migratable.c
index 210c6d3059d604e05c7e57f770694590851350ca..1695f512a66aa49e872f4fa047985046985a5a2f 100644 (file)
--- a/src/lttng-context-migratable.c
+++ b/src/lttng-context-migratable.c
@@ -45,30 +45,24 @@ void migratable_get_value(struct lttng_kernel_ctx_field *field,
        value->s64 = !current->migrate_disable;
 }
 
+static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
+       lttng_kernel_static_event_field("migratable",
+               lttng_kernel_static_type_integer_from_type(uint8_t, __BYTE_ORDER, 10),
+               false, false, false),
+       migratable_get_size,
+       NULL,
+       migratable_record,
+       migratable_get_value,
+       NULL, NULL);
+
 int lttng_add_migratable_to_ctx(struct lttng_kernel_ctx **ctx)
 {
-       struct lttng_kernel_ctx_field *field;
+       int ret;
 
-       field = lttng_append_context(ctx);
-       if (!field)
-               return -ENOMEM;
-       if (lttng_find_context(*ctx, "migratable")) {
-               lttng_remove_context_field(ctx, field);
+       if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
                return -EEXIST;
-       }
-       field->event_field.name = "migratable";
-       field->event_field.type.type = lttng_kernel_type_integer;
-       field->event_field.type.u.integer.size = sizeof(uint8_t) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(uint8_t) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(uint8_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_kernel_string_encoding_none;
-       field->get_size = migratable_get_size;
-       field->record = migratable_record;
-       field->get_value = migratable_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_migratable_to_ctx);

diff --git a/src/lttng-context-preemptible.c b/src/lttng-context-preemptible.c
index 9098f4b06b1a006e7823ac4b3d3293347440f92c..67c155a245741b1fff7f9d9905107abe89ec727d 100644 (file)
--- a/src/lttng-context-preemptible.c
+++ b/src/lttng-context-preemptible.c
@@ -63,30 +63,24 @@ void preemptible_get_value(struct lttng_kernel_ctx_field *field,
                value->s64 = 0;
 }
 
+static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
+       lttng_kernel_static_event_field("preemptible",
+               lttng_kernel_static_type_integer_from_type(uint8_t, __BYTE_ORDER, 10),
+               false, false, false),
+       preemptible_get_size,
+       NULL,
+       preemptible_record,
+       preemptible_get_value,
+       NULL, NULL);
+
 int lttng_add_preemptible_to_ctx(struct lttng_kernel_ctx **ctx)
 {
-       struct lttng_kernel_ctx_field *field;
+       int ret;
 
-       field = lttng_append_context(ctx);
-       if (!field)
-               return -ENOMEM;
-       if (lttng_find_context(*ctx, "preemptible")) {
-               lttng_remove_context_field(ctx, field);
+       if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
                return -EEXIST;
-       }
-       field->event_field.name = "preemptible";
-       field->event_field.type.type = lttng_kernel_type_integer;
-       field->event_field.type.u.integer.size = sizeof(uint8_t) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(uint8_t) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(uint8_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_kernel_string_encoding_none;
-       field->get_size = preemptible_get_size;
-       field->record = preemptible_record;
-       field->get_value = preemptible_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_preemptible_to_ctx);