{
int64_t val;
- switch (attr->value.type) {
+ switch (side_enum_get(attr->value.type)) {
case SIDE_ATTR_TYPE_U8:
val = attr->value.u.integer_value.side_u8;
break;
bool cmp;
tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size,
- attr->key.byte_order, NULL, &utf8_str);
+ side_enum_get(attr->key.byte_order), NULL, &utf8_str);
cmp = strcmp(utf8_str, "std.integer.base");
if (utf8_str != side_ptr_get(attr->key.p))
free(utf8_str);
char *utf8_str = NULL;
tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size,
- attr->key.byte_order, NULL, &utf8_str);
+ side_enum_get(attr->key.byte_order), NULL, &utf8_str);
printf("{ key%s \"%s\", value%s ", separator, utf8_str, separator);
if (utf8_str != side_ptr_get(attr->key.p))
free(utf8_str);
- switch (attr->value.type) {
+ switch (side_enum_get(attr->value.type)) {
case SIDE_ATTR_TYPE_BOOL:
printf("%s", attr->value.u.bool_value ? "true" : "false");
break;
case SIDE_ATTR_TYPE_STRING:
tracer_print_string(side_ptr_get(attr->value.u.string_value.p),
attr->value.u.string_value.unit_size,
- attr->value.u.string_value.byte_order, NULL);
+ side_enum_get(attr->value.u.string_value.byte_order), NULL);
break;
default:
fprintf(stderr, "ERROR: <UNKNOWN ATTRIBUTE TYPE>");
len_bits = type_integer->len_bits;
if (len_bits + offset_bits > type_integer->integer_size * CHAR_BIT)
abort();
- reverse_bo = type_integer->byte_order != SIDE_TYPE_BYTE_ORDER_HOST;
+ reverse_bo = side_enum_get(type_integer->byte_order) != SIDE_TYPE_BYTE_ORDER_HOST;
switch (type_integer->integer_size) {
case 1:
if (type_integer->signedness)
}
if (v64.s >= mapping->range_begin && v64.s <= mapping->range_end) {
printf("%s", print_count++ ? ", " : "");
- tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size, mapping->label.byte_order, NULL);
+ tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+ side_enum_get(mapping->label.byte_order), NULL);
}
}
if (!print_count)
const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum.elem_type);
union int64_value v64;
- if (elem_type->type != item->type) {
+ if (side_enum_get(elem_type->type) != side_enum_get(item->type)) {
fprintf(stderr, "ERROR: Unexpected enum element type\n");
abort();
}
{
uint32_t stride_bit;
- switch (elem_type->type) {
+ switch (side_enum_get(elem_type->type)) {
case SIDE_TYPE_BYTE:
stride_bit = 8;
break;
uint32_t i, print_count = 0, stride_bit, nr_items;
const struct side_arg *array_item;
- switch (enum_elem_type->type) {
+ switch (side_enum_get(enum_elem_type->type)) {
case SIDE_TYPE_U8: /* Fall-through */
case SIDE_TYPE_BYTE: /* Fall-through */
case SIDE_TYPE_U16: /* Fall-through */
break;
case SIDE_TYPE_ARRAY:
elem_type = side_ptr_get(enum_elem_type->u.side_array.elem_type);
- array_item = side_ptr_get(item->u.side_static.side_array)->sav;
+ array_item = side_ptr_get(side_ptr_get(item->u.side_static.side_array)->sav);
nr_items = type_desc->u.side_array.length;
break;
case SIDE_TYPE_VLA:
elem_type = side_ptr_get(enum_elem_type->u.side_vla.elem_type);
- array_item = side_ptr_get(item->u.side_static.side_vla)->sav;
+ array_item = side_ptr_get(side_ptr_get(item->u.side_static.side_vla)->sav);
nr_items = side_ptr_get(item->u.side_static.side_vla)->len;
break;
default:
for (bit = mapping->range_begin; bit <= mapping->range_end; bit++) {
if (bit > (nr_items * stride_bit) - 1)
break;
- if (elem_type->type == SIDE_TYPE_BYTE) {
+ if (side_enum_get(elem_type->type) == SIDE_TYPE_BYTE) {
uint8_t v = array_item[bit / 8].u.side_static.byte_value;
if (v & (1ULL << (bit % 8))) {
match = true;
match:
if (match) {
printf("%s", print_count++ ? ", " : "");
- tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size, mapping->label.byte_order, NULL);
+ tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+ side_enum_get(mapping->label.byte_order), NULL);
}
}
if (!print_count)
len_bits = type_bool->len_bits;
if (len_bits + offset_bits > type_bool->bool_size * CHAR_BIT)
abort();
- reverse_bo = type_bool->byte_order != SIDE_TYPE_BYTE_ORDER_HOST;
+ reverse_bo = side_enum_get(type_bool->byte_order) != SIDE_TYPE_BYTE_ORDER_HOST;
switch (type_bool->bool_size) {
case 1:
v = value->side_bool8;
bool reverse_bo;
tracer_print_type_header(separator, side_ptr_get(type_float->attr), type_float->nr_attr);
- reverse_bo = type_float->byte_order != SIDE_TYPE_FLOAT_WORD_ORDER_HOST;
+ reverse_bo = side_enum_get(type_float->byte_order) != SIDE_TYPE_FLOAT_WORD_ORDER_HOST;
switch (type_float->float_size) {
case 2:
{
{
enum side_type_label type;
- switch (type_desc->type) {
+ switch (side_enum_get(type_desc->type)) {
case SIDE_TYPE_ENUM:
- switch (item->type) {
+ switch (side_enum_get(item->type)) {
case SIDE_TYPE_U8:
case SIDE_TYPE_U16:
case SIDE_TYPE_U32:
break;
case SIDE_TYPE_ENUM_BITMAP:
- switch (item->type) {
+ switch (side_enum_get(item->type)) {
case SIDE_TYPE_U8:
case SIDE_TYPE_BYTE:
case SIDE_TYPE_U16:
break;
case SIDE_TYPE_GATHER_ENUM:
- switch (item->type) {
+ switch (side_enum_get(item->type)) {
case SIDE_TYPE_GATHER_INTEGER:
break;
default:
break;
case SIDE_TYPE_DYNAMIC:
- switch (item->type) {
+ switch (side_enum_get(item->type)) {
case SIDE_TYPE_DYNAMIC_NULL:
case SIDE_TYPE_DYNAMIC_BOOL:
case SIDE_TYPE_DYNAMIC_INTEGER:
break;
default:
- if (type_desc->type != item->type) {
+ if (side_enum_get(type_desc->type) != side_enum_get(item->type)) {
fprintf(stderr, "ERROR: type mismatch between description and arguments\n");
abort();
}
break;
}
- if (type_desc->type == SIDE_TYPE_ENUM || type_desc->type == SIDE_TYPE_ENUM_BITMAP ||
- type_desc->type == SIDE_TYPE_GATHER_ENUM)
- type = (enum side_type_label) type_desc->type;
+ if (side_enum_get(type_desc->type) == SIDE_TYPE_ENUM || side_enum_get(type_desc->type) == SIDE_TYPE_ENUM_BITMAP || side_enum_get(type_desc->type) == SIDE_TYPE_GATHER_ENUM)
+ type = side_enum_get(type_desc->type);
else
- type = (enum side_type_label) item->type;
+ type = side_enum_get(item->type);
printf("{ ");
switch (type) {
case SIDE_TYPE_STRING_UTF32:
tracer_print_type_header(":", side_ptr_get(type_desc->u.side_string.attr), type_desc->u.side_string.nr_attr);
tracer_print_string(side_ptr_get(item->u.side_static.string_value),
- type_desc->u.side_string.unit_size, type_desc->u.side_string.byte_order, NULL);
+ type_desc->u.side_string.unit_size, side_enum_get(type_desc->u.side_string.byte_order), NULL);
break;
/* Stack-copy compound types */
/* Gather basic types */
case SIDE_TYPE_GATHER_BOOL:
- (void) tracer_print_gather_bool_type(&type_desc->u.side_gather, item->u.side_static.side_bool_gather_ptr);
+ (void) tracer_print_gather_bool_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_bool_gather_ptr));
break;
case SIDE_TYPE_GATHER_INTEGER:
- (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, item->u.side_static.side_integer_gather_ptr,
+ (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr),
TRACER_DISPLAY_BASE_10);
break;
case SIDE_TYPE_GATHER_BYTE:
- (void) tracer_print_gather_byte_type(&type_desc->u.side_gather, item->u.side_static.side_byte_gather_ptr);
+ (void) tracer_print_gather_byte_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_byte_gather_ptr));
break;
case SIDE_TYPE_GATHER_POINTER:
- (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, item->u.side_static.side_integer_gather_ptr,
+ (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr),
TRACER_DISPLAY_BASE_16);
break;
case SIDE_TYPE_GATHER_FLOAT:
- (void) tracer_print_gather_float_type(&type_desc->u.side_gather, item->u.side_static.side_float_gather_ptr);
+ (void) tracer_print_gather_float_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_float_gather_ptr));
break;
case SIDE_TYPE_GATHER_STRING:
- (void) tracer_print_gather_string_type(&type_desc->u.side_gather, item->u.side_static.side_string_gather_ptr);
+ (void) tracer_print_gather_string_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_string_gather_ptr));
break;
/* Gather compound type */
case SIDE_TYPE_GATHER_STRUCT:
- (void) tracer_print_gather_struct(&type_desc->u.side_gather, item->u.side_static.side_struct_gather_ptr);
+ (void) tracer_print_gather_struct(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_struct_gather_ptr));
break;
case SIDE_TYPE_GATHER_ARRAY:
- (void) tracer_print_gather_array(&type_desc->u.side_gather, item->u.side_static.side_array_gather_ptr);
+ (void) tracer_print_gather_array(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_array_gather_ptr));
break;
case SIDE_TYPE_GATHER_VLA:
- (void) tracer_print_gather_vla(&type_desc->u.side_gather, item->u.side_static.side_vla_gather.ptr,
- item->u.side_static.side_vla_gather.length_ptr);
+ (void) tracer_print_gather_vla(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_vla_gather.ptr),
+ side_ptr_get(item->u.side_static.side_vla_gather.length_ptr));
break;
/* Gather enumeration types */
case SIDE_TYPE_GATHER_ENUM:
- (void) tracer_print_gather_enum_type(&type_desc->u.side_gather, item->u.side_static.side_integer_gather_ptr);
+ (void) tracer_print_gather_enum_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr));
break;
/* Dynamic basic types */
static
void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
{
- const struct side_arg *sav = side_arg_vec->sav;
+ const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
const struct side_type_struct *side_struct = side_ptr_get(type_desc->u.side_struct);
uint32_t i, side_sav_len = side_arg_vec->len;
union int64_value v64;
uint32_t i;
- if (selector_type->type != side_arg_variant->selector.type) {
+ if (side_enum_get(selector_type->type) != side_enum_get(side_arg_variant->selector.type)) {
fprintf(stderr, "ERROR: Unexpected variant selector type\n");
abort();
}
- switch (selector_type->type) {
+ switch (side_enum_get(selector_type->type)) {
case SIDE_TYPE_U8:
case SIDE_TYPE_U16:
case SIDE_TYPE_U32:
static
void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
{
- const struct side_arg *sav = side_arg_vec->sav;
+ const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
uint32_t i, side_sav_len = side_arg_vec->len;
if (type_desc->u.side_array.length != side_sav_len) {
static
void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
{
- const struct side_arg *sav = side_arg_vec->sav;
+ const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
uint32_t i, side_sav_len = side_arg_vec->len;
print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla.attr), type_desc->u.side_vla.nr_attr);
type_gather->u.side_string.type.nr_attr);
if (ptr) {
tracer_print_string(ptr, type_gather->u.side_string.type.unit_size,
- type_gather->u.side_string.type.byte_order, &string_len);
+ side_enum_get(type_gather->u.side_string.type.byte_order), &string_len);
} else {
printf("<NULL>");
string_len = type_gather->u.side_string.type.unit_size;
uint32_t len;
printf("{ ");
- switch (type_desc->type) {
+ switch (side_enum_get(type_desc->type)) {
/* Gather basic types */
case SIDE_TYPE_GATHER_BOOL:
len = tracer_print_gather_bool_type(&type_desc->u.side_gather, ptr);
for (i = 0; i < type_gather->u.side_array.type.length; i++) {
const struct side_type *elem_type = side_ptr_get(type_gather->u.side_array.type.elem_type);
- switch (elem_type->type) {
+ switch (side_enum_get(elem_type->type)) {
case SIDE_TYPE_GATHER_VLA:
fprintf(stderr, "<gather VLA only supported within gather structures>\n");
abort();
uint32_t i, length;
/* Access length */
- switch (length_type->type) {
+ switch (side_enum_get(length_type->type)) {
case SIDE_TYPE_GATHER_INTEGER:
break;
default:
for (i = 0; i < length; i++) {
const struct side_type *elem_type = side_ptr_get(type_gather->u.side_vla.type.elem_type);
- switch (elem_type->type) {
+ switch (side_enum_get(elem_type->type)) {
case SIDE_TYPE_GATHER_VLA:
fprintf(stderr, "<gather VLA only supported within gather structures>\n");
abort();
.write_elem = tracer_write_elem_cb,
.priv = &tracer_priv,
};
+ side_visitor_func func;
print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla_visitor.attr), type_desc->u.side_vla_visitor.nr_attr);
printf("%s", type_desc->u.side_vla_visitor.nr_attr ? ", " : "");
printf("elements: ");
printf("[ ");
- status = type_desc->u.side_vla_visitor.visitor(&tracer_ctx, app_ctx);
+ func = side_ptr_get(type_desc->u.side_vla_visitor.visitor);
+ status = func(&tracer_ctx, app_ctx);
switch (status) {
case SIDE_VISITOR_STATUS_OK:
break;
static
void tracer_print_dynamic_struct(const struct side_arg_dynamic_struct *dynamic_struct)
{
- const struct side_arg_dynamic_field *fields = dynamic_struct->fields;
+ const struct side_arg_dynamic_field *fields = side_ptr_get(dynamic_struct->fields);
uint32_t i, len = dynamic_struct->len;
print_attributes("attr", "::", side_ptr_get(dynamic_struct->attr), dynamic_struct->nr_attr);
printf("[ ");
for (i = 0; i < len; i++) {
printf("%s", i ? ", " : "");
- printf("%s:: ", fields[i].field_name);
+ printf("%s:: ", side_ptr_get(fields[i].field_name));
tracer_print_dynamic(&fields[i].elem);
}
printf(" ]");
(struct tracer_dynamic_struct_visitor_priv *) tracer_ctx->priv;
printf("%s", tracer_priv->i++ ? ", " : "");
- printf("%s:: ", dynamic_field->field_name);
+ printf("%s:: ", side_ptr_get(dynamic_field->field_name));
tracer_print_dynamic(&dynamic_field->elem);
return SIDE_VISITOR_STATUS_OK;
}
.write_field = tracer_dynamic_struct_write_elem_cb,
.priv = &tracer_priv,
};
- void *app_ctx = item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx;
+ void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx);
print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.attr), item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr);
printf("%s", item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr ? ", " : "");
printf("fields:: ");
printf("[ ");
- status = item->u.side_dynamic.side_dynamic_struct_visitor.visitor(&tracer_ctx, app_ctx);
+ status = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.visitor)(&tracer_ctx, app_ctx);
switch (status) {
case SIDE_VISITOR_STATUS_OK:
break;
static
void tracer_print_dynamic_vla(const struct side_arg_dynamic_vla *vla)
{
- const struct side_arg *sav = vla->sav;
+ const struct side_arg *sav = side_ptr_get(vla->sav);
uint32_t i, side_sav_len = vla->len;
print_attributes("attr", "::", side_ptr_get(vla->attr), vla->nr_attr);
.write_elem = tracer_dynamic_vla_write_elem_cb,
.priv = &tracer_priv,
};
- void *app_ctx = item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx;
+ void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx);
print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.attr), item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr);
printf("%s", item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr ? ", " : "");
printf("elements:: ");
printf("[ ");
- status = item->u.side_dynamic.side_dynamic_vla_visitor.visitor(&tracer_ctx, app_ctx);
+ status = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.visitor)(&tracer_ctx, app_ctx);
switch (status) {
case SIDE_VISITOR_STATUS_OK:
break;
void tracer_print_dynamic(const struct side_arg *item)
{
printf("{ ");
- switch (item->type) {
+ switch (side_enum_get(item->type)) {
/* Dynamic basic types */
case SIDE_TYPE_DYNAMIC_NULL:
tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_null.attr),
tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_string.type.attr), item->u.side_dynamic.side_string.type.nr_attr);
tracer_print_string((const char *)(uintptr_t) item->u.side_dynamic.side_string.value,
item->u.side_dynamic.side_string.type.unit_size,
- item->u.side_dynamic.side_string.type.byte_order, NULL);
+ side_enum_get(item->u.side_dynamic.side_string.type.byte_order), NULL);
break;
/* Dynamic compound types */
case SIDE_TYPE_DYNAMIC_STRUCT:
- tracer_print_dynamic_struct(item->u.side_dynamic.side_dynamic_struct);
+ tracer_print_dynamic_struct(side_ptr_get(item->u.side_dynamic.side_dynamic_struct));
break;
case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR:
tracer_print_dynamic_struct_visitor(item);
break;
case SIDE_TYPE_DYNAMIC_VLA:
- tracer_print_dynamic_vla(item->u.side_dynamic.side_dynamic_vla);
+ tracer_print_dynamic_vla(side_ptr_get(item->u.side_dynamic.side_dynamic_vla));
break;
case SIDE_TYPE_DYNAMIC_VLA_VISITOR:
tracer_print_dynamic_vla_visitor(item);
const struct side_arg_vec *side_arg_vec,
uint32_t *nr_items)
{
- const struct side_arg *sav = side_arg_vec->sav;
+ const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
uint32_t i, side_sav_len = side_arg_vec->len;
- printf("provider: %s, event: %s", desc->provider_name, desc->event_name);
+ printf("provider: %s, event: %s", side_ptr_get(desc->provider_name), side_ptr_get(desc->event_name));
if (desc->nr_fields != side_sav_len) {
fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n");
abort();
printf("%s", side_sav_len ? ", fields: [ " : "");
for (i = 0; i < side_sav_len; i++) {
printf("%s", i ? ", " : "");
- tracer_print_field(&desc->fields[i], &sav[i]);
+ tracer_print_field(&side_ptr_get(desc->fields)[i], &sav[i]);
}
if (nr_items)
*nr_items = i;
printf("%s", var_struct_len ? ", fields:: [ " : "");
for (i = 0; i < var_struct_len; i++, nr_fields++) {
printf("%s", i ? ", " : "");
- printf("%s:: ", var_struct->fields[i].field_name);
- tracer_print_dynamic(&var_struct->fields[i].elem);
+ printf("%s:: ", side_ptr_get(side_ptr_get(var_struct->fields)[i].field_name));
+ tracer_print_dynamic(&side_ptr_get(var_struct->fields)[i].elem);
}
if (i)
printf(" ]");
/* Skip NULL pointers */
if (!event)
continue;
+ if (event->version != SIDE_ABI_VERSION) {
+ printf("Error: event SIDE ABI version (%u) does not match the SIDE ABI version supported by the tracer (%u)\n",
+ event->version, SIDE_ABI_VERSION);
+ return;
+ }
printf("provider: %s, event: %s\n",
- event->provider_name, event->event_name);
+ side_ptr_get(event->provider_name), side_ptr_get(event->event_name));
+ if (event->struct_size != side_offsetofend(struct side_event_description, side_event_description_orig_abi_last)) {
+ printf("Warning: Event %s.%s contains fields unknown to the tracer\n",
+ side_ptr_get(event->provider_name), side_ptr_get(event->event_name));
+ }
if (notif == SIDE_TRACER_NOTIFICATION_INSERT_EVENTS) {
+ if (event->nr_side_type_label > _NR_SIDE_TYPE_LABEL) {
+ printf("Warning: event %s:%s may contain unknown field types (%u unknown types)\n",
+ side_ptr_get(event->provider_name), side_ptr_get(event->event_name),
+ event->nr_side_type_label - _NR_SIDE_TYPE_LABEL);
+ }
+ if (event->nr_side_attr_type > _NR_SIDE_ATTR_TYPE) {
+ printf("Warning: event %s:%s may contain unknown attribute types (%u unknown types)\n",
+ side_ptr_get(event->provider_name), side_ptr_get(event->event_name),
+ event->nr_side_attr_type - _NR_SIDE_ATTR_TYPE);
+ }
if (event->flags & SIDE_EVENT_FLAG_VARIADIC) {
ret = side_tracer_callback_variadic_register(event, tracer_call_variadic, NULL);
if (ret)