--- libaitsched/example/test.c	2012/08/02 12:25:38	1.6.8.8
+++ libaitsched/example/test.c	2012/08/22 23:43:36	1.9.2.4
@@ -8,48 +8,52 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include "../inc/config.h"
 #include <aitsched.h>
 
 intptr_t Kill;
+#ifdef AIO_SUPPORT
 struct iovec iv[3], wiv[3], riv[3];
+#endif
 
 void *event(sched_task_t *arg)
 {
 	printf("Event::\n");
-	return NULL;
+	taskExit(arg, NULL);
 }
 
-void *eventlo(sched_task_t *arg)
+void *regular(sched_task_t *arg)
 {
-	printf("EventLOW::\n");
-	return NULL;
+	printf("Task::\n");
+	taskExit(arg, NULL);
 }
 
 void *timer(sched_task_t *arg)
 {
 	printf("Timer %p sec::\n", TASK_ARG(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *r(sched_task_t *arg)
 {
-	printf("read:: bytes\n");
+	printf("read:: %d bytes wait\n", TASK_RET(arg));
 	Kill++;
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *w(sched_task_t *arg)
 {
-	printf("write::\n");
-	return NULL;
+	printf("write:: %d bytes wait\n", TASK_RET(arg));
+	taskExit(arg, NULL);
 }
 
 void *once(sched_task_t *arg)
 {
 	printf("once::\n");
-	return NULL;
+	taskExit(arg, NULL);
 }
 
+#ifdef AIO_SUPPORT
 void *aioread(sched_task_t *arg);
 void *aiowrite(sched_task_t *arg)
 {
@@ -61,7 +65,7 @@ void *aiowrite(sched_task_t *arg)
 
 	memset(ole, 0, BUFSIZ);
 	schedAIORead(TASK_ROOT(arg), aioread, NULL, TASK_FD(arg), ole, BUFSIZ - 1, -1);
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *aioread(sched_task_t *arg)
@@ -79,7 +83,7 @@ void *aioread(sched_task_t *arg)
 				
 	}
 	free(TASK_DATA(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *aiobulkread(sched_task_t *arg)
@@ -93,7 +97,7 @@ void *aiobulkread(sched_task_t *arg)
 		free(iv[i].iov_base);
 	}
 
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *aiobulkwrite(sched_task_t *arg)
@@ -107,9 +111,29 @@ void *aiobulkwrite(sched_task_t *arg)
 		free(iv[i].iov_base);
 	}
 
-	return NULL;
+	taskExit(arg, NULL);
 }
+#endif
 
+void *thr(sched_task_t *arg)
+{
+	printf("tid (%lx):: %s\n", TASK_VAL(arg), __func__);
+	printf("thread(%lx):: %s\n", TASK_VAL(arg), (char*) TASK_ARG(arg));
+	taskExit(arg, 42);
+}
+
+void *thr4kill(sched_task_t *arg)
+{
+	char blah[BUFSIZ];
+
+	printf("tid (%lx):: %s\n", TASK_VAL(arg), __func__);
+
+	printf("canceltype aaaaaaaaaaaaaaaaa:: %s (%lx)\n",  __func__, TASK_VAL(arg));
+	read(0, blah, sizeof blah);
+	printf("never see!!! (%lx):: %s (%d == %d)\n", TASK_VAL(arg), (char*) TASK_ARG(arg), TASK_TYPE(arg), taskTHREAD);
+	taskExit(arg, 0);
+}
+
 void sig(int s)
 {
 	switch (s) {
@@ -128,8 +152,11 @@ main(int argc, char **argv)
 	struct timespec ts = { 20, 0 };
 //	struct timespec p = { 0, 10000000 };
 	struct sigaction sa;
+	sched_task_t *t;
+#ifdef AIO_SUPPORT
 	char *ole = malloc(BUFSIZ);
 	register int i;
+#endif
 
 	sa.sa_handler = sig;
 	sigemptyset(&sa.sa_mask);
@@ -172,7 +199,7 @@ main(int argc, char **argv)
 		return 2;
 	}
 
-	if (!schedEventLo(root, eventlo, "piuk", 1111, NULL, 0)) {
+	if (!schedTask(root, regular, "piuk", 1111, NULL, 0)) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 3;
 	}
@@ -192,6 +219,30 @@ main(int argc, char **argv)
 		return 6;
 	}
 
+	if (!(t = schedThread(root, thr4kill, "0aaaa", 0, NULL, 0))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	if (!schedThread(root, thr, "mdaaaa this is thread task", 0, NULL, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	if (!schedThread(root, thr, "mdaaaa this is thread task -detached", 42, NULL, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	if (!schedThread(root, thr, "mdaaaa this is thread task -j", 0, NULL, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	printf("try to cancel tid = %lx\n", TASK_VAL(t));
+	schedCancel(t);
+	if (!schedThread(root, thr, "mdaaaa this is thread task -j2", 0, NULL, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+
+#ifdef AIO_SUPPORT
 	memset(ole, 0, BUFSIZ);
 	if (!schedAIORead(root, aioread, (void*) f, fd, ole, BUFSIZ - 1, 0))
 		printf("Warning:: #%d - %s\n", sched_GetErrno(), sched_GetError());
@@ -225,6 +276,7 @@ main(int argc, char **argv)
 	}
 	if (!schedLIORead(root, aiobulkread, NULL, fd, riv, 3, 0))
 		printf("Warning:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+#endif
 
 	schedCallOnce(root, once, "000000", 42, NULL, 0);
 
@@ -232,8 +284,10 @@ main(int argc, char **argv)
 	schedRun(root, &Kill);
 	schedEnd(&root);
 
+#ifdef AIO_SUPPORT
 	for (i = 0; i < 3; i++)
 		free(iv[i].iov_base);
+#endif
 
 	close(fd);
 	close(f);