X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=7162c0ea0822cbb2320317407aa1be87d0020f5e;hp=d31ee831bf15198cd1a2d21efb19d7bda9cd14f3;hb=ccd7e1c86f36342b0b06651cc52df86bb663c271;hpb=0a46062b3916eda6f871b5d80c4b97dcb3804d37 diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h index d31ee831..7162c0ea 100644 --- a/include/babeltrace/format.h +++ b/include/babeltrace/format.h @@ -6,21 +6,17 @@ * * Trace Format 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 @@ -29,38 +25,51 @@ struct format { GQuark name; - uint64_t (*uint_read)(const uint8_t *ptr, size_t len, int byte_order); - int64_t (*int_read)(const uint8_t *ptr, size_t len, int byte_order); - size_t (*uint_write)(uint8_t *ptr, size_t len, int byte_order, uint64_t v); - size_t (*int_write)(uint8_t *ptr, size_t len, int byte_order, int64_t v); - - uint64_t (*bitfield_unsigned_read)(const unsigned char *ptr, - unsigned long start, unsigned long len, - int byte_order); - int64_t (*bitfield_signed_read)(const unsigned char *ptr, - unsigned long start, unsigned long len, - int byte_order); - size_t (*bitfield_unsigned_write)(unsigned char *ptr, - unsigned long start, unsigned long len, - int byte_order, uint64_t v); - size_t (*bitfield_signed_write)(unsigned char *ptr, - unsigned long start, unsigned long len, - int byte_order, int64_t v); - - - void (*float_copy)(unsigned char *destp, const struct type_class_float *dest, - const unsigned char *srcp, const struct type_class_float *src); - double (*double_read)(const unsigned char *ptr, const struct type_class_float *src); - size_t (*double_write)(unsigned char *ptr, const struct type_class_float *dest, - double v); + uint64_t (*uint_read)(struct stream_pos *pos, + const struct type_class_integer *int_class); + int64_t (*int_read)(struct stream_pos *pos, + const struct type_class_integer *int_class); + void (*uint_write)(struct stream_pos *pos, + const struct type_class_integer *int_class, + uint64_t v); + void (*int_write)(struct stream_pos *pos, + const struct type_class_integer *int_class, + int64_t v); + void (*float_copy)(struct stream_pos *dest, + struct stream_pos *src, + const struct type_class_float *src); + double (*double_read)(struct stream_pos *pos, + const struct type_class_float *float_class); + void (*double_write)(struct stream_pos *pos, + const struct type_class_float *float_class, + double v); - size_t (*string_copy)(unsigned char *dest, const unsigned char *src); + void (*string_copy)(struct stream_pos *dest, struct stream_pos *src, + const struct type_class_string *string_class); + void (*string_read)(unsigned char **dest, struct stream_pos *src, + const struct type_class_string *string_class); + void (*string_write)(struct stream_pos *dest, const unsigned char *src, + const struct type_class_string *string_class); + void (*string_free_temp)(unsigned char *string); - GQuark (*enum_uint_to_quark)(const struct enum_table *table, uint64_t v); - GQuark (*enum_int_to_quark)(const struct enum_table *table, uint64_t v); - uint64_t (*enum_quark_to_uint)(size_t len, int byte_order, GQuark q); - int64_t (*enum_quark_to_int)(size_t len, int byte_order, GQuark q); + GQuark (*enum_read)(struct stream_pos *pos, + const struct type_class_enum *src); + void (*enum_write)(struct stream_pos *pos, + const struct type_class_enum *dest, + GQuark q); + void (*struct_begin)(struct stream_pos *pos, + const struct type_class_struct *struct_class); + void (*struct_end)(struct stream_pos *pos, + const struct type_class_struct *struct_class); + void (*array_begin)(struct stream_pos *pos, + const struct type_class_array *array_class); + void (*array_end)(struct stream_pos *pos, + const struct type_class_array *array_class); + void (*sequence_begin)(struct stream_pos *pos, + const struct type_class_sequence *sequence_class); + void (*sequence_end)(struct stream_pos *pos, + const struct type_class_sequence *sequence_class); }; struct format *bt_lookup_format(GQuark qname);