--- libelwix/src/mem.c	2013/05/30 09:07:33	1.2
+++ libelwix/src/mem.c	2015/06/25 16:59:50	1.4.18.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: mem.c,v 1.2 2013/05/30 09:07:33 misho Exp $
+* $Id: mem.c,v 1.4.18.4 2015/06/25 16:59:50 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -218,6 +218,7 @@ mpool_malloc(mpool_t * __restrict mp, u_int size, cons
 			return NULL;
 		} else {	/* quota */
 			mp->pool_quota.curr += size;
+			mp->pool_quota.real += 1 << (idx + MEM_MIN_BUCKET);
 			memset(m->alloc_mem, 0, align + 12);
 		}
 	}
@@ -326,6 +327,7 @@ mpool_realloc(mpool_t * __restrict mp, void * __restri
 	}
 	/* quota */
 	mp->pool_quota.curr += (u_long) newsize - osize;
+	mp->pool_quota.real += (1 << (idx + MEM_MIN_BUCKET)) - (1 << (oidx + MEM_MIN_BUCKET));
 
 	m->alloc_mem[0] = newsize / sizeof(u_int);
 	m->alloc_mem[1] = MEM_MAGIC_START;
@@ -382,6 +384,7 @@ mpool_purge(mpool_t * __restrict mp, u_int atmost)
 			mp->pool_bytes.free += mem_size(m);
 			/* quota */
 			mp->pool_quota.curr -= mem_size(m);
+			mp->pool_quota.real -= 1 << (i + MEM_MIN_BUCKET);
 
 			if (m->alloc_mem)
 				free(m->alloc_mem);
@@ -407,7 +410,8 @@ mpool_free(mpool_t * __restrict mp, void * __restrict 
 	int idx;
 	struct tagAlloc *m, *tmp;
 
-	assert(data);
+	if (!data)
+		return 0;
 	if (!mp) {
 		elwix_SetErr(EINVAL, "Pool not specified");
 		return -1;
@@ -439,6 +443,7 @@ mpool_free(mpool_t * __restrict mp, void * __restrict 
 				mp->pool_bytes.free += mem_size(m);
 				/* quota */
 				mp->pool_quota.curr -= mem_size(m);
+				mp->pool_quota.real -= 1 << (idx + MEM_MIN_BUCKET);
 
 				if (m->alloc_mem)
 					free(m->alloc_mem);
@@ -491,6 +496,7 @@ mpool_free2(mpool_t * __restrict mp, u_int size, const
 				mp->pool_bytes.free += mem_size(m);
 				/* quota */
 				mp->pool_quota.curr -= mem_size(m);
+				mp->pool_quota.real -= 1 << (idx + MEM_MIN_BUCKET);
 
 				if (m->alloc_mem)
 					free(m->alloc_mem);
@@ -626,18 +632,21 @@ mpool_setquota(mpool_t * __restrict mp, u_long maxmem)
  * mpool_getquota() - Get memory quota
  *
  * @mp = Memory pool
- * @currmem = Return current memory
+ * @currmem = Return current memory usage
+ * @realmem = Return current real memory usage
  * @maxmem = Return max quota size
  * return: none
  */
 void
-mpool_getquota(mpool_t * __restrict mp, u_long *currmem, u_long *maxmem)
+mpool_getquota(mpool_t * __restrict mp, u_long *currmem, u_long *realmem, u_long *maxmem)
 {
 	if (!mp)
 		return;
 
 	if (maxmem)
 		*maxmem = mp->pool_quota.max;
+	if (realmem)
+		*realmem = mp->pool_quota.real;
 	if (currmem)
 		*currmem = mp->pool_quota.curr;
 }
@@ -733,3 +742,66 @@ mpool_xstrdup(const char *str)
 {
 	return mpool_strdup(elwix_mpool, str, elwix_Prog);
 }
+
+/*
+ * mpool_xstatistics() - elwix memory pool statistics wrapper
+ *
+ * @cb = Export statistics to callback
+ * return: none
+ */
+void
+mpool_xstatistics(mpool_stat_cb cb)
+{
+	mpool_statistics(elwix_mpool, cb);
+}
+
+static void
+xdump_show(u_int size, u_int act, u_int inact)
+{
+	if (!act && !inact)
+		return;	/* skip empty bucket */
+
+	if (size < 1024)
+		printf("\t\t* BUCKET %uB size, %u active, %u inactive\n", 
+				size, act, inact);
+	else if (size < 1048576)
+		printf("\t\t* BUCKET %uKB size, %u active, %u inactive\n", 
+				size / 1024, act, inact);
+	else
+		printf("\t\t* BUCKET %uMB size, %u active, %u inactive\n", 
+				size / 1048576, act, inact);
+}
+
+/*
+ * mpool_xdump() - Dump elwix memory pool statistics
+ *
+ * @fmt = format string
+ * return: none
+ */
+void
+mpool_xdump(const char *fmt, ...)
+{
+	va_list lst;
+
+	if (fmt) {
+		va_start(lst, fmt);
+		vprintf(fmt, lst);
+		va_end(lst);
+	} else
+		printf("\n%s(%d)\n", __func__, __LINE__);
+
+	printf("------------------------------------------------------------\n");
+	printf( " ELWIX memory pool ::\n"
+		"\t- quotas Current/Real/Max = %lu/%lu/%lu\n"
+		"\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);
+
+	mpool_statistics(elwix_mpool, xdump_show);
+	printf("------------------------------------------------------------\n");
+}
+