--- libaitio/inc/aitio.h	2012/08/01 00:37:07	1.23
+++ libaitio/inc/aitio.h	2012/08/02 00:47:46	1.24
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.23 2012/08/01 00:37:07 misho Exp $
+* $Id: aitio.h,v 1.24 2012/08/02 00:47:46 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -50,12 +50,14 @@ SUCH DAMAGE.
 #define COMPAT_43TTY
 
 #include <assert.h>
+#include <syslog.h>
 #include <openssl/evp.h>
 #include <openssl/aes.h>
 #include <sys/tty.h>
 #include <sys/ioctl_compat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
 #include <atree.h>
@@ -310,16 +312,16 @@ typedef struct {
 						__val->val_type = f64; __val->val.f64 = _n; \
 						AIT_LEN(__val) = sizeof(double); } while (0)
 
-#define AIT_COPY_VAL(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
-						memcpy(__val, (_v), sizeof(ait_val_t)); \
-						switch (AIT_TYPE(__val)) { \
+#define AIT_COPY_VAL(_vl, _v)		do { assert((_vl)); assert((_v)); \
+						memcpy((_vl), (_v), sizeof(ait_val_t)); \
+						switch (AIT_TYPE((_vl))) { \
 							case buffer: \
-								AIT_SET_BUF(__val, \
+								AIT_SET_BUF((_vl), \
 										AIT_GET_BUF((_v)), \
 										AIT_LEN((_v))); \
 								break; \
 							case string: \
-								AIT_SET_STR(__val, \
+								AIT_SET_STR((_vl), \
 										AIT_GET_STR((_v))); \
 								break; \
 							default: \
@@ -1016,7 +1018,44 @@ int ioMkDir(const char *csDir, int mode);
 int ioWatchDirLoop(const char *csDir, int (*callback)(const char *csName, int nOp));
 
 
+#ifdef AIO_OPS
 /*
+ * io_aiobulk() - AIO bulk R/W function
+ *
+ * @mode = Bulk wait mode
+ * @acbs = List of aiocb structures
+ * @nacb = Number of aiocb in list
+ * @sig = Event for completed operations, may be =NULL
+ * return: -1 error or 0 ok
+ */
+inline int io_aiobulk(int mode, struct aiocb ** __restrict acbs, int nacb, 
+		struct sigevent *sig);
+#endif
+/*
+ * io_rreadv() - Raw VFS bulk read function
+ *
+ * @fd = File handle
+ * @bufs = Read buffers
+ * @nbufs = Number of read buffers
+ * @offset = Read from position, if -1 read nbytes from current position
+ * @update = Update file handle position !0
+ * return: -1 error or !=-1 readed bytes
+ */
+int io_rreadv(int fd, struct iovec * __restrict bufs, int nbufs, off_t offset, 
+		int update);
+/*
+ * io_rwritev() - Raw VFS bulk write function
+ *
+ * @fd = File handle
+ * @bufs = Write buffers
+ * @nbufs = Number of write buffers
+ * @offset = Write to position, if -1 write nbytes to current position
+ * @update = Update file handle position !0
+ * return: -1 error or !=-1 written bytes
+ */
+int io_rwritev(int fd, struct iovec * __restrict bufs, int nbufs, off_t offset, 
+		int update);
+/*
  * io_rread() - Raw VFS read function
  *
  * @fd = File handle
@@ -1026,7 +1065,8 @@ int ioWatchDirLoop(const char *csDir, int (*callback)(
  * @update = Update file handle position !0
  * return: -1 error or !=-1 readed bytes
  */
-inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
+inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, 
+		int update);
 /*
  * io_rwrite() - Raw VFS write function
  *
@@ -1035,9 +1075,10 @@ inline int io_rread(int fd, void * __restrict buf, siz
  * @nbytes = Write bytes from buffer
  * @offset = Write at position, if -1 write nbytes from current position
  * @update = Update file handle position !0
- * return: -1 error or !=-1 writed bytes
+ * return: -1 error or !=-1 written bytes
  */
-inline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
+inline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, 
+		int update);
 
 /* Disk I/O helper macros */
 #define io_read(f, b, n) io_rread(f, b, n, -1, 1)