RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:07:34 +00:00
Code Issues Activity Actions

UserspaceEmulator: Add some helpers to tidy up TrackedChunkedBlock

Browse source
This commit is contained in:
Andreas Kling 2020-11-14 18:36:17 +01:00
parent 2fceffff6f
commit d88b36448b
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
DevTools/UserspaceEmulator/MallocTracer.cpp
View file

@ -72,20 +72,28 @@ void MallocTracer::target_did_malloc(Badge<SoftCPU>, FlatPtr address, size_t siz
auto& block = const_cast<TrackedChunkedBlock&>(*tracked_chunked_block.value()); auto& block = const_cast<TrackedChunkedBlock&>(*tracked_chunked_block.value());
block.address = chunked_block_address; block.address = chunked_block_address;
block.chunk_size = mmap_region.read32(offsetof(CommonHeader, m_size)).value(); block.chunk_size = mmap_region.read32(offsetof(CommonHeader, m_size)).value();
auto chunk_count = (ChunkedBlock::block_size - sizeof(ChunkedBlock)) / block.chunk_size; block.mallocations.resize((ChunkedBlock::block_size - sizeof(ChunkedBlock)) / block.chunk_size);
block.mallocations.resize(chunk_count); dbgln("Tracking ChunkedBlock @ {:p} with chunk_size={}, chunk_count={}", block.address, block.chunk_size, block.mallocations.size());
dbgln("Tracking ChunkedBlock @ {:p} with chunk_size={}, chunk_count={}", block.address, block.chunk_size, chunk_count);
} }
ASSERT(tracked_chunked_block.has_value()); ASSERT(tracked_chunked_block.has_value());
auto& block = const_cast<TrackedChunkedBlock&>(*tracked_chunked_block.value()); auto& block = const_cast<TrackedChunkedBlock&>(*tracked_chunked_block.value());
auto chunk_offset = address - (block.address + sizeof(ChunkedBlock)); block.mallocation_for_address(address) = { address, size, true, false, Emulator::the().raw_backtrace(), Vector<FlatPtr>() };
auto chunk_index = chunk_offset / block.chunk_size;
block.mallocations[chunk_index] = { address, size, true, false, Emulator::the().raw_backtrace(), Vector<FlatPtr>() };
} else { } else {
m_big_mallocations.append({ address, size, true, false, Emulator::the().raw_backtrace(), Vector<FlatPtr>() }); m_big_mallocations.append({ address, size, true, false, Emulator::the().raw_backtrace(), Vector<FlatPtr>() });
} }
} }
ALWAYS_INLINE MallocTracer::Mallocation& MallocTracer::TrackedChunkedBlock::mallocation_for_address(FlatPtr address) const
{
return const_cast<Mallocation&>(this->mallocations[chunk_index_for_address(address)]);
}
ALWAYS_INLINE size_t MallocTracer::TrackedChunkedBlock::chunk_index_for_address(FlatPtr address) const
{
auto chunk_offset = address - (this->address + sizeof(ChunkedBlock));
return chunk_offset / this->chunk_size;
}
void MallocTracer::target_did_free(Badge<SoftCPU>, FlatPtr address) void MallocTracer::target_did_free(Badge<SoftCPU>, FlatPtr address)
{ {
if (!address) if (!address)
@ -143,9 +151,7 @@ MallocTracer::Mallocation* MallocTracer::find_mallocation(FlatPtr address)
auto chunked_block = m_chunked_blocks.get(possible_chunked_block); auto chunked_block = m_chunked_blocks.get(possible_chunked_block);
if (chunked_block.has_value()) { if (chunked_block.has_value()) {
auto& block = *chunked_block.value(); auto& block = *chunked_block.value();
auto chunk_offset = address - (block.address + sizeof(ChunkedBlock)); auto& mallocation = block.mallocation_for_address(address);
auto chunk_index = chunk_offset / block.chunk_size;
auto& mallocation = block.mallocations[chunk_index];
if (mallocation.used) { if (mallocation.used) {
ASSERT(mallocation.contains(address)); ASSERT(mallocation.contains(address));
return const_cast<Mallocation*>(&mallocation); return const_cast<Mallocation*>(&mallocation);

3
DevTools/UserspaceEmulator/MallocTracer.h
View file

@ -69,6 +69,9 @@ private:
FlatPtr address { 0 }; FlatPtr address { 0 };
size_t chunk_size { 0 }; size_t chunk_size { 0 };
size_t chunk_index_for_address(FlatPtr) const;
Mallocation& mallocation_for_address(FlatPtr) const;
Vector<Mallocation> mallocations; Vector<Mallocation> mallocations;
}; };