X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=1b0cd2bd35524f7e207ffcd0a49adc22f75c5ccc;hp=21dd66f246f0c9d71845858320bb359d7313ae60;hb=13fad8b6d8ad53a55baca25234a0c59aeff83a3b;hpb=6a36ddcab611cb253bc589c61a2ef87a6d033867 diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index 21dd66f2..1b0cd2bd 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -6,7 +6,9 @@ * * Type Header * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -17,10 +19,19 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include +#include #include #include #include @@ -31,65 +42,16 @@ /* Preallocate this many fields for structures */ #define DEFAULT_NR_STRUCT_FIELDS 8 -/* - * Always update stream_pos with move_pos and init_pos. - */ -struct stream_pos { - char *base; /* Base address */ - size_t offset; /* Offset from base, in bits */ - int dummy; /* Dummy position, for length calculation */ -}; - -static inline -void init_pos(struct stream_pos *pos, char *base) -{ - pos->base = base; /* initial base, page-aligned */ - pos->offset = 0; - pos->dummy = false; -} - -/* - * move_pos - move position of a relative bit offset - * - * TODO: allow larger files by updating base too. - */ -static inline -void move_pos(struct stream_pos *pos, size_t offset) -{ - pos->offset = pos->offset + offset; -} - -/* - * align_pos - align position on a bit offset (> 0) - * - * TODO: allow larger files by updating base too. - */ -static inline -void align_pos(struct stream_pos *pos, size_t offset) -{ - pos->offset += offset_align(pos->offset, offset); -} - -static inline -void copy_pos(struct stream_pos *dest, struct stream_pos *src) -{ - memcpy(dest, src, sizeof(struct stream_pos)); -} - -static inline -char *get_pos_addr(struct stream_pos *pos) -{ - /* Only makes sense to get the address after aligning on CHAR_BIT */ - assert(!(pos->offset % CHAR_BIT)); - return pos->base + (pos->offset / CHAR_BIT); -} - +struct ctf_stream_definition; +struct stream_pos; struct format; struct definition; +struct ctf_clock; /* type scope */ struct declaration_scope { /* Hash table mapping type name GQuark to "struct declaration" */ + /* Used for both typedef and typealias. */ GHashTable *typedef_declarations; /* Hash table mapping struct name GQuark to "struct declaration_struct" */ GHashTable *struct_declarations; @@ -116,22 +78,8 @@ struct definition_scope { GArray *scope_path; /* array of GQuark */ }; -enum ctf_type_id { - CTF_TYPE_UNKNOWN = 0, - CTF_TYPE_INTEGER, - CTF_TYPE_FLOAT, - CTF_TYPE_ENUM, - CTF_TYPE_STRING, - CTF_TYPE_STRUCT, - CTF_TYPE_VARIANT, - CTF_TYPE_ARRAY, - CTF_TYPE_SEQUENCE, - NR_CTF_TYPES, -}; - struct declaration { enum ctf_type_id id; - GQuark name; /* type name */ size_t alignment; /* type alignment, in bits */ int ref; /* number of references to the type */ /* @@ -141,26 +89,45 @@ 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. */ void (*definition_free)(struct definition *definition); - /* - * Definition copy function. Knows how to find the child - * definition from the parent definition. - */ - void (*copy)(struct stream_pos *dest, const struct format *fdest, - struct stream_pos *src, const struct format *fsrc, - struct definition *definition); }; 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, + struct definition *definition); + +/* Parent of per-plugin positions */ +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_definition *stream); +}; + +static inline +int generic_rw(struct stream_pos *pos, struct definition *definition) +{ + enum ctf_type_id dispatch_id = definition->declaration->id; + rw_dispatch call; + + assert(pos->rw_table[dispatch_id] != NULL); + call = pos->rw_table[dispatch_id]; + return call(pos, definition); +} + /* * 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 @@ -171,6 +138,9 @@ 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 ctf_clock *clock; }; struct definition_integer { @@ -195,8 +165,11 @@ struct declaration_float { struct definition_float { struct definition p; struct declaration_float *declaration; + struct definition_integer *sign; + struct definition_integer *mantissa; + struct definition_integer *exp; /* Last values read */ - long double value; + double value; }; /* @@ -214,7 +187,7 @@ struct enum_range { }; struct enum_range_to_quark { - struct cds_list_head node; + struct bt_list_head node; struct enum_range range; GQuark quark; }; @@ -233,7 +206,7 @@ struct enum_range_to_quark { */ struct enum_table { GHashTable *value_to_quark_set; /* (value, GQuark GArray) */ - struct cds_list_head range_to_quark; /* (range, GQuark) */ + struct bt_list_head range_to_quark; /* (range, GQuark) */ GHashTable *quark_to_range_set; /* (GQuark, range GArray) */ }; @@ -253,12 +226,14 @@ struct definition_enum { struct declaration_string { struct declaration p; + enum ctf_string_encoding encoding; }; struct definition_string { struct definition p; struct declaration_string *declaration; char *value; /* freed at definition_string teardown */ + size_t len, alloc_len; }; struct declaration_field { @@ -266,11 +241,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) */ @@ -281,26 +251,29 @@ 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_variant { +struct declaration_untagged_variant { struct declaration p; GHashTable *fields_by_tag; /* Tuples (field tag, field index) */ struct declaration_scope *scope; GArray *fields; /* Array of declaration_field */ - GQuark tag_name; /* TODO */ - /* Tag name must be nonzero and must exist when defining the variant */ }; +struct declaration_variant { + struct declaration p; + struct declaration_untagged_variant *untagged_variant; + GArray *tag_name; /* Array of GQuark */ +}; + +/* A variant needs to be tagged to be defined. */ 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 { @@ -313,13 +286,13 @@ struct declaration_array { struct definition_array { struct definition p; struct declaration_array *declaration; - struct definition_scope *scope; - struct field current_element; /* 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; }; @@ -327,16 +300,16 @@ struct declaration_sequence { struct definition_sequence { struct definition p; struct declaration_sequence *declaration; - struct definition_scope *scope; - struct definition_integer *len; - struct field current_element; /* 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, struct declaration *declaration, struct declaration_scope *scope); struct declaration *lookup_declaration(GQuark declaration_name, - struct declaration_scope *scope); + struct declaration_scope *scope); /* * Type scopes also contain a separate registry for struct, variant and @@ -351,9 +324,9 @@ struct declaration_struct * lookup_struct_declaration(GQuark struct_name, struct declaration_scope *scope); int register_variant_declaration(GQuark variant_name, - struct declaration_variant *variant_declaration, + struct declaration_untagged_variant *untagged_variant_declaration, struct declaration_scope *scope); -struct declaration_variant *lookup_variant_declaration(GQuark variant_name, +struct declaration_untagged_variant *lookup_variant_declaration(GQuark variant_name, struct declaration_scope *scope); int register_enum_declaration(GQuark enum_name, struct declaration_enum *enum_declaration, @@ -371,38 +344,49 @@ 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, - GQuark root_name); + GQuark field_name, const char *root_name); void free_definition_scope(struct definition_scope *scope); -void declaration_ref(struct declaration *declaration); -void declaration_unref(struct declaration *declaration); +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 definition_ref(struct definition *definition); -void definition_unref(struct definition *definition); +void bt_declaration_ref(struct declaration *declaration); +void bt_declaration_unref(struct declaration *declaration); -/* Nameless declarations can be created by passing a NULL name */ +void bt_definition_ref(struct definition *definition); +void bt_definition_unref(struct definition *definition); -struct declaration_integer *integer_declaration_new(const char *name, - size_t len, int byte_order, - int signedness, size_t alignment); +struct declaration_integer *integer_declaration_new(size_t len, int byte_order, + int signedness, size_t alignment, + int base, enum ctf_string_encoding encoding, + struct ctf_clock *clock); +uint64_t get_unsigned_int(const struct definition *field); +int64_t get_signed_int(const struct definition *field); +int get_int_signedness(const struct definition *field); +int get_int_byte_order(const struct definition *field); +int get_int_base(const struct definition *field); +size_t get_int_len(const struct definition *field); /* in bits */ +enum ctf_string_encoding get_int_encoding(const struct definition *field); /* * mantissa_len is the length of the number of bytes represented by the mantissa * (e.g. result of DBL_MANT_DIG). It includes the leading 1. */ -struct declaration_float *float_declaration_new(const char *name, - size_t mantissa_len, +struct declaration_float *float_declaration_new(size_t mantissa_len, size_t exp_len, int byte_order, size_t alignment); @@ -423,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. @@ -439,42 +423,51 @@ void enum_unsigned_insert(struct declaration_enum *enum_declaration, size_t enum_get_nr_enumerators(struct declaration_enum *enum_declaration); struct declaration_enum * - enum_declaration_new(const char *name, - struct declaration_integer *integer_declaration); + enum_declaration_new(struct declaration_integer *integer_declaration); + +struct declaration_string * + string_declaration_new(enum ctf_string_encoding encoding); +char *get_string(const struct definition *field); +enum ctf_string_encoding get_string_encoding(const struct definition *field); struct declaration_struct * - struct_declaration_new(const char *name, - 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); /* * Returns the index of a field within a structure. */ -unsigned long struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration, +int struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration, GQuark field_name); /* * field returned only valid as long as the field structure is not appended to. */ struct declaration_field * struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration, - unsigned long index); -struct field * -struct_get_field_from_index(struct definition_struct *struct_definition, - unsigned long index); + int index); +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 * from numeric values to a single tag. Overlapping tag value ranges are * therefore forbidden. */ -struct declaration_variant *variant_declaration_new(const char *name, +struct declaration_untagged_variant *untagged_variant_declaration_new( struct declaration_scope *parent_scope); -void variant_declaration_add_field(struct declaration_variant *variant_declaration, - const char *tag_name, - struct declaration *tag_declaration); +struct declaration_variant *variant_declaration_new(struct declaration_untagged_variant *untagged_variant, + const char *tag); + +void untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration, + const char *field_name, + struct declaration *field_declaration); struct declaration_field * - variant_declaration_get_field_from_tag(struct declaration_variant *variant_declaration, + untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag); /* * Returns 0 on success, -EPERM on error. @@ -486,7 +479,8 @@ 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); /* * elem_declaration passed as parameter now belongs to the array. No @@ -494,18 +488,52 @@ struct field *variant_get_current_field(struct definition_variant *variant); * array. */ struct declaration_array * - array_declaration_new(const char *name, - size_t len, struct declaration *elem_declaration, + bt_array_declaration_new(size_t len, struct declaration *elem_declaration, struct declaration_scope *parent_scope); +uint64_t bt_array_len(struct definition_array *array); +struct definition *bt_array_index(struct definition_array *array, uint64_t i); +int bt_array_rw(struct stream_pos *pos, struct definition *definition); +GString *bt_get_char_array(const struct definition *field); +int bt_get_array_len(const struct definition *field); /* * int_declaration and elem_declaration passed as parameter now belong * to the sequence. No need to free them explicitly. */ struct declaration_sequence * - sequence_declaration_new(const char *name, - 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); +struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i); +int sequence_rw(struct stream_pos *pos, struct definition *definition); + +/* + * in: path (dot separated), out: q (GArray of GQuark) + */ +void bt_append_scope_path(const char *path, GArray *q); + +/* + * Lookup helpers. + */ +struct definition *lookup_definition(const struct definition *definition, + const char *field_name); +struct definition_integer *lookup_integer(const struct definition *definition, + const char *field_name, + int signedness); +struct definition_enum *bt_lookup_enum(const struct definition *definition, + const char *field_name, + int signedness); +struct definition *lookup_variant(const struct definition *definition, + const char *field_name); + +static inline +const char *rem_(const char *str) +{ + if (str[0] == '_') + return &str[1]; + else + return str; +} -#endif /* _BABELTRACE_declarationS_H */ +#endif /* _BABELTRACE_TYPES_H */