From: Mathieu Desnoyers Date: Fri, 24 Nov 2023 19:14:44 +0000 (-0500) Subject: Move ABI headers under side/abi/ X-Git-Url: http://git.efficios.com/?p=libside.git;a=commitdiff_plain;h=b8dfb3487e6b30e0ae8e0c8e337ae46885e9761b Move ABI headers under side/abi/ Signed-off-by: Mathieu Desnoyers --- diff --git a/include/side/abi/attribute.h b/include/side/abi/attribute.h new file mode 100644 index 0000000..7bc9e9d --- /dev/null +++ b/include/side/abi/attribute.h @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022-2023 Mathieu Desnoyers + */ + +#ifndef SIDE_ABI_ATTRIBUTE_H +#define SIDE_ABI_ATTRIBUTE_H + +#include +#include +#include + +#include + +enum side_attr_type { + SIDE_ATTR_TYPE_NULL, + SIDE_ATTR_TYPE_BOOL, + SIDE_ATTR_TYPE_U8, + SIDE_ATTR_TYPE_U16, + SIDE_ATTR_TYPE_U32, + SIDE_ATTR_TYPE_U64, + SIDE_ATTR_TYPE_S8, + SIDE_ATTR_TYPE_S16, + SIDE_ATTR_TYPE_S32, + SIDE_ATTR_TYPE_S64, + SIDE_ATTR_TYPE_FLOAT_BINARY16, + SIDE_ATTR_TYPE_FLOAT_BINARY32, + SIDE_ATTR_TYPE_FLOAT_BINARY64, + SIDE_ATTR_TYPE_FLOAT_BINARY128, + SIDE_ATTR_TYPE_STRING, + + _NR_SIDE_ATTR_TYPE, /* Last entry. */ +}; + +struct side_attr_value { + side_enum_t(enum side_attr_type, uint32_t) type; + union { + uint8_t bool_value; + struct side_type_raw_string string_value; + union side_integer_value integer_value; + union side_float_value float_value; + side_padding(32); + } SIDE_PACKED u; +}; +side_check_size(struct side_attr_value, 36); + +struct side_attr { + const struct side_type_raw_string key; + const struct side_attr_value value; +} SIDE_PACKED; +side_check_size(struct side_attr, 54); + +#endif /* SIDE_ABI_ATTRIBUTE_H */ diff --git a/include/side/abi/event-description.h b/include/side/abi/event-description.h new file mode 100644 index 0000000..c72a959 --- /dev/null +++ b/include/side/abi/event-description.h @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022-2023 Mathieu Desnoyers + */ + +#ifndef SIDE_ABI_EVENT_DESCRIPTION_H +#define SIDE_ABI_EVENT_DESCRIPTION_H + +#include +#include +#include + +#define SIDE_EVENT_DESCRIPTION_ABI_VERSION 0 + +enum side_event_flags { + SIDE_EVENT_FLAG_VARIADIC = (1 << 0), +}; + +enum side_loglevel { + SIDE_LOGLEVEL_EMERG = 0, + SIDE_LOGLEVEL_ALERT = 1, + SIDE_LOGLEVEL_CRIT = 2, + SIDE_LOGLEVEL_ERR = 3, + SIDE_LOGLEVEL_WARNING = 4, + SIDE_LOGLEVEL_NOTICE = 5, + SIDE_LOGLEVEL_INFO = 6, + SIDE_LOGLEVEL_DEBUG = 7, +}; + +struct side_event_description { + uint32_t struct_size; /* Size of this structure. */ + uint32_t version; /* Event description ABI version. */ + + side_ptr_t(struct side_event_state) state; + side_ptr_t(const char) provider_name; + side_ptr_t(const char) event_name; + side_ptr_t(const struct side_event_field) fields; + side_ptr_t(const struct side_attr) attr; + uint64_t flags; /* Bitwise OR of enum side_event_flags */ + uint16_t nr_side_type_label; + uint16_t nr_side_attr_type; + side_enum_t(enum side_loglevel, uint32_t) loglevel; + uint32_t nr_fields; + uint32_t nr_attr; + uint32_t nr_callbacks; +#define side_event_description_orig_abi_last nr_callbacks + /* End of fields supported in the original ABI. */ + + char end[]; /* End with a flexible array to account for extensibility. */ +} SIDE_PACKED; + +#endif /* SIDE_ABI_EVENT_DESCRIPTION_H */ diff --git a/include/side/abi/type-argument.h b/include/side/abi/type-argument.h new file mode 100644 index 0000000..9d0f0cb --- /dev/null +++ b/include/side/abi/type-argument.h @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022-2023 Mathieu Desnoyers + */ + +#ifndef SIDE_ABI_TYPE_ARGUMENT_H +#define SIDE_ABI_TYPE_ARGUMENT_H + +#include +#include +#include + +#include +#include +#include +#include + +#if (SIDE_BYTE_ORDER == SIDE_LITTLE_ENDIAN) +# define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE +#else +# define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_BE +#endif + +#if (SIDE_FLOAT_WORD_ORDER == SIDE_LITTLE_ENDIAN) +# define SIDE_TYPE_FLOAT_WORD_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE +#else +# define SIDE_TYPE_FLOAT_WORD_ORDER_HOST SIDE_TYPE_BYTE_ORDER_BE +#endif + +union side_arg_static { + /* Stack-copy basic types */ + union side_bool_value bool_value; + uint8_t byte_value; + side_ptr_t(const void) string_value; /* const {uint8_t, uint16_t, uint32_t} * */ + union side_integer_value integer_value; + union side_float_value float_value; + + /* Stack-copy compound types */ + side_ptr_t(const struct side_arg_vec) side_struct; + side_ptr_t(const struct side_arg_variant) side_variant; + side_ptr_t(const struct side_arg_vec) side_array; + side_ptr_t(const struct side_arg_vec) side_vla; + void *side_vla_app_visitor_ctx; + + /* Gather basic types */ + side_ptr_t(const void) side_bool_gather_ptr; + side_ptr_t(const void) side_byte_gather_ptr; + side_ptr_t(const void) side_integer_gather_ptr; + side_ptr_t(const void) side_float_gather_ptr; + side_ptr_t(const void) side_string_gather_ptr; + + /* Gather compound types */ + side_ptr_t(const void) side_array_gather_ptr; + side_ptr_t(const void) side_struct_gather_ptr; + struct { + side_ptr_t(const void) ptr; + side_ptr_t(const void) length_ptr; + } SIDE_PACKED side_vla_gather; + side_padding(32); +} SIDE_PACKED; +side_check_size(union side_arg_static, 32); + +struct side_arg_dynamic_vla { + side_ptr_t(const struct side_arg) sav; + side_ptr_t(const struct side_attr) attr; + uint32_t len; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_arg_dynamic_vla, 40); + +struct side_arg_dynamic_struct { + side_ptr_t(const struct side_arg_dynamic_field) fields; + side_ptr_t(const struct side_attr) attr; + uint32_t len; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_arg_dynamic_struct, 40); + +struct side_dynamic_struct_visitor { + side_func_ptr_t(side_dynamic_struct_visitor_func) visitor; + side_ptr_t(void) app_ctx; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_dynamic_struct_visitor, 52); + +struct side_dynamic_vla_visitor { + side_func_ptr_t(side_visitor_func) visitor; + side_ptr_t(void) app_ctx; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_dynamic_vla_visitor, 52); + +union side_arg_dynamic { + /* Dynamic basic types */ + struct side_type_null side_null; + struct { + struct side_type_bool type; + union side_bool_value value; + } SIDE_PACKED side_bool; + struct { + struct side_type_byte type; + uint8_t value; + } SIDE_PACKED side_byte; + struct { + struct side_type_string type; + uint64_t value; /* const char * */ + } SIDE_PACKED side_string; + struct { + struct side_type_integer type; + union side_integer_value value; + } SIDE_PACKED side_integer; + struct { + struct side_type_float type; + union side_float_value value; + } SIDE_PACKED side_float; + + /* Dynamic compound types */ + side_ptr_t(const struct side_arg_dynamic_struct) side_dynamic_struct; + side_ptr_t(const struct side_arg_dynamic_vla) side_dynamic_vla; + + struct side_dynamic_struct_visitor side_dynamic_struct_visitor; + struct side_dynamic_vla_visitor side_dynamic_vla_visitor; + + side_padding(58); +} SIDE_PACKED; +side_check_size(union side_arg_dynamic, 58); + +struct side_arg { + side_enum_t(enum side_type_label, uint16_t) type; + union { + union side_arg_static side_static; + union side_arg_dynamic side_dynamic; + side_padding(62); + } SIDE_PACKED u; +} SIDE_PACKED; +side_check_size(struct side_arg, 64); + +struct side_arg_variant { + struct side_arg selector; + struct side_arg option; +} SIDE_PACKED; +side_check_size(struct side_arg_variant, 128); + +struct side_arg_vec { + side_ptr_t(const struct side_arg) sav; + uint32_t len; +} SIDE_PACKED; +side_check_size(struct side_arg_vec, 20); + +struct side_arg_dynamic_field { + side_ptr_t(const char) field_name; + const struct side_arg elem; +} SIDE_PACKED; +side_check_size(struct side_arg_dynamic_field, 16 + sizeof(const struct side_arg)); + +#endif /* SIDE_ABI_TYPE_ARGUMENT_H */ diff --git a/include/side/abi/type-description.h b/include/side/abi/type-description.h new file mode 100644 index 0000000..47056ba --- /dev/null +++ b/include/side/abi/type-description.h @@ -0,0 +1,351 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022-2023 Mathieu Desnoyers + */ + +#ifndef SIDE_ABI_TYPE_DESCRIPTION_H +#define SIDE_ABI_TYPE_DESCRIPTION_H + +#include +#include +#include + +#include +#include +#include + +enum side_type_label { + /* Stack-copy basic types */ + SIDE_TYPE_NULL, + SIDE_TYPE_BOOL, + SIDE_TYPE_U8, + SIDE_TYPE_U16, + SIDE_TYPE_U32, + SIDE_TYPE_U64, + SIDE_TYPE_S8, + SIDE_TYPE_S16, + SIDE_TYPE_S32, + SIDE_TYPE_S64, + SIDE_TYPE_BYTE, + SIDE_TYPE_POINTER, + SIDE_TYPE_FLOAT_BINARY16, + SIDE_TYPE_FLOAT_BINARY32, + SIDE_TYPE_FLOAT_BINARY64, + SIDE_TYPE_FLOAT_BINARY128, + SIDE_TYPE_STRING_UTF8, + SIDE_TYPE_STRING_UTF16, + SIDE_TYPE_STRING_UTF32, + + /* Stack-copy compound types */ + SIDE_TYPE_STRUCT, + SIDE_TYPE_VARIANT, + SIDE_TYPE_ARRAY, + SIDE_TYPE_VLA, + SIDE_TYPE_VLA_VISITOR, + + /* Stack-copy enumeration types */ + SIDE_TYPE_ENUM, + SIDE_TYPE_ENUM_BITMAP, + + /* Stack-copy place holder for dynamic types */ + SIDE_TYPE_DYNAMIC, + + /* Gather basic types */ + SIDE_TYPE_GATHER_BOOL, + SIDE_TYPE_GATHER_INTEGER, + SIDE_TYPE_GATHER_BYTE, + SIDE_TYPE_GATHER_POINTER, + SIDE_TYPE_GATHER_FLOAT, + SIDE_TYPE_GATHER_STRING, + + /* Gather compound types */ + SIDE_TYPE_GATHER_STRUCT, + SIDE_TYPE_GATHER_ARRAY, + SIDE_TYPE_GATHER_VLA, + + /* Gather enumeration types */ + SIDE_TYPE_GATHER_ENUM, + + /* Dynamic basic types */ + SIDE_TYPE_DYNAMIC_NULL, + SIDE_TYPE_DYNAMIC_BOOL, + SIDE_TYPE_DYNAMIC_INTEGER, + SIDE_TYPE_DYNAMIC_BYTE, + SIDE_TYPE_DYNAMIC_POINTER, + SIDE_TYPE_DYNAMIC_FLOAT, + SIDE_TYPE_DYNAMIC_STRING, + + /* Dynamic compound types */ + SIDE_TYPE_DYNAMIC_STRUCT, + SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, + SIDE_TYPE_DYNAMIC_VLA, + SIDE_TYPE_DYNAMIC_VLA_VISITOR, + + _NR_SIDE_TYPE_LABEL, /* Last entry. */ +}; + +enum side_visitor_status { + SIDE_VISITOR_STATUS_OK = 0, + SIDE_VISITOR_STATUS_ERROR = -1, +}; + +enum side_type_gather_access_mode { + SIDE_TYPE_GATHER_ACCESS_DIRECT, + SIDE_TYPE_GATHER_ACCESS_POINTER, /* Pointer dereference */ +}; + +/* Type descriptions */ +struct side_type_null { + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_type_null, 20); + +struct side_type_bool { + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; + uint16_t bool_size; /* bytes */ + uint16_t len_bits; /* bits. 0 for (bool_size * CHAR_BITS) */ + side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; +} SIDE_PACKED; +side_check_size(struct side_type_bool, 25); + +struct side_type_byte { + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_type_byte, 20); + +struct side_type_string { + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; + uint8_t unit_size; /* 1, 2, or 4 bytes */ + side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; +} SIDE_PACKED; +side_check_size(struct side_type_string, 22); + +struct side_type_integer { + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; + uint16_t integer_size; /* bytes */ + uint16_t len_bits; /* bits. 0 for (integer_size * CHAR_BITS) */ + uint8_t signedness; /* true/false */ + side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; +} SIDE_PACKED; +side_check_size(struct side_type_integer, 26); + +struct side_type_float { + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; + uint16_t float_size; /* bytes */ + side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; +} SIDE_PACKED; +side_check_size(struct side_type_float, 23); + +struct side_enum_mapping { + int64_t range_begin; + int64_t range_end; + struct side_type_raw_string label; +} SIDE_PACKED; +side_check_size(struct side_enum_mapping, 16 + sizeof(struct side_type_raw_string)); + +struct side_enum_mappings { + side_ptr_t(const struct side_enum_mapping) mappings; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_mappings; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_enum_mappings, 40); + +struct side_enum_bitmap_mapping { + uint64_t range_begin; + uint64_t range_end; + struct side_type_raw_string label; +} SIDE_PACKED; +side_check_size(struct side_enum_bitmap_mapping, 16 + sizeof(struct side_type_raw_string)); + +struct side_enum_bitmap_mappings { + side_ptr_t(const struct side_enum_bitmap_mapping) mappings; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_mappings; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_enum_bitmap_mappings, 40); + +struct side_type_struct { + side_ptr_t(const struct side_event_field) fields; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_fields; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_type_struct, 40); + +struct side_type_array { + side_ptr_t(const struct side_type) elem_type; + side_ptr_t(const struct side_attr) attr; + uint32_t length; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_type_array, 40); + +struct side_type_vla { + side_ptr_t(const struct side_type) elem_type; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_type_vla, 36); + +struct side_type_vla_visitor { + side_ptr_t(const struct side_type) elem_type; + side_func_ptr_t(side_visitor_func) visitor; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_attr; +} SIDE_PACKED; +side_check_size(struct side_type_vla_visitor, 52); + +struct side_type_enum { + side_ptr_t(const struct side_enum_mappings) mappings; + side_ptr_t(const struct side_type) elem_type; +} SIDE_PACKED; +side_check_size(struct side_type_enum, 32); + +struct side_type_enum_bitmap { + side_ptr_t(const struct side_enum_bitmap_mappings) mappings; + side_ptr_t(const struct side_type) elem_type; +} SIDE_PACKED; +side_check_size(struct side_type_enum_bitmap, 32); + +struct side_type_gather_bool { + uint64_t offset; /* bytes */ + uint16_t offset_bits; /* bits */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_bool type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_bool, 11 + sizeof(struct side_type_bool)); + +struct side_type_gather_byte { + uint64_t offset; /* bytes */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_byte type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_byte, 9 + sizeof(struct side_type_byte)); + +struct side_type_gather_integer { + uint64_t offset; /* bytes */ + uint16_t offset_bits; /* bits */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_integer type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_integer, 11 + sizeof(struct side_type_integer)); + +struct side_type_gather_float { + uint64_t offset; /* bytes */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_float type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_float, 9 + sizeof(struct side_type_float)); + +struct side_type_gather_string { + uint64_t offset; /* bytes */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_string type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_string, 9 + sizeof(struct side_type_string)); + +struct side_type_gather_enum { + side_ptr_t(const struct side_enum_mappings) mappings; + side_ptr_t(const struct side_type) elem_type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_enum, 32); + +struct side_type_gather_struct { + side_ptr_t(const struct side_type_struct) type; + uint64_t offset; /* bytes */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + uint32_t size; /* bytes */ +} SIDE_PACKED; +side_check_size(struct side_type_gather_struct, 29); + +struct side_type_gather_array { + uint64_t offset; /* bytes */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_array type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_array, 9 + sizeof(struct side_type_array)); + +struct side_type_gather_vla { + side_ptr_t(const struct side_type) length_type; /* side_length() */ + uint64_t offset; /* bytes */ + uint8_t access_mode; /* enum side_type_gather_access_mode */ + struct side_type_vla type; +} SIDE_PACKED; +side_check_size(struct side_type_gather_vla, 25 + sizeof(struct side_type_vla)); + +struct side_type_gather { + union { + struct side_type_gather_bool side_bool; + struct side_type_gather_byte side_byte; + struct side_type_gather_integer side_integer; + struct side_type_gather_float side_float; + struct side_type_gather_string side_string; + struct side_type_gather_enum side_enum; + struct side_type_gather_array side_array; + struct side_type_gather_vla side_vla; + struct side_type_gather_struct side_struct; + side_padding(61); + } SIDE_PACKED u; +} SIDE_PACKED; +side_check_size(struct side_type_gather, 61); + +struct side_type { + side_enum_t(enum side_type_label, uint16_t) type; + union { + /* Stack-copy basic types */ + struct side_type_null side_null; + struct side_type_bool side_bool; + struct side_type_byte side_byte; + struct side_type_string side_string; + struct side_type_integer side_integer; + struct side_type_float side_float; + + /* Stack-copy compound types */ + struct side_type_array side_array; + struct side_type_vla side_vla; + struct side_type_vla_visitor side_vla_visitor; + side_ptr_t(const struct side_type_struct) side_struct; + side_ptr_t(const struct side_type_variant) side_variant; + + /* Stack-copy enumeration types */ + struct side_type_enum side_enum; + struct side_type_enum_bitmap side_enum_bitmap; + + /* Gather types */ + struct side_type_gather side_gather; + side_padding(62); + } SIDE_PACKED u; +} SIDE_PACKED; +side_check_size(struct side_type, 64); + +struct side_variant_option { + int64_t range_begin; + int64_t range_end; + const struct side_type side_type; +} SIDE_PACKED; +side_check_size(struct side_variant_option, 16 + sizeof(const struct side_type)); + +struct side_type_variant { + side_ptr_t(const struct side_variant_option) options; + side_ptr_t(const struct side_attr) attr; + uint32_t nr_options; + uint32_t nr_attr; + const struct side_type selector; +} SIDE_PACKED; +side_check_size(struct side_type_variant, 40 + sizeof(const struct side_type)); + +struct side_event_field { + side_ptr_t(const char) field_name; + struct side_type side_type; +} SIDE_PACKED; +side_check_size(struct side_event_field, 16 + sizeof(struct side_type)); + +#endif /* SIDE_ABI_TYPE_DESCRIPTION_H */ diff --git a/include/side/abi/type-value.h b/include/side/abi/type-value.h new file mode 100644 index 0000000..9d489ef --- /dev/null +++ b/include/side/abi/type-value.h @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022-2023 Mathieu Desnoyers + */ + +#ifndef SIDE_ABI_TYPE_VALUE_H +#define SIDE_ABI_TYPE_VALUE_H + +#include +#include +#include + +enum side_type_label_byte_order { + SIDE_TYPE_BYTE_ORDER_LE = 0, + SIDE_TYPE_BYTE_ORDER_BE = 1, +}; + +union side_integer_value { + uint8_t side_u8; + uint16_t side_u16; + uint32_t side_u32; + uint64_t side_u64; + int8_t side_s8; + int16_t side_s16; + int32_t side_s32; + int64_t side_s64; + uintptr_t side_uptr; + side_padding(32); +} SIDE_PACKED; +side_check_size(union side_integer_value, 32); + +union side_bool_value { + uint8_t side_bool8; + uint16_t side_bool16; + uint32_t side_bool32; + uint64_t side_bool64; + side_padding(32); +} SIDE_PACKED; +side_check_size(union side_bool_value, 32); + +union side_float_value { +#if __HAVE_FLOAT16 + _Float16 side_float_binary16; +#endif +#if __HAVE_FLOAT32 + _Float32 side_float_binary32; +#endif +#if __HAVE_FLOAT64 + _Float64 side_float_binary64; +#endif +#if __HAVE_FLOAT128 + _Float128 side_float_binary128; +#endif + side_padding(32); +} SIDE_PACKED; +side_check_size(union side_float_value, 32); + +struct side_type_raw_string { + side_ptr_t(const void) p; /* pointer to string */ + uint8_t unit_size; /* 1, 2, or 4 bytes */ + side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; +} SIDE_PACKED; +side_check_size(struct side_type_raw_string, 18); + +#endif /* SIDE_ABI_TYPE_VALUE_H */ diff --git a/include/side/abi/visitor.h b/include/side/abi/visitor.h new file mode 100644 index 0000000..b79dffc --- /dev/null +++ b/include/side/abi/visitor.h @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright 2022-2023 Mathieu Desnoyers + */ + +#ifndef SIDE_ABI_VISITOR_H +#define SIDE_ABI_VISITOR_H + +#include +#include +#include + +struct side_arg; +struct side_arg_dynamic_field; +struct side_tracer_visitor_ctx; +struct side_tracer_dynamic_struct_visitor_ctx; + +/* The visitor pattern is a double-dispatch visitor. */ + +typedef enum side_visitor_status (*side_write_elem_func)( + const struct side_tracer_visitor_ctx *tracer_ctx, + const struct side_arg *elem); +typedef enum side_visitor_status (*side_visitor_func)( + const struct side_tracer_visitor_ctx *tracer_ctx, + void *app_ctx); + +struct side_tracer_visitor_ctx { + side_write_elem_func write_elem; + void *priv; /* Private tracer context. */ +} SIDE_PACKED; + +typedef enum side_visitor_status (*side_write_field_func)( + const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx, + const struct side_arg_dynamic_field *dynamic_field); +typedef enum side_visitor_status (*side_dynamic_struct_visitor_func)( + const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx, + void *app_ctx); + +struct side_tracer_dynamic_struct_visitor_ctx { + side_write_field_func write_field; + void *priv; /* Private tracer context. */ +} SIDE_PACKED; + +#endif /* SIDE_ABI_VISITOR_H */ diff --git a/include/side/attribute-abi.h b/include/side/attribute-abi.h deleted file mode 100644 index 710e992..0000000 --- a/include/side/attribute-abi.h +++ /dev/null @@ -1,53 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright 2022-2023 Mathieu Desnoyers - */ - -#ifndef SIDE_ATTRIBUTE_ABI_H -#define SIDE_ATTRIBUTE_ABI_H - -#include -#include -#include - -#include - -enum side_attr_type { - SIDE_ATTR_TYPE_NULL, - SIDE_ATTR_TYPE_BOOL, - SIDE_ATTR_TYPE_U8, - SIDE_ATTR_TYPE_U16, - SIDE_ATTR_TYPE_U32, - SIDE_ATTR_TYPE_U64, - SIDE_ATTR_TYPE_S8, - SIDE_ATTR_TYPE_S16, - SIDE_ATTR_TYPE_S32, - SIDE_ATTR_TYPE_S64, - SIDE_ATTR_TYPE_FLOAT_BINARY16, - SIDE_ATTR_TYPE_FLOAT_BINARY32, - SIDE_ATTR_TYPE_FLOAT_BINARY64, - SIDE_ATTR_TYPE_FLOAT_BINARY128, - SIDE_ATTR_TYPE_STRING, - - _NR_SIDE_ATTR_TYPE, /* Last entry. */ -}; - -struct side_attr_value { - side_enum_t(enum side_attr_type, uint32_t) type; - union { - uint8_t bool_value; - struct side_type_raw_string string_value; - union side_integer_value integer_value; - union side_float_value float_value; - side_padding(32); - } SIDE_PACKED u; -}; -side_check_size(struct side_attr_value, 36); - -struct side_attr { - const struct side_type_raw_string key; - const struct side_attr_value value; -} SIDE_PACKED; -side_check_size(struct side_attr, 54); - -#endif /* SIDE_ATTRIBUTE_ABI_H */ diff --git a/include/side/event-description-abi.h b/include/side/event-description-abi.h deleted file mode 100644 index beff152..0000000 --- a/include/side/event-description-abi.h +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright 2022-2023 Mathieu Desnoyers - */ - -#ifndef SIDE_EVENT_DESCRIPTION_ABI_H -#define SIDE_EVENT_DESCRIPTION_ABI_H - -#include -#include -#include - -#define SIDE_EVENT_DESCRIPTION_ABI_VERSION 0 - -enum side_event_flags { - SIDE_EVENT_FLAG_VARIADIC = (1 << 0), -}; - -enum side_loglevel { - SIDE_LOGLEVEL_EMERG = 0, - SIDE_LOGLEVEL_ALERT = 1, - SIDE_LOGLEVEL_CRIT = 2, - SIDE_LOGLEVEL_ERR = 3, - SIDE_LOGLEVEL_WARNING = 4, - SIDE_LOGLEVEL_NOTICE = 5, - SIDE_LOGLEVEL_INFO = 6, - SIDE_LOGLEVEL_DEBUG = 7, -}; - -struct side_event_description { - uint32_t struct_size; /* Size of this structure. */ - uint32_t version; /* Event description ABI version. */ - - side_ptr_t(struct side_event_state) state; - side_ptr_t(const char) provider_name; - side_ptr_t(const char) event_name; - side_ptr_t(const struct side_event_field) fields; - side_ptr_t(const struct side_attr) attr; - uint64_t flags; /* Bitwise OR of enum side_event_flags */ - uint16_t nr_side_type_label; - uint16_t nr_side_attr_type; - side_enum_t(enum side_loglevel, uint32_t) loglevel; - uint32_t nr_fields; - uint32_t nr_attr; - uint32_t nr_callbacks; -#define side_event_description_orig_abi_last nr_callbacks - /* End of fields supported in the original ABI. */ - - char end[]; /* End with a flexible array to account for extensibility. */ -} SIDE_PACKED; - -#endif /* SIDE_EVENT_DESCRIPTION_ABI_H */ diff --git a/include/side/instrumentation-c-api.h b/include/side/instrumentation-c-api.h index 13f8524..c6e0576 100644 --- a/include/side/instrumentation-c-api.h +++ b/include/side/instrumentation-c-api.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #if (SIDE_BYTE_ORDER == SIDE_LITTLE_ENDIAN) # define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE diff --git a/include/side/trace.h b/include/side/trace.h index 91de083..25ec2aa 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -102,8 +102,8 @@ #define SIDE_EVENT_STATE_ABI_VERSION 0 -#include -#include +#include +#include #include enum side_error { diff --git a/include/side/type-argument-abi.h b/include/side/type-argument-abi.h deleted file mode 100644 index 40960e5..0000000 --- a/include/side/type-argument-abi.h +++ /dev/null @@ -1,158 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright 2022-2023 Mathieu Desnoyers - */ - -#ifndef SIDE_TYPE_ARGUMENT_ABI_H -#define SIDE_TYPE_ARGUMENT_ABI_H - -#include -#include -#include - -#include -#include -#include -#include - -#if (SIDE_BYTE_ORDER == SIDE_LITTLE_ENDIAN) -# define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE -#else -# define SIDE_TYPE_BYTE_ORDER_HOST SIDE_TYPE_BYTE_ORDER_BE -#endif - -#if (SIDE_FLOAT_WORD_ORDER == SIDE_LITTLE_ENDIAN) -# define SIDE_TYPE_FLOAT_WORD_ORDER_HOST SIDE_TYPE_BYTE_ORDER_LE -#else -# define SIDE_TYPE_FLOAT_WORD_ORDER_HOST SIDE_TYPE_BYTE_ORDER_BE -#endif - -union side_arg_static { - /* Stack-copy basic types */ - union side_bool_value bool_value; - uint8_t byte_value; - side_ptr_t(const void) string_value; /* const {uint8_t, uint16_t, uint32_t} * */ - union side_integer_value integer_value; - union side_float_value float_value; - - /* Stack-copy compound types */ - side_ptr_t(const struct side_arg_vec) side_struct; - side_ptr_t(const struct side_arg_variant) side_variant; - side_ptr_t(const struct side_arg_vec) side_array; - side_ptr_t(const struct side_arg_vec) side_vla; - void *side_vla_app_visitor_ctx; - - /* Gather basic types */ - side_ptr_t(const void) side_bool_gather_ptr; - side_ptr_t(const void) side_byte_gather_ptr; - side_ptr_t(const void) side_integer_gather_ptr; - side_ptr_t(const void) side_float_gather_ptr; - side_ptr_t(const void) side_string_gather_ptr; - - /* Gather compound types */ - side_ptr_t(const void) side_array_gather_ptr; - side_ptr_t(const void) side_struct_gather_ptr; - struct { - side_ptr_t(const void) ptr; - side_ptr_t(const void) length_ptr; - } SIDE_PACKED side_vla_gather; - side_padding(32); -} SIDE_PACKED; -side_check_size(union side_arg_static, 32); - -struct side_arg_dynamic_vla { - side_ptr_t(const struct side_arg) sav; - side_ptr_t(const struct side_attr) attr; - uint32_t len; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_arg_dynamic_vla, 40); - -struct side_arg_dynamic_struct { - side_ptr_t(const struct side_arg_dynamic_field) fields; - side_ptr_t(const struct side_attr) attr; - uint32_t len; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_arg_dynamic_struct, 40); - -struct side_dynamic_struct_visitor { - side_func_ptr_t(side_dynamic_struct_visitor_func) visitor; - side_ptr_t(void) app_ctx; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_dynamic_struct_visitor, 52); - -struct side_dynamic_vla_visitor { - side_func_ptr_t(side_visitor_func) visitor; - side_ptr_t(void) app_ctx; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_dynamic_vla_visitor, 52); - -union side_arg_dynamic { - /* Dynamic basic types */ - struct side_type_null side_null; - struct { - struct side_type_bool type; - union side_bool_value value; - } SIDE_PACKED side_bool; - struct { - struct side_type_byte type; - uint8_t value; - } SIDE_PACKED side_byte; - struct { - struct side_type_string type; - uint64_t value; /* const char * */ - } SIDE_PACKED side_string; - struct { - struct side_type_integer type; - union side_integer_value value; - } SIDE_PACKED side_integer; - struct { - struct side_type_float type; - union side_float_value value; - } SIDE_PACKED side_float; - - /* Dynamic compound types */ - side_ptr_t(const struct side_arg_dynamic_struct) side_dynamic_struct; - side_ptr_t(const struct side_arg_dynamic_vla) side_dynamic_vla; - - struct side_dynamic_struct_visitor side_dynamic_struct_visitor; - struct side_dynamic_vla_visitor side_dynamic_vla_visitor; - - side_padding(58); -} SIDE_PACKED; -side_check_size(union side_arg_dynamic, 58); - -struct side_arg { - side_enum_t(enum side_type_label, uint16_t) type; - union { - union side_arg_static side_static; - union side_arg_dynamic side_dynamic; - side_padding(62); - } SIDE_PACKED u; -} SIDE_PACKED; -side_check_size(struct side_arg, 64); - -struct side_arg_variant { - struct side_arg selector; - struct side_arg option; -} SIDE_PACKED; -side_check_size(struct side_arg_variant, 128); - -struct side_arg_vec { - side_ptr_t(const struct side_arg) sav; - uint32_t len; -} SIDE_PACKED; -side_check_size(struct side_arg_vec, 20); - -struct side_arg_dynamic_field { - side_ptr_t(const char) field_name; - const struct side_arg elem; -} SIDE_PACKED; -side_check_size(struct side_arg_dynamic_field, 16 + sizeof(const struct side_arg)); - -#endif /* SIDE_TYPE_ARGUMENT_ABI_H */ diff --git a/include/side/type-description-abi.h b/include/side/type-description-abi.h deleted file mode 100644 index c25e134..0000000 --- a/include/side/type-description-abi.h +++ /dev/null @@ -1,351 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright 2022-2023 Mathieu Desnoyers - */ - -#ifndef SIDE_TYPE_DESCRIPTION_ABI_H -#define SIDE_TYPE_DESCRIPTION_ABI_H - -#include -#include -#include - -#include -#include -#include - -enum side_type_label { - /* Stack-copy basic types */ - SIDE_TYPE_NULL, - SIDE_TYPE_BOOL, - SIDE_TYPE_U8, - SIDE_TYPE_U16, - SIDE_TYPE_U32, - SIDE_TYPE_U64, - SIDE_TYPE_S8, - SIDE_TYPE_S16, - SIDE_TYPE_S32, - SIDE_TYPE_S64, - SIDE_TYPE_BYTE, - SIDE_TYPE_POINTER, - SIDE_TYPE_FLOAT_BINARY16, - SIDE_TYPE_FLOAT_BINARY32, - SIDE_TYPE_FLOAT_BINARY64, - SIDE_TYPE_FLOAT_BINARY128, - SIDE_TYPE_STRING_UTF8, - SIDE_TYPE_STRING_UTF16, - SIDE_TYPE_STRING_UTF32, - - /* Stack-copy compound types */ - SIDE_TYPE_STRUCT, - SIDE_TYPE_VARIANT, - SIDE_TYPE_ARRAY, - SIDE_TYPE_VLA, - SIDE_TYPE_VLA_VISITOR, - - /* Stack-copy enumeration types */ - SIDE_TYPE_ENUM, - SIDE_TYPE_ENUM_BITMAP, - - /* Stack-copy place holder for dynamic types */ - SIDE_TYPE_DYNAMIC, - - /* Gather basic types */ - SIDE_TYPE_GATHER_BOOL, - SIDE_TYPE_GATHER_INTEGER, - SIDE_TYPE_GATHER_BYTE, - SIDE_TYPE_GATHER_POINTER, - SIDE_TYPE_GATHER_FLOAT, - SIDE_TYPE_GATHER_STRING, - - /* Gather compound types */ - SIDE_TYPE_GATHER_STRUCT, - SIDE_TYPE_GATHER_ARRAY, - SIDE_TYPE_GATHER_VLA, - - /* Gather enumeration types */ - SIDE_TYPE_GATHER_ENUM, - - /* Dynamic basic types */ - SIDE_TYPE_DYNAMIC_NULL, - SIDE_TYPE_DYNAMIC_BOOL, - SIDE_TYPE_DYNAMIC_INTEGER, - SIDE_TYPE_DYNAMIC_BYTE, - SIDE_TYPE_DYNAMIC_POINTER, - SIDE_TYPE_DYNAMIC_FLOAT, - SIDE_TYPE_DYNAMIC_STRING, - - /* Dynamic compound types */ - SIDE_TYPE_DYNAMIC_STRUCT, - SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, - SIDE_TYPE_DYNAMIC_VLA, - SIDE_TYPE_DYNAMIC_VLA_VISITOR, - - _NR_SIDE_TYPE_LABEL, /* Last entry. */ -}; - -enum side_visitor_status { - SIDE_VISITOR_STATUS_OK = 0, - SIDE_VISITOR_STATUS_ERROR = -1, -}; - -enum side_type_gather_access_mode { - SIDE_TYPE_GATHER_ACCESS_DIRECT, - SIDE_TYPE_GATHER_ACCESS_POINTER, /* Pointer dereference */ -}; - -/* Type descriptions */ -struct side_type_null { - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_type_null, 20); - -struct side_type_bool { - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; - uint16_t bool_size; /* bytes */ - uint16_t len_bits; /* bits. 0 for (bool_size * CHAR_BITS) */ - side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; -} SIDE_PACKED; -side_check_size(struct side_type_bool, 25); - -struct side_type_byte { - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_type_byte, 20); - -struct side_type_string { - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; - uint8_t unit_size; /* 1, 2, or 4 bytes */ - side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; -} SIDE_PACKED; -side_check_size(struct side_type_string, 22); - -struct side_type_integer { - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; - uint16_t integer_size; /* bytes */ - uint16_t len_bits; /* bits. 0 for (integer_size * CHAR_BITS) */ - uint8_t signedness; /* true/false */ - side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; -} SIDE_PACKED; -side_check_size(struct side_type_integer, 26); - -struct side_type_float { - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; - uint16_t float_size; /* bytes */ - side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; -} SIDE_PACKED; -side_check_size(struct side_type_float, 23); - -struct side_enum_mapping { - int64_t range_begin; - int64_t range_end; - struct side_type_raw_string label; -} SIDE_PACKED; -side_check_size(struct side_enum_mapping, 16 + sizeof(struct side_type_raw_string)); - -struct side_enum_mappings { - side_ptr_t(const struct side_enum_mapping) mappings; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_mappings; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_enum_mappings, 40); - -struct side_enum_bitmap_mapping { - uint64_t range_begin; - uint64_t range_end; - struct side_type_raw_string label; -} SIDE_PACKED; -side_check_size(struct side_enum_bitmap_mapping, 16 + sizeof(struct side_type_raw_string)); - -struct side_enum_bitmap_mappings { - side_ptr_t(const struct side_enum_bitmap_mapping) mappings; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_mappings; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_enum_bitmap_mappings, 40); - -struct side_type_struct { - side_ptr_t(const struct side_event_field) fields; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_fields; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_type_struct, 40); - -struct side_type_array { - side_ptr_t(const struct side_type) elem_type; - side_ptr_t(const struct side_attr) attr; - uint32_t length; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_type_array, 40); - -struct side_type_vla { - side_ptr_t(const struct side_type) elem_type; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_type_vla, 36); - -struct side_type_vla_visitor { - side_ptr_t(const struct side_type) elem_type; - side_func_ptr_t(side_visitor_func) visitor; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_attr; -} SIDE_PACKED; -side_check_size(struct side_type_vla_visitor, 52); - -struct side_type_enum { - side_ptr_t(const struct side_enum_mappings) mappings; - side_ptr_t(const struct side_type) elem_type; -} SIDE_PACKED; -side_check_size(struct side_type_enum, 32); - -struct side_type_enum_bitmap { - side_ptr_t(const struct side_enum_bitmap_mappings) mappings; - side_ptr_t(const struct side_type) elem_type; -} SIDE_PACKED; -side_check_size(struct side_type_enum_bitmap, 32); - -struct side_type_gather_bool { - uint64_t offset; /* bytes */ - uint16_t offset_bits; /* bits */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_bool type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_bool, 11 + sizeof(struct side_type_bool)); - -struct side_type_gather_byte { - uint64_t offset; /* bytes */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_byte type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_byte, 9 + sizeof(struct side_type_byte)); - -struct side_type_gather_integer { - uint64_t offset; /* bytes */ - uint16_t offset_bits; /* bits */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_integer type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_integer, 11 + sizeof(struct side_type_integer)); - -struct side_type_gather_float { - uint64_t offset; /* bytes */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_float type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_float, 9 + sizeof(struct side_type_float)); - -struct side_type_gather_string { - uint64_t offset; /* bytes */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_string type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_string, 9 + sizeof(struct side_type_string)); - -struct side_type_gather_enum { - side_ptr_t(const struct side_enum_mappings) mappings; - side_ptr_t(const struct side_type) elem_type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_enum, 32); - -struct side_type_gather_struct { - side_ptr_t(const struct side_type_struct) type; - uint64_t offset; /* bytes */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - uint32_t size; /* bytes */ -} SIDE_PACKED; -side_check_size(struct side_type_gather_struct, 29); - -struct side_type_gather_array { - uint64_t offset; /* bytes */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_array type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_array, 9 + sizeof(struct side_type_array)); - -struct side_type_gather_vla { - side_ptr_t(const struct side_type) length_type; /* side_length() */ - uint64_t offset; /* bytes */ - uint8_t access_mode; /* enum side_type_gather_access_mode */ - struct side_type_vla type; -} SIDE_PACKED; -side_check_size(struct side_type_gather_vla, 25 + sizeof(struct side_type_vla)); - -struct side_type_gather { - union { - struct side_type_gather_bool side_bool; - struct side_type_gather_byte side_byte; - struct side_type_gather_integer side_integer; - struct side_type_gather_float side_float; - struct side_type_gather_string side_string; - struct side_type_gather_enum side_enum; - struct side_type_gather_array side_array; - struct side_type_gather_vla side_vla; - struct side_type_gather_struct side_struct; - side_padding(61); - } SIDE_PACKED u; -} SIDE_PACKED; -side_check_size(struct side_type_gather, 61); - -struct side_type { - side_enum_t(enum side_type_label, uint16_t) type; - union { - /* Stack-copy basic types */ - struct side_type_null side_null; - struct side_type_bool side_bool; - struct side_type_byte side_byte; - struct side_type_string side_string; - struct side_type_integer side_integer; - struct side_type_float side_float; - - /* Stack-copy compound types */ - struct side_type_array side_array; - struct side_type_vla side_vla; - struct side_type_vla_visitor side_vla_visitor; - side_ptr_t(const struct side_type_struct) side_struct; - side_ptr_t(const struct side_type_variant) side_variant; - - /* Stack-copy enumeration types */ - struct side_type_enum side_enum; - struct side_type_enum_bitmap side_enum_bitmap; - - /* Gather types */ - struct side_type_gather side_gather; - side_padding(62); - } SIDE_PACKED u; -} SIDE_PACKED; -side_check_size(struct side_type, 64); - -struct side_variant_option { - int64_t range_begin; - int64_t range_end; - const struct side_type side_type; -} SIDE_PACKED; -side_check_size(struct side_variant_option, 16 + sizeof(const struct side_type)); - -struct side_type_variant { - side_ptr_t(const struct side_variant_option) options; - side_ptr_t(const struct side_attr) attr; - uint32_t nr_options; - uint32_t nr_attr; - const struct side_type selector; -} SIDE_PACKED; -side_check_size(struct side_type_variant, 40 + sizeof(const struct side_type)); - -struct side_event_field { - side_ptr_t(const char) field_name; - struct side_type side_type; -} SIDE_PACKED; -side_check_size(struct side_event_field, 16 + sizeof(struct side_type)); - -#endif /* SIDE_TYPE_DESCRIPTION_ABI_H */ diff --git a/include/side/type-value-abi.h b/include/side/type-value-abi.h deleted file mode 100644 index ac49590..0000000 --- a/include/side/type-value-abi.h +++ /dev/null @@ -1,65 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright 2022-2023 Mathieu Desnoyers - */ - -#ifndef SIDE_TYPE_VALUE_ABI_H -#define SIDE_TYPE_VALUE_ABI_H - -#include -#include -#include - -enum side_type_label_byte_order { - SIDE_TYPE_BYTE_ORDER_LE = 0, - SIDE_TYPE_BYTE_ORDER_BE = 1, -}; - -union side_integer_value { - uint8_t side_u8; - uint16_t side_u16; - uint32_t side_u32; - uint64_t side_u64; - int8_t side_s8; - int16_t side_s16; - int32_t side_s32; - int64_t side_s64; - uintptr_t side_uptr; - side_padding(32); -} SIDE_PACKED; -side_check_size(union side_integer_value, 32); - -union side_bool_value { - uint8_t side_bool8; - uint16_t side_bool16; - uint32_t side_bool32; - uint64_t side_bool64; - side_padding(32); -} SIDE_PACKED; -side_check_size(union side_bool_value, 32); - -union side_float_value { -#if __HAVE_FLOAT16 - _Float16 side_float_binary16; -#endif -#if __HAVE_FLOAT32 - _Float32 side_float_binary32; -#endif -#if __HAVE_FLOAT64 - _Float64 side_float_binary64; -#endif -#if __HAVE_FLOAT128 - _Float128 side_float_binary128; -#endif - side_padding(32); -} SIDE_PACKED; -side_check_size(union side_float_value, 32); - -struct side_type_raw_string { - side_ptr_t(const void) p; /* pointer to string */ - uint8_t unit_size; /* 1, 2, or 4 bytes */ - side_enum_t(enum side_type_label_byte_order, uint8_t) byte_order; -} SIDE_PACKED; -side_check_size(struct side_type_raw_string, 18); - -#endif /* SIDE_TYPE_VALUE_ABI_H */ diff --git a/include/side/visitor-abi.h b/include/side/visitor-abi.h deleted file mode 100644 index 59cad69..0000000 --- a/include/side/visitor-abi.h +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright 2022-2023 Mathieu Desnoyers - */ - -#ifndef SIDE_VISITOR_ABI_H -#define SIDE_VISITOR_ABI_H - -#include -#include -#include - -struct side_arg; -struct side_arg_dynamic_field; -struct side_tracer_visitor_ctx; -struct side_tracer_dynamic_struct_visitor_ctx; - -/* The visitor pattern is a double-dispatch visitor. */ - -typedef enum side_visitor_status (*side_write_elem_func)( - const struct side_tracer_visitor_ctx *tracer_ctx, - const struct side_arg *elem); -typedef enum side_visitor_status (*side_visitor_func)( - const struct side_tracer_visitor_ctx *tracer_ctx, - void *app_ctx); - -struct side_tracer_visitor_ctx { - side_write_elem_func write_elem; - void *priv; /* Private tracer context. */ -} SIDE_PACKED; - -typedef enum side_visitor_status (*side_write_field_func)( - const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx, - const struct side_arg_dynamic_field *dynamic_field); -typedef enum side_visitor_status (*side_dynamic_struct_visitor_func)( - const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx, - void *app_ctx); - -struct side_tracer_dynamic_struct_visitor_ctx { - side_write_field_func write_field; - void *priv; /* Private tracer context. */ -} SIDE_PACKED; - -#endif /* SIDE_VISITOR_ABI_H */