X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordList.cpp;h=16f3b92e86e49c08c3f6c079d350f24f439a52ce;hb=c6e1db7682dc8d58a68147b5eee1d004829ef6d2;hp=5dcbc142348622efb76dd09cdadcf876bdf61b9e;hpb=d52c9fda348a9fb830f5dfa7815787587e3e5877;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 5dcbc14234..16f3b92e86 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -12,14 +12,13 @@
 
 #include "WordList.h"
 
-#include "Language.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/lassert.h"
 #include "support/weighted_btree.h"
 
-#include "support/lassert.h"
+#include <QThreadStorage>
 
 #include <map>
 
@@ -28,25 +27,38 @@ using namespace std;
 namespace lyx {
 
 ///
-map<Language, WordList *> theGlobalWordList;
+typedef map<string, WordList *> GlobalWordList;
+// Each thread uses its own word list, but only the one of the GUI thread is
+// used to do real work. The others are only neded to prevent simultanous
+// write access e.g. from a cloned buffer and a true document buffer.
+QThreadStorage<GlobalWordList *> theGlobalWordList;
 
 
-WordList * theWordList(Language const & lang)
+WordList * theWordList(string const & lang)
 {
-	map<Language, WordList *>::iterator it = theGlobalWordList.find(lang);
-	if (it != theGlobalWordList.end())
+	if (!theGlobalWordList.hasLocalData())
+		theGlobalWordList.setLocalData(new GlobalWordList);
+	GlobalWordList * globalWordList = theGlobalWordList.localData();
+	GlobalWordList::iterator it = globalWordList->find(lang);
+	if (it != globalWordList->end())
 		return it->second;
-	else
-		theGlobalWordList[lang] = new WordList;
-	return theGlobalWordList[lang];
+	else {
+		WordList * wl = new WordList;
+		(*globalWordList)[lang] = wl;
+		return wl;
+	}
 }
 
 
-void WordList::cleanupWordLists() {
-	map<Language, WordList *>::const_iterator it = theGlobalWordList.begin();
-	for (; it != theGlobalWordList.end(); ++it)
+void WordList::cleanupWordLists()
+{
+	if (!theGlobalWordList.hasLocalData())
+		return;
+	GlobalWordList * globalWordList = theGlobalWordList.localData();
+	GlobalWordList::const_iterator it = globalWordList->begin();
+	for (; it != globalWordList->end(); ++it)
 		delete it->second;
-	theGlobalWordList.clear();
+	globalWordList->clear();
 }
 
 
@@ -83,7 +95,7 @@ WordList::~WordList()
 docstring const & WordList::word(size_t idx) const
 {
 	Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);
-	LASSERT(it != d->words_.end(), /**/);
+	LASSERT(it != d->words_.end(), { static docstring dummy; return dummy; });
 	
 	// We use the key() method here, and not something like it->first
 	// because the btree only returns (iterator-) temporary value pairs.