change mutex order

Author: hendrikmuhs

keyvi/include/keyvi/index/internal/index_reader_worker.h

@@ -115,12 +115,12 @@ class IndexReaderWorker final {
   }
 
  private:
+  std::mutex mutex_;
   boost::filesystem::path index_directory_;
   boost::filesystem::path index_toc_file_;
   std::time_t last_modification_time_;
   read_only_segments_t segments_;
   std::weak_ptr<read_only_segment_vec_t> segments_weak_;
-  std::mutex mutex_;
   std::unordered_map<std::string, read_only_segment_t> segments_by_name_;
   std::chrono::milliseconds refresh_interval_;
   std::thread update_thread_;

keyvi/include/keyvi/index/internal/read_only_segment.h

@@ -218,6 +218,9 @@ class ReadOnlySegment {
   const deleted_t& DeletedKeysDirect() const { return *deleted_keys_; }
 
  private:
+  //! a mutex to secure access to the deleted keys shared pointer
+  std::mutex mutex_;
+
   //! path of the underlying dictionary
   boost::filesystem::path dictionary_path_;
 
@@ -245,9 +248,6 @@ class ReadOnlySegment {
   //! a weak ptr to deleted keys for access in the main thread
   std::weak_ptr<deleted_t> deleted_keys_weak_;
 
-  //! a mutex to secure access to the deleted keys shared pointer
-  std::mutex mutex_;
-
   //! last modification time for the deleted keys file
   std::time_t last_modification_time_deleted_keys_;
 

keyvi/include/keyvi/index/internal/segment.h

@@ -49,6 +49,7 @@ class Segment final : public ReadOnlySegment {
 
   explicit Segment(const boost::filesystem::path& path, bool no_deletes = false)
       : ReadOnlySegment(path, false, !no_deletes),
+        lazy_load_mutex_(),
         deleted_keys_for_write_(),
         deleted_keys_during_merge_for_write_(),
         dictionary_loaded(false),
@@ -61,9 +62,9 @@ class Segment final : public ReadOnlySegment {
 
   explicit Segment(const boost::filesystem::path& path, const std::vector<std::shared_ptr<Segment>>& parent_segments)
       : ReadOnlySegment(path, false, false),
+        lazy_load_mutex_(),
         deleted_keys_for_write_(),
         deleted_keys_during_merge_for_write_(),
-        lazy_load_mutex_(),
         dictionary_loaded(false),
         deletes_loaded(true),
         in_merge_(false),
@@ -184,9 +185,9 @@ class Segment final : public ReadOnlySegment {
   }
 
  private:
+  std::mutex lazy_load_mutex_;
   deleted_t deleted_keys_for_write_;
   deleted_t deleted_keys_during_merge_for_write_;
-  std::mutex lazy_load_mutex_;
   bool dictionary_loaded;
   bool deletes_loaded;
   bool in_merge_;
@@ -198,9 +199,9 @@ class Segment final : public ReadOnlySegment {
 
   explicit Segment(const dictionary::dictionary_properties_t& dictionary_properties, bool no_deletes = false)
       : ReadOnlySegment(dictionary_properties, false, !no_deletes),
+        lazy_load_mutex_(),
         deleted_keys_for_write_(),
         deleted_keys_during_merge_for_write_(),
-        lazy_load_mutex_(),
         dictionary_loaded(false),
         deletes_loaded(no_deletes),
         in_merge_(false),