--- libaitsched/src/tasks.c 2012/08/01 14:11:43 1.10.2.3 +++ libaitsched/src/tasks.c 2012/08/22 10:38:21 1.13.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.10.2.3 2012/08/01 14:11:43 misho Exp $ +* $Id: tasks.c,v 1.13.2.2 2012/08/22 10:38:21 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -46,10 +46,14 @@ SUCH DAMAGE. #include "global.h" -#pragma GCC visibility push(hidden) - +/* + * sched_useTask() - Get and init new task + * + * @root = root task + * return: NULL error or !=NULL prepared task + */ inline sched_task_t * -_sched_useTask(sched_root_task_t * __restrict root) +sched_useTask(sched_root_task_t * __restrict root) { sched_task_t *task, *tmp; @@ -79,8 +83,14 @@ _sched_useTask(sched_root_task_t * __restrict root) return task; } +/* + * sched_unuseTask() - Unlock and put task to unuse queue + * + * @task = task + * return: always is NULL + */ inline sched_task_t * -_sched_unuseTask(sched_task_t * __restrict task) +sched_unuseTask(sched_task_t * __restrict task) { TASK_UNLOCK(task); TASK_TYPE(task) = taskUNUSE; @@ -96,9 +106,58 @@ _sched_unuseTask(sched_task_t * __restrict task) return task; } +#pragma GCC visibility push(hidden) + +void * +_sched_threadJoin(sched_task_t *task) +{ + void *ret = NULL; + + if (!task) + return NULL; + +#ifdef HAVE_LIBPTHREAD + pthread_join((pthread_t) TASK_VAL(task), &ret); + TASK_ROOT(task)->root_ret = ret; +#endif + + return NULL; +} + #pragma GCC visibility pop +/* + * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks + * + * @task = current task + * @retcode = return code + * return: return code + */ +inline void * +sched_taskExit(sched_task_t *task, intptr_t retcode) +{ + if (!task || !TASK_ROOT(task)) + return (void*) -1; + if (TASK_ROOT(task)->root_hooks.hook_exec.exit) + TASK_ROOT(task)->root_hooks.hook_exec.exit(task, (void*) retcode); + + TASK_ROOT(task)->root_ret = (void*) retcode; + +#ifdef HAVE_LIBPTHREAD + if (TASK_TYPE(task) == taskTHREAD) { + if (TASK_FLAG(task) == PTHREAD_CREATE_JOINABLE) /* joinable thread */ + schedTask(TASK_ROOT(task), _sched_threadJoin, TASK_ARG(task), + TASK_VAL(task), TASK_DATA(task), TASK_DATLEN(task)); + sched_unuseTask(task); + pthread_exit((void*) retcode); + } +#endif + + return (void*) retcode; +} + + /* * schedRead() - Add READ I/O task to scheduler queue * @@ -121,7 +180,7 @@ schedRead(sched_root_task_t * __restrict root, sched_t return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -148,7 +207,7 @@ schedRead(sched_root_task_t * __restrict root, sched_t pthread_mutex_unlock(&root->root_mtx[taskREAD]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -175,7 +234,7 @@ schedWrite(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -202,7 +261,7 @@ schedWrite(sched_root_task_t * __restrict root, sched_ pthread_mutex_unlock(&root->root_mtx[taskWRITE]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -229,7 +288,7 @@ schedNode(sched_root_task_t * __restrict root, sched_t return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -256,7 +315,7 @@ schedNode(sched_root_task_t * __restrict root, sched_t pthread_mutex_unlock(&root->root_mtx[taskNODE]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -283,7 +342,7 @@ schedProc(sched_root_task_t * __restrict root, sched_t return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -310,7 +369,7 @@ schedProc(sched_root_task_t * __restrict root, sched_t pthread_mutex_unlock(&root->root_mtx[taskPROC]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -341,7 +400,7 @@ schedUser(sched_root_task_t * __restrict root, sched_t return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -368,7 +427,7 @@ schedUser(sched_root_task_t * __restrict root, sched_t pthread_mutex_unlock(&root->root_mtx[taskUSER]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; #endif @@ -396,7 +455,7 @@ schedSignal(sched_root_task_t * __restrict root, sched return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -423,7 +482,7 @@ schedSignal(sched_root_task_t * __restrict root, sched pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -450,7 +509,7 @@ schedAlarm(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -477,11 +536,12 @@ schedAlarm(sched_root_task_t * __restrict root, sched_ pthread_mutex_unlock(&root->root_mtx[taskALARM]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } +#ifdef AIO_SUPPORT /* * schedAIO() - Add AIO task to scheduler queue * @@ -497,18 +557,14 @@ sched_task_t * schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen) { -#ifndef EVFILT_AIO - sched_SetErr(ENOTSUP, "Not supported kevent() filter"); - return NULL; -#else sched_task_t *task; void *ptr; - if (!root || !func) + if (!root || !func || !acb || !opt_dlen) return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -535,10 +591,9 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta pthread_mutex_unlock(&root->root_mtx[taskAIO]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; -#endif } /* @@ -550,24 +605,28 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta * @fd = file descriptor * @buffer = Buffer * @buflen = Buffer length + * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ inline sched_task_t * schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, - void *buffer, size_t buflen) + void *buffer, size_t buflen, off_t offset) { -#ifndef EVFILT_AIO - sched_SetErr(ENOTSUP, "Not supported kevent() filter"); - return NULL; -#else struct aiocb *acb; - off_t off = 0; + off_t off; - if (!root || !func) + if (!root || !func || !buffer || !buflen) return NULL; - else - memset(buffer, 0, buflen); + if (offset == (off_t) -1) { + off = lseek(fd, 0, SEEK_CUR); + if (off == -1) { + LOGERR; + return NULL; + } + } else + off = offset; + if (!(acb = malloc(sizeof(struct aiocb)))) { LOGERR; return NULL; @@ -577,17 +636,10 @@ schedAIORead(sched_root_task_t * __restrict root, sche acb->aio_fildes = fd; acb->aio_nbytes = buflen; acb->aio_buf = buffer; - off = lseek(fd, 0, SEEK_CUR); - if (off == -1) { - LOGERR; - free(acb); - return NULL; - } else - acb->aio_offset = off; + acb->aio_offset = off; acb->aio_sigevent.sigev_notify = SIGEV_KEVENT; - acb->aio_sigevent.sigev_notify_kevent_flags = EV_CLEAR | EV_DISPATCH; acb->aio_sigevent.sigev_notify_kqueue = root->root_kq; - acb->aio_sigevent.sigev_value.sival_ptr = (void*) O_RDONLY; + acb->aio_sigevent.sigev_value.sival_ptr = acb; if (aio_read(acb)) { LOGERR; @@ -596,7 +648,6 @@ schedAIORead(sched_root_task_t * __restrict root, sche } return schedAIO(root, func, arg, acb, buffer, buflen); -#endif } /* @@ -608,24 +659,28 @@ schedAIORead(sched_root_task_t * __restrict root, sche * @fd = file descriptor * @buffer = Buffer * @buflen = Buffer length + * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ inline sched_task_t * schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, - void *buffer, size_t buflen) + void *buffer, size_t buflen, off_t offset) { -#ifndef EVFILT_AIO - sched_SetErr(ENOTSUP, "Not supported kevent() filter"); - return NULL; -#else struct aiocb *acb; - off_t off = 0; + off_t off; - if (!root || !func) + if (!root || !func || !buffer || !buflen) return NULL; - else - memset(buffer, 0, buflen); + if (offset == (off_t) -1) { + off = lseek(fd, 0, SEEK_CUR); + if (off == -1) { + LOGERR; + return NULL; + } + } else + off = offset; + if (!(acb = malloc(sizeof(struct aiocb)))) { LOGERR; return NULL; @@ -635,17 +690,10 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch acb->aio_fildes = fd; acb->aio_nbytes = buflen; acb->aio_buf = buffer; - off = lseek(fd, 0, SEEK_CUR); - if (off == -1) { - LOGERR; - free(acb); - return NULL; - } else - acb->aio_offset = off; + acb->aio_offset = off; acb->aio_sigevent.sigev_notify = SIGEV_KEVENT; - acb->aio_sigevent.sigev_notify_kevent_flags = EV_CLEAR | EV_DISPATCH; acb->aio_sigevent.sigev_notify_kqueue = root->root_kq; - acb->aio_sigevent.sigev_value.sival_ptr = (void*) O_WRONLY; + acb->aio_sigevent.sigev_value.sival_ptr = acb; if (aio_write(acb)) { LOGERR; @@ -654,10 +702,210 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch } return schedAIO(root, func, arg, acb, buffer, buflen); +} + +#ifdef EVFILT_LIO +/* + * schedLIO() - Add AIO bulk tasks to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @acbs = AIO cb structure addresses + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t * +schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen) +{ + sched_task_t *task; + void *ptr; + + if (!root || !func || !acbs || !opt_dlen) + return NULL; + + /* get new task */ + if (!(task = sched_useTask(root))) + return NULL; + + task->task_func = func; + TASK_TYPE(task) = taskLIO; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_VAL(task) = (u_long) acbs; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + if (root->root_hooks.hook_add.lio) + ptr = root->root_hooks.hook_add.lio(task, NULL); + else + ptr = NULL; + + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskLIO]); #endif + TAILQ_INSERT_TAIL(&root->root_lio, TASK_ID(task), task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskLIO]); +#endif + } else + task = sched_unuseTask(task); + + return task; } /* + * schedLIORead() - Add list of AIO read tasks to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = file descriptor + * @bufs = Buffer's list + * @nbufs = Number of Buffers + * @offset = Offset from start of file, if =-1 from current position + * return: NULL error or !=NULL new queued task + */ +sched_task_t * +schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, + struct iovec *bufs, size_t nbufs, off_t offset) +{ + struct sigevent sig; + struct aiocb **acb; + off_t off; + register int i; + + if (!root || !func || !bufs || !nbufs) + return NULL; + + if (offset == (off_t) -1) { + off = lseek(fd, 0, SEEK_CUR); + if (off == -1) { + LOGERR; + return NULL; + } + } else + off = offset; + + if (!(acb = calloc(sizeof(void*), nbufs))) { + LOGERR; + return NULL; + } else + memset(acb, 0, sizeof(void*) * nbufs); + for (i = 0; i < nbufs; off += bufs[i++].iov_len) { + acb[i] = malloc(sizeof(struct aiocb)); + if (!acb[i]) { + LOGERR; + for (i = 0; i < nbufs; i++) + if (acb[i]) + free(acb[i]); + free(acb); + return NULL; + } else + memset(acb[i], 0, sizeof(struct aiocb)); + acb[i]->aio_fildes = fd; + acb[i]->aio_nbytes = bufs[i].iov_len; + acb[i]->aio_buf = bufs[i].iov_base; + acb[i]->aio_offset = off; + acb[i]->aio_lio_opcode = LIO_READ; + } + memset(&sig, 0, sizeof sig); + sig.sigev_notify = SIGEV_KEVENT; + sig.sigev_notify_kqueue = root->root_kq; + sig.sigev_value.sival_ptr = acb; + + if (lio_listio(LIO_NOWAIT, acb, nbufs, &sig)) { + LOGERR; + for (i = 0; i < nbufs; i++) + if (acb[i]) + free(acb[i]); + free(acb); + return NULL; + } + + return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); +} + +/* + * schedLIOWrite() - Add list of AIO write tasks to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = file descriptor + * @bufs = Buffer's list + * @nbufs = Number of Buffers + * @offset = Offset from start of file, if =-1 from current position + * return: NULL error or !=NULL new queued task + */ +inline sched_task_t * +schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, + struct iovec *bufs, size_t nbufs, off_t offset) +{ + struct sigevent sig; + struct aiocb **acb; + off_t off; + register int i; + + if (!root || !func || !bufs || !nbufs) + return NULL; + + if (offset == (off_t) -1) { + off = lseek(fd, 0, SEEK_CUR); + if (off == -1) { + LOGERR; + return NULL; + } + } else + off = offset; + + if (!(acb = calloc(sizeof(void*), nbufs))) { + LOGERR; + return NULL; + } else + memset(acb, 0, sizeof(void*) * nbufs); + for (i = 0; i < nbufs; off += bufs[i++].iov_len) { + acb[i] = malloc(sizeof(struct aiocb)); + if (!acb[i]) { + LOGERR; + for (i = 0; i < nbufs; i++) + if (acb[i]) + free(acb[i]); + free(acb); + return NULL; + } else + memset(acb[i], 0, sizeof(struct aiocb)); + acb[i]->aio_fildes = fd; + acb[i]->aio_nbytes = bufs[i].iov_len; + acb[i]->aio_buf = bufs[i].iov_base; + acb[i]->aio_offset = off; + acb[i]->aio_lio_opcode = LIO_WRITE; + } + memset(&sig, 0, sizeof sig); + sig.sigev_notify = SIGEV_KEVENT; + sig.sigev_notify_kqueue = root->root_kq; + sig.sigev_value.sival_ptr = acb; + + if (lio_listio(LIO_NOWAIT, acb, nbufs, &sig)) { + LOGERR; + for (i = 0; i < nbufs; i++) + if (acb[i]) + free(acb[i]); + free(acb); + return NULL; + } + + return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); +} +#endif /* EVFILT_LIO */ +#endif /* AIO_SUPPORT */ + +/* * schedTimer() - Add TIMER task to scheduler queue * * @root = root task @@ -680,7 +928,7 @@ schedTimer(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -729,7 +977,7 @@ schedTimer(sched_root_task_t * __restrict root, sched_ pthread_mutex_unlock(&root->root_mtx[taskTIMER]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -756,7 +1004,7 @@ schedEvent(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -783,62 +1031,68 @@ schedEvent(sched_root_task_t * __restrict root, sched_ pthread_mutex_unlock(&root->root_mtx[taskEVENT]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } /* - * schedEventLo() - Add EVENT_Lo task to scheduler queue + * schedTask() - Add regular task to scheduler queue * * @root = root task * @func = task execution function * @arg = 1st func argument - * @val = additional func argument + * @prio = regular task priority, 0 is hi priority for regular tasks * @opt_data = Optional data * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ sched_task_t * -schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, +schedTask(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long prio, void *opt_data, size_t opt_dlen) { - sched_task_t *task; + sched_task_t *task, *tmp, *t = NULL; void *ptr; if (!root || !func) return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; - TASK_TYPE(task) = taskEVENT; + TASK_TYPE(task) = taskTASK; TASK_ROOT(task) = root; TASK_ARG(task) = arg; - TASK_VAL(task) = val; + TASK_VAL(task) = prio; TASK_DATA(task) = opt_data; TASK_DATLEN(task) = opt_dlen; - if (root->root_hooks.hook_add.eventlo) - ptr = root->root_hooks.hook_add.eventlo(task, NULL); + if (root->root_hooks.hook_add.task) + ptr = root->root_hooks.hook_add.task(task, NULL); else ptr = NULL; if (!ptr) { #ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskEVENTLO]); + pthread_mutex_lock(&root->root_mtx[taskTASK]); #endif - TAILQ_INSERT_TAIL(&root->root_eventlo, TASK_ID(task), task_node); + TAILQ_FOREACH_SAFE(t, &root->root_task, task_node, tmp) + if (TASK_VAL(task) < TASK_VAL(t)) + break; + if (!t) + TAILQ_INSERT_TAIL(&root->root_task, TASK_ID(task), task_node); + else + TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node); #ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskEVENTLO]); + pthread_mutex_unlock(&root->root_mtx[taskTASK]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -865,7 +1119,7 @@ schedSuspend(sched_root_task_t * __restrict root, sche return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -892,7 +1146,7 @@ schedSuspend(sched_root_task_t * __restrict root, sche pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -919,7 +1173,7 @@ schedCallOnce(sched_root_task_t * __restrict root, sch return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -934,6 +1188,65 @@ schedCallOnce(sched_root_task_t * __restrict root, sch ret = schedCall(task); - _sched_unuseTask(task); + sched_unuseTask(task); return ret; } + +/* + * schedThread() - Add thread task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @detach = Detach thread from scheduler, if !=0 + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t * +schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int detach, + void *opt_data, size_t opt_dlen) +{ +#ifndef HAVE_LIBPTHREAD + sched_SetErr(ENOTSUP, "Not supported thread tasks"); + return NULL; +#endif + sched_task_t *task; + void *ptr; + pthread_attr_t attr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = sched_useTask(root))) + return NULL; + + task->task_func = func; + TASK_TYPE(task) = taskTHREAD; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_FLAG(task) = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, TASK_FLAG(task)); + if (root->root_hooks.hook_add.thread) + ptr = root->root_hooks.hook_add.thread(task, &attr); + else + ptr = NULL; + pthread_attr_destroy(&attr); + + if (!ptr) { + pthread_mutex_lock(&root->root_mtx[taskTHREAD]); + TAILQ_INSERT_TAIL(&root->root_thread, TASK_ID(task), task_node); + pthread_mutex_unlock(&root->root_mtx[taskTHREAD]); + } else + task = sched_unuseTask(task); + + return task; +} +