walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make default_language threadsafe

This commit is contained in:
Behdad Esfahbod 2012-08-08 15:23:48 -04:00
parent 06b192c458
commit 7e7d245b33
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-common.cc
View File

@ -238,17 +238,12 @@ hb_language_to_string (hb_language_t language)
hb_language_t hb_language_t
hb_language_get_default (void) hb_language_get_default (void)
{ {
static hb_language_t default_language; static hb_language_t default_language = HB_LANGUAGE_INVALID;
if (!default_language) { hb_language_t language = (hb_language_t) hb_atomic_ptr_get (&default_language);
/* This block is not quite threadsafe, but is not as bad as if (unlikely (language == HB_LANGUAGE_INVALID)) {
* it looks since it's idempotent. As long as pointer ops language = hb_language_from_string (setlocale (LC_CTYPE, NULL), -1);
* are atomic, we are safe. */ hb_atomic_ptr_cmpexch (&default_language, HB_LANGUAGE_INVALID, language);
/* I hear that setlocale() doesn't honor env vars on Windows,
* but for now we ignore that. */
default_language = hb_language_from_string (setlocale (LC_CTYPE, NULL), -1);
} }
return default_language; return default_language;