Cleanup: namespace string encoding

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ic7265a6617feaacfe621d895cd0bc8ce2b50d912

diff --git a/include/lttng/events.h b/include/lttng/events.h
index 9cbc3b999d18a89edb1338608f3d3ded9d4c076d..5e456c52a38e3e3b3886fbfb7dff2b19637362b1 100644 (file)
--- a/include/lttng/events.h
+++ b/include/lttng/events.h
@@ -46,11 +46,11 @@ enum lttng_kernel_type {
        NR_LTTNG_KERNEL_TYPES,
 };
 
-enum lttng_string_encodings {
-       lttng_encode_none = 0,
-       lttng_encode_UTF8 = 1,
-       lttng_encode_ASCII = 2,
-       NR_STRING_ENCODINGS,
+enum lttng_kernel_string_encoding {
+       lttng_kernel_string_encoding_none = 0,
+       lttng_kernel_string_encoding_UTF8 = 1,
+       lttng_kernel_string_encoding_ASCII = 2,
+       NR_LTTNG_KERNEL_STRING_ENCODING,
 };
 
 enum channel_type {
@@ -82,7 +82,7 @@ struct lttng_enum_entry {
                  .signedness = (_signedness) >= 0 ? (_signedness) : lttng_is_signed_type(_type), \
                  .reverse_byte_order = _byte_order != __BYTE_ORDER, \
                  .base = _base,                                \
-                 .encoding = lttng_encode_##_encoding,         \
+                 .encoding = lttng_kernel_string_encoding_##_encoding,         \
                },                                              \
        }                                                       \
 
@@ -92,7 +92,7 @@ struct lttng_integer_type {
        unsigned int signedness:1,
                reverse_byte_order:1;
        unsigned int base;              /* 2, 8, 10, 16, for pretty print */
-       enum lttng_string_encodings encoding;
+       enum lttng_kernel_string_encoding encoding;
 };
 
 struct lttng_type {
@@ -100,7 +100,7 @@ struct lttng_type {
        union {
                struct lttng_integer_type integer;
                struct {
-                       enum lttng_string_encodings encoding;
+                       enum lttng_kernel_string_encoding encoding;
                } string;
                struct {
                        const struct lttng_enum_desc *desc;     /* Enumeration mapping */

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index 5259c596516d4f4fa55841b4408a69d7d70ff18b..74e246b8b3ade6423ab9c338f49bf5f4c16e1e11 100644 (file)
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -419,7 +419,7 @@ void __event_notifier_template_proto___##_name(void);
                  .type = lttng_kernel_type_string,                     \
                  .u =                                          \
                        {                                       \
-                         .string = { .encoding = lttng_encode_UTF8 }, \
+                         .string = { .encoding = lttng_kernel_string_encoding_UTF8 }, \
                        },                                      \
                },                                              \
          .nowrite = _nowrite,                                  \

diff --git a/src/lttng-bytecode-interpreter.c b/src/lttng-bytecode-interpreter.c
index 01828b171aaf799201e6c8677b787c14f2d85d68..fcbfe0b133a4d44410b33e957dc347347c8236e8 100644 (file)
--- a/src/lttng-bytecode-interpreter.c
+++ b/src/lttng-bytecode-interpreter.c
@@ -321,7 +321,7 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
                        printk(KERN_WARNING "LTTng: bytecode: Array nesting only supports integer types.\n");
                        return -EINVAL;
                }
-               if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
+               if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_kernel_string_encoding_none) {
                        printk(KERN_WARNING "LTTng: bytecode: Only string arrays are supported for contexts.\n");
                        return -EINVAL;
                }
@@ -334,7 +334,7 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
                        printk(KERN_WARNING "LTTng: bytecode: Sequence nesting only supports integer types.\n");
                        return -EINVAL;
                }
-               if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
+               if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_kernel_string_encoding_none) {
                        printk(KERN_WARNING "LTTng: bytecode: Only string sequences are supported for contexts.\n");
                        return -EINVAL;
                }

diff --git a/src/lttng-bytecode-specialize.c b/src/lttng-bytecode-specialize.c
index b5869a88836f81df0b21c25707b52090b5a00a3d..091879eae9cbdc15cf9905500863d2968fe52aed 100644 (file)
--- a/src/lttng-bytecode-specialize.c
+++ b/src/lttng-bytecode-specialize.c
@@ -350,7 +350,7 @@ static int specialize_load_object(const struct lttng_event_field *field,
                if (is_context) {
                        load->object_type = OBJECT_TYPE_STRING;
                } else {
-                       if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
+                       if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_kernel_string_encoding_none) {
                                load->object_type = OBJECT_TYPE_ARRAY;
                                load->field = field;
                        } else {
@@ -366,7 +366,7 @@ static int specialize_load_object(const struct lttng_event_field *field,
                if (is_context) {
                        load->object_type = OBJECT_TYPE_STRING;
                } else {
-                       if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
+                       if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_kernel_string_encoding_none) {
                                load->object_type = OBJECT_TYPE_SEQUENCE;
                                load->field = field;
                        } else {

diff --git a/src/lttng-bytecode.c b/src/lttng-bytecode.c
index bd6a30ea095b1521116e3d92822d4c9e2c09dd39..3e9b3e53745e07fadd5fdfa8845d0523f74091d1 100644 (file)
--- a/src/lttng-bytecode.c
+++ b/src/lttng-bytecode.c
@@ -247,7 +247,7 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc,
                {
                        const struct lttng_type *elem_type = field->type.u.array_nestable.elem_type;
 
-                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode_none)
+                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
                                return -EINVAL;
                        if (field->user)
                                op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
@@ -259,7 +259,7 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc,
                {
                        const struct lttng_type *elem_type = field->type.u.sequence_nestable.elem_type;
 
-                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode_none)
+                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
                                return -EINVAL;
                        if (field->user)
                                op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
@@ -334,7 +334,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
                {
                        const struct lttng_type *elem_type = ctx_field->event_field.type.u.array_nestable.elem_type;
 
-                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode_none)
+                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
                                return -EINVAL;
                        BUG_ON(ctx_field->event_field.user);
                        op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
@@ -344,7 +344,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
                {
                        const struct lttng_type *elem_type = ctx_field->event_field.type.u.sequence_nestable.elem_type;
 
-                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_encode_none)
+                       if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
                                return -EINVAL;
                        BUG_ON(ctx_field->event_field.user);
                        op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;

diff --git a/src/lttng-context-callstack.c b/src/lttng-context-callstack.c
index d1da784ed56999a2c3d13796efc56d1f441a1d3b..dc61c71077f5172470a9013286c247b32e690159 100644 (file)
--- a/src/lttng-context-callstack.c
+++ b/src/lttng-context-callstack.c
@@ -143,7 +143,7 @@ int __lttng_add_callstack_generic(struct lttng_ctx **ctx,
        field->type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        field->type.u.integer.reverse_byte_order = 0;
        field->type.u.integer.base = 10;
-       field->type.u.integer.encoding = lttng_encode_none;
+       field->type.u.integer.encoding = lttng_kernel_string_encoding_none;
        length_field->get_size_arg = lttng_callstack_length_get_size;
        length_field->record = lttng_callstack_length_record;
        length_field->priv = fdata;

diff --git a/src/lttng-context-cgroup-ns.c b/src/lttng-context-cgroup-ns.c
index 3d5b518fc61b87bda3c2d534ca3ddd0b17d962f2..bb7587ff7737f7d53b8d80def54322ef8c27f1bf 100644 (file)
--- a/src/lttng-context-cgroup-ns.c
+++ b/src/lttng-context-cgroup-ns.c
@@ -92,7 +92,7 @@ int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = cgroup_ns_get_size;
        field->record = cgroup_ns_record;
        field->get_value = cgroup_ns_get_value;

diff --git a/src/lttng-context-cpu-id.c b/src/lttng-context-cpu-id.c
index d0eac981535eb2a9d714cea8f6b4968cb570a70c..c02aad7e7d1d296765bfa03f39af199047ba66ca 100644 (file)
--- a/src/lttng-context-cpu-id.c
+++ b/src/lttng-context-cpu-id.c
@@ -63,7 +63,7 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = cpu_id_get_size;
        field->record = cpu_id_record;
        field->get_value = cpu_id_get_value;

diff --git a/src/lttng-context-egid.c b/src/lttng-context-egid.c
index f12158cd5f4d4bd0003397c48dfaeafc1aa19013..0d20c3f0782a3f85c01dc4f331d51054a423ad3f 100644 (file)
--- a/src/lttng-context-egid.c
+++ b/src/lttng-context-egid.c
@@ -65,7 +65,7 @@ int lttng_add_egid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(gid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = egid_get_size;
        field->record = egid_record;
        field->get_value = egid_get_value;

diff --git a/src/lttng-context-euid.c b/src/lttng-context-euid.c
index 00d201ffecd0a795af3e19745673e30adecd4479..3105cb7a28e2cfd45a9ab8e2ee80470aca812526 100644 (file)
--- a/src/lttng-context-euid.c
+++ b/src/lttng-context-euid.c
@@ -65,7 +65,7 @@ int lttng_add_euid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = euid_get_size;
        field->record = euid_record;
        field->get_value = euid_get_value;

diff --git a/src/lttng-context-gid.c b/src/lttng-context-gid.c
index 0dbdd301c1df955fa7cae6477a8d8620ce10a6c7..8f33e937f25c1d4392bc5836a2ec2ef9608e62e1 100644 (file)
--- a/src/lttng-context-gid.c
+++ b/src/lttng-context-gid.c
@@ -65,7 +65,7 @@ int lttng_add_gid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(gid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = gid_get_size;
        field->record = gid_record;
        field->get_value = gid_get_value;

diff --git a/src/lttng-context-interruptible.c b/src/lttng-context-interruptible.c
index 4bc4d8d715f71ed63e3e765b6ab35c78a5c0f744..7229a2a72aab7223c5178688182f858e417ac5ff 100644 (file)
--- a/src/lttng-context-interruptible.c
+++ b/src/lttng-context-interruptible.c
@@ -70,7 +70,7 @@ int lttng_add_interruptible_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(int8_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = interruptible_get_size;
        field->record = interruptible_record;
        field->get_value = interruptible_get_value;

diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c
index b4925ac9f9ab730f485f8673e9a904bbbf5ad4c8..e6f83e94b3e983a06bea1eccf48e63112cb4f36b 100644 (file)
--- a/src/lttng-context-ipc-ns.c
+++ b/src/lttng-context-ipc-ns.c
@@ -91,7 +91,7 @@ int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = ipc_ns_get_size;
        field->record = ipc_ns_record;
        field->get_value = ipc_ns_get_value;

diff --git a/src/lttng-context-migratable.c b/src/lttng-context-migratable.c
index 604f487eea89644ca191e24915a44214bad3a0a4..797f8ecaf01f059a44292dcc8c65fd42096fae4d 100644 (file)
--- a/src/lttng-context-migratable.c
+++ b/src/lttng-context-migratable.c
@@ -63,7 +63,7 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
        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_encode_none;
+       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;

diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c
index 09fb81a7590346f5a0e76ecaf31946a95e310948..7f215a8a1500b5e998e14934124d18e0fa972c76 100644 (file)
--- a/src/lttng-context-mnt-ns.c
+++ b/src/lttng-context-mnt-ns.c
@@ -93,7 +93,7 @@ int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = mnt_ns_get_size;
        field->record = mnt_ns_record;
        field->get_value = mnt_ns_get_value;

diff --git a/src/lttng-context-need-reschedule.c b/src/lttng-context-need-reschedule.c
index e7a30955f1e996fc6131b67da7b89c71c558e0b3..3a5517dd9048d6eb0b7584bf02d00564661dba3c 100644 (file)
--- a/src/lttng-context-need-reschedule.c
+++ b/src/lttng-context-need-reschedule.c
@@ -63,7 +63,7 @@ int lttng_add_need_reschedule_to_ctx(struct lttng_ctx **ctx)
        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_encode_none;
+       field->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = need_reschedule_get_size;
        field->record = need_reschedule_record;
        field->get_value = need_reschedule_get_value;

diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c
index 66b3b8d538eeb391c4afa380c3f9dc2c4ed125f0..8ccaaefd7e9c9d3dacf7a307d216f4c5e5b5fc05 100644 (file)
--- a/src/lttng-context-net-ns.c
+++ b/src/lttng-context-net-ns.c
@@ -92,7 +92,7 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = net_ns_get_size;
        field->record = net_ns_record;
        field->get_value = net_ns_get_value;

diff --git a/src/lttng-context-nice.c b/src/lttng-context-nice.c
index 411f336e5fdcc014f41d0e5bfcd19c8134f2e644..b914c03a697f8b0f1febc7fd1bb8801140b696ba 100644 (file)
--- a/src/lttng-context-nice.c
+++ b/src/lttng-context-nice.c
@@ -63,7 +63,7 @@ int lttng_add_nice_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = nice_get_size;
        field->record = nice_record;
        field->get_value = nice_get_value;

diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c
index b9b1e27da6ea2fd68368e34db25a8d1a9217ba41..6f0bb791a1ec99a516c5c2d0864a59ba7064f178 100644 (file)
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -315,7 +315,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uint64_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = perf_counter_get_size;
        field->record = perf_counter_record;
        field->u.perf_counter = perf_field;

diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c
index 705b50f54033ed159a84bbcba618372eaa061190..1a18897cb40ea3864f7fc6d80dc712b04b0895f2 100644 (file)
--- a/src/lttng-context-pid-ns.c
+++ b/src/lttng-context-pid-ns.c
@@ -93,7 +93,7 @@ int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = pid_ns_get_size;
        field->record = pid_ns_record;
        field->get_value = pid_ns_get_value;

diff --git a/src/lttng-context-pid.c b/src/lttng-context-pid.c
index cfce99744047370da863b9d15001f32e7e997fff..c52973bfc48f0e629d4750b8377dc1691cbd5e60 100644 (file)
--- a/src/lttng-context-pid.c
+++ b/src/lttng-context-pid.c
@@ -63,7 +63,7 @@ int lttng_add_pid_to_ctx(struct lttng_ctx **ctx)
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = pid_get_size;
        field->record = pid_record;
        field->get_value = pid_get_value;

diff --git a/src/lttng-context-ppid.c b/src/lttng-context-ppid.c
index 07663f6c39418d4c78ca1fc80bfaada2c3ac184f..4d065bce25713d5ab75eaf50ad04cbc0003c3503 100644 (file)
--- a/src/lttng-context-ppid.c
+++ b/src/lttng-context-ppid.c
@@ -85,7 +85,7 @@ int lttng_add_ppid_to_ctx(struct lttng_ctx **ctx)
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = ppid_get_size;
        field->record = ppid_record;
        field->get_value = ppid_get_value;

diff --git a/src/lttng-context-preemptible.c b/src/lttng-context-preemptible.c
index ae5f825680ab9093c72613f662a75769646d5325..0e67b250a524147ce8881ab71c7c6b42edd11663 100644 (file)
--- a/src/lttng-context-preemptible.c
+++ b/src/lttng-context-preemptible.c
@@ -81,7 +81,7 @@ int lttng_add_preemptible_to_ctx(struct lttng_ctx **ctx)
        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_encode_none;
+       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;

diff --git a/src/lttng-context-prio.c b/src/lttng-context-prio.c
index 885c48bc8e2827fb9f802298c37dbf90d965943e..a1840251828971b8eeb3705e96ea7fbaba559a23 100644 (file)
--- a/src/lttng-context-prio.c
+++ b/src/lttng-context-prio.c
@@ -97,7 +97,7 @@ int lttng_add_prio_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = prio_get_size;
        field->record = prio_record;
        field->get_value = prio_get_value;

diff --git a/src/lttng-context-sgid.c b/src/lttng-context-sgid.c
index c2708283bedd6479f64e9fc8907d74f6f7d26fa3..0cb536e432ecd5965e144333a73eb2c14cb8ac29 100644 (file)
--- a/src/lttng-context-sgid.c
+++ b/src/lttng-context-sgid.c
@@ -65,7 +65,7 @@ int lttng_add_sgid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(gid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = sgid_get_size;
        field->record = sgid_record;
        field->get_value = sgid_get_value;

diff --git a/src/lttng-context-suid.c b/src/lttng-context-suid.c
index c26b1413e157a76091bcdb0eb197b4250f843b53..86cbb9e17d6922146952900d90809f1368afac3e 100644 (file)
--- a/src/lttng-context-suid.c
+++ b/src/lttng-context-suid.c
@@ -65,7 +65,7 @@ int lttng_add_suid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = suid_get_size;
        field->record = suid_record;
        field->get_value = suid_get_value;

diff --git a/src/lttng-context-tid.c b/src/lttng-context-tid.c
index d4bedafc9370178f7f71b719304a7bed120933d6..22a04476704c41eabdcf1b578f363452184e935b 100644 (file)
--- a/src/lttng-context-tid.c
+++ b/src/lttng-context-tid.c
@@ -66,7 +66,7 @@ int lttng_add_tid_to_ctx(struct lttng_ctx **ctx)
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = tid_get_size;
        field->record = tid_record;
        field->get_value = tid_get_value;

diff --git a/src/lttng-context-time-ns.c b/src/lttng-context-time-ns.c
index 3d197827e32c964c9b7505142ca1d31a83a87350..723b8bab0e730f88c211e12b078fa8558cd3ac16 100644 (file)
--- a/src/lttng-context-time-ns.c
+++ b/src/lttng-context-time-ns.c
@@ -91,7 +91,7 @@ int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = time_ns_get_size;
        field->record = time_ns_record;
        field->get_value = time_ns_get_value;

diff --git a/src/lttng-context-uid.c b/src/lttng-context-uid.c
index 47c740f98b85fe2510a18bea78d6f954618dfae1..710b22a67a41d021cb73aebf83af842858afb494 100644 (file)
--- a/src/lttng-context-uid.c
+++ b/src/lttng-context-uid.c
@@ -65,7 +65,7 @@ int lttng_add_uid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = uid_get_size;
        field->record = uid_record;
        field->get_value = uid_get_value;

diff --git a/src/lttng-context-user-ns.c b/src/lttng-context-user-ns.c
index 2b5f46c66b9fb1c39485bd309a8bac6b604278ea..85153db230ac446844eb0547cd179861cee8a27c 100644 (file)
--- a/src/lttng-context-user-ns.c
+++ b/src/lttng-context-user-ns.c
@@ -77,7 +77,7 @@ int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = user_ns_get_size;
        field->record = user_ns_record;
        field->get_value = user_ns_get_value;

diff --git a/src/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c
index 6e1fabe8b4e4555b3cb522a2bd3209240bc603e2..554f18b1fa8e63dd0d0f8f050b27b789531de01d 100644 (file)
--- a/src/lttng-context-uts-ns.c
+++ b/src/lttng-context-uts-ns.c
@@ -91,7 +91,7 @@ int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(unsigned int);
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = uts_ns_get_size;
        field->record = uts_ns_record;
        field->get_value = uts_ns_get_value;

diff --git a/src/lttng-context-vegid.c b/src/lttng-context-vegid.c
index 753278242fea2efa5b431e961371b3abb21f8ab9..eebbe1cc8c105ce6497827781ff232feb79213f4 100644 (file)
--- a/src/lttng-context-vegid.c
+++ b/src/lttng-context-vegid.c
@@ -65,7 +65,7 @@ int lttng_add_vegid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(gid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vegid_get_size;
        field->record = vegid_record;
        field->get_value = vegid_get_value;

diff --git a/src/lttng-context-veuid.c b/src/lttng-context-veuid.c
index 2c49b1824fccb45d4a2418f6330afebe17a19c19..63e7bd422472c855437a9f729e067500abd88e5d 100644 (file)
--- a/src/lttng-context-veuid.c
+++ b/src/lttng-context-veuid.c
@@ -65,7 +65,7 @@ int lttng_add_veuid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = veuid_get_size;
        field->record = veuid_record;
        field->get_value = veuid_get_value;

diff --git a/src/lttng-context-vgid.c b/src/lttng-context-vgid.c
index b42e4988e9a23eb7795f24983844de1050cb68e7..e8167c977af5a3afaf02db368ab606445977ae8e 100644 (file)
--- a/src/lttng-context-vgid.c
+++ b/src/lttng-context-vgid.c
@@ -65,7 +65,7 @@ int lttng_add_vgid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(gid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vgid_get_size;
        field->record = vgid_record;
        field->get_value = vgid_get_value;

diff --git a/src/lttng-context-vpid.c b/src/lttng-context-vpid.c
index 41296c4811e4828f5a05f4ee9a411a7324efef73..e0531958d814d448595b75349b5fa1a6ca8546f0 100644 (file)
--- a/src/lttng-context-vpid.c
+++ b/src/lttng-context-vpid.c
@@ -78,7 +78,7 @@ int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vpid_get_size;
        field->record = vpid_record;
        field->get_value = vpid_get_value;

diff --git a/src/lttng-context-vppid.c b/src/lttng-context-vppid.c
index 1ff182c3bee5d5b775a141767cfcfc39a77c1e92..b93e292f61c01603db0ad1ab55f7ce942d4d8b25 100644 (file)
--- a/src/lttng-context-vppid.c
+++ b/src/lttng-context-vppid.c
@@ -107,7 +107,7 @@ int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx)
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vppid_get_size;
        field->record = vppid_record;
        field->get_value = vppid_get_value;

diff --git a/src/lttng-context-vsgid.c b/src/lttng-context-vsgid.c
index a00545b543b5af090ff47759484381de6c5d25fa..2bb8db7e3b84df70cda9ec77dd003e3de62d06d0 100644 (file)
--- a/src/lttng-context-vsgid.c
+++ b/src/lttng-context-vsgid.c
@@ -65,7 +65,7 @@ int lttng_add_vsgid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(gid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vsgid_get_size;
        field->record = vsgid_record;
        field->get_value = vsgid_get_value;

diff --git a/src/lttng-context-vsuid.c b/src/lttng-context-vsuid.c
index 635bba48ab8ee18eeb4615d6d32ea94675625784..9571992ab5eaf666b2b46394ca5466c6a75059a1 100644 (file)
--- a/src/lttng-context-vsuid.c
+++ b/src/lttng-context-vsuid.c
@@ -65,7 +65,7 @@ int lttng_add_vsuid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vsuid_get_size;
        field->record = vsuid_record;
        field->get_value = vsuid_get_value;

diff --git a/src/lttng-context-vtid.c b/src/lttng-context-vtid.c
index 1e2e1ad9419fd30c14c5ae41c0091929fcf7a4ae..106fa4e55c36f5c27639afed05dd9d453f6b3611 100644 (file)
--- a/src/lttng-context-vtid.c
+++ b/src/lttng-context-vtid.c
@@ -78,7 +78,7 @@ int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx)
        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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vtid_get_size;
        field->record = vtid_record;
        field->get_value = vtid_get_value;

diff --git a/src/lttng-context-vuid.c b/src/lttng-context-vuid.c
index 6980af9ff7eb03381257ab63dbaa9ada313ae450..978cc54559ba9fd04f57f60db4ddde035031a1e8 100644 (file)
--- a/src/lttng-context-vuid.c
+++ b/src/lttng-context-vuid.c
@@ -65,7 +65,7 @@ int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx)
        field->event_field.type.u.integer.signedness = lttng_is_signed_type(uid_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->event_field.type.u.integer.encoding = lttng_kernel_string_encoding_none;
        field->get_size = vuid_get_size;
        field->record = vuid_record;
        field->get_value = vuid_get_value;

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 9df49fac55fe4ca60c62137b10dcde1e12386724..1ae0d85c874759cc4e28a4ff1f0a6e63b01bbc99 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -3022,9 +3022,9 @@ int _lttng_integer_type_statedump(struct lttng_session *session,
                type->u.integer.size,
                type->u.integer.alignment,
                type->u.integer.signedness,
-               (type->u.integer.encoding == lttng_encode_none)
+               (type->u.integer.encoding == lttng_kernel_string_encoding_none)
                        ? "none"
-                       : (type->u.integer.encoding == lttng_encode_UTF8)
+                       : (type->u.integer.encoding == lttng_kernel_string_encoding_UTF8)
                                ? "UTF8"
                                : "ASCII",
                type->u.integer.base,
@@ -3417,7 +3417,7 @@ int _lttng_string_type_statedump(struct lttng_session *session,
                return ret;
        ret = lttng_metadata_printf(session,
                "string%s",
-               type->u.string.encoding == lttng_encode_ASCII ?
+               type->u.string.encoding == lttng_kernel_string_encoding_ASCII ?
                        " { encoding = ASCII; }" : "");
        return ret;
 }

diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c
index c4b089c64f7ce20176f4e6a05aae6e7e2f31263d..01bc16e4e534cf6c5f02544455252f3df192eb32 100644 (file)
--- a/src/probes/lttng-kprobes.c
+++ b/src/probes/lttng-kprobes.c
@@ -97,7 +97,7 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
        field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
        field->type.u.integer.reverse_byte_order = 0;
        field->type.u.integer.base = 16;
-       field->type.u.integer.encoding = lttng_encode_none;
+       field->type.u.integer.encoding = lttng_kernel_string_encoding_none;
        desc->owner = THIS_MODULE;
        event->desc = desc;
 

diff --git a/src/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c
index 25bdec90ef52b90d6bde748a9d66e7704fc762ee..c9991d9105145fa89e16b4424760a7bd4a97e09d 100644 (file)
--- a/src/probes/lttng-kretprobes.c
+++ b/src/probes/lttng-kretprobes.c
@@ -135,7 +135,7 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event,
        fields[0].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
        fields[0].type.u.integer.reverse_byte_order = 0;
        fields[0].type.u.integer.base = 16;
-       fields[0].type.u.integer.encoding = lttng_encode_none;
+       fields[0].type.u.integer.encoding = lttng_kernel_string_encoding_none;
 
        fields[1].name = "parent_ip";
        fields[1].type.type = lttng_kernel_type_integer;
@@ -144,7 +144,7 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event,
        fields[1].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
        fields[1].type.u.integer.reverse_byte_order = 0;
        fields[1].type.u.integer.base = 16;
-       fields[1].type.u.integer.encoding = lttng_encode_none;
+       fields[1].type.u.integer.encoding = lttng_kernel_string_encoding_none;
 
        desc->owner = THIS_MODULE;
        event->desc = desc;

diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c
index b738847f78ba51e8c7cb39044f27ef57bc7941db..816b7fc1be209c952c11eedddf5df5fcc83e1338 100644 (file)
--- a/src/probes/lttng-uprobes.c
+++ b/src/probes/lttng-uprobes.c
@@ -113,7 +113,7 @@ int lttng_create_uprobe_event(const char *name, struct lttng_event *event)
        fields[0].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
        fields[0].type.u.integer.reverse_byte_order = 0;
        fields[0].type.u.integer.base = 16;
-       fields[0].type.u.integer.encoding = lttng_encode_none;
+       fields[0].type.u.integer.encoding = lttng_kernel_string_encoding_none;
 
        desc->owner = THIS_MODULE;
        event->desc = desc;