--- libaitsched/src/tasks.c 2012/08/08 08:15:24 1.11.2.1 +++ libaitsched/src/tasks.c 2012/08/22 10:33:45 1.13.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.11.2.1 2012/08/08 08:15:24 misho Exp $ +* $Id: tasks.c,v 1.13.2.1 2012/08/22 10:33:45 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,10 +106,55 @@ _sched_unuseTask(sched_task_t * __restrict task) return task; } -#pragma GCC visibility pop +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; +} + /* + * 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 * * @root = root task @@ -121,7 +176,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 +203,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 +230,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 +257,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 +284,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 +311,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 +338,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 +365,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 +396,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 +423,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 +451,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 +478,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 +505,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 +532,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 +560,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 +587,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; } @@ -668,7 +723,7 @@ schedLIO(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; @@ -695,7 +750,7 @@ schedLIO(sched_root_task_t * __restrict root, sched_ta pthread_mutex_unlock(&root->root_mtx[taskLIO]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -869,7 +924,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; @@ -918,7 +973,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; } @@ -945,7 +1000,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; @@ -972,7 +1027,7 @@ 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; } @@ -1000,7 +1055,7 @@ schedTask(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; @@ -1033,7 +1088,7 @@ schedTask(sched_root_task_t * __restrict root, sched_t pthread_mutex_unlock(&root->root_mtx[taskTASK]); #endif } else - task = _sched_unuseTask(task); + task = sched_unuseTask(task); return task; } @@ -1060,7 +1115,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; @@ -1087,7 +1142,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; } @@ -1114,7 +1169,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; @@ -1129,6 +1184,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; +} +