--- libelwix/inc/elwix/ampool.h	2015/06/25 00:36:47	1.3.20.1
+++ libelwix/inc/elwix/ampool.h	2024/08/14 16:05:42	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ampool.h,v 1.3.20.1 2015/06/25 00:36:47 misho Exp $
+* $Id: ampool.h,v 1.7 2024/08/14 16:05:42 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 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -79,6 +79,7 @@ typedef struct _tagMPool {
 	} pool_bytes;
 	struct {
 		unsigned long max;
+		unsigned long real;
 		unsigned long curr;
 	} pool_quota;
 
@@ -89,7 +90,8 @@ typedef struct _tagMPool {
 #define mpool_lock(x)	(assert((x)), pthread_mutex_lock(&(x)->pool_mtx))
 #define mpool_unlock(x)	(assert((x)), pthread_mutex_unlock(&(x)->pool_mtx))
 
-typedef void (*mpool_stat_cb)(unsigned int, unsigned int, unsigned int);
+typedef int (*mpool_stat_cb)(unsigned int, unsigned int, unsigned int, 
+		void *, unsigned int);
 
 /* mpool functions */
 
@@ -125,6 +127,16 @@ int mpool_purge(mpool_t * __restrict mp, unsigned int 
  */
 void *mpool_malloc(mpool_t * __restrict mp, unsigned int size, const char *memname);
 /*
+ * mpool_calloc() - Multiple memory block allocation
+ *
+ * @mp = Memory pool
+ * @nmemb = Number of memory blocks
+ * @size = Size
+ * @memname = Optional memory block name
+ * return: NULL error or !=NULL ok allocated memory
+ */
+void *mpool_calloc(mpool_t * __restrict mp, u_int nmemb, u_int size, const char *memname);
+/*
  * mpool_free() Free allocated memory with mpool_alloc()
  *
  * @mp = Memory pool
@@ -198,20 +210,22 @@ unsigned long mpool_setquota(mpool_t * __restrict mp, 
  * 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, unsigned long *currmem, 
-		unsigned long *maxmem);
+		unsigned long *realmem, unsigned long *maxmem);
 /*
  * mpool_statistics() - Dump statistics from memory pool buckets
  *
  * @mp = Memory pool
  * @cb = Export statistics to callback
- * return: none
+ * return: -1 error or >0 bytes in data buffer
  */
-void mpool_statistics(mpool_t * __restrict mp, mpool_stat_cb cb);
+int mpool_statistics(mpool_t * __restrict mp, mpool_stat_cb cb, 
+		void *data, unsigned int datlen);
 
 
 /* Wrappers */
@@ -254,12 +268,32 @@ void mpool_xfree(void * __restrict data);
  */
 char *mpool_xstrdup(const char *str);
 /*
- * mpool_xstatistics() - elwix memory pool statistics wrapper
+ * mpool_xstatistics() - elwix default memory pool statistics wrapper
  *
  * @cb = Export statistics to callback
+ * @data = data buffer
+ * @datlen = data buffer length
+ * return: -1 error or >0 bytes in data buffer
+ */
+int mpool_xstatistics(mpool_stat_cb cb, void *data, unsigned int datlen);
+/*
+ * mpool_dump() - Dump elwix memory pool statistics
+ *
+ * @mp = memory pool, if =NULL dump elwix default memory pool
+ * @fmt = prefix info format string
+ * @... = argument(s)
  * return: none
  */
-void mpool_xstatistics(mpool_stat_cb cb);
+void mpool_dump(mpool_t * __restrict mp, const char *fmt, ...);
+/*
+ * mpool_dump2() - Dump elwix memory pool statistics to string
+ *
+ * @mp = memory pool, if =NULL dump elwix default memory pool
+ * @str = string buffer
+ * @strlen = string buffer length
+ * return: >0 data in string buffer
+ */
+int mpool_dump2(mpool_t * __restrict mp, char *str, int strlen);
 
 
 #endif