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

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index 9ad4e602..0cf9caeb 100644
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -17,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
  */
 
@@ -25,6 +33,7 @@
 #include <float.h>	/* C99 floating point definitions */
 #include <limits.h>	/* C99 limits */
 #include <babeltrace/endian.h>
+#include <pthread.h>
 
 /*
  * This library is limited to binary representation of floating point values.
@@ -58,13 +67,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 +179,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,7 +192,8 @@ 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));
@@ -178,9 +211,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;
 }
 
@@ -198,6 +236,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(
@@ -210,7 +249,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);
@@ -225,11 +265,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;
 }