--- libaitsched/example/test.c 2012/09/10 15:03:08 1.10.2.1 +++ libaitsched/example/test.c 2023/02/24 16:20:06 1.14.30.2 @@ -11,7 +11,7 @@ #include "../inc/config.h" #include -intptr_t Kill; +intptr_t Kill[1]; #ifdef AIO_SUPPORT struct iovec iv[3], wiv[3], riv[3]; #endif @@ -36,14 +36,14 @@ void *timer(sched_task_t *arg) void *r(sched_task_t *arg) { - printf("read:: %d bytes wait\n", TASK_RET(arg)); - Kill++; + 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)); + printf("write:: %ld bytes wait\n", (long) TASK_RET(arg)); taskExit(arg, NULL); } @@ -125,7 +125,7 @@ void *thr4kill(sched_task_t *arg) { char blah[BUFSIZ]; - printf("tid (%lx):: %s\n", TASK_VAL(arg), __func__); + 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); @@ -136,11 +136,26 @@ void sig(int s) { switch (s) { case SIGTERM: - Kill++; + 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) { @@ -149,21 +164,25 @@ main(int argc, char **argv) struct sockaddr_in sin; struct timespec ts = { 20, 0 }; // struct timespec p = { 0, 10000000 }; - struct sigaction sa; +// 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; @@ -207,45 +226,50 @@ 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 (!(t = schedThread(root, thr4kill, "0aaaa", 0, 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", 0, 8192, NULL, 0)) { + if (!schedThread(root, thr, "mdaaaa this is thread task", 8192, NULL, 0)) { printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError()); - return 7; + printf("stack is too small\n"); } - if (!schedThread(root, thr, "mdaaaa this is thread task -detached", 42, 131072, NULL, 0)) { + 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, 0, NULL, 0)) { + 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)); + printf("~~~try to cancel tid = %lx\n", TASK_VAL(t)); schedCancel(t); - if (!schedThread(root, thr, "mdaaaa this is thread task -j2", 0, 0, NULL, 0)) { + 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, 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 -j3", 0, 4096, NULL, 0)) { + if (!schedThread(root, thr, "mdaaaa this is thread task -j3", 4096, NULL, 0)) { printf("Error:: #%d - %s\n", sched_GetErrno(), sched_GetError()); - return 7; + printf("stack is too small\n"); } sleep(1); schedCancel(t); @@ -288,9 +312,17 @@ main(int argc, char **argv) schedCallOnce(root, once, "000000", 42, NULL, 0); + 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); - schedRun(root, &Kill); + schedSignalDispatch(root, 42); + schedRun(root, Kill); + schedSignalDispatch(root, 0); schedEnd(&root); + sleep(1); #ifdef AIO_SUPPORT for (i = 0; i < 3; i++)