X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=782f72bfef514433303a9c232188e86bee4f4e80;hp=7a7c323afc674bf689596b95a28fd5f7a76a01ad;hb=08c82b90d94a6dfee1f3da4ec06864c6045c07f7;hpb=aee35fcc7e82d20396d82d151de93b1b51325398 diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c index 7a7c323a..782f72bf 100644 --- a/formats/ctf/types/float.c +++ b/formats/ctf/types/float.c @@ -25,6 +25,7 @@ #include /* C99 floating point definitions */ #include /* C99 limits */ #include +#include /* * This library is limited to binary representation of floating point values. @@ -58,13 +59,35 @@ union doubleIEEE754 { #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_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, @@ -148,6 +171,7 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition) 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( @@ -160,9 +184,11 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition) NULL, 0, 0, "__tmpfloat"); break; default: - return -EINVAL; + 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; @@ -177,9 +203,14 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition) float_definition->value = u.vd; break; default: - return -EINVAL; + ret = -EINVAL; + goto end_unref; } + +end_unref: definition_unref(tmpdef); +end: + float_unlock(); return ret; } @@ -197,6 +228,7 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition) 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( @@ -209,7 +241,8 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition) NULL, 0, 0, "__tmpfloat"); break; default: - return -EINVAL; + ret = -EINVAL; + goto end; } tmpfloat = container_of(tmpdef, struct definition_float, p); ctf_init_pos(&srcp, -1, O_RDONLY); @@ -224,11 +257,16 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition) u.vd = float_definition->value; break; default: - return -EINVAL; + 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; }