From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 20 Aug 2014 06:40:24 +0000 (+0800)
Subject: util: initialize locale_t with a static object
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61c3d493882440d4d8d01a12b7b83fce63d6a7c7;p=mesa.git

util: initialize locale_t with a static object

_mesa_strtod and _mesa_strtof may be called from multiple threads.  They need
to be thread-safe.

v2: platform checks are now done in configure.ac

Signed-off-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/util/strtod.cpp b/src/util/strtod.cpp
index 2a3e8eb5294..2b4dd982a80 100644
--- a/src/util/strtod.cpp
+++ b/src/util/strtod.cpp
@@ -36,6 +36,12 @@
 #include "strtod.h"
 
 
+#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
+static struct locale_initializer {
+   locale_initializer() { loc = newlocale(LC_CTYPE_MASK, "C", NULL); }
+   locale_t loc;
+} loc_init;
+#endif
 
 /**
  * Wrapper around strtod which uses the "C" locale so the decimal
@@ -45,11 +51,7 @@ double
 _mesa_strtod(const char *s, char **end)
 {
 #if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
-   static locale_t loc = NULL;
-   if (!loc) {
-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-   }
-   return strtod_l(s, end, loc);
+   return strtod_l(s, end, loc_init.loc);
 #else
    return strtod(s, end);
 #endif
@@ -64,11 +66,7 @@ float
 _mesa_strtof(const char *s, char **end)
 {
 #if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
-   static locale_t loc = NULL;
-   if (!loc) {
-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-   }
-   return strtof_l(s, end, loc);
+   return strtof_l(s, end, loc_init.loc);
 #elif defined(HAVE_STRTOF)
    return strtof(s, end);
 #else