anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make theWordList() thread safe.

Browse Source 
Without this, you get crashes in a few second when you set the autosave
interval to one second and edit quickly (typing new words etc). The reason
is that the cloned buffer wants to insert words into the word list and
remove them again, but it lives in a different thread.
This commit is contained in:
Georg Baum 2014-07-06 18:12:57 +02:00
parent e64954e7d3
commit f5cf3705d5
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/WordList.cpp
View File

@ -18,6 +18,8 @@
#include "support/lassert.h"
#include "support/weighted_btree.h"
#include <QThreadStorage>
#include <map>
using namespace std;
@ -26,26 +28,37 @@ namespace lyx {
///
typedef map<string, WordList *> GlobalWordList;
GlobalWordList theGlobalWordList;
// 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)
{
GlobalWordList::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()
{
GlobalWordList::const_iterator it = theGlobalWordList.begin();
for (; it != theGlobalWordList.end(); ++it)
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();
}

3
status.21x
View File

@ -63,7 +63,8 @@ What's new
* INTERNALS
- Improve thread-safety
* DOCUMENTATION AND LOCALIZATION