X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=0cf9caeb6c7795212c53dc7d540c1a9fdd53b36e;hp=20cf7fa537c8e96e7a4e14359688f58f967655c3;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=11d43b909baeee566511acfec577d4605386fa09

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index 20cf7fa5..0cf9caeb 100644
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -3,21 +3,27 @@
  *
  * Floating point read/write functions.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
  *
- * 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.
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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.
+ *
+ * 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
  */
@@ -26,17 +32,18 @@
 #include <glib.h>
 #include <float.h>	/* C99 floating point definitions */
 #include <limits.h>	/* C99 limits */
-#include <endian.h>
+#include <babeltrace/endian.h>
+#include <pthread.h>
 
 /*
  * 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.
  */
 
 /*
  * Aliasing float/double and unsigned long is not strictly permitted by strict
- * aliasing, but in practice type prunning is well supported, and this permits
+ * aliasing, but in practice declaration prunning is well supported, and this permits
  * us to use per-word read/writes rather than per-byte.
  */
 
@@ -51,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
@@ -59,132 +67,233 @@ 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_float_declaration,
+		*static_double_declaration;
 
 struct pos_len {
-	size_t sign_start, exp_start, mantissa_start, len;
+	size_t len;
 };
 
-void _ctf_float_copy(struct stream_pos *destp,
-		     const struct type_class_float *dest_class,
-		     struct stream_pos *srcp,
-		     const struct type_class_float *src_class)
+static void float_lock(void)
 {
-	uint8_t sign;
-	int64_t exp;
-	uint64_t mantissa;
+	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,
+		    const struct definition_float *src_definition)
+{
+	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->byte_order == LITTLE_ENDIAN) {
-		mantissa = ctf_bitfield_unsigned_read(srcp,
-						      src_class->mantissa);
-		exp = ctf_bitfield_signed_read(srcp, src_class->exp);
-		sign = ctf_bitfield_unsigned_read(srcp, src_class->sign);
+	if (src_definition->declaration->byte_order == LITTLE_ENDIAN) {
+		ret = ctf_integer_read(srcp, &src_definition->mantissa->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_read(srcp, &src_definition->exp->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_read(srcp, &src_definition->sign->p);
+		if (ret)
+			return ret;
 	} else {
-		sign = ctf_bitfield_unsigned_read(srcp, src_class->sign);
-		exp = ctf_bitfield_signed_read(srcp, src_class->exp);
-		mantissa = ctf_bitfield_unsigned_read(srcp,
-						      src_class->mantissa);
+		ret = ctf_integer_read(srcp, &src_definition->sign->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_read(srcp, &src_definition->exp->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_read(srcp, &src_definition->mantissa->p);
+		if (ret)
+			return ret;
 	}
+
+	dest_definition->mantissa->value._unsigned =
+		src_definition->mantissa->value._unsigned;
+	dest_definition->exp->value._signed =
+		src_definition->exp->value._signed;
+	dest_definition->sign->value._unsigned =
+		src_definition->sign->value._unsigned;
+
 	/* Write */
-	if (dest->byte_order == LITTLE_ENDIAN) {
-		ctf_bitfield_unsigned_write(destp, dest_class->mantissa,
-					    mantissa);
-		ctf_bitfield_signed_write(destp, dest_class->exp, exp);
-		ctf_bitfield_unsigned_write(destp, dest_class->sign, sign);
+	if (dest_definition->declaration->byte_order == LITTLE_ENDIAN) {
+		ret = ctf_integer_write(destp, &dest_definition->mantissa->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_write(destp, &dest_definition->exp->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_write(destp, &dest_definition->sign->p);
+		if (ret)
+			return ret;
 	} else {
-		ctf_bitfield_unsigned_write(destp, dest_class->sign, sign);
-		ctf_bitfield_signed_write(destp, dest_class->exp, exp);
-		ctf_bitfield_unsigned_write(destp, dest_class->mantissa,
-					    mantissa);
+		ret = ctf_integer_write(destp, &dest_definition->sign->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_write(destp, &dest_definition->exp->p);
+		if (ret)
+			return ret;
+		ret = ctf_integer_write(destp, &dest_definition->mantissa->p);
+		if (ret)
+			return ret;
 	}
+	return 0;
 }
 
-void ctf_float_copy(struct stream_pos *dest, struct stream_pos *src,
-		    const struct type_class_float *float_class)
-{
-	align_pos(src, float_class->p.alignment);
-	align_pos(dest, float_class->p.alignment);
-	_ctf_float_copy(dest, float_class, src, float_class);
-}
-
-double ctf_double_read(struct stream_pos *srcp,
-		       const struct type_class_float *float_class)
+int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
 {
+	struct definition_float *float_definition =
+		container_of(definition, struct definition_float, p);
+	const struct declaration_float *float_declaration =
+		float_definition->declaration;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	union doubleIEEE754 u;
-	struct ctf_float *dest_class = float_type_new(NULL,
-				DBL_MANT_DIG,
-				sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
-				BYTE_ORDER,
-				__alignof__(double));
-	struct stream_pos destp;
+	struct definition *tmpdef;
+	struct definition_float *tmpfloat;
+	struct ctf_stream_pos destp;
+	struct mmap_align mma;
+	int ret;
 
-	align_pos(srcp, float_class->p.alignment);
-	init_pos(&destp, &u.bits);
-	_ctf_float_copy(&destp, dest_class, srcp, float_class);
-	float_type_free(dest_class);
-	return u.v;
+	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);
+	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;
 }
 
-void ctf_double_write(struct stream_pos *destp,
-		      const struct type_class_float *float_class,
-		      double v)
+int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
 {
+	struct definition_float *float_definition =
+		container_of(definition, struct definition_float, p);
+	const struct declaration_float *float_declaration =
+		float_definition->declaration;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
 	union doubleIEEE754 u;
-	struct ctf_float *src_class = float_type_new(NULL,
-				DBL_MANT_DIG,
-				sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
-				BYTE_ORDER,
-				__alignof__(double));
-	struct stream_pos srcp;
+	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);
+	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);
 
-	u.v = v;
-	align_pos(destp, float_class->p.alignment);
-	init_pos(&srcp, &u.bits);
-	_ctf_float_copy(destp, float_class, &srcp, src_class);
-	float_type_free(src_class);
+end_unref:
+	definition_unref(tmpdef);
+end:
+	float_unlock();
+	return ret;
 }
 
-long double ctf_ldouble_read(struct stream_pos *srcp,
-			     const struct type_class_float *float_class)
+void __attribute__((constructor)) ctf_float_init(void)
 {
-	union ldoubleIEEE754 u;
-	struct ctf_float *dest_class = float_type_new(NULL,
-				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__(long double));
-	struct stream_pos destp;
-
-	align_pos(srcp, float_class->p.alignment);
-	init_pos(&destp, &u.bits);
-	_ctf_float_copy(&destp, dest_class, srcp, float_class);
-	float_type_free(dest_class);
-	return u.v;
+				__alignof__(float));
+	static_double_declaration =
+		float_declaration_new(DBL_MANT_DIG,
+				sizeof(double) * CHAR_BIT - DBL_MANT_DIG,
+				BYTE_ORDER,
+				__alignof__(double));
 }
 
-void ctf_ldouble_write(struct stream_pos *destp,
-		       const struct type_class_float *float_class,
-		       long double v)
+void __attribute__((destructor)) ctf_float_fini(void)
 {
-	union ldoubleIEEE754 u;
-	struct ctf_float *src_class = float_type_new(NULL,
-				LDBL_MANT_DIG,
-				sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG,
-				BYTE_ORDER,
-				__alignof__(long double));
-	struct stream_pos srcp;
-
-	u.v = v;
-	align_pos(destp, float_class->p.alignment);
-	init_pos(&srcp, &u.bits);
-	_ctf_float_copy(destp, float_class, &srcp, src_class);
-	float_type_free(src_class);
+	declaration_unref(&static_float_declaration->p);
+	declaration_unref(&static_double_declaration->p);
 }