--- libaitsched/example/test.c	2012/08/21 12:54:39	1.9
+++ libaitsched/example/test.c	2023/02/25 15:55:00	1.15
@@ -11,7 +11,7 @@
 #include "../inc/config.h"
 #include <aitsched.h>
 
-intptr_t Kill;
+intptr_t Kill[1];
 #ifdef AIO_SUPPORT
 struct iovec iv[3], wiv[3], riv[3];
 #endif
@@ -19,38 +19,38 @@ struct iovec iv[3], wiv[3], riv[3];
 void *event(sched_task_t *arg)
 {
 	printf("Event::\n");
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *regular(sched_task_t *arg)
 {
 	printf("Task::\n");
-	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 *r(sched_task_t *arg)
 {
-	printf("read:: %d bytes wait\n", TASK_RET(arg));
-	Kill++;
-	return NULL;
+	printf("read:: %ld bytes wait\n", (long) TASK_RET(arg));
+	Kill[0]++;
+	taskExit(arg, NULL);
 }
 
 void *w(sched_task_t *arg)
 {
-	printf("write:: %d bytes wait\n", TASK_RET(arg));
-	return NULL;
+	printf("write:: %ld bytes wait\n", (long) TASK_RET(arg));
+	taskExit(arg, NULL);
 }
 
 void *once(sched_task_t *arg)
 {
 	printf("once::\n");
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 #ifdef AIO_SUPPORT
@@ -65,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)
@@ -83,7 +83,7 @@ void *aioread(sched_task_t *arg)
 				
 	}
 	free(TASK_DATA(arg));
-	return NULL;
+	taskExit(arg, NULL);
 }
 
 void *aiobulkread(sched_task_t *arg)
@@ -97,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)
@@ -111,25 +111,53 @@ void *aiobulkwrite(sched_task_t *arg)
 		free(iv[i].iov_base);
 	}
 
-	return NULL;
+	taskExit(arg, NULL);
 }
 #endif
 
 void *thr(sched_task_t *arg)
 {
-	printf("thread(%lu):: %s\n", TASK_VAL(arg), (char*) TASK_ARG(arg));
+	printf("tid (%lx):: %s\n", TASK_VAL(arg), __func__);
 	taskExit(arg, 42);
 }
 
+void *thr4kill(sched_task_t *arg)
+{
+	char blah[BUFSIZ];
+
+	printf("THREAD!!! 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 SIGTERM:
-			Kill++;
+		case SIGINT:
+			printf("I'm in switch case %d\n", s);
+			Kill[0]++;
 			break;
+		case SIGHUP:
+			printf("Test SIGHUP\n");
+			break;
 	}
 }
 
+void *sigt(sched_task_t *arg)
+{
+	int s = TASK_VAL(arg);
+
+	printf("Received signal #%d\n", s);
+
+	sig(s);
+
+	schedSignalSelf(arg);
+	taskExit(arg, NULL);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -137,21 +165,26 @@ main(int argc, char **argv)
 	int f, fd;
 	struct sockaddr_in sin;
 	struct timespec ts = { 20, 0 };
-//	struct timespec p = { 0, 10000000 };
-	struct sigaction sa;
+	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);
 	sigaction(SIGTERM, &sa, NULL);
+	*/
 
 	f = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	if (f == -1)
 		return 1;
+#ifndef __linux__
 	sin.sin_len = sizeof sin;
+#endif
 	sin.sin_family = AF_INET;
 	sin.sin_port = htons(2345);
 	sin.sin_addr.s_addr = INADDR_ANY;
@@ -195,28 +228,53 @@ main(int argc, char **argv)
 		return 4;
 	}
 
+	if (!(t = schedRead(root, r, "rrr_test", f, NULL, 0))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 5;
+	}
 	if (!schedRead(root, r, "rrr", f, NULL, 0)) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 5;
 	}
+	schedCancel(t);
 
 	if (!schedWrite(root, w, "www", f, NULL, 0)) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
 		return 6;
 	}
 
-	if (!schedThread(root, thr, "mdaaaa this is thread task", 0, NULL, 0)) {
+	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 -detached", 42, NULL, 0)) {
+	if (!schedThread(root, thr, "mdaaaa this is thread task", 8192, NULL, 0)) {
 		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		printf("stack is too small\n");
+	}
+	if (!schedThread(root, thr, "mdaaaa this is thread task -detached", 131072, 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", 0, NULL, 0))) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		return 7;
+	}
+	if (!schedThread(root, thr, "mdaaaa this is thread task -j3", 4096, NULL, 0)) {
+		printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError());
+		printf("stack is too small\n");
+	}
+	sleep(1);
+	schedCancel(t);
 
 #ifdef AIO_SUPPORT
 	memset(ole, 0, BUFSIZ);
@@ -256,9 +314,17 @@ main(int argc, char **argv)
 
 	schedCallOnce(root, once, "000000", 42, NULL, 0);
 
-//	schedPolling(root, &p, NULL);
-	schedRun(root, &Kill);
+	printf("add signals\n");
+	schedSignal(root, sigt, NULL, SIGHUP, NULL, 0);
+	schedSignal(root, sigt, NULL, SIGTERM, NULL, 0);
+	schedSignal(root, sigt, NULL, SIGINT, NULL, 0);
+
+	schedPolling(root, &p, NULL);
+	schedSignalDispatch(root, 42);
+	schedRun(root, Kill);
+	schedSignalDispatch(root, 0);
 	schedEnd(&root);
+	sleep(1);
 
 #ifdef AIO_SUPPORT
 	for (i = 0; i < 3; i++)