Merge pull request #224 from tetengo/search_dict_c

Correct the file mapping lifetime #223

Author: kaorut

library/trie/c/src/tetengo_trie_storage.hpp

@@ -18,9 +18,10 @@
 
 struct tetengo_trie_storage_tag
 {
-private:
+public:
     std::unique_ptr<boost::interprocess::file_mapping> p_cpp_file_mapping;
 
+private:
     const tetengo::trie::storage* p_cpp_storage_referred;
 
 public:

library/trie/c/src/tetengo_trie_trie.cpp

@@ -113,9 +113,10 @@ tetengo_trie_trie_t* tetengo_trie_trie_createWithStorage(tetengo_trie_storage_t*
         }
 
         auto p_cpp_trie = std::make_unique<cpp_trie_type>(std::move(p_storage->p_cpp_storage_owned));
+        auto p_cpp_file_mapping = std::move(p_storage->p_cpp_file_mapping);
         tetengo_trie_storage_destroy(p_storage);
 
-        auto p_instance = std::make_unique<tetengo_trie_trie_t>(std::move(p_cpp_trie));
+        auto p_instance = std::make_unique<tetengo_trie_trie_t>(std::move(p_cpp_trie), std::move(p_cpp_file_mapping));
         return p_instance.release();
     }
     catch (...)

library/trie/c/src/tetengo_trie_trie.hpp

@@ -24,10 +24,21 @@ struct tetengo_trie_trie_tag
 {
     std::unique_ptr<cpp_trie_type> p_cpp_trie;
 
+    std::unique_ptr<boost::interprocess::file_mapping> p_cpp_file_mapping;
+
     std::unique_ptr<tetengo_trie_storage_t> p_storage;
 
     tetengo_trie_trie_tag(std::unique_ptr<cpp_trie_type>&& p_cpp_trie) :
     p_cpp_trie{ std::move(p_cpp_trie) },
+    p_cpp_file_mapping{},
+    p_storage{}
+    {}
+
+    tetengo_trie_trie_tag(
+        std::unique_ptr<cpp_trie_type>&&                   p_cpp_trie,
+        std::unique_ptr<boost::interprocess::file_mapping> p_cpp_file_mapping) :
+    p_cpp_trie{ std::move(p_cpp_trie) },
+    p_cpp_file_mapping{ std::move(p_cpp_file_mapping) },
     p_storage{}
     {}