--- libaitsched/example/test.c 2012/08/21 12:54:39 1.9 +++ libaitsched/example/test.c 2012/08/23 02:33:12 1.10 @@ -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; + taskExit(arg, NULL); } void *w(sched_task_t *arg) { printf("write:: %d bytes wait\n", TASK_RET(arg)); - return NULL; + 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,16 +111,27 @@ 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("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) { @@ -139,6 +150,7 @@ 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; @@ -205,6 +217,10 @@ 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; @@ -217,6 +233,22 @@ main(int argc, char **argv) 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); #ifdef AIO_SUPPORT memset(ole, 0, BUFSIZ);