X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=52cc6bb682fa6baad78c2c0036b2d44eebeab5cf;hp=7e996f2786feeeb414f56b28f56a56cfbd1c6530;hb=12471830622f2f6e67bb14e3fdb112c70a5dbe5e;hpb=56e603733d2a16aba6fdaf149ad6a4cd42e44eda diff --git a/types/integer.c b/types/integer.c index 7e996f27..52cc6bb6 100644 --- a/types/integer.c +++ b/types/integer.c @@ -16,23 +16,32 @@ * * 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 static -struct definition *_integer_definition_new(struct declaration *declaration, +struct bt_definition *_integer_definition_new(struct bt_declaration *declaration, struct definition_scope *parent_scope, GQuark field_name, int index, const char *root_name); static -void _integer_definition_free(struct definition *definition); +void _integer_definition_free(struct bt_definition *definition); static -void _integer_declaration_free(struct declaration *declaration) +void _integer_declaration_free(struct bt_declaration *declaration) { struct declaration_integer *integer_declaration = container_of(declaration, struct declaration_integer, p); @@ -40,14 +49,14 @@ void _integer_declaration_free(struct declaration *declaration) } struct declaration_integer * - integer_declaration_new(size_t len, int byte_order, + bt_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) { struct declaration_integer *integer_declaration; - integer_declaration = g_new(struct declaration_integer, 1); + integer_declaration = g_new0(struct declaration_integer, 1); integer_declaration->p.id = CTF_TYPE_INTEGER; integer_declaration->p.alignment = alignment; integer_declaration->p.declaration_free = _integer_declaration_free; @@ -64,8 +73,8 @@ struct declaration_integer * } static -struct definition * - _integer_definition_new(struct declaration *declaration, +struct bt_definition * + _integer_definition_new(struct bt_declaration *declaration, struct definition_scope *parent_scope, GQuark field_name, int index, const char *root_name) @@ -75,8 +84,8 @@ struct definition * struct definition_integer *integer; int ret; - integer = g_new(struct definition_integer, 1); - declaration_ref(&integer_declaration->p); + integer = g_new0(struct definition_integer, 1); + bt_declaration_ref(&integer_declaration->p); integer->p.declaration = declaration; integer->declaration = integer_declaration; integer->p.ref = 1; @@ -86,27 +95,82 @@ struct definition * */ integer->p.index = root_name ? INT_MAX : index; integer->p.name = field_name; - integer->p.path = new_definition_path(parent_scope, field_name, + integer->p.path = bt_new_definition_path(parent_scope, field_name, root_name); integer->p.scope = NULL; integer->value._unsigned = 0; - ret = register_field_definition(field_name, &integer->p, + ret = bt_register_field_definition(field_name, &integer->p, parent_scope); assert(!ret); return &integer->p; } static -void _integer_definition_free(struct definition *definition) +void _integer_definition_free(struct bt_definition *definition) { struct definition_integer *integer = container_of(definition, struct definition_integer, p); - declaration_unref(integer->p.declaration); + bt_declaration_unref(integer->p.declaration); g_free(integer); } -uint64_t get_unsigned_int(struct definition *field) +enum ctf_string_encoding bt_get_int_encoding(const struct bt_definition *field) +{ + struct definition_integer *integer_definition; + const struct declaration_integer *integer_declaration; + + integer_definition = container_of(field, struct definition_integer, p); + integer_declaration = integer_definition->declaration; + + return integer_declaration->encoding; +} + +int bt_get_int_base(const struct bt_definition *field) +{ + struct definition_integer *integer_definition; + const struct declaration_integer *integer_declaration; + + integer_definition = container_of(field, struct definition_integer, p); + integer_declaration = integer_definition->declaration; + + return integer_declaration->base; +} + +size_t bt_get_int_len(const struct bt_definition *field) +{ + struct definition_integer *integer_definition; + const struct declaration_integer *integer_declaration; + + integer_definition = container_of(field, struct definition_integer, p); + integer_declaration = integer_definition->declaration; + + return integer_declaration->len; +} + +int bt_get_int_byte_order(const struct bt_definition *field) +{ + struct definition_integer *integer_definition; + const struct declaration_integer *integer_declaration; + + integer_definition = container_of(field, struct definition_integer, p); + integer_declaration = integer_definition->declaration; + + return integer_declaration->byte_order; +} + +int bt_get_int_signedness(const struct bt_definition *field) +{ + struct definition_integer *integer_definition; + const struct declaration_integer *integer_declaration; + + integer_definition = container_of(field, struct definition_integer, p); + integer_declaration = integer_definition->declaration; + + return integer_declaration->signedness; +} + +uint64_t bt_get_unsigned_int(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -117,11 +181,12 @@ uint64_t get_unsigned_int(struct definition *field) if (!integer_declaration->signedness) { return integer_definition->value._unsigned; } - fprintf(stderr, "[warning] Extracting unsigned value in a signed int\n"); + fprintf(stderr, "[warning] Extracting unsigned value from a signed int (%s)\n", + g_quark_to_string(field->name)); return (uint64_t)integer_definition->value._signed; } -int64_t get_signed_int(struct definition *field) +int64_t bt_get_signed_int(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -132,6 +197,7 @@ int64_t get_signed_int(struct definition *field) if (integer_declaration->signedness) { return integer_definition->value._signed; } - fprintf(stderr, "[warning] Extracting signed value in an unsigned int\n"); + fprintf(stderr, "[warning] Extracting signed value from an unsigned int (%s)\n", + g_quark_to_string(field->name)); return (int64_t)integer_definition->value._unsigned; }