X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=b42ba03e066ef65cd7b18d4f0d8fed5e0f82a345;hp=da9ca5c5faeabef771f70fcadf5e57599ffc209a;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=81dee1bb528a95f7bf2bc622948807150794a75e diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index da9ca5c5..b42ba03e 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,10 +42,11 @@ /* Preallocate this many fields for structures */ #define DEFAULT_NR_STRUCT_FIELDS 8 -struct ctf_stream; +struct ctf_stream_definition; struct stream_pos; struct format; struct definition; +struct ctf_clock; /* type scope */ struct declaration_scope { @@ -66,20 +78,6 @@ 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_UNTAGGED_VARIANT, - CTF_TYPE_VARIANT, - CTF_TYPE_ARRAY, - CTF_TYPE_SEQUENCE, - NR_CTF_TYPES, -}; - struct declaration { enum ctf_type_id id; size_t alignment; /* type alignment, in bits */ @@ -105,6 +103,7 @@ struct definition { 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, @@ -115,7 +114,7 @@ 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); + struct ctf_stream_definition *stream); }; static inline @@ -129,13 +128,6 @@ 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 @@ -148,6 +140,7 @@ struct declaration_integer { int signedness; int base; /* Base for pretty-printing: 2, 8, 10, 16 */ enum ctf_string_encoding encoding; + struct ctf_clock *clock; }; struct definition_integer { @@ -175,9 +168,8 @@ struct definition_float { struct definition_integer *sign; struct definition_integer *mantissa; struct definition_integer *exp; - struct definition_scope *scope; /* Last values read */ - long double value; + double value; }; /* @@ -195,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; }; @@ -214,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) */ }; @@ -228,7 +220,6 @@ struct definition_enum { struct definition p; struct definition_integer *integer; struct declaration_enum *declaration; - struct definition_scope *scope; /* Last GQuark values read. Keeping a reference on the GQuark array. */ GArray *value; }; @@ -260,7 +251,6 @@ struct declaration_struct { struct definition_struct { struct definition p; struct declaration_struct *declaration; - struct definition_scope *scope; GPtrArray *fields; /* Array of pointers to struct definition */ }; @@ -281,7 +271,6 @@ struct declaration_variant { 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 */ @@ -297,7 +286,6 @@ struct declaration_array { 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 */ }; @@ -312,7 +300,6 @@ struct declaration_sequence { struct definition_sequence { struct definition p; struct declaration_sequence *declaration; - struct definition_scope *scope; struct definition_integer *length; GPtrArray *elems; /* Array of pointers to struct definition */ GString *string; /* String for encoded integer children */ @@ -357,9 +344,9 @@ 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); @@ -385,7 +372,15 @@ void definition_unref(struct definition *definition); struct declaration_integer *integer_declaration_new(size_t len, int byte_order, int signedness, size_t alignment, - int base, enum ctf_string_encoding encoding); + 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 @@ -412,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. @@ -432,6 +427,8 @@ struct declaration_enum * 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(struct declaration_scope *parent_scope, @@ -496,6 +493,8 @@ struct declaration_array * uint64_t array_len(struct definition_array *array); struct definition *array_index(struct definition_array *array, uint64_t i); int array_rw(struct stream_pos *pos, struct definition *definition); +GString *get_char_array(const struct definition *field); +int get_array_len(const struct definition *field); /* * int_declaration and elem_declaration passed as parameter now belong @@ -514,4 +513,27 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition); */ void 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 *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_TYPES_H */