--- libaitsess/inc/aitsess.h	2011/08/21 14:00:43	1.2.2.2
+++ libaitsess/inc/aitsess.h	2011/09/07 16:08:41	1.3.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsess.h,v 1.2.2.2 2011/08/21 14:00:43 misho Exp $
+* $Id: aitsess.h,v 1.3.2.2 2011/09/07 16:08:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,8 +47,10 @@ SUCH DAMAGE.
 #define __AITSESS_H
 
 
+#include <assert.h>
 #include <semaphore.h>
 #include <sys/types.h>
+#include <aitio.h>
 
 #define SHARED_UNKNOWN	0
 #define SHARED_IPC	1
@@ -61,13 +63,14 @@ SUCH DAMAGE.
 #define ISNEW(x)	(((x) & IS_ADD) == IS_ADD)
 #define ISDEF(x)	(((x) & IS_DEF) == IS_DEF)
 
-#define MAX_ATTRIBUTE	63
+#define MAX_ATTRIBUTE	64
 #define MAX_SEMNAME	14
 
 
 typedef struct _tagSess {
 	key_t	key;
 	u_char	type;
+	u_char	zcopy;
 	off_t	eom;
 	void	*addr;
 	off_t	offset;
@@ -87,6 +90,8 @@ typedef struct _tagSess {
 inline int sess_GetErrno();
 // sess_GetError() Get error text of last operation
 inline const char *sess_GetError();
+// sess_SetErr() Set error to variables for internal use!!!
+inline void sess_SetErr(int eno, char *estr, ...);
 // -------------------------------------------------------
 
 
@@ -226,7 +231,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 //  Lazy macros for lazy programmers :-) by Michael Pounov; Optimizing work with sessions!
 //
 
-#define DESTROY_SESSION(fname, s)	do { \
+#define DESTROY_SESSION(fname, s)	do { assert((s)); assert((*s)); \
 						switch (((*s))->type) { \
 							case SHARED_IPC: \
 									 ipc_destroySession((fname), (s)); \
@@ -237,7 +242,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 						} \
 					} while(0)
 
-#define ATTACH_MEMORY(s)		do { \
+#define ATTACH_MEMORY(s)		do { assert((s)); \
 						switch ((s)->type) { \
 							case SHARED_IPC: \
 									 ipc_attachSession((s), 0); \
@@ -248,7 +253,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 						} \
 					} while(0)
 
-#define DETACH_MEMORY(s)		do { \
+#define DETACH_MEMORY(s)		do { assert((s)); \
 						switch ((s)->type) { \
 							case SHARED_IPC: \
 									 ipc_detachSession((s)); \
@@ -259,7 +264,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 						} \
 					} while(0)
 
-#define NOT_SEMAPHORE(s)	do { \
+#define NOT_SEMAPHORE(s)	do { assert((s)); \
 					switch ((s)->type) { \
 						case SHARED_IPC: \
 								 ipc_notSemaphore((s)); \
@@ -270,7 +275,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 					} \
 				} while(0)
 
-#define IS_SEMAPHORED(s, ret)	do { \
+#define IS_SEMAPHORED(s, ret)	do { assert((s)); \
 					switch ((s)->type) { \
 						case SHARED_IPC: \
 								 (ret) = ipc_isSemaphored((s)); \
@@ -283,7 +288,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 					} \
 				} while(0)
 
-#define ADD_SEMAPHORE(s, ret)	do { \
+#define ADD_SEMAPHORE(s, ret)	do { assert((s)); \
 					switch ((s)->type) { \
 						case SHARED_IPC: \
 								 (ret) = ipc_addSemaphore((s)); \
@@ -296,7 +301,7 @@ inline int ipc_decSemaphore(tagSess * __restrict s);
 					} \
 				} while(0)
 
-#define DEC_SEMAPHORE(s, ret)	do { \
+#define DEC_SEMAPHORE(s, ret)	do { assert((s)); \
 					switch ((s)->type) { \
 						case SHARED_IPC: \
 								 (ret) = ipc_decSemaphore((s)); \
@@ -350,6 +355,29 @@ int sess_DelValue(tagSess * __restrict s, const char *
  	>0 set position, if add item merged with IS_ADD and if define item merged with IS_DEF
 */
 int sess_SetValue(tagSess * __restrict s, const char *csAttr, const char *psVal);
+
+/*
+ * sess_prepareSession() Attach to shared memory and de-marshaling data
+ * @s = Session
+ * @useDirect = Use direct shared memory if !=0 or snapshot of data to array
+ * return: NULL error or no data, !=NULL array with variables, 
+ *		after use must free resources with sess_doneSession()
+ */
+array_t *sess_prepareSession(tagSess * __restrict s, unsigned char useDirect);
+/*
+ * sess_doneSession() Free resources allocated with sess_prepareSession()
+ * @s = Session
+ * @arr = Array with variables for free
+ * return: none
+ */
+void sess_doneSession(tagSess * __restrict s, array_t ** __restrict arr);
+/*
+ * sess_commitSession() Commit data to shared memory
+ * @s = Session
+ * @arr = Array with variables for save
+ * return -1 error or !=-1 size of stored variables into shared memory
+ */
+int sess_commitSession(tagSess * __restrict s, array_t * __restrict arr);
 
 
 #endif