--- libaitsched/example/test_time.c	2012/08/21 12:54:39	1.8
+++ libaitsched/example/test_time.c	2012/08/23 02:33:12	1.9
@@ -16,79 +16,98 @@ sched_root_task_t *root;
 void *event(sched_task_t *arg)
 {
 	printf("Event::\n");
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *regular(sched_task_t *arg)
 {
 	printf("Task(%lu):: %s\n", TASK_VAL(arg), (char*) TASK_ARG(arg));
 	fflush(stdout);
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *timer(sched_task_t *arg)
 {
 	printf("Timer %p sec::\n", TASK_ARG(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *alarmz(sched_task_t *arg)
 {
 	printf("Alarm %ld sec::\n", (u_long) TASK_ARG(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *node(sched_task_t *arg)
 {
 	printf("Node %s data %d fflags 0x%X\n", (char*) TASK_ARG(arg), TASK_RET(arg), TASK_FLAG(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *proc(sched_task_t *arg)
 {
 	printf("Proc pid=%ld data %d fflags 0x%X\n", TASK_VAL(arg), TASK_RET(arg), TASK_FLAG(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *sigz(sched_task_t *arg)
 {
 	printf("Signal signal=%ld how many times %d\n", TASK_VAL(arg), TASK_RET(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 #ifdef EVFILT_USER
 void *user(sched_task_t *arg)
 {
 	printf("User trigger id %ld fflags %d\n", TASK_VAL(arg), TASK_FLAG(arg) & NOTE_FFLAGSMASK);
-	return NULL;
+	taskExit(arg, NULL);
 }
 #endif
 
 void *susp1(sched_task_t *arg)
 {
 	printf("Suspend 1 =%ld\n", TASK_VAL(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 void *susp2(sched_task_t *arg)
 {
 	printf("Suspend 2 =%ld\n", TASK_VAL(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 void *susp3(sched_task_t *arg)
 {
 	printf("Suspend 3 =%ld\n", TASK_VAL(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *once(sched_task_t *arg)
 {
 	printf("once::\n");
-	return NULL;
+	taskExit(arg, NULL);
 }
 
+void *thr(sched_task_t *arg)
+{
+	printf("tid (%lx):: %s\n", TASK_VAL(arg), __func__);
+	printf("tid (%lu):: %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__);
+
+	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) {
+		case SIGINT:
 		case SIGTERM:
 			Kill++;
 			break;
@@ -106,14 +125,16 @@ main(int argc, char **argv)
 //	struct timespec p = { 0, 10000000 };
 	int f = 0;
 	struct sigaction sa;
+	sched_task_t *t;
 #ifdef EVFILT_USER
-	sched_task_t *t[4];
+	sched_task_t *tt[4];
 #endif
 	sched_task_t *task;
 
 	sa.sa_handler = sig;
 	sigemptyset(&sa.sa_mask);
 	sigaction(SIGTERM, &sa, NULL);
+	sigaction(SIGINT, &sa, NULL);
 	sigaction(SIGUSR1, &sa, NULL);
 
 	root = schedBegin();
@@ -185,19 +206,19 @@ main(int argc, char **argv)
 	}
 
 #ifdef EVFILT_USER
-	if (!(t[0] = schedUser(root, user, NULL, 42, 0, 0))) {
+	if (!(tt[0] = schedUser(root, user, NULL, 42, 0, 0))) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 6;
 	}
-	if (!(t[1] = schedUser(root, user, NULL, 1, 0, 73))) {
+	if (!(tt[1] = schedUser(root, user, NULL, 1, 0, 73))) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 6;
 	}
-	if (!(t[2] = schedUser(root, user, NULL, 0xaa, 0, NOTE_FFAND | 0xaa))) {
+	if (!(tt[2] = schedUser(root, user, NULL, 0xaa, 0, NOTE_FFAND | 0xaa))) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 6;
 	}
-	if (!(t[3] = schedUser(root, user, NULL, -1, 0, NOTE_FFCOPY | 1003))) {
+	if (!(tt[3] = schedUser(root, user, NULL, -1, 0, NOTE_FFCOPY | 1003))) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 6;
 	}
@@ -215,6 +236,39 @@ 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;
+	}
+	if (!(t = schedThread(root, thr4kill, "0aaaa", 42, NULL, 0))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	if (!schedThread(root, thr, "mdaaaa this is thread task -j3", 0, NULL, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	sleep(1);
+	schedCancel(t);
+
 	if (argc > 1)
 		if (!schedProc(root, proc, NULL, atoi(argv[1]), 0, 0)) {
 			printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
@@ -234,8 +288,8 @@ main(int argc, char **argv)
 	}
 
 #ifdef EVFILT_USER
-	schedTrigger(t[3]);
-	schedTrigger(t[1]);
+	schedTrigger(tt[3]);
+	schedTrigger(tt[1]);
 #endif
 	schedResumeby(root, CRITERIA_DATA, task);
 
@@ -246,8 +300,8 @@ main(int argc, char **argv)
 	}
 
 #ifdef EVFILT_USER
-	schedTrigger(t[2]);
-	schedTrigger(t[0]);
+	schedTrigger(tt[2]);
+	schedTrigger(tt[0]);
 #endif
 
 	schedCallOnce(root, once, "000000", 42, NULL, 0);