--- libaitsess/contrib/test2.c	2011/09/07 23:38:39	1.1.2.4
+++ libaitsess/contrib/test2.c	2013/01/17 13:54:53	1.3.4.1
@@ -1,20 +1,21 @@
 #include <stdio.h>
 #include <string.h>
 #include <aitsess.h>
-#include <aitio.h>
+#include <elwix.h>
 
+
 int main(int argc, char **argv)
 {
-	tagSess *n = NULL;
+	ait_sess_t *n = NULL;
 	array_t *inp;
 	ait_val_t *v;
 	int i;
 
-	inp = io_arrayInit(argc);
+	inp = array_Init(argc);
 	for (i = 0; i < argc; i++) {
-		v = malloc(sizeof(ait_val_t));
+		v = ait_allocVar();
 		AIT_SET_STR(v, argv[i]);
-		io_arraySet(inp, i, v);
+		array_Set(inp, i, v);
 	}
 
 	/*
@@ -43,66 +44,84 @@ int main(int argc, char **argv)
 	freeSession(NULL, &n);
 	*/
 
-	if (ipc_createSession("/tmp/abra-kadabra-321", 1003, 4096, &n) == -1) {
+	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
+	if (ALLOC_MEMORY(1003, 4096, n) == -1) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 2;
 	}
 	if (sess_commitSession(n, inp) == -1) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 2;
 	}
-	freeSession(NULL, &n);
-	io_arrayFree(inp);
-	io_arrayDestroy(&inp);
+	sess_freeSession(&n);
+	for (i = 0; i < array_Size(inp); i++)
+		AIT_FREE_VAL(array_Get(inp, i));
+	array_Free(inp);
+	array_Destroy(&inp);
 	printf("set session");
 	getchar();
-	ipc_createSession("/tmp/abra-kadabra-321", 1003, 4096, &n);
+	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
+	ALLOC_MEMORY(1003, 4096, n);
 	if (sess_GetErrno()) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 3;
 	}
-	if (!(inp = sess_prepareSession(n, 0))) {
+	if (!(inp = sess_prepareSession(n, 42))) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 3;
 	}
-	for (i = 0; i < io_arraySize(inp); i++)
-		printf("i=%d->%s\n", i, AIT_GET_STR(io_array(inp, i, ait_val_t*)));
+	for (i = 0; i < array_Size(inp); i++)
+		printf("i=%d->%s\n", i, AIT_GET_STR(array(inp, i, ait_val_t*)));
 	sess_doneSession(n, &inp);
-	freeSession(NULL, &n);
+	sess_freeSession(&n);
 	getchar();
-	ipc_createSession("/tmp/abra-kadabra-321", 1003, 4096, &n);
+	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
+	ALLOC_MEMORY(1003, 4096, n);
 	if (sess_GetErrno()) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 4;
 	}
 	if (!(inp = sess_prepareSession(n, 0))) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 4;
 	}
-	AIT_FREE_VAL(io_array(inp, 2, ait_val_t*));
-	AIT_SET_STR(io_array(inp, 2, ait_val_t*), "djmy");
-	for (i = 0; i < io_arraySize(inp); i++)
-		printf("i=%d->%s\n", i, AIT_GET_STR(io_array(inp, i, ait_val_t*)));
+	AIT_FREE_VAL(array(inp, 2, ait_val_t*));
+	AIT_SET_STR(array(inp, 2, ait_val_t*), "djmy");
+	for (i = 0; i < array_Size(inp); i++)
+		printf("i=%d->%s\n", i, AIT_GET_STR(array(inp, i, ait_val_t*)));
 	sess_commitSession(n, inp);
+	for (i = 0; i < array_Size(inp); i++)
+		AIT_FREE_VAL(array_Get(inp, i));
 	sess_doneSession(n, &inp);
-	freeSession(NULL, &n);
+	sess_freeSession(&n);
 	getchar();
-	ipc_createSession("/tmp/abra-kadabra-321", 1003, 4096, &n);
+	sess_initSession(SHARED_IPC, "/tmp/abra-kadabra-321", &n);
+	ALLOC_MEMORY(1003, 4096, n);
 	if (sess_GetErrno()) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
 		return 3;
 	}
-	if (!(inp = sess_prepareSession(n, 0))) {
+	if (!(inp = sess_prepareSession(n, 42))) {
 		printf("Error:: #%d - %s\n", sess_GetErrno(), sess_GetError());
-		DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+		FREE_MEMORY(n);
+		sess_freeSession(&n);
 		return 3;
 	}
-	for (i = 0; i < io_arraySize(inp); i++)
-		printf("i=%d->%s\n", i, AIT_GET_STR(io_array(inp, i, ait_val_t*)));
+	for (i = 0; i < array_Size(inp); i++)
+		printf("i=%d->%s\n", i, AIT_GET_STR(array(inp, i, ait_val_t*)));
+	/*
+	for (i = 0; i < array_Size(inp); i++)
+		AIT_FREE_VAL(array_Get(inp, i));
+		*/
 	sess_doneSession(n, &inp);
-	DESTROY_SESSION("/tmp/abra-kadabra-321", &n);
+	FREE_MEMORY(n);
+	sess_freeSession(&n);
+
 	return 0;
 }