--- libaitio/inc/aitio.h	2011/08/29 14:57:53	1.11.2.1
+++ libaitio/inc/aitio.h	2011/08/30 08:54:25	1.11.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.11.2.1 2011/08/29 14:57:53 misho Exp $
+* $Id: aitio.h,v 1.11.2.5 2011/08/30 08:54:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -103,14 +103,16 @@ struct tagReqXML {
 	url_Item_t	xml_value;
 };
 
-/* RPC variables and managment */
+/* AIT RPC variables and managment */
 
 typedef enum {
 	empty, 				/* empty -> variable is not set */
 	buffer, string, blob, array, 	/* buffer -> uint8_t*; string -> int8_t*; 
 					   	blob -> void*(+socket); array -> array_t* */
 	u8, u16, u32, u64,		/* unsigned integers ... */
-	i8, i16, i32, i64		/* integers ... */
+	i8, i16, i32, i64,		/* integers ... */
+	zeroCopy = 0x80			/* OR attribute used from RPC dispatcher to mark data in val union 
+					   	is zero copied from network buffer */
 } ait_type_t;
 
 typedef struct {
@@ -132,74 +134,80 @@ typedef struct {
 	} val;
 } __packed ait_val_t;
 
-#define AIT_TYPE(_vl)			(assert((_vl)), ((ait_type_t) (_vl)->val_type))
-#define AIT_LEN(_vl)			(assert((_vl)), (_vl)->val_len)
-#define AIT_BLOB_CHUNKS(_vl, _n)	(assert((_vl)), (_vl)->val_len / _n + ((_vl)->val_len % _n) ? 1 : 0)
-#define AIT_ISEMPTY(_vl)		(assert((_vl)), (_vl)->val_type == empty)
+#define AIT_TYPE(_vl)			((ait_type_t) (_vl)->val_type & ~zeroCopy)
+#define AIT_LEN(_vl)			(_vl)->val_len
+#define AIT_BLOB_CHUNKS(_vl, _n)	(assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0)
+#define AIT_ISEMPTY(_vl)		(assert((_vl)), AIT_TYPE((_vl)) == empty)
 
-#define AIT_GET_ARRAY(_vl)		(assert((_vl)), assert((_vl)->val_type == array), \
+#define AIT_ISZCOPY(_vl)		(assert((_vl)), (_vl)->val_type & zeroCopy)
+#define AIT_ADDZCOPY(_vl)		(assert((_vl)), (_vl)->val_type | zeroCopy)
+#define AIT_DELZCOPY(_vl)		(assert((_vl)), (_vl)->val_type &= ~zeroCopy)
+
+#define AIT_GET_ARRAY(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == array), \
 						((array_t*) (_vl)->val.array))
-#define AIT_GET_BUF(_vl)		(assert((_vl)), assert((_vl)->val_type == buffer), (_vl)->val.buffer)
-#define AIT_GET_STR(_vl)		(assert((_vl)), assert((_vl)->val_type == string), (_vl)->val.string)
-#define AIT_GET_BLOB(_vl)		(assert((_vl)), assert((_vl)->val_type == blob), (_vl)->val.blob)
-#define AIT_GET_U8(_vl)			(assert((_vl)), assert((_vl)->val_type == u8), (_vl)->val.u8)
-#define AIT_GET_U16(_vl)		(assert((_vl)), assert((_vl)->val_type == u16), (_vl)->val.u16)
-#define AIT_GET_U32(_vl)		(assert((_vl)), assert((_vl)->val_type == u32), (_vl)->val.u32)
-#define AIT_GET_U64(_vl)		(assert((_vl)), assert((_vl)->val_type == u64), (_vl)->val.u64)
-#define AIT_GET_I8(_vl)			(assert((_vl)), assert((_vl)->val_type == i8), (_vl)->val.i8)
-#define AIT_GET_I16(_vl)		(assert((_vl)), assert((_vl)->val_type == i16), (_vl)->val.i16)
-#define AIT_GET_I32(_vl)		(assert((_vl)), assert((_vl)->val_type == i32), (_vl)->val.i32)
-#define AIT_GET_I64(_vl)		(assert((_vl)), assert((_vl)->val_type == i64), (_vl)->val.i64)
+#define AIT_GET_BUF(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer)
+#define AIT_GET_STR(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string)
+#define AIT_GET_BLOB(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob)
+#define AIT_GET_U8(_vl)			(assert((_vl)), assert(AIT_TYPE((_vl)) == u8), (_vl)->val.u8)
+#define AIT_GET_U16(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == u16), (_vl)->val.u16)
+#define AIT_GET_U32(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == u32), (_vl)->val.u32)
+#define AIT_GET_U64(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == u64), (_vl)->val.u64)
+#define AIT_GET_I8(_vl)			(assert((_vl)), assert(AIT_TYPE((_vl)) == i8), (_vl)->val.i8)
+#define AIT_GET_I16(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == i16), (_vl)->val.i16)
+#define AIT_GET_I32(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == i32), (_vl)->val.i32)
+#define AIT_GET_I64(_vl)		(assert((_vl)), assert(AIT_TYPE((_vl)) == i64), (_vl)->val.i64)
 
 #define AIT_SET_BUF(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
 						__val->val.buffer = malloc(_len); \
 						if (__val->val.buffer) { \
-							AIT_TYPE(__val) = buffer; AIT_LEN(__val) = _len; \
+							__val->val_type = buffer; AIT_LEN(__val) = _len; \
 							memcpy(__val->val.buffer, (_v), _len); \
 						} } while (0)
-#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
+#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val.string = (int8_t*) strdup((_v)); \
 						if (__val->val.string) { \
-							AIT_TYPE(__val) = string; \
+							__val->val_type = string; \
 							AIT_LEN(__val) = strlen((_v)) + 1; \
 						} } while (0)
 #define AIT_SET_BLOB(_vl, _n, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = blob; AIT_LEN(__val) = _len; \
+						__val->val_type = blob; AIT_LEN(__val) = _len; \
 						__val->val.blob = _n; } while (0)
 #define AIT_SET_BLOB2(_vl, _bv)		do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
-						AIT_TYPE(__val) = blob; AIT_LEN(__val) = (_bv)->blob_len; \
+						__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
 						__val->val.blob = (_bv)->blob_var; } while (0)
 #define AIT_SET_ARRAY(_vl, _arr)	do { ait_val_t *__val = (_vl); assert(__val); assert((_arr)); \
-						AIT_TYPE(__val) = array; AIT_LEN(__val) = io_arraySize((_arr)); \
+						__val->val_type = array; AIT_LEN(__val) = io_arraySize((_arr)); \
+						__val->val.array = (uint8_t*) (_arr); \
 					} while (0)
 
 #define AIT_SET_U8(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = u8; __val->val.u8 = _n; \
+						__val->val_type = u8; __val->val.u8 = _n; \
 						AIT_LEN(__val) = sizeof(uint8_t); } while (0)
 #define AIT_SET_U16(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = u16; __val->val.u16 = _n; \
+						__val->val_type = u16; __val->val.u16 = _n; \
 						AIT_LEN(__val) = sizeof(uint16_t); } while (0)
 #define AIT_SET_U32(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = u32; __val->val.u32 = _n; \
+						__val->val_type = u32; __val->val.u32 = _n; \
 						AIT_LEN(__val) = sizeof(uint32_t); } while (0)
 #define AIT_SET_U64(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = u64; __val->val.u64 = _n; \
+						__val->val_type = u64; __val->val.u64 = _n; \
 						AIT_LEN(__val) = sizeof(uint64_t); } while (0)
 #define AIT_SET_I8(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = i8; __val->val.i8 = _n; \
+						__val->val_type = i8; __val->val.i8 = _n; \
 						AIT_LEN(__val) = sizeof(int8_t); } while (0)
 #define AIT_SET_I16(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = i16; __val->val.i16 = _n; \
+						__val->val_type = i16; __val->val.i16 = _n; \
 						AIT_LEN(__val) = sizeof(int16_t); } while (0)
 #define AIT_SET_I32(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = i32; __val->val.i32 = _n; \
+						__val->val_type = i32; __val->val.i32 = _n; \
 						AIT_LEN(__val) = sizeof(int32_t); } while (0)
 #define AIT_SET_I64(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
-						AIT_TYPE(__val) = i64; __val->val.i64 = _n; \
+						__val->val_type = i64; __val->val.i64 = _n; \
 						AIT_LEN(__val) = sizeof(int64_t); } while (0)
 
+					/* if attribute zeroCopy is set not execute free() */
 #define AIT_FREE_VAL(_vl)		do { ait_val_t *__val = (_vl); assert(__val); \
-						switch (AIT_TYPE(__val)) { \
+						switch (__val->val_type) { \
 							case buffer: \
 								if (__val->val.buffer) { \
 									free(__val->val.buffer); \
@@ -212,11 +220,10 @@ typedef struct {
 									__val->val.string = NULL; \
 								} \
 								break; \
-							case array: \
-								io_arrayDestroy(&AIT_GET_ARRAY(__val)); \
+							default: \
 								break; \
 						} \
-						AIT_TYPE(__val) = empty; \
+						__val->val_type = empty; \
 						AIT_LEN(__val) = 0; \
 					} while (0)