X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=b42ba03e066ef65cd7b18d4f0d8fed5e0f82a345;hp=b4d2d4a7dc8b423a5bf1f7ebea971f381384ef2f;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=56e603733d2a16aba6fdaf149ad6a4cd42e44eda diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index b4d2d4a7..b42ba03e 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -19,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 @@ -33,7 +42,7 @@ /* 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; @@ -69,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 */ @@ -119,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 @@ -133,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 @@ -199,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; }; @@ -218,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) */ }; @@ -386,8 +374,13 @@ 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(struct definition *field); -int64_t get_signed_int(struct definition *field); +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 @@ -434,7 +427,8 @@ struct declaration_enum * struct declaration_string * string_declaration_new(enum ctf_string_encoding encoding); -char *get_string(struct definition *field); +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, @@ -499,7 +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(struct definition *field); +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 @@ -521,15 +516,24 @@ void append_scope_path(const char *path, GArray *q); /* * Lookup helpers. */ -struct definition *lookup_definition(struct definition *definition, +struct definition *lookup_definition(const struct definition *definition, const char *field_name); -struct definition_integer *lookup_integer(struct definition *definition, +struct definition_integer *lookup_integer(const struct definition *definition, const char *field_name, int signedness); -struct definition_enum *lookup_enum(struct definition *definition, +struct definition_enum *lookup_enum(const struct definition *definition, const char *field_name, int signedness); -struct definition *lookup_variant(struct definition *definition, +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 */