--- libaitsched/src/tasks.c 2012/08/21 11:07:16 1.12.4.1 +++ libaitsched/src/tasks.c 2013/09/02 11:19:20 1.21.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.12.4.1 2012/08/21 11:07:16 misho Exp $ +* $Id: tasks.c,v 1.21.2.2 2013/09/02 11:19:20 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 @@ -46,25 +46,29 @@ SUCH DAMAGE. #include "global.h" -#pragma GCC visibility push(hidden) - -inline sched_task_t * -_sched_useTask(sched_root_task_t * __restrict root) +/* + * sched_useTask() - Get and init new task + * + * @root = root task + * return: NULL error or !=NULL prepared task + */ +sched_task_t * +sched_useTask(sched_root_task_t * __restrict root) { sched_task_t *task, *tmp; - TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) { - if (!TASK_ISLOCKED(task)) { #ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskUNUSE]); + pthread_mutex_lock(&root->root_mtx[taskUNUSE]); #endif + TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) { + if (!TASK_ISLOCKED(task)) { TAILQ_REMOVE(&root->root_unuse, task, task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskUNUSE]); -#endif break; } } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskUNUSE]); +#endif if (!task) { task = malloc(sizeof(sched_task_t)); @@ -79,8 +83,14 @@ _sched_useTask(sched_root_task_t * __restrict root) return task; } -inline sched_task_t * -_sched_unuseTask(sched_task_t * __restrict task) +/* + * sched_unuseTask() - Unlock and put task to unuse queue + * + * @task = task + * return: always is NULL + */ +sched_task_t * +sched_unuseTask(sched_task_t * __restrict task) { TASK_UNLOCK(task); TASK_TYPE(task) = taskUNUSE; @@ -96,9 +106,100 @@ _sched_unuseTask(sched_task_t * __restrict task) return task; } +#pragma GCC visibility push(hidden) + +#ifdef HAVE_LIBPTHREAD +static void +_sched_threadCleanup(sched_task_t *t) +{ + if (!t || !TASK_ROOT(t)) + return; + + 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 * +_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_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); + /* + pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); + */ + + /* notify parent, thread is ready for execution */ + pthread_testcancel(); + + ret = schedCall(t); + + pthread_cleanup_pop(42); + TASK_ROOT(t)->root_ret = ret; + pthread_exit(ret); +} +#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 +/* + * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks + * + * @task = current task + * @retcode = return code + * return: return code + */ +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; + return (void*) retcode; +} + + /* * schedRead() - Add READ I/O task to scheduler queue * @@ -121,7 +222,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 +249,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 +276,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 +303,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 +330,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 +357,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 +384,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 +411,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 +442,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 +469,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 +497,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 +524,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; } @@ -435,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 */ @@ -450,7 +551,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 +578,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 +606,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 +633,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; } @@ -549,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) { @@ -603,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) { @@ -668,7 +769,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 +796,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; } @@ -784,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) { @@ -869,7 +970,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 +1019,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 +1046,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 +1073,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 +1101,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 +1134,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 +1161,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 +1188,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 +1215,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,7 +1230,7 @@ schedCallOnce(sched_root_task_t * __restrict root, sch ret = schedCall(task); - _sched_unuseTask(task); + sched_unuseTask(task); return ret; } @@ -1139,30 +1240,30 @@ 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_t tid; 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; @@ -1173,32 +1274,98 @@ schedThread(sched_root_task_t * __restrict root, sched TASK_DATA(task) = opt_data; TASK_DATLEN(task) = opt_dlen; + pthread_attr_init(&attr); + 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, NULL); + 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; 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]); - - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, detach ? - PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE); - if (pthread_create(&tid, &attr, - (void *(*)(void*)) task->task_func, task)) { - LOGERR; - pthread_mutex_lock(&root->root_mtx[taskTHREAD]); - TAILQ_REMOVE(&root->root_thread, TASK_ID(task), task_node); - pthread_mutex_unlock(&root->root_mtx[taskTHREAD]); - task = _sched_unuseTask(task); - } else - TASK_VAL(task) = (u_long) tid; - pthread_attr_destroy(&attr); +#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); + task = sched_unuseTask(task); return task; +#else + sched_SetErr(ENOTSUP, "Not supported realtime clock extensions"); + return NULL; +#endif } -