X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FWordList.cpp;h=d883994a76186d52007bcfa434e229d172145ed8;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=7dc620e0898e2fba99101d23a546021b118982bf;hpb=9b4a26a252b2da164fcd6aa84feed0a738b16c10;p=lyx.git

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 7dc620e089..d883994a76 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -15,20 +15,53 @@
 #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>
+
+using namespace std;
 
 namespace lyx {
 
 ///
-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(string const & lang)
+{
+	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 {
+		WordList * wl = new WordList;
+		(*globalWordList)[lang] = wl;
+		return wl;
+	}
+}
 
-WordList & theWordList()
+
+void WordList::cleanupWordLists()
 {
-	return theGlobalWordList;
+	if (!theGlobalWordList.hasLocalData())
+		return;
+	GlobalWordList * globalWordList = theGlobalWordList.localData();
+	GlobalWordList::const_iterator it = globalWordList->begin();
+	for (; it != globalWordList->end(); ++it)
+		delete it->second;
+	globalWordList->clear();
 }
 
+
 ///
 struct WordList::Impl {
 	///
@@ -40,9 +73,8 @@ struct WordList::Impl {
 };
 
 
-WordList::WordList()
+WordList::WordList() : d(new Impl)
 {
-	d = new Impl;
 	d->c_ = 0;
 
 #if 0
@@ -53,16 +85,10 @@ 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.