X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.cpp;h=0d1d11607720b7ac622c11a3fc490607c4d2c612;hb=429f4669b03cae0fd41e2abc6b0144d1c61bfe69;hp=4a8faf1f7861656d8c15d1895b1976940e684a33;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 4a8faf1f78..0d1d116077 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -19,6 +19,7 @@
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/mutex.h"
 #include "support/textutils.h"
 #include "support/unicode.h"
 
@@ -82,6 +83,7 @@ CharInfo::CharInfo(
 {
 }
 
+
 Encoding::Encoding(string const & n, string const & l, string const & g,
 		   string const & i, bool f, bool u, Encoding::Package p)
 	: name_(n), latexName_(l), guiName_(g), iconvName_(i), fixedwidth_(f),
@@ -104,10 +106,28 @@ Encoding::Encoding(string const & n, string const & l, string const & g,
 
 void Encoding::init() const
 {
+	// Since the the constructor is the only method which sets complete_
+	// to false the test for complete_ is thread-safe without mutex.
+	if (complete_)
+		return;
+
+	static Mutex mutex;
+	Mutex::Locker lock(&mutex);
+
+	// We need to test again for complete_, since another thread could
+	// have set it to true while we were waiting for the lock and we must
+	// not modify an encoding which is already complete.
 	if (complete_)
 		return;
 
-	start_encodable_ = 0;
+	// We do not make any member mutable  so that it can be easily verified
+	// that all const methods are thread-safe: init() is the only const
+	// method which changes complete_, encodable_ and start_encodable_, and
+	// it uses a mutex to ensure thread-safety.
+	CharSet & encodable = const_cast<Encoding *>(this)->encodable_;
+	char_type & start_encodable = const_cast<Encoding *>(this)->start_encodable_;
+
+	start_encodable = 0;
 	// temporarily switch off lyxerr, since we will generate iconv errors
 	lyxerr.disable();
 	if (fixedwidth_) {
@@ -121,10 +141,10 @@ void Encoding::init() const
 			char_type const uc = ucs4[0];
 			CharInfoMap::const_iterator const it = unicodesymbols.find(uc);
 			if (it == unicodesymbols.end())
-				encodable_.insert(uc);
+				encodable.insert(uc);
 			else if (!it->second.force()) {
 				if (forced_->empty() || forced_->find(uc) == forced_->end())
-					encodable_.insert(uc);
+					encodable.insert(uc);
 			}
 		}
 	} else {
@@ -137,22 +157,22 @@ void Encoding::init() const
 			if (!eightbit.empty()) {
 				CharInfoMap::const_iterator const it = unicodesymbols.find(c);
 				if (it == unicodesymbols.end())
-					encodable_.insert(c);
+					encodable.insert(c);
 				else if (!it->second.force()) {
 					if (forced_->empty() || forced_->find(c) == forced_->end())
-						encodable_.insert(c);
+						encodable.insert(c);
 				}
 			}
 		}
 	}
 	lyxerr.enable();
-	CharSet::iterator it = encodable_.find(start_encodable_);
-	while (it != encodable_.end()) {
-		encodable_.erase(it);
-		++start_encodable_;
-		it = encodable_.find(start_encodable_);
+	CharSet::iterator it = encodable.find(start_encodable);
+	while (it != encodable.end()) {
+		encodable.erase(it);
+		++start_encodable;
+		it = encodable.find(start_encodable);
 	}
-	complete_ = true;
+	const_cast<Encoding *>(this)->complete_ = true;
 }
 
 
@@ -451,7 +471,7 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
 				   || (tmp.size() == prefix + 1 &&
 				       !isAlphaASCII(tmp[1]) &&
 				       (prefix == 1 || !isAlphaASCII(tmp[2])))
-				   || k == cmdend 
+				   || k == cmdend
 				   || !isAlphaASCII(cmd[k])
 				   || tmp[tmp.size() - 1] == '}'
 				 ) {
@@ -581,9 +601,11 @@ Encoding const *
 Encodings::fromLyXName(string const & name, bool allowUnsafe) const
 {
 	EncodingList::const_iterator const it = encodinglist.find(name);
+	if (it == encodinglist.end())
+		return 0;
 	if (!allowUnsafe && it->second.unsafe())
 		return 0;
-	return it != encodinglist.end() ? &it->second : 0;
+	return &it->second;
 }
 
 
@@ -660,7 +682,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 		if (!symbolslex.next(true))
 			break;
 		string sflags = symbolslex.getString();
-		
+
 		string tipashortcut;
 		int flags = 0;