anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make include and bibitem insets threadsafe

Browse Source 
Using a mutex to ensure that the generated filenames and ids are still unique.
This commit is contained in:
Georg Baum 2014-07-05 12:09:49 +02:00
parent 4a2250a5d1
commit 50929b5b8a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/InsetBibitem.cpp
View File

@ -41,6 +41,7 @@
#include "support/docstream.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/mutex.h"
using namespace std;
using namespace lyx::support;
@ -48,8 +49,8 @@ using namespace lyx::support;
namespace lyx {
// FIXME THREAD
int InsetBibitem::key_counter = 0;
static Mutex counter_mutex;
docstring const key_prefix = from_ascii("key-");
@ -57,8 +58,10 @@ InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
: InsetCommand(buf, p)
{
buffer().invalidateBibinfoCache();
if (getParam("key").empty())
if (getParam("key").empty()) {
Mutex::Locker lock(&counter_mutex);
setParam("key", key_prefix + convert<docstring>(++key_counter));
}
}
@ -196,6 +199,7 @@ void InsetBibitem::read(Lexer & lex)
if (prefixIs(getParam("key"), key_prefix)) {
int const key = convert<int>(getParam("key").substr(key_prefix.length()));
Mutex::Locker lock(&counter_mutex);
key_counter = max(key_counter, key);
}
}

4
src/insets/InsetInclude.cpp
View File

@ -60,6 +60,7 @@
#include "support/lassert.h"
#include "support/lstrings.h" // contains
#include "support/lyxalgo.h"
#include "support/mutex.h"
#include "support/bind.h"
@ -75,8 +76,9 @@ namespace {
docstring const uniqueID()
{
// FIXME THREAD
static unsigned int seed = 1000;
static Mutex mutex;
Mutex::Locker lock(&mutex);
return "file" + convert<docstring>(++seed);
}