X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=15bbef36c328ffcb970d6027d8dafc62bc86c214;hp=cfc74a2f6206c72cfb3805bf139b81dbd0dba719;hb=2399b6f48012dd60cb48f87b60fc1cc698a56fdc;hpb=8673030f3cb8d157a30e79af524fd5cca253025e diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index cfc74a2f..15bbef36 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -19,6 +19,14 @@ * * 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 @@ -34,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; @@ -106,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 @@ -356,11 +364,11 @@ 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); +void bt_declaration_ref(struct declaration *declaration); +void bt_declaration_unref(struct declaration *declaration); -void definition_ref(struct definition *definition); -void definition_unref(struct definition *definition); +void bt_definition_ref(struct definition *definition); +void bt_definition_unref(struct definition *definition); struct declaration_integer *integer_declaration_new(size_t len, int byte_order, int signedness, size_t alignment, @@ -371,6 +379,7 @@ 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); /* @@ -390,14 +399,14 @@ struct declaration_float *float_declaration_new(size_t mantissa_len, * Returns a GArray of GQuark or NULL. * Caller must release the GArray with g_array_unref(). */ -GArray *enum_uint_to_quark_set(const struct declaration_enum *enum_declaration, +GArray *bt_enum_uint_to_quark_set(const struct declaration_enum *enum_declaration, uint64_t v); /* * Returns a GArray of GQuark or NULL. * Caller must release the GArray with g_array_unref(). */ -GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration, +GArray *bt_enum_int_to_quark_set(const struct declaration_enum *enum_declaration, int64_t v); /* @@ -405,16 +414,16 @@ GArray *enum_int_to_quark_set(const struct declaration_enum *enum_declaration, * Callers do _not_ own the returned GArray (and therefore _don't_ need to * release it). */ -GArray *enum_quark_to_range_set(const struct declaration_enum *enum_declaration, +GArray *bt_enum_quark_to_range_set(const struct declaration_enum *enum_declaration, GQuark q); -void enum_signed_insert(struct declaration_enum *enum_declaration, +void bt_enum_signed_insert(struct declaration_enum *enum_declaration, int64_t start, int64_t end, GQuark q); -void enum_unsigned_insert(struct declaration_enum *enum_declaration, +void bt_enum_unsigned_insert(struct declaration_enum *enum_declaration, uint64_t start, uint64_t end, GQuark q); -size_t enum_get_nr_enumerators(struct declaration_enum *enum_declaration); +size_t bt_enum_get_nr_enumerators(struct declaration_enum *enum_declaration); struct declaration_enum * - enum_declaration_new(struct declaration_integer *integer_declaration); + bt_enum_declaration_new(struct declaration_integer *integer_declaration); struct declaration_string * string_declaration_new(enum ctf_string_encoding encoding); @@ -479,13 +488,13 @@ int variant_rw(struct stream_pos *pos, struct definition *definition); * array. */ struct declaration_array * - array_declaration_new(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 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); +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 @@ -502,20 +511,29 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition); /* * in: path (dot separated), out: q (GArray of GQuark) */ -void append_scope_path(const char *path, GArray *q); +void bt_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 *bt_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 */