Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 05:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adopt owning_lock in wgettext

Browse source
This commit is contained in:
ridiculousfish 2017-01-29 21:12:23 -08:00
parent 4ac2cfba61
commit f220250ada
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wutil.cpp
View file

@ -38,12 +38,8 @@ const file_id_t kInvalidFileID = {(dev_t)-1LL, (ino_t)-1LL, (uint64_t)-1LL, -1,
#endif #endif
#endif #endif
/// Lock to protect wgettext.
static pthread_mutex_t wgettext_lock;
/// Map used as cache by wgettext. /// Map used as cache by wgettext.
typedef std::map<wcstring, wcstring> wgettext_map_t; static owning_lock<std::map<wcstring, wcstring>> wgettext_map;
static wgettext_map_t wgettext_map;
bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &out_name, bool wreaddir_resolving(DIR *dir, const std::wstring &dir_path, std::wstring &out_name,
bool *out_is_dir) { bool *out_is_dir) {
@ -405,7 +401,6 @@ wcstring wbasename(const wcstring &path) {
// Really init wgettext. // Really init wgettext.
static void wgettext_really_init() { static void wgettext_really_init() {
pthread_mutex_init(&wgettext_lock, NULL);
fish_bindtextdomain(PACKAGE_NAME, LOCALEDIR); fish_bindtextdomain(PACKAGE_NAME, LOCALEDIR);
fish_textdomain(PACKAGE_NAME); fish_textdomain(PACKAGE_NAME);
} }
@ -423,8 +418,8 @@ const wcstring &wgettext(const wchar_t *in) {
wcstring key = in; wcstring key = in;
wgettext_init_if_necessary(); wgettext_init_if_necessary();
scoped_lock locker(wgettext_lock); auto wmap = wgettext_map.acquire();
wcstring &val = wgettext_map[key]; wcstring &val = wmap.value[key];
if (val.empty()) { if (val.empty()) {
cstring mbs_in = wcs2string(key); cstring mbs_in = wcs2string(key);
char *out = fish_gettext(mbs_in.c_str()); char *out = fish_gettext(mbs_in.c_str());