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

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 5dcbc14234..27d7b31d00 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -12,14 +12,14 @@
 
 #include "WordList.h"
 
-#include "Language.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/lassert.h"
+#include "support/unique_ptr.h"
 #include "support/weighted_btree.h"
 
-#include "support/lassert.h"
+#include <QThreadStorage>
 
 #include <map>
 
@@ -28,25 +28,23 @@ using namespace std;
 namespace lyx {
 
 ///
-map<Language, WordList *> theGlobalWordList;
+typedef map<string, unique_ptr<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())
-		return it->second;
+	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];
-}
-
-
-void WordList::cleanupWordLists() {
-	map<Language, WordList *>::const_iterator it = theGlobalWordList.begin();
-	for (; it != theGlobalWordList.end(); ++it)
-		delete it->second;
-	theGlobalWordList.clear();
+		return *(globalWordList[lang] = make_unique<WordList>());
 }
 
 
@@ -61,9 +59,8 @@ struct WordList::Impl {
 };
 
 
-WordList::WordList()
+WordList::WordList() : d(make_unique<Impl>())
 {
-	d = new Impl;
 	d->c_ = 0;
 
 #if 0
@@ -74,17 +71,11 @@ WordList::WordList()
 }
 
 
-WordList::~WordList()
-{
-	delete d;
-}
-
-
 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.
 	// If we returned the first component of those here, we get an