/* Type description */
-enum abstract_types {
- atype_integer,
- atype_string,
- atype_enum_nestable,
- atype_array_nestable,
- atype_sequence_nestable,
- atype_struct_nestable,
- atype_variant_nestable,
- NR_ABSTRACT_TYPES,
+enum lttng_kernel_type {
+ lttng_kernel_type_integer,
+ lttng_kernel_type_string,
+ lttng_kernel_type_enum_nestable,
+ lttng_kernel_type_array_nestable,
+ lttng_kernel_type_sequence_nestable,
+ lttng_kernel_type_struct_nestable,
+ lttng_kernel_type_variant_nestable,
+ 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 {
#define __type_integer(_type, _size, _alignment, _signedness, \
_byte_order, _base, _encoding) \
{ \
- .atype = atype_integer, \
+ .type = lttng_kernel_type_integer, \
.u.integer = \
{ \
.size = (_size) ? : sizeof(_type) * CHAR_BIT, \
.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, \
}, \
} \
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 {
- enum abstract_types atype;
+ enum lttng_kernel_type 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 */
static inline bool lttng_is_bytewise_integer(const struct lttng_type *type)
{
- if (type->atype != atype_integer)
+ if (type->type != lttng_kernel_type_integer)
return false;
switch (type->u.integer.size) {
case 8: /* Fall-through. */