--- libaitsess/inc/aitsess.h	2012/02/10 22:46:41	1.3.2.6
+++ libaitsess/inc/aitsess.h	2012/02/27 17:43:33	1.4.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsess.h,v 1.3.2.6 2012/02/10 22:46:41 misho Exp $
+* $Id: aitsess.h,v 1.4.2.1 2012/02/27 17:43:33 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -66,11 +66,49 @@ SUCH DAMAGE.
 #define MAX_ATTRIBUTE	64
 #define MAX_SEMNAME	14
 
+/* Memory pool */
 
-struct tagSess;
-typedef struct tagSess ait_sess_t;
+#define MEM_BUCKETS	28	/* 32 bits - 4 bits = 28 items in bucket array */
 
-struct tagSess {
+struct tagAlloc {
+	char			alloc_name[MAX_ATTRIBUTE];
+	volatile unsigned int	alloc_flags;
+
+	unsigned int		*alloc_mem;
+
+	TAILQ_ENTRY(tagAlloc)	alloc_node;
+};
+typedef TAILQ_HEAD(, tagAlloc) mpool_bucket_t;
+
+typedef struct _tagMPool {
+	pthread_mutex_t	pool_mtx;
+
+	struct {
+		unsigned long alloc;
+		unsigned long free;
+		unsigned long cache;
+	} pool_calls;
+	struct {
+		unsigned long alloc;
+		unsigned long free;
+		unsigned long cache;
+	} pool_bytes;
+	struct {
+		unsigned long max;
+		unsigned long curr;
+		unsigned long inact;
+	} pool_quota;
+
+	/* pool buckets */
+	mpool_bucket_t	pool_active[MEM_BUCKETS];
+	mpool_bucket_t	pool_inactive[MEM_BUCKETS];
+} mpool_t;
+#define mpool_lock(x)	(assert((x)), pthread_mutex_lock(&(x)->pool_mtx))
+#define mpool_unlock(x)	(assert((x)), pthread_mutex_unlock(&(x)->pool_mtx))
+
+/* Shared memory session */
+
+typedef struct tagSess {
 	key_t	key;
 	char	type;
 	char	zcpy;
@@ -89,16 +127,16 @@ struct tagSess {
 	} id;
 
 	struct {
-		int (*create)(int, long, ait_sess_t * __restrict, ...);
-		void (*destroy)(ait_sess_t * __restrict);
-		void *(*attach)(ait_sess_t * __restrict, void *);
-		void (*detach)(ait_sess_t * __restrict);
-		void (*notSem)(ait_sess_t * __restrict);
-		int (*isSemOK)(ait_sess_t * __restrict);
-		int (*incSem)(ait_sess_t * __restrict);
-		int (*decSem)(ait_sess_t * __restrict);
+		int (*create)(int, long, void *, ...);
+		void (*destroy)(void *);
+		void *(*attach)(void *, void *);
+		void (*detach)(void *);
+		void (*notSem)(void *);
+		int (*isSemOK)(void *);
+		int (*incSem)(void *);
+		int (*decSem)(void *);
 	} sess;
-};
+} ait_sess_t;
 
 
 // -------------------------------------------------------
@@ -112,6 +150,58 @@ inline void sess_SetErr(int eno, char *estr, ...);
 
 
 /*
+ * mpool_init() - Init memory pool
+ *
+ * return: =NULL error or !=NULL new allocated pool
+ */
+mpool_t *mpool_init(void);
+/*
+ * mpool_destroy() - Destroy memory pool
+ *
+ * @mp = Memory pool
+ * return: none
+ */
+void mpool_destroy(mpool_t ** __restrict mp);
+/*
+ * mpool_malloc() - Memory allocation
+ *
+ * @mp = Memory pool
+ * @size = Size
+ * @memname = Optional memory block name
+ * return: NULL error or !=NULL ok allocated memory
+ */
+void *mpool_malloc(mpool_t * __restrict mp, unsigned int size, const char *memname);
+/*
+ * mpool_free() Free allocated memory with mpool_alloc()
+ *
+ * @mp = Memory pool
+ * @data = Allocated memory data
+ * @purge = if !=0 force release memory block
+ * return: <0 error or 0 ok released memory block
+ */
+int mpool_free(mpool_t * __restrict mp, void * __restrict data, int purge);
+/*
+ * mpool_free2() Free allocated memory with mpool_alloc() by size and memory name
+ *
+ * @mp = Memory pool
+ * @size = Allocated memory data size
+ * @memname = Memory name
+ * @purge = if !=0 force release memory block
+ * return: <0 error or 0 ok released memory block
+ */
+int mpool_free2(mpool_t * __restrict mp, u_int size, const char *memname, int purge);
+/*
+ * mpool_getmembynam() Find allocated memory block by size and memory name
+ *
+ * @mp = Memory pool
+ * @size = Memory size
+ * @memname = Memory name
+ * return: NULL error or not found and !=NULL allocated memory 
+ */
+inline struct tagAlloc *mpool_getmembynam(mpool_t * __restrict mp, u_int size, const char *memname);
+
+
+/*
  * sess_initSession() Initializing session structure, if session file not exists creating with specified tech
  *
  * @id = Technology using in session. SHARED_IPC IPC tech orSHARED_MAP BSD MemoryMap tech
@@ -124,10 +214,9 @@ int sess_initSession(int id, const char *csFName, ait_
  * sess_freeSession() Free allocated memory for session item and delete session file if present name
  *
  * @Sess = Session item
- * @delFile = !=0 delete session file or =0 keep session
  * return: none
  */
-void sess_freeSession(ait_sess_t ** __restrict Sess, int delFile);
+void sess_freeSession(ait_sess_t ** __restrict Sess);
 
 
 /*