struct definition *
(*definition_new)(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index);
+ GQuark field_name, int index,
+ const char *root_name);
/*
* definition_free called with definition ref is decremented to 0.
*/
GQuark name; /* Field name in its container (or 0 if unset) */
int ref; /* number of references to the definition */
GQuark path;
+ struct definition_scope *scope;
};
typedef int (*rw_dispatch)(struct stream_pos *pos,
return call(pos, definition);
}
+enum ctf_string_encoding {
+ CTF_STRING_NONE = 0,
+ CTF_STRING_UTF8,
+ CTF_STRING_ASCII,
+ CTF_STRING_UNKNOWN,
+};
+
/*
* Because we address in bits, bitfields end up being exactly the same as
* integers, except that their read/write functions must be able to deal with
size_t len; /* length, in bits. */
int byte_order; /* byte order */
int signedness;
+ int base; /* Base for pretty-printing: 2, 8, 10, 16 */
+ enum ctf_string_encoding encoding;
};
struct definition_integer {
GArray *value;
};
-enum ctf_string_encoding {
- CTF_STRING_UTF8 = 0,
- CTF_STRING_ASCII,
- CTF_STRING_UNKNOWN,
-};
-
struct declaration_string {
struct declaration p;
enum ctf_string_encoding encoding;
struct definition_struct {
struct definition p;
struct declaration_struct *declaration;
- struct definition_scope *scope;
GPtrArray *fields; /* Array of pointers to struct definition */
};
struct definition_variant {
struct definition p;
struct declaration_variant *declaration;
- struct definition_scope *scope;
struct definition *enum_tag;
GPtrArray *fields; /* Array of pointers to struct definition */
struct definition *current_field; /* Last field read */
struct definition_array {
struct definition p;
struct declaration_array *declaration;
- struct definition_scope *scope;
GPtrArray *elems; /* Array of pointers to struct definition */
+ GString *string; /* String for encoded integer children */
};
struct declaration_sequence {
struct declaration p;
- struct declaration_integer *len_declaration;
+ GArray *length_name; /* Array of GQuark */
struct declaration *elem;
struct declaration_scope *scope;
};
struct definition_sequence {
struct definition p;
struct declaration_sequence *declaration;
- struct definition_scope *scope;
- struct definition_integer *len;
+ struct definition_integer *length;
GPtrArray *elems; /* Array of pointers to struct definition */
+ GString *string; /* String for encoded integer children */
};
int register_declaration(GQuark declaration_name,
* definition scopes.
*/
struct definition *
- lookup_definition(GArray *cur_path, /* array of GQuark */
- GArray *lookup_path, /* array of GQuark */
- struct definition_scope *scope);
+ lookup_path_definition(GArray *cur_path, /* array of GQuark */
+ GArray *lookup_path, /* array of GQuark */
+ struct definition_scope *scope);
int register_field_definition(GQuark field_name,
struct definition *definition,
struct definition_scope *scope);
struct definition_scope *
new_definition_scope(struct definition_scope *parent_scope,
- GQuark field_name);
-void set_dynamic_definition_scope(struct definition *definition,
- struct definition_scope *scope,
- const char *root_name);
+ GQuark field_name, const char *root_name);
void free_definition_scope(struct definition_scope *scope);
-GQuark new_definition_path(struct definition_scope *parent_scope, GQuark field_name);
+GQuark new_definition_path(struct definition_scope *parent_scope,
+ GQuark field_name, const char *root_name);
static inline
int compare_definition_path(struct definition *definition, GQuark path)
void definition_unref(struct definition *definition);
struct declaration_integer *integer_declaration_new(size_t len, int byte_order,
- int signedness, size_t alignment);
+ int signedness, size_t alignment,
+ int base, enum ctf_string_encoding encoding);
/*
* mantissa_len is the length of the number of bytes represented by the mantissa
* Caller must release the GArray with g_array_unref().
*/
GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration,
- uint64_t v);
+ int64_t v);
/*
* Returns a GArray of struct enum_range or NULL.
string_declaration_new(enum ctf_string_encoding encoding);
struct declaration_struct *
- struct_declaration_new(struct declaration_scope *parent_scope);
+ struct_declaration_new(struct declaration_scope *parent_scope,
+ uint64_t min_align);
void struct_declaration_add_field(struct declaration_struct *struct_declaration,
const char *field_name,
struct declaration *field_declaration);
* to the sequence. No need to free them explicitly.
*/
struct declaration_sequence *
- sequence_declaration_new(struct declaration_integer *len_declaration,
+ sequence_declaration_new(const char *length_name,
struct declaration *elem_declaration,
struct declaration_scope *parent_scope);
uint64_t sequence_len(struct definition_sequence *sequence);
*/
void append_scope_path(const char *path, GArray *q);
+/*
+ * Lookup helpers.
+ */
+struct definition *lookup_definition(struct definition *definition,
+ const char *field_name);
+struct definition_integer *lookup_integer(struct definition *definition,
+ const char *field_name,
+ int signedness);
+struct definition_enum *lookup_enum(struct definition *definition,
+ const char *field_name,
+ int signedness);
+struct definition *lookup_variant(struct definition *definition,
+ const char *field_name);
+
#endif /* _BABELTRACE_TYPES_H */
projects / babeltrace.git / blobdiff