lock m_vocab variable access in Encode() and Lookup(). Other functions are still not threadsafe

1 files changed, 12 insertions, 18 deletions

diff --git a/mert/Vocabulary.h b/mert/Vocabulary.h
index a8630e951..52c088f18 100644
--- a/mert/Vocabulary.h
+++ b/mert/Vocabulary.h
@@ -4,6 +4,10 @@
 #include <map>
 #include <string>
 
+#ifdef WITH_THREADS
+#include <boost/thread/shared_mutex.hpp>
+#endif
+
 namespace mert {
 
 /**
@@ -21,28 +25,12 @@ class Vocabulary {
   virtual ~Vocabulary() {}
 
   /** Returns the assiged id for given "token". */
-  int Encode(const std::string& token) {
-    iterator it = m_vocab.find(token);
-    int encoded_token;
-    if (it == m_vocab.end()) {
-      // Add an new entry to the vocaburary.
-      encoded_token = static_cast<int>(m_vocab.size());
-      m_vocab[token] = encoded_token;
-    } else {
-      encoded_token = it->second;
-    }
-    return encoded_token;
-  }
+  int Encode(const std::string& token);
 
   /**
    * Return true iff the specified "str" is found in the container.
    */
-  bool Lookup(const std::string&str , int* v) const {
-    const_iterator it = m_vocab.find(str);
-    if (it == m_vocab.end()) return false;
-    *v = it->second;
-    return true;
-  }
+  bool Lookup(const std::string&str , int* v) const;
 
   void clear() { m_vocab.clear(); }
 
@@ -62,6 +50,12 @@ class Vocabulary {
 
  private:
   std::map<std::string, int> m_vocab;
+  
+#ifdef WITH_THREADS
+  //reader-writer lock
+  mutable boost::shared_mutex m_accessLock;
+#endif
+
 };
 
 class VocabularyFactory {