thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a sequence of bitmap_allocs for metadata instead of std::sets...

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-11-23 19:07:43 +03:00
parent ec9eba63af
commit 1747cd6a95
2 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockstore/blockstore_heap.cpp
+30 -35
View File
@@ -334,7 +334,8 @@ blockstore_heap_t::blockstore_heap_t(blockstore_disk_t *dsk, uint8_t *buffer_are
assert(target_block_free_space < dsk->meta_block_size);
assert(dsk->meta_block_size < 32768);
assert(sizeof(heap_object_t) < sizeof(heap_write_t));
meta_alloc = new allocator_t(meta_block_count);
for (int i = 0; i < meta_alloc_buckets; i++)
meta_allocs[i] = new allocator_t(meta_block_count);
block_info.resize(meta_block_count);
data_alloc = new allocator_t(dsk->block_count);
if (!target_block_free_space)
@@ -360,9 +361,10 @@ blockstore_heap_t::~blockstore_heap_t()
}
}
object_mvcc.clear();
if (meta_alloc)
for (int i = 0; i < meta_alloc_buckets; i++)
{
delete meta_alloc;
if (meta_allocs[i])
delete meta_allocs[i];
}
if (data_alloc)
{
@@ -1133,20 +1135,16 @@ void blockstore_heap_t::compact_block(uint32_t block_num)
int blockstore_heap_t::get_block_for_new_object(uint32_t & out_block_num)
{
// Blocks with at least target_block_free_space are tried first in number order
uint64_t block_num = meta_alloc->find_free();
if (block_num >= block_info.size())
for (int i = 0; i < meta_alloc_buckets; i++)
{
// Blocks with less than target_block_free_space are tried second, in free space order
auto u_it = used_alloc_queue.begin();
if (u_it == used_alloc_queue.end() || u_it->free_space < sizeof(heap_object_t) + 2*max_write_entry_size)
uint64_t block_num = meta_allocs[i]->find_free();
if (block_num < block_info.size())
{
return ENOSPC;
out_block_num = block_num;
return 0;
}
block_num = u_it->block_num;
}
out_block_num = block_num;
return 0;
return ENOSPC;
}
uint32_t blockstore_heap_t::find_block_run(heap_block_info_t & inf, uint32_t space)
@@ -1694,30 +1692,27 @@ void blockstore_heap_t::add_used_space(uint32_t block_num, int32_t used_delta)
{
auto & inf = block_info.at(block_num);
meta_used_space += used_delta;
if (inf.used_space <= dsk->meta_block_size-target_block_free_space &&
inf.used_space+used_delta <= dsk->meta_block_size-target_block_free_space)
{
inf.used_space += used_delta;
return;
}
if (inf.used_space > dsk->meta_block_size-target_block_free_space)
{
meta_alloc_count--;
meta_alloc->set(block_num, false);
used_alloc_queue.erase((heap_block_free_t){
.block_num = block_num,
.free_space = (uint32_t)(dsk->meta_block_size-inf.used_space),
});
}
auto minthresh = dsk->meta_block_size-target_block_free_space;
auto maxthresh = dsk->meta_block_size-sizeof(heap_object_t)-2*max_write_entry_size;
auto thresh = minthresh;
auto old_used_space = inf.used_space;
inf.used_space += used_delta;
if (inf.used_space > dsk->meta_block_size-target_block_free_space)
for (int i = 0; i < meta_alloc_buckets; )
{
meta_alloc_count++;
meta_alloc->set(block_num, true);
used_alloc_queue.insert((heap_block_free_t){
.block_num = block_num,
.free_space = (uint32_t)(dsk->meta_block_size-inf.used_space),
});
if (old_used_space > thresh && inf.used_space <= thresh)
{
meta_allocs[i]->set(block_num, false);
if (!i)
meta_alloc_count--;
}
else if (old_used_space <= thresh && inf.used_space > thresh)
{
meta_allocs[i]->set(block_num, true);
if (!i)
meta_alloc_count++;
}
i++;
thresh = (i == meta_alloc_buckets-1 ? maxthresh : minthresh + (maxthresh-minthresh)*i/(meta_alloc_buckets-1));
}
}
src/blockstore/blockstore_heap.h
+2 -13
View File
@@ -96,17 +96,6 @@ struct __attribute__((__packed__)) heap_block_info_t
uint8_t *data = NULL;
};
struct __attribute__((__packed__)) heap_block_free_t
{
uint32_t block_num = 0;
uint32_t free_space = 0;
};
inline bool operator < (const heap_block_free_t & a, const heap_block_free_t & b)
{
return a.free_space > b.free_space || a.free_space == b.free_space && a.block_num < b.block_num;
}
struct multilist_alloc_t
{
const uint32_t count, maxn;
@@ -138,6 +127,7 @@ class blockstore_heap_t
const uint32_t meta_block_count = 0;
uint32_t target_block_free_space = 800;
const int meta_alloc_buckets = 4;
uint64_t next_lsn = 0;
uint64_t compacted_lsn = 0;
@@ -147,11 +137,10 @@ class blockstore_heap_t
std::deque<object_id> compact_queue;
std::vector<heap_block_info_t> block_info;
allocator_t *data_alloc = NULL;
allocator_t *meta_alloc = NULL;
allocator_t *meta_allocs[4] = {};
uint32_t meta_alloc_count = 0;
uint64_t meta_used_space = 0;
multilist_alloc_t *buffer_alloc = NULL;
std::set<heap_block_free_t> used_alloc_queue;
std::map<heap_object_lsn_t, heap_object_mvcc_t> object_mvcc;
std::map<uint64_t, uint32_t> mvcc_data_refs;
std::map<uint64_t, uint32_t> mvcc_buffer_refs;