--- libaitsched/src/tasks.c 2012/08/23 02:09:54 1.13.2.4 +++ libaitsched/src/tasks.c 2013/09/02 11:21:22 1.22 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.13.2.4 2012/08/23 02:09:54 misho Exp $ +* $Id: tasks.c,v 1.22 2013/09/02 11:21:22 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -52,7 +52,7 @@ SUCH DAMAGE. * @root = root task * return: NULL error or !=NULL prepared task */ -inline sched_task_t * +sched_task_t * sched_useTask(sched_root_task_t * __restrict root) { sched_task_t *task, *tmp; @@ -89,7 +89,7 @@ sched_useTask(sched_root_task_t * __restrict root) * @task = task * return: always is NULL */ -inline sched_task_t * +sched_task_t * sched_unuseTask(sched_task_t * __restrict task) { TASK_UNLOCK(task); @@ -115,9 +115,9 @@ _sched_threadCleanup(sched_task_t *t) if (!t || !TASK_ROOT(t)) return; - if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE) - pthread_detach(pthread_self()); - + pthread_mutex_lock(&TASK_ROOT(t)->root_mtx[taskTHREAD]); + TAILQ_REMOVE(&TASK_ROOT(t)->root_thread, t, task_node); + pthread_mutex_unlock(&TASK_ROOT(t)->root_mtx[taskTHREAD]); sched_unuseTask(t); } void * @@ -125,16 +125,20 @@ _sched_threadWrapper(sched_task_t *t) { void *ret = NULL; + pthread_cleanup_push((void (*)(void*)) _sched_threadCleanup, t); + if (!t || !TASK_ROOT(t)) pthread_exit(ret); - pthread_cleanup_push((void (*)(void*)) _sched_threadCleanup, t); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); + /* pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); + */ + + /* notify parent, thread is ready for execution */ pthread_testcancel(); - ret = TASK_FUNC(t)(t); + ret = schedCall(t); pthread_cleanup_pop(42); TASK_ROOT(t)->root_ret = ret; @@ -142,6 +146,37 @@ _sched_threadWrapper(sched_task_t *t) } #endif +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) +void * +_sched_rtcWrapper(sched_task_t *t) +{ + sched_task_func_t func; + sched_task_t *task; + sched_root_task_t *r; + + if (!t || !TASK_ROOT(t) || !TASK_DATA(t)) + return NULL; + else { + r = TASK_ROOT(t); + task = (sched_task_t*) TASK_DATA(t); + func = TASK_FUNC(task); + } + +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskRTC]); +#endif + TAILQ_REMOVE(&r->root_rtc, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskRTC]); +#endif + sched_unuseTask(task); + + timer_delete((timer_t) TASK_DATLEN(t)); + + return schedCall(task); +} +#endif + #pragma GCC visibility pop /* @@ -151,7 +186,7 @@ _sched_threadWrapper(sched_task_t *t) * @retcode = return code * return: return code */ -inline void * +void * sched_taskExit(sched_task_t *task, intptr_t retcode) { if (!task || !TASK_ROOT(task)) @@ -501,7 +536,7 @@ schedSignal(sched_root_task_t * __restrict root, sched * @func = task execution function * @arg = 1st func argument * @ts = timeout argument structure, minimum alarm timer resolution is 1msec! - * @opt_data = Optional data + * @opt_data = Alarm timer ID * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ @@ -615,7 +650,7 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t * +sched_task_t * schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *buffer, size_t buflen, off_t offset) { @@ -669,7 +704,7 @@ schedAIORead(sched_root_task_t * __restrict root, sche * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t * +sched_task_t * schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *buffer, size_t buflen, off_t offset) { @@ -850,7 +885,7 @@ schedLIORead(sched_root_task_t * __restrict root, sche * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ -inline sched_task_t * +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) { @@ -1205,55 +1240,132 @@ schedCallOnce(sched_root_task_t * __restrict root, sch * @root = root task * @func = task execution function * @arg = 1st func argument - * @detach = Detach thread from scheduler, if !=0 + * @ss = stack size * @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) +schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + size_t ss, 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))) + 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)); + pthread_attr_setdetachstate(&attr, PTHREAD_DETACHED); + if (ss && (errno = pthread_attr_setstacksize(&attr, ss))) { + LOGERR; + pthread_attr_destroy(&attr); + return sched_unuseTask(task); + } + if ((errno = pthread_attr_getstacksize(&attr, &ss))) { + LOGERR; + pthread_attr_destroy(&attr); + return sched_unuseTask(task); + } else + TASK_FLAG(task) = ss; + if ((errno = pthread_attr_setguardsize(&attr, ss))) { + LOGERR; + pthread_attr_destroy(&attr); + return sched_unuseTask(task); + } +#ifdef SCHED_RR + pthread_attr_setschedpolicy(&attr, SCHED_RR); +#else + pthread_attr_setschedpolicy(&attr, SCHED_OTHER); +#endif + + 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]); + if (root->root_hooks.hook_add.thread) - ptr = root->root_hooks.hook_add.thread(task, &attr); + if (root->root_hooks.hook_add.thread(task, &attr)) { + schedCancel(task); + task = NULL; + } + pthread_attr_destroy(&attr); + return task; +} + +/* + * schedRTC() - Add RTC task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @ts = timeout argument structure, minimum alarm timer resolution is 1msec! + * @opt_data = Optional RTC ID + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t * +schedRTC(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts, + void *opt_data, size_t opt_dlen) +{ +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) + sched_task_t *task; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = sched_useTask(root))) + return NULL; + + task->task_func = func; + TASK_TYPE(task) = taskRTC; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_TS(task) = ts; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + if (root->root_hooks.hook_add.rtc) + ptr = root->root_hooks.hook_add.rtc(task, NULL); 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]); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskRTC]); +#endif + TAILQ_INSERT_TAIL(&root->root_rtc, TASK_ID(task), task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskRTC]); +#endif } else task = sched_unuseTask(task); return task; +#else + sched_SetErr(ENOTSUP, "Not supported realtime clock extensions"); + return NULL; +#endif } -