emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid embedding data[] in struct block to satisfy windows build

Browse source
This commit is contained in:
Sven M. Hallberg 2016-12-07 12:39:49 +01:00
parent ec8249513c
commit 631ca40f91
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/sloballoc.c
View file

@ -10,7 +10,7 @@ struct alloc {
}; };
struct block { struct block {
struct alloc alloc; size_t size; // read: struct alloc
struct block *next; struct block *next;
}; };
@ -31,7 +31,7 @@ SLOB *slobinit(void *mem, size_t size)
slob = mem; slob = mem;
slob->size = size - sizeof(SLOB); slob->size = size - sizeof(SLOB);
slob->head = (struct block *)((uint8_t *)mem + sizeof(SLOB)); slob->head = (struct block *)((uint8_t *)mem + sizeof(SLOB));
slob->head->alloc.size = slob->size - sizeof(struct alloc); slob->head->size = slob->size - sizeof(struct alloc);
slob->head->next = NULL; slob->head->next = NULL;
return slob; return slob;
@ -52,16 +52,16 @@ void *sloballoc(SLOB *slob, size_t size)
// scan list for the first block of sufficient size // scan list for the first block of sufficient size
for(p=&slob->head; (b=*p); p=&b->next) { for(p=&slob->head; (b=*p); p=&b->next) {
if(b->alloc.size >= remblock) { if(b->size >= remblock) {
// cut from the end of the block // cut from the end of the block
b->alloc.size -= sizeof(struct alloc) + size; b->size -= sizeof(struct alloc) + size;
struct alloc *a = (struct alloc *)(b->alloc.data + b->alloc.size); struct alloc *a = (struct alloc *)(((struct alloc *)b)->data + b->size);
a->size = size; a->size = size;
return a->data; return a->data;
} else if(b->alloc.size >= size) { } else if(b->size >= size) {
// when a block fills, it converts directly to a struct alloc // when a block fills, it converts directly to a struct alloc
*p = b->next; // unlink *p = b->next; // unlink
return b->alloc.data; return ((struct alloc *)b)->data;
} }
} }
@ -79,7 +79,7 @@ void slobfree(SLOB *slob, void *a_)
// scan list for blocks adjacent to a // scan list for blocks adjacent to a
for(p=&slob->head; (b=*p); p=&b->next) { for(p=&slob->head; (b=*p); p=&b->next) {
if((uint8_t *)a == b->alloc.data + b->alloc.size) { if((uint8_t *)a == ((struct alloc *)b)->data + b->size) {
assert(!left); assert(!left);
left = b; left = b;
} }
@ -91,8 +91,8 @@ void slobfree(SLOB *slob, void *a_)
if(left && right) { if(left && right) {
// extend left and unlink right // extend left and unlink right
left->alloc.size += sizeof(*a) + a->size + left->size += sizeof(*a) + a->size +
sizeof(right->alloc) + right->alloc.size; sizeof(struct alloc) + right->size;
*rightp = right->next; *rightp = right->next;
return; return;
} }
@ -100,10 +100,10 @@ void slobfree(SLOB *slob, void *a_)
if(left) { if(left) {
// extend left to absorb a // extend left to absorb a
left->alloc.size += sizeof(*a) + a->size; left->size += sizeof(*a) + a->size;
} else if(right) { } else if(right) {
// shift and extend right to absorb a // shift and extend right to absorb a
right->alloc.size += sizeof(*a) + a->size; right->size += sizeof(*a) + a->size;
*rightp = (struct block *)a; **rightp = *right; *rightp = (struct block *)a; **rightp = *right;
} else { } else {
// spawn new block over a // spawn new block over a