--- libaitsched/src/tasks.c 2012/08/02 12:58:02 1.10.2.10 +++ libaitsched/src/tasks.c 2012/08/21 12:54:39 1.13 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.10.2.10 2012/08/02 12:58:02 misho Exp $ +* $Id: tasks.c,v 1.13 2012/08/21 12:54:39 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,7 @@ _sched_unuseTask(sched_task_t * __restrict task) return task; } -#pragma GCC visibility pop - /* * schedRead() - Add READ I/O task to scheduler queue * @@ -121,7 +129,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 +156,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 +183,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 +210,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 +237,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 +264,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 +291,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 +318,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 +349,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 +376,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 +404,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 +431,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 +458,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,7 +485,7 @@ 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; } @@ -505,7 +513,7 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta return NULL; /* get new task */ - if (!(task = _sched_useTask(root))) + if (!(task = sched_useTask(root))) return NULL; task->task_func = func; @@ -532,7 +540,7 @@ 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; } @@ -647,6 +655,60 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch #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 @@ -691,7 +753,7 @@ schedLIORead(sched_root_task_t * __restrict root, sche for (i = 0; i < nbufs; i++) if (acb[i]) free(acb[i]); - free(acb); + free(acb); return NULL; } else memset(acb[i], 0, sizeof(struct aiocb)); @@ -708,10 +770,14 @@ schedLIORead(sched_root_task_t * __restrict root, sche 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 schedAIO(root, func, arg, (void*) acb, bufs, nbufs); + return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); } /* @@ -759,7 +825,7 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch for (i = 0; i < nbufs; i++) if (acb[i]) free(acb[i]); - free(acb); + free(acb); return NULL; } else memset(acb[i], 0, sizeof(struct aiocb)); @@ -776,10 +842,14 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch 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 schedAIO(root, func, arg, (void*) acb, bufs, nbufs); + return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); } #endif /* EVFILT_LIO */ #endif /* AIO_SUPPORT */ @@ -807,7 +877,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; @@ -856,7 +926,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; } @@ -883,7 +953,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; @@ -910,62 +980,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; } @@ -992,7 +1068,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; @@ -1019,7 +1095,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; } @@ -1046,7 +1122,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; @@ -1061,6 +1137,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_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, detach ? + PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE); + 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; +} +