X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=373e4bc4af85ea068a13ddfff22a6e452409c99e;hp=8a540af159013ed23d98bcf8241c0e1c99bb5bc4;hb=05628561ca57ff5d269571a72a12cb86854c5f70;hpb=698f0fe44073e0bfdc6c26222c3bdc1a0dc2d423 diff --git a/types/integer.c b/types/integer.c index 8a540af1..373e4bc4 100644 --- a/types/integer.c +++ b/types/integer.c @@ -1,72 +1,106 @@ /* - * BabelTrace - Integer Type Converter + * integer.c * - * Copyright (c) 2010 Mathieu Desnoyers + * BabelTrace - Integer Type Converter * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * Copyright 2010, 2011 - Mathieu Desnoyers * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. */ #include #include +#include #include -size_t integer_copy(unsigned char *dest, const struct format *fdest, - const unsigned char *src, const struct format *fsrc, - const struct type_class *type_class) -{ - struct type_class_integer *int_class = - container_of(type_class, struct type_class_integer, p); +static +struct declaration *_integer_declaration_new(struct type *type, + struct declaration_scope *parent_scope); +static +void _integer_declaration_free(struct declaration *declaration); - if (fsrc->p.alignment) - src = PTR_ALIGN(src, fsrc->p.alignment / CHAR_BIT); - if (fdest->p.alignment) - dest = PTR_ALIGN(dest, fdest->p.alignment / CHAR_BIT); +void integer_copy(struct stream_pos *dest, const struct format *fdest, + struct stream_pos *src, const struct format *fsrc, + struct declaration *declaration) +{ + struct declaration_integer *integer = + container_of(declaration, struct declaration_integer, p); + struct type_integer *integer_type = integer->type; - if (!int_class->signedness) { + if (!integer_type->signedness) { uint64_t v; - v = fsrc->uint_read(src, int_class->len, int_class->byte_order); - return fdest->uint_write(dest, int_class->len, int_class->byte_order, v); + v = fsrc->uint_read(src, integer_type); + fdest->uint_write(dest, integer_type, v); } else { int64_t v; - v = fsrc->int_read(src, int_class->len, int_class->byte_order); - return fdest->int_write(dest, int_class->len, int_class->byte_order, v); + v = fsrc->int_read(src, integer_type); + fdest->int_write(dest, integer_type, v); } } -int integer_type_new(const char *name, size_t alignment, size_t len, - int byte_order, int signedness) +static +void _integer_type_free(struct type *type) +{ + struct type_integer *integer_type = + container_of(type, struct type_integer, p); + g_free(integer_type); +} + +struct type_integer * + integer_type_new(const char *name, size_t len, int byte_order, + int signedness, size_t alignment) { - struct type_class_integer int_class; - int ret; + struct type_integer *integer_type; - /* - * Freed when type is unregistered. - */ - int_class = g_new(struct type_class_integer, 1); - int_class->p.name = g_quark_from_string(name); - int_class->p.alignment = alignment; - int_class->p.copy = integer_copy; - int_class->len = len; - int_class->byte_order = byte_order; - int_class->signedness = signedness; - ret = ctf_register_type(&int_class.p); - if (ret) - g_free(int_class); - return ret; + integer_type = g_new(struct type_integer, 1); + integer_type->p.id = CTF_TYPE_INTEGER; + integer_type->p.name = g_quark_from_string(name); + integer_type->p.alignment = alignment; + integer_type->p.copy = integer_copy; + integer_type->p.type_free = _integer_type_free; + integer_type->p.declaration_free = _integer_declaration_free; + integer_type->p.declaration_new = _integer_declaration_new; + integer_type->p.ref = 1; + integer_type->len = len; + integer_type->byte_order = byte_order; + integer_type->signedness = signedness; + return integer_type; } -/* TODO: integer_type_free */ +static +struct declaration * + _integer_declaration_new(struct type *type, + struct declaration_scope *parent_scope) +{ + struct type_integer *integer_type = + container_of(type, struct type_integer, p); + struct declaration_integer *integer; + + integer = g_new(struct declaration_integer, 1); + type_ref(&integer_type->p); + integer->p.type = type; + integer->type = integer_type; + integer->p.ref = 1; + integer->value._unsigned = 0; + return &integer->p; +} + +static +void _integer_declaration_free(struct declaration *declaration) +{ + struct declaration_integer *integer = + container_of(declaration, struct declaration_integer, p); + + type_unref(integer->p.type); + g_free(integer); +}