--- libaitsched/example/test.c 2012/08/02 12:08:44 1.6.8.6 +++ libaitsched/example/test.c 2012/08/22 10:33:45 1.9.2.3 @@ -8,48 +8,52 @@ #include #include #include +#include "../inc/config.h" #include 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) { @@ -59,8 +63,9 @@ void *aiowrite(sched_task_t *arg) TASK_DATA(arg)); free(TASK_DATA(arg)); - schedAIORead(TASK_ROOT(arg), aioread, NULL, TASK_FD(arg), ole, BUFSIZ); - return NULL; + memset(ole, 0, BUFSIZ); + schedAIORead(TASK_ROOT(arg), aioread, NULL, TASK_FD(arg), ole, BUFSIZ - 1, -1); + taskExit(arg, NULL); } void *aioread(sched_task_t *arg) @@ -72,15 +77,13 @@ void *aioread(sched_task_t *arg) (char*) TASK_DATA(arg)); if (TASK_ARG(arg)) { -// write((int) TASK_ARG(arg), TASK_DATA(arg), TASK_DATLEN(arg)); - len = strlcpy(ole, "++++++BAHURA OR CULTURE .... A CULTURE OR BAHURA :-)\n", BUFSIZ); printf("sched Write len=%d %p\n", len, ole); - schedAIOWrite(TASK_ROOT(arg), aiowrite, TASK_ARG(arg), TASK_FD(arg), ole, len); + schedAIOWrite(TASK_ROOT(arg), aiowrite, TASK_ARG(arg), TASK_FD(arg), ole, len, -1); } free(TASK_DATA(arg)); - return NULL; + taskExit(arg, NULL); } void *aiobulkread(sched_task_t *arg) @@ -94,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) @@ -108,9 +111,23 @@ 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)); + taskExit(arg, 42); +} + +void *thr4kill(sched_task_t *arg) +{ + sleep(3); + printf("never see!!! (%lu):: %s\n", TASK_VAL(arg), (char*) TASK_ARG(arg)); + taskExit(arg, 0); +} + void sig(int s) { switch (s) { @@ -129,8 +146,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); @@ -173,7 +193,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; } @@ -193,7 +213,27 @@ main(int argc, char **argv) return 6; } - if (!schedAIORead(root, aioread, (void*) f, fd, ole, BUFSIZ)) + if (!schedThread(root, thr, "mdaaaa this is thread task", 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 -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; + } + schedCancel(t); + +#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()); @@ -207,13 +247,13 @@ main(int argc, char **argv) fsync(fd); for (i = 0; i < 3; i++) { wiv[i].iov_len = 100; - wiv[i].iov_base = malloc(iv[i].iov_len); + wiv[i].iov_base = malloc(wiv[i].iov_len); } - strlcpy(wiv[0].iov_base, "aaa0000000000000000000134234234242424\n", wiv[0].iov_len); + strlcpy(wiv[0].iov_base, "12345678900000000000000000\n", wiv[0].iov_len); wiv[0].iov_len = strlen(wiv[0].iov_base) + 1; - strlcpy(wiv[1].iov_base, "bbbbbbbbbbbbbbbbbbbbb\n", wiv[1].iov_len); + strlcpy(wiv[1].iov_base, "222222222222222222222222\n", wiv[1].iov_len); wiv[1].iov_len = strlen(wiv[1].iov_base) + 1; - strlcpy(wiv[2].iov_base, "zzz\n", wiv[2].iov_len); + strlcpy(wiv[2].iov_base, "333\n", wiv[2].iov_len); wiv[2].iov_len = strlen(wiv[2].iov_base) + 1; if (!schedLIOWrite(root, aiobulkwrite, NULL, fd, wiv, 3, 0)) printf("Warning:: #%d - %s\n", sched_GetErrno(), sched_GetError()); @@ -225,6 +265,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 +273,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);