X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=0cf9caeb6c7795212c53dc7d540c1a9fdd53b36e;hp=c494ee8202dec2ef9f9ac7d0f23b82c2fc377cf2;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=c5e74408f9786219f6b44400dcf2098ab9cc78fb diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c index c494ee82..0cf9caeb 100644 --- a/formats/ctf/types/float.c +++ b/formats/ctf/types/float.c @@ -3,7 +3,9 @@ * * Floating point read/write functions. * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -15,6 +17,14 @@ * 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. + * * Reference: ISO C99 standard 5.2.4 */ @@ -22,12 +32,13 @@ #include #include /* C99 floating point definitions */ #include /* C99 limits */ -#include +#include +#include /* * This library is limited to binary representation of floating point values. - * Sign-extension of the exponents is assumed to keep the NaN, +inf, -inf - * values, but this should be double-checked (TODO). + * We use hardware support for conversion between 32 and 64-bit floating + * point values. */ /* @@ -47,7 +58,8 @@ #endif union doubleIEEE754 { - double v; + double vd; + float vf; #ifdef HAS_TYPE_PRUNING unsigned long bits[(sizeof(double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)]; #else @@ -55,21 +67,35 @@ union doubleIEEE754 { #endif }; -union ldoubleIEEE754 { - long double v; -#ifdef HAS_TYPE_PRUNING - unsigned long bits[(sizeof(long double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)]; -#else - unsigned char bits[sizeof(long double)]; -#endif -}; +/* + * This mutex protects the static temporary float and double + * declarations (static_float_declaration and static_double_declaration). + */ +static pthread_mutex_t float_mutex = PTHREAD_MUTEX_INITIALIZER; -static struct declaration_float *static_ldouble_declaration; +static struct declaration_float *static_float_declaration, + *static_double_declaration; struct pos_len { - size_t sign_start, exp_start, mantissa_start, len; + size_t len; }; +static void float_lock(void) +{ + int ret; + + ret = pthread_mutex_lock(&float_mutex); + assert(!ret); +} + +static void float_unlock(void) +{ + int ret; + + ret = pthread_mutex_unlock(&float_mutex); + assert(!ret); +} + int _ctf_float_copy(struct stream_pos *destp, struct definition_float *dest_definition, struct stream_pos *srcp, @@ -77,6 +103,13 @@ int _ctf_float_copy(struct stream_pos *destp, { int ret; + /* We only support copy of same-size floats for now */ + assert(src_definition->declaration->sign->len == + dest_definition->declaration->sign->len); + assert(src_definition->declaration->exp->len == + dest_definition->declaration->exp->len); + assert(src_definition->declaration->mantissa->len == + dest_definition->declaration->mantissa->len); /* Read */ if (src_definition->declaration->byte_order == LITTLE_ENDIAN) { ret = ctf_integer_read(srcp, &src_definition->mantissa->p); @@ -139,22 +172,53 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition) const struct declaration_float *float_declaration = float_definition->declaration; struct ctf_stream_pos *pos = ctf_pos(ppos); - union ldoubleIEEE754 u; - struct definition *tmpdef = - static_ldouble_declaration->p.definition_new(&static_ldouble_declaration->p, - NULL, 0, 0); - struct definition_float *tmpfloat = - container_of(tmpdef, struct definition_float, p); + union doubleIEEE754 u; + struct definition *tmpdef; + struct definition_float *tmpfloat; struct ctf_stream_pos destp; + struct mmap_align mma; int ret; - ctf_init_pos(&destp, -1, O_WRONLY); - destp.base = (char *) u.bits; - + float_lock(); + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + tmpdef = static_float_declaration->p.definition_new( + &static_float_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + case DBL_MANT_DIG: + tmpdef = static_double_declaration->p.definition_new( + &static_double_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + default: + ret = -EINVAL; + goto end; + } + tmpfloat = container_of(tmpdef, struct definition_float, p); + memset(&destp, 0, sizeof(destp)); + ctf_init_pos(&destp, -1, O_RDWR); + mmap_align_set_addr(&mma, (char *) u.bits); + destp.base_mma = &mma; + destp.packet_size = sizeof(u) * CHAR_BIT; ctf_align_pos(pos, float_declaration->p.alignment); ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition); - float_definition->value = u.v; + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + float_definition->value = u.vf; + break; + case DBL_MANT_DIG: + float_definition->value = u.vd; + break; + default: + ret = -EINVAL; + goto end_unref; + } + +end_unref: definition_unref(tmpdef); +end: + float_unlock(); return ret; } @@ -165,35 +229,71 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition) const struct declaration_float *float_declaration = float_definition->declaration; struct ctf_stream_pos *pos = ctf_pos(ppos); - union ldoubleIEEE754 u; - struct definition *tmpdef = - static_ldouble_declaration->p.definition_new(&static_ldouble_declaration->p, - NULL, 0, 0); - struct definition_float *tmpfloat = - container_of(tmpdef, struct definition_float, p); + union doubleIEEE754 u; + struct definition *tmpdef; + struct definition_float *tmpfloat; struct ctf_stream_pos srcp; + struct mmap_align mma; int ret; + float_lock(); + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + tmpdef = static_float_declaration->p.definition_new( + &static_float_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + case DBL_MANT_DIG: + tmpdef = static_double_declaration->p.definition_new( + &static_double_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + default: + ret = -EINVAL; + goto end; + } + tmpfloat = container_of(tmpdef, struct definition_float, p); ctf_init_pos(&srcp, -1, O_RDONLY); - srcp.base = (char *) u.bits; - - u.v = float_definition->value; + mmap_align_set_addr(&mma, (char *) u.bits); + srcp.base_mma = &mma; + srcp.packet_size = sizeof(u) * CHAR_BIT; + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + u.vf = float_definition->value; + break; + case DBL_MANT_DIG: + u.vd = float_definition->value; + break; + default: + ret = -EINVAL; + goto end_unref; + } ctf_align_pos(pos, float_declaration->p.alignment); ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat); + +end_unref: definition_unref(tmpdef); +end: + float_unlock(); return ret; } void __attribute__((constructor)) ctf_float_init(void) { - static_ldouble_declaration = - float_declaration_new(LDBL_MANT_DIG, - sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG, + static_float_declaration = + float_declaration_new(FLT_MANT_DIG, + sizeof(float) * CHAR_BIT - FLT_MANT_DIG, + BYTE_ORDER, + __alignof__(float)); + static_double_declaration = + float_declaration_new(DBL_MANT_DIG, + sizeof(double) * CHAR_BIT - DBL_MANT_DIG, BYTE_ORDER, - __alignof__(long double)); + __alignof__(double)); } void __attribute__((destructor)) ctf_float_fini(void) { - declaration_unref(&static_ldouble_declaration->p); + declaration_unref(&static_float_declaration->p); + declaration_unref(&static_double_declaration->p); }