--- libaitsched/src/tasks.c 2013/08/26 13:26:56 1.19.2.1 +++ libaitsched/src/tasks.c 2014/02/01 14:06:08 1.23.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.19.2.1 2013/08/26 13:26:56 misho Exp $ +* $Id: tasks.c,v 1.23.4.1 2014/02/01 14:06:08 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, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -115,55 +115,30 @@ _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 * _sched_threadWrapper(sched_task_t *t) { void *ret = NULL; - sem_t *s = NULL; - sched_root_task_t *r; - if (!t || !TASK_ROOT(t) || !TASK_RET(t)) - pthread_exit(ret); - else { - s = (sem_t*) TASK_RET(t); - r = TASK_ROOT(t); - } - 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); + */ -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&r->root_mtx[taskTHREAD]); -#endif - TAILQ_REMOVE(&r->root_thread, t, task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&r->root_mtx[taskTHREAD]); -#endif - t->task_type = taskUNUSE; -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&r->root_mtx[taskUNUSE]); -#endif - TAILQ_INSERT_TAIL(&r->root_unuse, t, task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); -#endif - /* notify parent, thread is ready for execution */ - sem_post(s); pthread_testcancel(); - ret = TASK_FUNC(t)(t); + ret = schedCall(t); pthread_cleanup_pop(42); TASK_ROOT(t)->root_ret = ret; @@ -171,11 +146,10 @@ _sched_threadWrapper(sched_task_t *t) } #endif -#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) void * _sched_rtcWrapper(sched_task_t *t) { - void *ret = NULL; sched_task_func_t func; sched_task_t *task; sched_root_task_t *r; @@ -195,19 +169,11 @@ _sched_rtcWrapper(sched_task_t *t) #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&r->root_mtx[taskRTC]); #endif - task->task_type = taskUNUSE; -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&r->root_mtx[taskUNUSE]); -#endif - TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); -#endif + sched_unuseTask(task); - ret = func(task); - timer_delete((timer_t) TASK_DATLEN(t)); - return ret; + + return schedCall(task); } #endif @@ -357,6 +323,10 @@ sched_task_t * schedNode(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *opt_data, size_t opt_dlen) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -394,6 +364,7 @@ schedNode(sched_root_task_t * __restrict root, sched_t task = sched_unuseTask(task); return task; +#endif /* KQ_DISABLE */ } /* @@ -411,6 +382,10 @@ sched_task_t * schedProc(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long pid, void *opt_data, size_t opt_dlen) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -448,6 +423,7 @@ schedProc(sched_root_task_t * __restrict root, sched_t task = sched_unuseTask(task); return task; +#endif /* KQ_DISABLE */ } /* @@ -465,6 +441,10 @@ sched_task_t * schedUser(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long id, void *opt_data, size_t opt_dlen) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else #ifndef EVFILT_USER sched_SetErr(ENOTSUP, "Not supported kevent() filter"); return NULL; @@ -506,7 +486,8 @@ schedUser(sched_root_task_t * __restrict root, sched_t task = sched_unuseTask(task); return task; -#endif +#endif /* EVFILT_USER */ +#endif /* KQ_DISABLE */ } /* @@ -524,6 +505,10 @@ sched_task_t * schedSignal(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long sig, void *opt_data, size_t opt_dlen) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -561,6 +546,7 @@ schedSignal(sched_root_task_t * __restrict root, sched task = sched_unuseTask(task); return task; +#endif /* KQ_DISABLE */ } /* @@ -578,6 +564,10 @@ sched_task_t * schedAlarm(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts, void *opt_data, size_t opt_dlen) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -615,6 +605,7 @@ schedAlarm(sched_root_task_t * __restrict root, sched_ task = sched_unuseTask(task); return task; +#endif /* KQ_DISABLE */ } #ifdef AIO_SUPPORT @@ -633,6 +624,10 @@ 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) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -670,6 +665,7 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta task = sched_unuseTask(task); return task; +#endif /* KQ_DISABLE */ } /* @@ -688,6 +684,10 @@ 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) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct aiocb *acb; off_t off; @@ -724,6 +724,7 @@ schedAIORead(sched_root_task_t * __restrict root, sche } return schedAIO(root, func, arg, acb, buffer, buflen); +#endif /* KQ_DISABLE */ } /* @@ -742,6 +743,10 @@ 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) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct aiocb *acb; off_t off; @@ -778,6 +783,7 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch } return schedAIO(root, func, arg, acb, buffer, buflen); +#endif /* KQ_DISABLE */ } #ifdef EVFILT_LIO @@ -796,6 +802,10 @@ 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) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -833,6 +843,7 @@ schedLIO(sched_root_task_t * __restrict root, sched_ta task = sched_unuseTask(task); return task; +#endif /* KQ_DISABLE */ } /* @@ -851,6 +862,10 @@ 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) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct sigevent sig; struct aiocb **acb; off_t off; @@ -905,6 +920,7 @@ schedLIORead(sched_root_task_t * __restrict root, sche } return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); +#endif /* KQ_DISABLE */ } /* @@ -923,6 +939,10 @@ 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) { +#ifdef KQ_DISABLE + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct sigevent sig; struct aiocb **acb; off_t off; @@ -977,6 +997,7 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch } return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); +#endif /* KQ_DISABLE */ } #endif /* EVFILT_LIO */ #endif /* AIO_SUPPORT */ @@ -1274,14 +1295,13 @@ 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, +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 @@ -1289,33 +1309,13 @@ schedThread(sched_root_task_t * __restrict root, sched return NULL; #endif sched_task_t *task; - void *ptr; pthread_attr_t attr; - sem_t *s = NULL; if (!root || !func) return NULL; - else { - /* normalizing stack size & detach state */ - if (ss) - ss &= 0x7FFFFFFF; - detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE; - } - if (!(s = (sem_t*) malloc(sizeof(sem_t)))) { - LOGERR; - return NULL; - } - if (sem_init(s, 0, 1)) { - LOGERR; - free(s); - return NULL; - } - /* get new task */ if (!(task = sched_useTask(root))) { - sem_destroy(s); - free(s); return NULL; } @@ -1325,34 +1325,26 @@ schedThread(sched_root_task_t * __restrict root, sched TASK_ROOT(task) = root; TASK_ARG(task) = arg; - TASK_FLAG(task) = detach; - TASK_RET(task) = (intptr_t) s; TASK_DATA(task) = opt_data; TASK_DATLEN(task) = opt_dlen; pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, detach); + pthread_attr_setdetachstate(&attr, PTHREAD_DETACHED); if (ss && (errno = pthread_attr_setstacksize(&attr, ss))) { LOGERR; pthread_attr_destroy(&attr); - sem_destroy(s); - free(s); return sched_unuseTask(task); } if ((errno = pthread_attr_getstacksize(&attr, &ss))) { LOGERR; pthread_attr_destroy(&attr); - sem_destroy(s); - free(s); return sched_unuseTask(task); } else - TASK_FLAG(task) |= (ss << 1); + TASK_FLAG(task) = ss; if ((errno = pthread_attr_setguardsize(&attr, ss))) { LOGERR; pthread_attr_destroy(&attr); - sem_destroy(s); - free(s); return sched_unuseTask(task); } #ifdef SCHED_RR @@ -1360,24 +1352,17 @@ schedThread(sched_root_task_t * __restrict root, sched #else pthread_attr_setschedpolicy(&attr, SCHED_OTHER); #endif - 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]); + 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]); - /* wait for init thread actions */ - sem_wait(s); - } else - task = sched_unuseTask(task); - - sem_destroy(s); - free(s); + if (root->root_hooks.hook_add.thread) + if (root->root_hooks.hook_add.thread(task, &attr)) { + schedCancel(task); + task = NULL; + } + pthread_attr_destroy(&attr); return task; } @@ -1396,7 +1381,7 @@ 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) +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) sched_task_t *task; void *ptr;