mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-16 10:03:06 +00:00
Make include and bibitem insets threadsafe
Using a mutex to ensure that the generated filenames and ids are still unique.
This commit is contained in:
parent
8fe58b90c2
commit
f4ed3dc6b5
@ -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;
|
||||
@ -49,6 +50,7 @@ namespace lyx {
|
||||
|
||||
|
||||
int InsetBibitem::key_counter = 0;
|
||||
static Mutex counter_mutex;
|
||||
docstring const key_prefix = from_ascii("key-");
|
||||
|
||||
|
||||
@ -56,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));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -197,6 +201,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);
|
||||
}
|
||||
}
|
||||
|
@ -61,6 +61,7 @@
|
||||
#include "support/lassert.h"
|
||||
#include "support/lstrings.h" // contains
|
||||
#include "support/lyxalgo.h"
|
||||
#include "support/mutex.h"
|
||||
|
||||
#include "support/bind.h"
|
||||
|
||||
@ -77,6 +78,8 @@ namespace {
|
||||
docstring const uniqueID()
|
||||
{
|
||||
static unsigned int seed = 1000;
|
||||
static Mutex mutex;
|
||||
Mutex::Locker lock(&mutex);
|
||||
return "file" + convert<docstring>(++seed);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user