*
* BabelTrace - Integer Type Converter
*
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
static
struct definition *_integer_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index);
+ GQuark field_name, int index,
+ const char *root_name);
static
void _integer_definition_free(struct definition *definition);
struct declaration_integer *
integer_declaration_new(size_t len, int byte_order,
- int signedness, size_t alignment, int base)
+ int signedness, size_t alignment, int base,
+ enum ctf_string_encoding encoding)
{
struct declaration_integer *integer_declaration;
integer_declaration->byte_order = byte_order;
integer_declaration->signedness = signedness;
integer_declaration->base = base;
+ integer_declaration->encoding = encoding;
return integer_declaration;
}
struct definition *
_integer_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index)
+ GQuark field_name, int index,
+ const char *root_name)
{
struct declaration_integer *integer_declaration =
container_of(declaration, struct declaration_integer, p);
struct definition_integer *integer;
+ int ret;
integer = g_new(struct definition_integer, 1);
declaration_ref(&integer_declaration->p);
integer->p.declaration = declaration;
integer->declaration = integer_declaration;
integer->p.ref = 1;
- integer->p.index = index;
+ /*
+ * Use INT_MAX order to ensure that all fields of the parent
+ * scope are seen as being prior to this scope.
+ */
+ integer->p.index = root_name ? INT_MAX : index;
integer->p.name = field_name;
- integer->p.path = new_definition_path(parent_scope, field_name);
+ integer->p.path = new_definition_path(parent_scope, field_name,
+ root_name);
+ integer->p.scope = NULL;
integer->value._unsigned = 0;
+ ret = register_field_definition(field_name, &integer->p,
+ parent_scope);
+ assert(!ret);
return &integer->p;
}