X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=43decb50574bb190f3521d0a7f698427a453730d;hp=db6853f5ebcbf902a60cdcb9a86782c6bb225f5e;hb=1cf393f63db4dce618515749d5549564d1313ee4;hpb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d diff --git a/types/array.c b/types/array.c index db6853f5..43decb50 100644 --- a/types/array.c +++ b/types/array.c @@ -16,10 +16,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 static @@ -29,7 +38,7 @@ struct definition *_array_definition_new(struct declaration *declaration, static void _array_definition_free(struct definition *definition); -int array_rw(struct stream_pos *pos, struct definition *definition) +int bt_array_rw(struct bt_stream_pos *pos, struct definition *definition) { struct definition_array *array_definition = container_of(definition, struct definition_array, p); @@ -55,13 +64,13 @@ void _array_declaration_free(struct declaration *declaration) struct declaration_array *array_declaration = container_of(declaration, struct declaration_array, p); - free_declaration_scope(array_declaration->scope); - declaration_unref(array_declaration->elem); + bt_free_declaration_scope(array_declaration->scope); + bt_declaration_unref(array_declaration->elem); g_free(array_declaration); } struct declaration_array * - array_declaration_new(size_t len, + bt_array_declaration_new(size_t len, struct declaration *elem_declaration, struct declaration_scope *parent_scope) { @@ -71,12 +80,11 @@ struct declaration_array * array_declaration = g_new(struct declaration_array, 1); declaration = &array_declaration->p; array_declaration->len = len; - declaration_ref(elem_declaration); + bt_declaration_ref(elem_declaration); array_declaration->elem = elem_declaration; - array_declaration->scope = new_declaration_scope(parent_scope); + array_declaration->scope = bt_new_declaration_scope(parent_scope); declaration->id = CTF_TYPE_ARRAY; - /* No need to align the array, the first element will align itself */ - declaration->alignment = 1; + declaration->alignment = elem_declaration->alignment; declaration->declaration_free = _array_declaration_free; declaration->definition_new = _array_definition_new; declaration->definition_free = _array_definition_free; @@ -97,7 +105,7 @@ struct definition * int i; array = g_new(struct definition_array, 1); - declaration_ref(&array_declaration->p); + bt_declaration_ref(&array_declaration->p); array->p.declaration = declaration; array->declaration = array_declaration; array->p.ref = 1; @@ -107,9 +115,9 @@ struct definition * */ array->p.index = root_name ? INT_MAX : index; array->p.name = field_name; - array->p.path = new_definition_path(parent_scope, field_name, root_name); - array->p.scope = new_definition_scope(parent_scope, field_name, root_name); - ret = register_field_definition(field_name, &array->p, + array->p.path = bt_new_definition_path(parent_scope, field_name, root_name); + array->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); + ret = bt_register_field_definition(field_name, &array->p, parent_scope); assert(!ret); array->string = NULL; @@ -161,8 +169,8 @@ error: field->declaration->definition_free(field); } (void) g_ptr_array_free(array->elems, TRUE); - free_definition_scope(array->p.scope); - declaration_unref(array->p.declaration); + bt_free_definition_scope(array->p.scope); + bt_declaration_unref(array->p.declaration); g_free(array); return NULL; } @@ -185,19 +193,19 @@ void _array_definition_free(struct definition *definition) } (void) g_ptr_array_free(array->elems, TRUE); } - free_definition_scope(array->p.scope); - declaration_unref(array->p.declaration); + bt_free_definition_scope(array->p.scope); + bt_declaration_unref(array->p.declaration); g_free(array); } -uint64_t array_len(struct definition_array *array) +uint64_t bt_array_len(struct definition_array *array) { if (!array->elems) return array->string->len; return array->elems->len; } -struct definition *array_index(struct definition_array *array, uint64_t i) +struct definition *bt_array_index(struct definition_array *array, uint64_t i) { if (!array->elems) return NULL; @@ -205,3 +213,41 @@ struct definition *array_index(struct definition_array *array, uint64_t i) return NULL; return g_ptr_array_index(array->elems, i); } + +int bt_get_array_len(const struct definition *field) +{ + struct definition_array *array_definition; + struct declaration_array *array_declaration; + + array_definition = container_of(field, struct definition_array, p); + array_declaration = array_definition->declaration; + + return array_declaration->len; +} + +GString *bt_get_char_array(const struct definition *field) +{ + struct definition_array *array_definition; + struct declaration_array *array_declaration; + struct declaration *elem; + + array_definition = container_of(field, struct definition_array, p); + array_declaration = array_definition->declaration; + elem = array_declaration->elem; + if (elem->id == CTF_TYPE_INTEGER) { + struct declaration_integer *integer_declaration = + container_of(elem, struct declaration_integer, p); + + if (integer_declaration->encoding == CTF_STRING_UTF8 + || integer_declaration->encoding == CTF_STRING_ASCII) { + + if (integer_declaration->len == CHAR_BIT + && integer_declaration->p.alignment == CHAR_BIT) { + + return array_definition->string; + } + } + } + fprintf(stderr, "[warning] Extracting string\n"); + return NULL; +}