Skip to content

batch reading on load to avoid memory issue #44

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

batch reading on load to avoid memory issue #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
316d7da
batch reading on load to avoid memory issue
gmossessian Dec 3, 2020
a44973c
fix integer overflow issue and cleanup code
gmossessian Dec 3, 2020
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
20 changes: 16 additions & 4 deletions lib/dawgdic/dictionary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,22 @@ class Dictionary {
}

SizeType size = static_cast<SizeType>(base_size);
std::vector<DictionaryUnit> units_buf(size);
if (!input->read(reinterpret_cast<char *>(&units_buf[0]),
sizeof(DictionaryUnit) * size)) {
return false;
std::vector<DictionaryUnit> units_buf;

// read the file in batches to avoid a corrupted file from asking to allocate
// a very large amount of memory
SizeType batch_size = 1000;
while( size > 0 ) {
SizeType size_to_read = std::min(size, batch_size);
SizeType cur_size = units_buf.size();
units_buf.resize(cur_size + size_to_read);
if (!input->read(reinterpret_cast<char *>(&units_buf[cur_size]),
sizeof(DictionaryUnit) * size_to_read)) {
return false;
}
// subtract size_to_read (not batch_size)
// so size does not integer overflow on becoming negative
size -= size_to_read;
}

SwapUnitsBuf(&units_buf);
Expand Down