Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

memtype-managed: correctly merge free blocks

Browse source
This commit is contained in:
Georg Reinke 2017-03-28 13:09:57 +02:00
parent 1fd368d360
commit 1b33861528
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/memory.c
View file

@ -181,8 +181,15 @@ int memory_managed_free(struct memtype *m, void *ptr, size_t len)
// alignment, ptr may not actually be the start of the block
if ((char*) block + sizeof(struct memblock) <= cptr &&
cptr < (char*) block + sizeof(struct memblock) + block->len) {
// try to merge it with a neighbouring free block
if (block->prev && !(block->prev->flags & MEMBLOCK_USED)) {
// try to merge it with neighbouring free blocks
if (block->prev && !(block->prev->flags & MEMBLOCK_USED) &&
block->next && !(block->next->flags & MEMBLOCK_USED)) {
// special case first: both previous and next block are unused
block->prev->len += block->len + block->next->len + 2 * sizeof(struct memblock);
block->prev->next = block->next->next;
if (block->next->next)
block->next->next->prev = block->prev;
} else if (block->prev && !(block->prev->flags & MEMBLOCK_USED)) {
block->prev->len += block->len + sizeof(struct memblock);
block->prev->next = block->next;
if (block->next)