qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[util] Make cmem consistent on 32 and 64 bit systems

Browse source 
I don't know that the cache line size is 64 bytes on 32 bit systems, but
it should be ok to assume that 64-byte alignment behaves well on systems
with smaller cache lines so long as they are powers of two. This does
mean there is some waste on 32-bit systems, but it should be fairly
minimal (32 bytes per memblock, which manages page sized regions).
This commit is contained in:
Bill Currie 2021-05-24 11:19:55 +09:00
parent 0a6cb3ad53
commit a461c09586
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/QF/cmem.h
View file

@ -48,7 +48,7 @@ typedef struct memline_s {
*/
struct memblock_s *block;
size_t pad[2];
} memline_t;
} __attribute__((aligned (64))) memline_t;
typedef struct memsline_s {
struct memsline_s *next;
@ -82,9 +82,11 @@ typedef struct memblock_s {
/* True if the post-header block is free to be reused.
*/
int post_free;
#if __WORDSIZE == 64
int pad;
#endif
size_t pre_allocated;
} memblock_t;
} __attribute__((aligned (64))) memblock_t;
typedef struct memsuper_s {
size_t page_size;

2
libs/util/cmem.c
View file

@ -114,7 +114,7 @@ init_block (memsuper_t *super, void *mem, size_t alloc_size)
size_t ptr = (size_t) mem;
memblock_t *block;
block = (memblock_t *) (((ptr + size) & ~mask) - sizeof (memblock_t));
block = (memblock_t *) (((ptr + size) & ~mask)) - 1;
memset (block, 0, sizeof (memblock_t));
if (super->memblocks) {

26
libs/util/test/test-cmem.c
View file

@ -57,9 +57,11 @@ check_block (memblock_t *block, int line_count, int allocated)
for (memline_t **l = &block->free_lines; *l; l = &(*l)->block_next) {
memline_t *line = *l;
ptrdiff_t ind = (memline_t *) block - line;
ptrdiff_t ind = (byte *) block - (byte *) line;
ind /= MEM_LINE_SIZE;
if (ind < 1 || (size_t ) ind > block->pre_size / MEM_LINE_SIZE) {
fprintf (stderr, "line outside of block\n");
fprintf (stderr, "line outside of block: %p %p %p\n",
line, block->mem, block);
return 0;
}
if (set_is_member (visited, ind)) {
@ -187,15 +189,18 @@ test_line (memsuper_t *super)
return 0;
}
if (line1 < (memline_t *) block->mem || line1 >= (memline_t *) block) {
fprintf (stderr, "line1 outside block line pool\n");
fprintf (stderr, "line1 outside block line pool: %p %p %p\n",
line1, block->mem, block);
return 0;
}
if (line2 < (memline_t *) block->mem || line2 >= (memline_t *) block) {
fprintf (stderr, "line2 outside block line pool\n");
fprintf (stderr, "line2 outside block line pool: %p %p %p\n",
line2, block->mem, block);
return 0;
}
if (line3 < (memline_t *) block->mem || line3 >= (memline_t *) block) {
fprintf (stderr, "line3 outside block line pool\n");
fprintf (stderr, "line3 outside block line pool: %p %p %p\n",
line3, block->mem, block);
return 0;
}
if (!((size_t) line1 & super->page_mask)) {
@ -531,12 +536,19 @@ main (void)
{
memsuper_t *super = new_memsuper ();
int i;
#if __WORDSIZE == 32
if (sizeof (memsuper_t) != 1 * MEM_LINE_SIZE) {
fprintf (stderr, "memsuper_t not 2 * cache size: %zd\n",
sizeof (memsuper_t));
return 1;
}
#else
if (sizeof (memsuper_t) != 2 * MEM_LINE_SIZE) {
fprintf (stderr, "memsuper_t not 2 * cache size: %zd\n",
sizeof (memsuper_t));
return 1;
}
#endif
if (sizeof (memline_t) != MEM_LINE_SIZE) {
fprintf (stderr, "memline_t not cache size: %zd\n",
sizeof (memline_t));
@ -558,7 +570,7 @@ main (void)
}
if (super->page_size != (size_t) sysconf (_SC_PAGESIZE)) {
fprintf (stderr, "page size not equal to system page size: %zd, %zd\n",
super->page_size, sysconf (_SC_PAGESIZE));
super->page_size, (size_t) sysconf (_SC_PAGESIZE));
return 1;
}
if (!super->page_size || (super->page_size & (super->page_size - 1))) {