diff options
author | Paul Baltescu <pauldb89@gmail.com> | 2013-06-19 16:46:52 +0100 |
---|---|---|
committer | Paul Baltescu <pauldb89@gmail.com> | 2013-06-19 16:46:52 +0100 |
commit | 46b533663019404f642fa1621701c066fc57734d (patch) | |
tree | 8b9d8072cae6ac024b46196c4712a5f02afc33c0 /klm/util/pool.cc | |
parent | a3243017d6b8c46cc3e41f4243311dc3dbc80ab4 (diff) | |
parent | f1ce46ec9b1b8efcc4a91a149454acf03c01db02 (diff) |
Merge branch 'master' of https://github.com/redpony/cdec
Diffstat (limited to 'klm/util/pool.cc')
-rw-r--r-- | klm/util/pool.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/klm/util/pool.cc b/klm/util/pool.cc index 429ba158..db72a8ec 100644 --- a/klm/util/pool.cc +++ b/klm/util/pool.cc @@ -25,7 +25,9 @@ void Pool::FreeAll() { } void *Pool::More(std::size_t size) { - std::size_t amount = std::max(static_cast<size_t>(32) << free_list_.size(), size); + // Double until we hit 2^21 (2 MB). Then grow in 2 MB blocks. + std::size_t desired_size = static_cast<size_t>(32) << std::min(static_cast<std::size_t>(16), free_list_.size()); + std::size_t amount = std::max(desired_size, size); uint8_t *ret = static_cast<uint8_t*>(MallocOrThrow(amount)); free_list_.push_back(ret); current_ = ret + size; |