Skip to content

remove file mapping member in order to free file handles earlier #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hendrikmuhs wants to merge 4 commits into
base: master
Choose a base branch
from
Open

remove file mapping member in order to free file handles earlier #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40e24d1
remove file mapping member in order to free file handles earlier
hendrikmuhs Jan 30, 2026
9b05d2a
fix clang tidy warning
hendrikmuhs Jan 30, 2026
16fe92a
ignore private headers from boost in clang-tidy
hendrikmuhs Jan 30, 2026
f29f8b8
fix nullptr
hendrikmuhs Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions keyvi/.clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,11 @@ Checks: "*,
"
HeaderFilterRegex: ''
FormatStyle: none
CheckOptions:
- key: misc-include-cleaner.IgnoreHeaders
# The following files are ignored when clang-tidy analyzes header
# inclusions:
# - boost detail
value: '
boost/.*/detail/.*\.hpp;
'
19 changes: 10 additions & 9 deletions keyvi/include/keyvi/dictionary/fsa/automata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,23 @@ class Automata final {
explicit Automata(const dictionary_properties_t& dictionary_properties, loading_strategy_types loading_strategy,
const bool load_value_store)
: dictionary_properties_(dictionary_properties) {
file_mapping_ = boost::interprocess::file_mapping(dictionary_properties_->GetFileName().c_str(),
boost::interprocess::read_only);
boost::interprocess::file_mapping file_mapping = boost::interprocess::file_mapping(
dictionary_properties_->GetFileName().c_str(), boost::interprocess::read_only);

const boost::interprocess::map_options_t map_options =
internal::MemoryMapFlags::FSAGetMemoryMapOptions(loading_strategy);

TRACE("labels start offset: %d", dictionary_properties_->GetPersistenceOffset());
labels_region_ = boost::interprocess::mapped_region(file_mapping_, boost::interprocess::read_only,
dictionary_properties_->GetPersistenceOffset(),
dictionary_properties_->GetSparseArraySize(), 0, map_options);
labels_region_ = boost::interprocess::mapped_region(
file_mapping, boost::interprocess::read_only,
static_cast<boost::interprocess::offset_t>(dictionary_properties_->GetPersistenceOffset()),
dictionary_properties_->GetSparseArraySize(), nullptr, map_options);

TRACE("transitions start offset: %d", dictionary_properties_->GetTransitionsOffset());
transitions_region_ = boost::interprocess::mapped_region(
file_mapping_, boost::interprocess::read_only, dictionary_properties_->GetTransitionsOffset(),
dictionary_properties_->GetTransitionsSize(), 0, map_options);
file_mapping, boost::interprocess::read_only,
static_cast<boost::interprocess::offset_t>(dictionary_properties_->GetTransitionsOffset()),
dictionary_properties_->GetTransitionsSize(), nullptr, map_options);

const auto advise = internal::MemoryMapFlags::FSAGetMemoryMapAdvices(loading_strategy);

Expand All @@ -117,7 +119,7 @@ class Automata final {

if (load_value_store) {
value_store_reader_.reset(
internal::ValueStoreFactory::MakeReader(dictionary_properties_->GetValueStoreType(), &file_mapping_,
internal::ValueStoreFactory::MakeReader(dictionary_properties_->GetValueStoreType(), &file_mapping,
dictionary_properties_->GetValueStoreProperties(), loading_strategy));
}
}
Expand Down Expand Up @@ -415,7 +417,6 @@ class Automata final {
private:
dictionary_properties_t dictionary_properties_;
std::unique_ptr<internal::IValueStoreReader> value_store_reader_;
boost::interprocess::file_mapping file_mapping_;
boost::interprocess::mapped_region labels_region_;
boost::interprocess::mapped_region transitions_region_;
unsigned char* labels_;
Expand Down
Loading