--- libelwix/inc/elwix.h	2019/09/24 15:49:52	1.17
+++ libelwix/inc/elwix.h	2024/10/10 23:53:00	1.24.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.h,v 1.17 2019/09/24 15:49:52 misho Exp $
+* $Id: elwix.h,v 1.24.2.1 2024/10/10 23:53:00 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 - 2019
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@ SUCH DAMAGE.
 #define __ELWIX_H
 
 
+#include <stdio.h>
 #include <assert.h>
 #include <syslog.h>
 #include <stdarg.h>
@@ -79,6 +80,8 @@ SUCH DAMAGE.
 #include <elwix/apack.h>
 #include <elwix/apio.h>
 #include <elwix/ajson.h>
+#include <elwix/aiov.h>
+#include <elwix/aindex.h>
 
 
 #ifndef STRSIZ
@@ -248,6 +251,7 @@ extern void (*e_free)(void*);
 
 /* Verbose macros */
 extern int elwix_Verbose;
+#define e_Verbose		elwix_Verbose
 #define e_initVerbose(x)	(elwix_Verbose = (x))
 #define e_incVerbose		(elwix_Verbose++)
 #define e_decVerbose		(elwix_Verbose--)
@@ -261,6 +265,14 @@ extern int elwix_Verbose;
 								(x), __func__, __LINE__, __str); \
 					} \
 				} while (0)
+#define EVERBOSE2(x, fmt, ...)	do { assert((fmt)); \
+					if ((x) <= elwix_Verbose) { \
+						char __str[0x10000] = { [0 ... 0xffff] = 0 }; \
+						snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \
+						syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \
+								(x), __func__, __LINE__, __str); \
+					} \
+				} while (0)
 
 /* Debug macros */
 extern int elwix_Debug;
@@ -269,8 +281,17 @@ extern int elwix_Debug;
 #define ELWIX_DEBUG_OFF		0x0
 #define ELWIX_DEBUG_TRACE	0x1
 #define ELWIX_DEBUG_LOG		0x2
+#define ELWIX_DEBUG_MEM		0x4
+#define ELWIX_DEBUG_MEMORY	ELWIX_DEBUG_MEM
+#define ELWIX_DEBUG_IO		0x8
+#define ELWIX_DEBUG_IPC		0x10
+#define ELWIX_DEBUG_LOCK	0x20
+#define ELWIX_DEBUG_SYS		0x40
+#define ELWIX_DEBUG_NET		0x80
 #define ELWIX_DEBUG_ANY		0xFFFFFFFF
 
+#define EDBG(x)			(elwix_Debug & (x))
+#define EDBGS(x)		if (EDBG(x))
 #define ETRACE()		if (elwix_Debug & ELWIX_DEBUG_TRACE) \
 					   syslog(LOG_DEBUG, "I'm in %s(%d)\n", __func__, __LINE__)
 #define EDEBUG(x, fmt, ...)	do { assert((fmt)); \