--- libelwix/src/mem.c	2015/06/25 17:53:50	1.5
+++ libelwix/src/mem.c	2016/05/14 13:12:43	1.6.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: mem.c,v 1.5 2015/06/25 17:53:50 misho Exp $
+* $Id: mem.c,v 1.6.2.2 2016/05/14 13:12:43 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2015
+Copyright 2004 - 2016
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -247,10 +247,9 @@ mpool_malloc(mpool_t * __restrict mp, u_int size, cons
 void *
 mpool_realloc(mpool_t * __restrict mp, void * __restrict data, u_int newsize, const char *memname)
 {
-	struct tagAlloc *m, *tmp;
 	int idx, oidx;
 	void *p;
-	u_int align, osize;
+	u_int osize;
 
 	/* if !data execute mpool_malloc() */
 	if (!data)
@@ -264,21 +263,20 @@ mpool_realloc(mpool_t * __restrict mp, void * __restri
 	if (MEM_BADADDR(data) || MEM_CORRUPT(data)) {
 		elwix_SetErr(EFAULT, "Corrupted memory address");
 		return NULL;
-	} else {
-		osize = ((u_int*)data)[-2] * sizeof(u_int);
-		oidx = BucketIndex(osize);
 	}
 	/* prepare new size */
 	if (newsize > MEM_ALLOC_MAX) {
 		elwix_SetErr(ENOMEM, "Memory size is too large");
 		return NULL;
-	} else {
-		newsize = (newsize + 3) & ~3;	/* must align to 4 because needed room for sentinels */
-		idx = BucketIndex(newsize);
 	}
 
 	mpool_lock(mp);
 
+	osize = ((u_int*)data)[-2] * sizeof(u_int);
+	oidx = BucketIndex(osize);
+	newsize = (newsize + 3) & ~3;	/* must align to 4 because needed room for sentinels */
+	idx = BucketIndex(newsize);
+
 	/* quota */
 	if (mp->pool_quota.max && 
 			(mp->pool_quota.curr + ((u_long) newsize - osize)) > mp->pool_quota.max) {
@@ -287,64 +285,27 @@ mpool_realloc(mpool_t * __restrict mp, void * __restri
 		return NULL;
 	}
 
-	/* find old memory block */
-	TAILQ_FOREACH_SAFE(m, &mp->pool_active[oidx], alloc_node, tmp) {
-		if (mem_data(m, void*) == data && mem_size(m) == osize) {
-			/* case in different buckets */
-			if (oidx != idx) {
-				TAILQ_REMOVE(&mp->pool_active[oidx], m, alloc_node);
-				/* statistics */
-				mp->pool_calls.alloc--;
-			}
-			mp->pool_bytes.alloc -= osize;
-			break;
-		}
-	}
-	/* memory block not found! */
-	if (!m) {
+	if (oidx != idx) {
 		mpool_unlock(mp);
-		elwix_SetErr(EFAULT, "Memory block not found");
-		return NULL;
-	}
+		p = mpool_malloc(mp, newsize, memname);
+		if (!p)
+			return NULL;
 
-	/* try to reallocate memory block to new bucket */
-	if (oidx != idx) {
-		align = 1 << (idx + MEM_MIN_BUCKET);
-		p = realloc(m->alloc_mem, align + 12);
-		if (!p) {
-			LOGERR;
+		memcpy(p, data, MIN(osize, newsize));
+		mpool_free(mp, data, 0);
+	} else {
+		p = data;
 
-			/* restore to old bucket pulled memory block for reallocation */
-			TAILQ_INSERT_HEAD(&mp->pool_active[oidx], m, alloc_node);
-			/* statistics */
-			mp->pool_calls.alloc++;
-			mp->pool_bytes.alloc += osize;
+		((u_int*) p)[-2] = newsize / sizeof(u_int);
+		((u_int*) p)[newsize / sizeof(u_int)] = MEM_MAGIC_STOP;
 
-			mpool_unlock(mp);
-			return NULL;
-		} else
-			m->alloc_mem = (u_int*) p;
-	}
-	/* quota */
-	mp->pool_quota.curr += (u_long) newsize - osize;
-	mp->pool_quota.real += (1 << (idx + MEM_MIN_BUCKET)) - (1 << (oidx + MEM_MIN_BUCKET));
+		mp->pool_bytes.alloc += (u_long) newsize - osize;
+		mp->pool_quota.curr += (u_long) newsize - osize;
 
-	m->alloc_mem[0] = newsize / sizeof(u_int);
-	m->alloc_mem[1] = MEM_MAGIC_START;
-	m->alloc_mem[2 + newsize / sizeof(u_int)] = MEM_MAGIC_STOP;
-
-	if (oidx != idx) {
-		TAILQ_INSERT_HEAD(&mp->pool_active[idx], m, alloc_node);
-		/* statistics */
-		mp->pool_calls.alloc++;
+		mpool_unlock(mp);
 	}
-	mp->pool_bytes.alloc += newsize;
 
-	if (memname)
-		strlcpy(m->alloc_name, memname, sizeof m->alloc_name);
-
-	mpool_unlock(mp);
-	return mem_data(m, void*);
+	return p;
 }
 
 /*
@@ -773,16 +734,18 @@ xdump_show(u_int size, u_int act, u_int inact)
 }
 
 /*
- * mpool_xdump() - Dump elwix memory pool statistics
+ * mpool_dump() - Dump elwix memory pool statistics
  *
- * @fmt = format string
+ * @mp = memory pool, if =NULL dump elwix default memory pool
+ * @fmt = prefix info format string
  * @... = argument(s)
  * return: none
  */
 void
-mpool_xdump(const char *fmt, ...)
+mpool_dump(mpool_t * __restrict mp, const char *fmt, ...)
 {
 	va_list lst;
+	mpool_t *p = mp ? mp : elwix_mpool;
 
 	if (fmt) {
 		va_start(lst, fmt);
@@ -797,12 +760,11 @@ mpool_xdump(const char *fmt, ...)
 		"\t- calls Alloc/Free/Cache = %lu/%lu/%lu\n"
 		"\t- bytes Alloc/Free/Cache = %lu/%lu/%lu\n"
 		"\t- buckets :\n", 
-		elwix_mpool->pool_quota.curr, elwix_mpool->pool_quota.real, elwix_mpool->pool_quota.max, 
-		elwix_mpool->pool_calls.alloc, elwix_mpool->pool_calls.free, 
-		elwix_mpool->pool_calls.cache, elwix_mpool->pool_bytes.alloc, 
-		elwix_mpool->pool_bytes.free, elwix_mpool->pool_bytes.cache);
+		p->pool_quota.curr, p->pool_quota.real, p->pool_quota.max, 
+		p->pool_calls.alloc, p->pool_calls.free, p->pool_calls.cache, 
+		p->pool_bytes.alloc, p->pool_bytes.free, p->pool_bytes.cache);
 
-	mpool_statistics(elwix_mpool, xdump_show);
+	mpool_statistics(p, xdump_show);
 	printf("------------------------------------------------------------\n");
 }