Browse Source

big diff yet small change: fix ran into outside of shared memory. and commit the test that figure it out.

valgrind rocks even for our code for shared memory.


git-svn-id: svn://svn.lighttpd.net/xcache/trunk@49 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.1
Xuefer 16 years ago
parent
commit
06413c7c2f
  1. 147
      mem.c
  2. 18
      test.mak
  3. 18
      xcache.c

147
mem.c

@ -1,12 +1,34 @@
#ifdef TEST
#include <limits.h>
#include <stdio.h>
#else
#include <php.h>
#endif
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "mem.h"
#include "align.h"
#define PADD(p, a) (((char*)p) + a)
#ifdef TEST
# define ALLOC_DEBUG
#endif
#ifdef ALLOC_DEBUG
# define ALLOC_DEBUG_BLOCK_CHECK
#endif
#if 0
#undef ALLOC_DEBUG_BLOCK_CHECK
#endif
#define CHAR_PTR(p) ((char *) (p))
#define PADD(p, a) (CHAR_PTR(p) + a)
#define PSUB(p1, p2) (CHAR_PTR(p1) - CHAR_PTR(p2))
// {{{ mem
struct _xc_block_t {
#ifdef ALLOC_DEBUG
#ifdef ALLOC_DEBUG_BLOCK_CHECK
unsigned int magic;
#endif
xc_memsize_t size; /* reserved even after alloc */
@ -19,25 +41,27 @@ struct _xc_mem_t {
xc_block_t headblock[1]; /* just as a pointer to first block*/
};
#ifndef offsetof
# define offsetof(type, field) ((int) ((char *) &((type *) 0)->field))
#ifndef XtOffsetOf
# include <linux/stddef.h>
# define XtOffsetOf(s_type, field) offsetof(s_type, field)
#endif
#define SizeOf(type, field) sizeof( ((type *) 0)->field )
#define BLOCK_HEADER_SIZE() (ALIGN( offsetof(xc_block_t, size) + SizeOf(xc_block_t, size) ))
#define BLOCK_HEADER_SIZE() (ALIGN( XtOffsetOf(xc_block_t, size) + SizeOf(xc_block_t, size) ))
#define BLOCK_MAGIC ((unsigned int) 0x87655678)
/* }}} */
static inline void xc_block_setup(xc_block_t *b, xc_memsize_t size, xc_block_t *next) /* {{{ */
{
#ifdef ALLOC_DEBUG
#ifdef ALLOC_DEBUG_BLOCK_CHECK
b->magic = BLOCK_MAGIC;
#endif
b->size = size;
b->next = next;
}
/* }}} */
#ifdef ALLOC_DEBUG
#ifdef ALLOC_DEBUG_BLOCK_CHECK
static void xc_block_check(xc_block_t *b) /* {{{ */
{
if (b->magic != BLOCK_MAGIC) {
@ -62,9 +86,19 @@ void *xc_mem_malloc(xc_mem_t *mem, xc_memsize_t size) /* {{{ */
/* realsize is ALIGNed so next block start at ALIGNed address */
realsize = ALIGN(realsize);
#ifdef ALLOC_DEBUG
fprintf(stderr, "avail: %d (%dKB). Allocate size: %d realsize: %d (%dKB)"
, mem->avail, mem->avail / 1024
, size
, realsize, realsize / 1024
);
#endif
do {
p = NULL;
if (mem->avail < realsize) {
#ifdef ALLOC_DEBUG
fprintf(stderr, " oom\n");
#endif
break;
}
@ -93,6 +127,9 @@ void *xc_mem_malloc(xc_mem_t *mem, xc_memsize_t size) /* {{{ */
}
if (b == NULL) {
#ifdef ALLOC_DEBUG
fprintf(stderr, " no fit chunk\n");
#endif
break;
}
@ -104,9 +141,12 @@ void *xc_mem_malloc(xc_mem_t *mem, xc_memsize_t size) /* {{{ */
/* update the block header */
mem->avail -= realsize;
/*perfect fit, just unlink */
/* perfect fit, just unlink */
if (cur->size == realsize) {
prev->next = cur->next;
#ifdef ALLOC_DEBUG
fprintf(stderr, " perfect fit. Got: %p\n", p);
#endif
break;
}
@ -125,12 +165,11 @@ void *xc_mem_malloc(xc_mem_t *mem, xc_memsize_t size) /* {{{ */
*/
#ifdef ALLOC_DEBUG
fprintf(stderr, "avail: %d (%dKB). size: %d %d (%dKB) new next: %p offset: %d %dKB\n"
, mem->avail, mem->avail/1024
, size
, realsize, realsize/1024
fprintf(stderr, " -> avail: %d (%dKB). new next: %p offset: %d %dKB. Got: %p\n"
, mem->avail, mem->avail / 1024
, newb
, ((char*)newb - mem->rw), ((char*)newb - mem->rw) / 1024
, PSUB(newb, mem), PSUB(newb, mem) / 1024
, p
);
#endif
prev->next = newb;
@ -148,7 +187,11 @@ int xc_mem_free(xc_mem_t *mem, const void *p) /* {{{ return block size freed */
xc_block_t *cur, *b;
int size;
cur = (xc_block_t *) (((char *) p) - BLOCK_HEADER_SIZE());
cur = (xc_block_t *) (CHAR_PTR(p) - BLOCK_HEADER_SIZE());
#ifdef ALLOC_DEBUG
fprintf(stderr, "freeing: %p", p);
fprintf(stderr, ", size=%d", cur->size);
#endif
xc_block_check(cur);
assert((char*)mem < (char*)cur && (char*)cur < (char*)mem + mem->size);
@ -163,6 +206,9 @@ int xc_mem_free(xc_mem_t *mem, const void *p) /* {{{ return block size freed */
b->next = cur;
size = cur->size;
#ifdef ALLOC_DEBUG
fprintf(stderr, ", avail %d (%dKB)", mem->avail, mem->avail / 1024);
#endif
mem->avail += size;
/* combine prev|cur */
@ -170,6 +216,9 @@ int xc_mem_free(xc_mem_t *mem, const void *p) /* {{{ return block size freed */
b->size += cur->size;
b->next = cur->next;
cur = b;
#ifdef ALLOC_DEBUG
fprintf(stderr, ", combine prev");
#endif
}
/* combine cur|next */
@ -177,7 +226,13 @@ int xc_mem_free(xc_mem_t *mem, const void *p) /* {{{ return block size freed */
if (PADD(cur, cur->size) == (char *)b) {
cur->size += b->size;
cur->next = b->next;
#ifdef ALLOC_DEBUG
fprintf(stderr, ", combine next");
#endif
}
#ifdef ALLOC_DEBUG
fprintf(stderr, " -> avail %d (%dKB)\n", mem->avail, mem->avail / 1024);
#endif
return size;
}
/* }}} */
@ -245,19 +300,27 @@ xc_memsize_t xc_mem_block_offset(const xc_mem_t *mem, const xc_block_t *block) /
xc_mem_t *xc_mem_init(void *ptr, xc_memsize_t size) /* {{{ */
{
xc_mem_t *mem = (xc_mem_t *) ptr;
xc_block_t *b;
xc_mem_t *mem;
xc_block_t *b;
#define MINSIZE (ALIGN(sizeof(xc_mem_t)) + sizeof(xc_block_t))
/* requires at least the header and 1 tail block */
if (size < MINSIZE) {
fprintf(stderr, "xc_mem_init requires %d bytes at least\n", MINSIZE);
return NULL;
}
mem = (xc_mem_t *) ptr;
mem->size = size;
mem->avail = size - ALIGN(sizeof(xc_mem_t));
mem->avail = size - MINSIZE;
/* pointer to first block */
/* pointer to first block, right after ALIGNed header */
b = mem->headblock;
xc_block_setup(b, 0, (xc_block_t *)(mem + ALIGN(sizeof(xc_mem_t))));
xc_block_setup(b, 0, (xc_block_t *) PADD(mem, ALIGN(sizeof(xc_mem_t))));
/* first block*/
b = b->next;
xc_block_setup(b, mem->avail, 0);
#undef MINSIZE
return mem;
}
@ -266,3 +329,47 @@ void xc_mem_destroy(xc_mem_t *mem) /* {{{ */
{
}
/* }}} */
#ifdef TEST
/* {{{ */
#undef CHECK
#define CHECK(a, msg) do { if ((a) == NULL) { puts(msg); return -1; } } while (0)
#include <time.h>
int main()
{
int count = 0;
void *p;
void *memory;
xc_mem_t *mem;
void **ptrs;
int size, i;
#if 0
fprintf(stderr, "%s", "Input test size: ");
scanf("%d", &size);
#else
size = 100;
#endif
CHECK(memory = malloc(size), "OOM");
CHECK(ptrs = malloc(size * sizeof(void*)), "OOM");
CHECK(mem = xc_mem_init(memory, size), "Failed init memory allocator");
while ((p = xc_mem_malloc(mem, 1))) {
ptrs[count ++] = p;
}
fprintf(stderr, "count=%d, random freeing\n", count);
srandom(time(NULL));
while (count) {
i = (random() % count);
fprintf(stderr, "freeing %d: ", i);
xc_mem_free(mem, ptrs[i]);
ptrs[i] = ptrs[count - 1];
count --;
}
free(memory);
return 0;
}
/* }}} */
#endif

18
test.mak

@ -0,0 +1,18 @@
#!/usr/bin/make -f
EXES=mem_test
OBJS=mem.o
CC=gcc
CFLAGS=-g -O0 -D TEST -Wall
TEST=valgrind
all: mem
mem_test: mem.c
$(CC) $(CFLAGS) -o mem_test mem.c
mem: mem_test
$(TEST) ./mem_test
clean:
rm -f $(OBJS) $(EXES)

18
xcache.c

@ -891,14 +891,26 @@ static xc_cache_t **xc_cache_init(xc_shm_t *shm, char *ptr, xc_hash_t *hcache, x
xc_cache_t **caches = NULL, *cache;
xc_mem_t *mem;
int i;
xc_memsize_t memsize;
xc_memsize_t memsize = shmsize / hcache->size;
memsize = shmsize / hcache->size;
/* Don't let it break out of mem after ALIGNed
* This is important for
* Simply loop until it fit our need
*/
while (ALIGN(memsize) * hcache->size > shmsize && ALIGN(memsize) != memsize) {
if (memsize < ALIGN(1)) {
CHECK(NULL, "cache too small");
}
memsize --;
}
CHECK(caches = calloc(hcache->size, sizeof(xc_cache_t *)), "caches OOM");
for (i = 0; i < hcache->size; i ++) {
mem = xc_mem_init(ptr, memsize);
ptr += ALIGN(memsize);
CHECK(mem = xc_mem_init(ptr, memsize), "Failed init memory allocator");
ptr += memsize;
CHECK(cache = xc_mem_calloc(mem, 1, sizeof(xc_cache_t)), "cache OOM");
CHECK(cache->entries = xc_mem_calloc(mem, hentry->size, sizeof(xc_entry_t*)), "entries OOM");
CHECK(cache->lck = xc_lock_init(NULL), "can't create lock");

Loading…
Cancel
Save