X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Ftypes.h;h=ea60d88ab951633c71eca1a1640cfb38d8563885;hp=cc1965a0aa6fec46e2e74ae93c5f25926b46c67d;hb=8eab883c99f13a74c3a30b288070f0038357103e;hpb=d06d03dbf4babd3426818f23770e15058a6876c4 diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h index cc1965a0..ea60d88a 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace/types.h @@ -6,26 +6,26 @@ * * Type Header * - * Copyright (c) 2010 Mathieu Desnoyers + * Copyright 2010 - Mathieu Desnoyers * - * 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. + * 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: * - * 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. - * - * 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 +#include #include +#include +#include /* Preallocate this many fields for structures */ #define DEFAULT_NR_STRUCT_FIELDS 8 @@ -79,20 +79,23 @@ static inline unsigned char *get_pos_addr(struct stream_pos *pos) { /* Only makes sense to get the address after aligning on CHAR_BIT */ - assert(!(pos->alignment % CHAR_BIT)); + assert(!(pos->offset % CHAR_BIT)); return pos->base + (pos->offset / CHAR_BIT); } +struct format; + struct type_class { GQuark name; /* type name */ size_t alignment; /* type alignment, in bits */ + int ref; /* number of references to the type */ /* * Type copy function. Knows how to find the child type_class from the * parent type_class. */ - size_t (*copy)(struct stream_pos *dest, const struct format *fdest, - struct stream_pos *src, const struct format *fsrc, - const struct type_class *type_class); + void (*copy)(struct stream_pos *dest, const struct format *fdest, + struct stream_pos *src, const struct format *fsrc, + const struct type_class *type_class); void (*free)(struct type_class *type_class); }; @@ -110,9 +113,9 @@ struct type_class_integer { struct type_class_float { struct type_class p; - struct int_class *sign; - struct int_class *mantissa; - struct int_class *exp; + struct type_class_integer *sign; + struct type_class_integer *mantissa; + struct type_class_integer *exp; int byte_order; /* TODO: we might want to express more info about NaN, +inf and -inf */ }; @@ -123,7 +126,7 @@ struct enum_table { }; struct type_class_enum { - struct type_class_int p; /* inherit from integer */ + struct type_class_integer p; /* inherit from integer */ struct enum_table table; }; @@ -150,12 +153,15 @@ struct type_class_array { struct type_class_sequence { struct type_class p; - struct type_class_integer *len; + struct type_class_integer *len_class; struct type_class *elem; }; -struct type_class *ctf_lookup_type(GQuark qname); -int ctf_register_type(struct type_class *type_class); +struct type_class *lookup_type(GQuark qname); +int register_type(struct type_class *type_class); + +void type_ref(struct type_class *type_class); +void type_unref(struct type_class *type_class); /* Nameless types can be created by passing a NULL name */ @@ -182,9 +188,9 @@ void float_type_free(struct type_class_float *float_class); GQuark enum_uint_to_quark(const struct type_class_enum *enum_class, uint64_t v); GQuark enum_int_to_quark(const struct type_class_enum *enum_class, uint64_t v); uint64_t enum_quark_to_uint(const struct type_class_enum *enum_class, - size_t len, int byte_order, GQuark q); + GQuark q); int64_t enum_quark_to_int(const struct type_class_enum *enum_class, - size_t len, int byte_order, GQuark q); + GQuark q); void enum_signed_insert(struct type_class_enum *enum_class, int64_t v, GQuark q); void enum_unsigned_insert(struct type_class_enum *enum_class, @@ -199,7 +205,7 @@ void enum_type_free(struct type_class_enum *enum_class); struct type_class_struct *struct_type_new(const char *name); void struct_type_free(struct type_class_struct *struct_class); void struct_type_add_field(struct type_class_struct *struct_class, - GQuark field_name, + const char *field_name, struct type_class *type_class); /* * Returns the index of a field within a structure. @@ -228,7 +234,7 @@ void array_type_free(struct type_class_array *array_class); * need to free them explicitely. */ struct type_class_sequence *sequence_type_new(const char *name, - struct type_class_integer *int_class, + struct type_class_integer *len_class, struct type_class *elem_class); void sequence_type_free(struct type_class_sequence *sequence_class);