X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=5523eb42987adcc7af24a6e3fe2702109f835269;hp=cb0044e0471d57e73453452ac60657b3e717674b;hb=620961f6401b2ccf70979dd758204f8a9fa3912d;hpb=c5e74408f9786219f6b44400dcf2098ab9cc78fb diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index cb0044e0..5523eb42 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -31,6 +31,7 @@ /* Preallocate this many fields for structures */ #define DEFAULT_NR_STRUCT_FIELDS 8 +struct ctf_stream; struct stream_pos; struct format; struct definition; @@ -90,7 +91,8 @@ struct declaration { 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. */ @@ -100,7 +102,10 @@ struct declaration { struct definition { struct declaration *declaration; int index; /* Position of the definition in its container */ + 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, @@ -110,6 +115,8 @@ typedef int (*rw_dispatch)(struct stream_pos *pos, struct stream_pos { /* read/write dispatch table. Specific to plugin used for stream. */ rw_dispatch *rw_table; /* rw dispatch table */ + int (*event_cb)(struct stream_pos *pos, + struct ctf_stream *stream); }; static inline @@ -123,6 +130,13 @@ int generic_rw(struct stream_pos *pos, struct definition *definition) 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 @@ -133,6 +147,8 @@ struct declaration_integer { 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 { @@ -216,12 +232,6 @@ struct definition_enum { 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; @@ -239,11 +249,6 @@ struct declaration_field { struct declaration *declaration; }; -struct field { - GQuark name; - struct definition *definition; -}; - struct declaration_struct { struct declaration p; GHashTable *fields_by_name; /* Tuples (field name, field index) */ @@ -254,8 +259,7 @@ struct declaration_struct { struct definition_struct { struct definition p; struct declaration_struct *declaration; - struct definition_scope *scope; - GArray *fields; /* Array of struct field */ + GPtrArray *fields; /* Array of pointers to struct definition */ }; struct declaration_untagged_variant { @@ -275,10 +279,9 @@ struct declaration_variant { struct definition_variant { struct definition p; struct declaration_variant *declaration; - struct definition_scope *scope; struct definition *enum_tag; - GArray *fields; /* Array of struct field */ - struct field *current_field; /* Last field read */ + GPtrArray *fields; /* Array of pointers to struct definition */ + struct definition *current_field; /* Last field read */ }; struct declaration_array { @@ -291,13 +294,13 @@ struct declaration_array { struct definition_array { struct definition p; struct declaration_array *declaration; - struct definition_scope *scope; - GArray *elems; /* struct field */ + 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; }; @@ -305,9 +308,9 @@ struct declaration_sequence { struct definition_sequence { struct definition p; struct declaration_sequence *declaration; - struct definition_scope *scope; - struct definition_integer *len; - GArray *elems; /* struct field */ + 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, @@ -349,20 +352,26 @@ void free_declaration_scope(struct declaration_scope *scope); * 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, const char *root_name); + +static inline +int compare_definition_path(struct definition *definition, GQuark path) +{ + return definition->path == path; +} + void declaration_ref(struct declaration *declaration); void declaration_unref(struct declaration *declaration); @@ -370,7 +379,8 @@ void definition_ref(struct definition *definition); 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 @@ -397,7 +407,7 @@ GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration, * 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. @@ -419,7 +429,8 @@ struct declaration_string * 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); @@ -434,10 +445,11 @@ int struct_declaration_lookup_field_index(struct declaration_struct *struct_decl struct declaration_field * struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration, int index); -struct field * +struct definition * struct_definition_get_field_from_index(struct definition_struct *struct_definition, int index); int struct_rw(struct stream_pos *pos, struct definition *definition); +uint64_t struct_declaration_len(struct declaration_struct *struct_declaration); /* * The tag enumeration is validated to ensure that it contains only mappings @@ -465,7 +477,7 @@ int variant_definition_set_tag(struct definition_variant *variant, * field returned only valid as long as the variant structure is not appended * to. */ -struct field *variant_get_current_field(struct definition_variant *variant); +struct definition *variant_get_current_field(struct definition_variant *variant); int variant_rw(struct stream_pos *pos, struct definition *definition); /* @@ -485,7 +497,7 @@ int array_rw(struct stream_pos *pos, struct definition *definition); * 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); @@ -497,4 +509,18 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition); */ void append_scope_path(const char *path, GArray *q); -#endif /* _BABELTRACE_declarationS_H */ +/* + * 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 */