sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-30 14:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix nits: variable naming, typos

Browse Source
This commit is contained in:
Martin Ankerl 2018-01-06 09:13:41 +01:00
parent 1e0ee9095c
commit 5fbf7c478a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/support/lockedpool.cpp
View File

@ -69,24 +69,24 @@ void* Arena::alloc(size_t size)
// This allocation strategy is best-fit. According to "Dynamic Storage Allocation: A Survey and Critical Review", // This allocation strategy is best-fit. According to "Dynamic Storage Allocation: A Survey and Critical Review",
// Wilson et. al. 1995, http://www.scs.stanford.edu/14wi-cs140/sched/readings/wilson.pdf, best-fit and first-fit // Wilson et. al. 1995, http://www.scs.stanford.edu/14wi-cs140/sched/readings/wilson.pdf, best-fit and first-fit
// policies seem to work well in practice. // policies seem to work well in practice.
auto sizePtrIt = size_to_free_chunk.lower_bound(size); auto size_ptr_it = size_to_free_chunk.lower_bound(size);
if (sizePtrIt == size_to_free_chunk.end()) if (size_ptr_it == size_to_free_chunk.end())
return nullptr; return nullptr;
// Create the used-chunk, taking its space from the end of the free-chunk // Create the used-chunk, taking its space from the end of the free-chunk
const size_t sizeRemaining = sizePtrIt->first - size; const size_t size_remaining = size_ptr_it->first - size;
auto alloced = chunks_used.emplace(sizePtrIt->second + sizeRemaining, size).first; auto alloced = chunks_used.emplace(size_ptr_it->second + size_remaining, size).first;
chunks_free_end.erase(sizePtrIt->second + sizePtrIt->first); chunks_free_end.erase(size_ptr_it->second + size_ptr_it->first);
if (sizePtrIt->first == size) { if (size_ptr_it->first == size) {
// whole chunk is used up // whole chunk is used up
chunks_free.erase(sizePtrIt->second); chunks_free.erase(size_ptr_it->second);
} else { } else {
// still some memory left in the chunk // still some memory left in the chunk
auto itRemaining = size_to_free_chunk.emplace(sizeRemaining, sizePtrIt->second); auto it_remaining = size_to_free_chunk.emplace(size_remaining, size_ptr_it->second);
chunks_free[sizePtrIt->second] = itRemaining; chunks_free[size_ptr_it->second] = it_remaining;
chunks_free_end.emplace(sizePtrIt->second + sizeRemaining, itRemaining); chunks_free_end.emplace(size_ptr_it->second + size_remaining, it_remaining);
} }
size_to_free_chunk.erase(sizePtrIt); size_to_free_chunk.erase(size_ptr_it);
return reinterpret_cast<void*>(alloced->first); return reinterpret_cast<void*>(alloced->first);
} }
@ -106,7 +106,7 @@ void Arena::free(void *ptr)
std::pair<char*, size_t> freed = *i; std::pair<char*, size_t> freed = *i;
chunks_used.erase(i); chunks_used.erase(i);
// Coalesc freed with previous chunk // coalesce freed with previous chunk
auto prev = chunks_free_end.find(freed.first); auto prev = chunks_free_end.find(freed.first);
if (prev != chunks_free_end.end()) { if (prev != chunks_free_end.end()) {
freed.first -= prev->second->first; freed.first -= prev->second->first;
@ -115,7 +115,7 @@ void Arena::free(void *ptr)
chunks_free_end.erase(prev); chunks_free_end.erase(prev);
} }
// Coalesc freed with chunk after freed // coalesce freed with chunk after freed
auto next = chunks_free.find(freed.first + freed.second); auto next = chunks_free.find(freed.first + freed.second);
if (next != chunks_free.end()) { if (next != chunks_free.end()) {
freed.second += next->second->first; freed.second += next->second->first;