diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2013-06-30 11:30:12 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2013-06-30 11:30:12 +0400 |
| commit | 0e320ae49fc14b7d299640f0337eb6c20871b61e (patch) | |
| tree | 348132e6ae7612d209e510cc9050b9275fdac363 | |
| parent | 49b348dd38dcf89a057abebc0ffdf73748effa0a (diff) | |
| download | accel-ppp-xebd-0e320ae49fc14b7d299640f0337eb6c20871b61e.tar.gz accel-ppp-xebd-0e320ae49fc14b7d299640f0337eb6c20871b61e.zip | |
Revert "mempool: set/check magic only if MEMDEBUG defined"
This reverts commit 49b348dd38dcf89a057abebc0ffdf73748effa0a.
| -rw-r--r-- | accel-pppd/triton/mempool.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/accel-pppd/triton/mempool.c b/accel-pppd/triton/mempool.c index ef563e9..5323771 100644 --- a/accel-pppd/triton/mempool.c +++ b/accel-pppd/triton/mempool.c @@ -29,9 +29,9 @@ struct _mempool_t struct list_head items; #ifdef MEMDEBUG struct list_head ditems; - uint64_t magic; #endif spinlock_t lock; + uint64_t magic; int mmap:1; int objects; }; @@ -46,9 +46,9 @@ struct _item_t #ifdef MEMDEBUG const char *fname; int line; +#endif uint64_t magic2; uint64_t magic1; -#endif char ptr[0]; }; @@ -69,10 +69,10 @@ mempool_t __export *mempool_create(int size) INIT_LIST_HEAD(&p->items); #ifdef MEMDEBUG INIT_LIST_HEAD(&p->ditems); - p->magic = (uint64_t)random() * (uint64_t)random(); #endif spinlock_init(&p->lock); p->size = size; + p->magic = (uint64_t)random() * (uint64_t)random(); spin_lock(&pools_lock); list_add_tail(&p->entry, &pools); @@ -135,6 +135,9 @@ void __export *mempool_alloc(mempool_t *pool) return NULL; } it->owner = p; + it->magic2 = p->magic; + it->magic1 = MAGIC1; + *(uint64_t*)(it->ptr + p->size) = it->magic2; return it->ptr; } |