--- libaitsched/src/tasks.c 2013/08/15 18:40:39 1.16.6.3 +++ libaitsched/src/tasks.c 2022/11/28 23:52:35 1.29.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.16.6.3 2013/08/15 18:40:39 misho Exp $ +* $Id: tasks.c,v 1.29.4.2 2022/11/28 23:52:35 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 - 2022 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -57,21 +57,17 @@ sched_useTask(sched_root_task_t * __restrict root) { sched_task_t *task, *tmp; -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskUNUSE]); -#endif + SCHED_QLOCK(root, taskUNUSE); TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) { if (!TASK_ISLOCKED(task)) { TAILQ_REMOVE(&root->root_unuse, task, task_node); break; } } -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskUNUSE]); -#endif + SCHED_QUNLOCK(root, taskUNUSE); if (!task) { - task = malloc(sizeof(sched_task_t)); + task = e_malloc(sizeof(sched_task_t)); if (!task) { LOGERR; return NULL; @@ -93,67 +89,14 @@ sched_task_t * sched_unuseTask(sched_task_t * __restrict task) { TASK_UNLOCK(task); + TASK_TYPE(task) = taskUNUSE; -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[taskUNUSE]); -#endif - TAILQ_INSERT_TAIL(&TASK_ROOT(task)->root_unuse, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[taskUNUSE]); -#endif - task = NULL; + insert_task_to(task, &(TASK_ROOT(task))->root_unuse); + task = NULL; return task; } -#pragma GCC visibility push(hidden) - -#ifdef HAVE_LIBPTHREAD -static void -_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; - - if (!t || !TASK_ROOT(t) || !TASK_RET(t)) - pthread_exit(ret); - else - s = (sem_t*) TASK_RET(t); - - 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 */ - sem_post(s); - pthread_testcancel(); - - ret = TASK_FUNC(t)(t); - - pthread_cleanup_pop(42); - TASK_ROOT(t)->root_ret = ret; - pthread_exit(ret); -} -#endif - -#pragma GCC visibility pop - /* * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks * @@ -190,6 +133,25 @@ sched_task_t * schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *opt_data, size_t opt_dlen) { + return schedReadExt(root, func, arg, fd, opt_data, opt_dlen, 0); +} + +/* + * schedReadExt() - Add READ I/O task to scheduler queue with custom event mask + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = fd handle + * @opt_data = Optional data + * @opt_dlen = Optional data length + * @mask = Event mask + * return: NULL error or !=NULL new queued task + */ +sched_task_t * +schedReadExt(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, + void *opt_data, size_t opt_dlen, u_long mask) +{ sched_task_t *task; void *ptr; @@ -200,7 +162,7 @@ schedRead(sched_root_task_t * __restrict root, sched_t if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskREAD; TASK_ROOT(task) = root; @@ -210,20 +172,17 @@ schedRead(sched_root_task_t * __restrict root, sched_t TASK_DATA(task) = opt_data; TASK_DATLEN(task) = opt_dlen; + TASK_HARG(task) = mask; + if (root->root_hooks.hook_add.read) - ptr = root->root_hooks.hook_add.read(task, NULL); + ptr = root->root_hooks.hook_add.read(task, + (void*) task->task_harg); else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskREAD]); -#endif - TAILQ_INSERT_TAIL(&root->root_read, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskREAD]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_read); + else task = sched_unuseTask(task); return task; @@ -254,7 +213,7 @@ schedWrite(sched_root_task_t * __restrict root, sched_ if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskWRITE; TASK_ROOT(task) = root; @@ -269,15 +228,9 @@ schedWrite(sched_root_task_t * __restrict root, sched_ else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskWRITE]); -#endif - TAILQ_INSERT_TAIL(&root->root_write, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskWRITE]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_write); + else task = sched_unuseTask(task); return task; @@ -298,6 +251,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -308,7 +265,7 @@ schedNode(sched_root_task_t * __restrict root, sched_t if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskNODE; TASK_ROOT(task) = root; @@ -323,18 +280,71 @@ schedNode(sched_root_task_t * __restrict root, sched_t else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskNODE]); + if (!ptr) + insert_task_to(task, &root->root_node); + else + task = sched_unuseTask(task); + + return task; +#endif /* KQ_SUPPORT */ +} + +/* + * schedNode2() - Add NODE task with all events to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @fd = fd handle + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t * +schedNode2(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, + void *opt_data, size_t opt_dlen) +{ +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else + sched_task_t *task; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = sched_useTask(root))) + return NULL; + + TASK_FUNC(task) = func; + TASK_TYPE(task) = taskNODE; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_FD(task) = fd; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + if (root->root_hooks.hook_add.node) +#ifdef __FreeBSD__ + ptr = root->root_hooks.hook_add.node(task, + (void*) (NOTE_READ | NOTE_CLOSE_WRITE | NOTE_CLOSE | NOTE_OPEN)); +#else + ptr = root->root_hooks.hook_add.node(task, NULL); #endif - TAILQ_INSERT_TAIL(&root->root_node, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskNODE]); -#endif - } else + else + ptr = NULL; + + if (!ptr) + insert_task_to(task, &root->root_node); + else task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -352,6 +362,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -362,7 +376,7 @@ schedProc(sched_root_task_t * __restrict root, sched_t if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskPROC; TASK_ROOT(task) = root; @@ -377,18 +391,13 @@ schedProc(sched_root_task_t * __restrict root, sched_t else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskPROC]); -#endif - TAILQ_INSERT_TAIL(&root->root_proc, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskPROC]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_proc); + else task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -406,6 +415,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else #ifndef EVFILT_USER sched_SetErr(ENOTSUP, "Not supported kevent() filter"); return NULL; @@ -420,7 +433,7 @@ schedUser(sched_root_task_t * __restrict root, sched_t if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskUSER; TASK_ROOT(task) = root; @@ -435,19 +448,14 @@ schedUser(sched_root_task_t * __restrict root, sched_t else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskUSER]); -#endif - TAILQ_INSERT_TAIL(&root->root_user, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskUSER]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_user); + else task = sched_unuseTask(task); return task; -#endif +#endif /* EVFILT_USER */ +#endif /* KQ_SUPPORT */ } /* @@ -465,6 +473,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -475,7 +487,7 @@ schedSignal(sched_root_task_t * __restrict root, sched if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskSIGNAL; TASK_ROOT(task) = root; @@ -490,18 +502,13 @@ schedSignal(sched_root_task_t * __restrict root, sched else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskSIGNAL]); -#endif - TAILQ_INSERT_TAIL(&root->root_signal, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_signal); + else task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -519,6 +526,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -529,7 +540,7 @@ schedAlarm(sched_root_task_t * __restrict root, sched_ if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskALARM; TASK_ROOT(task) = root; @@ -544,18 +555,13 @@ schedAlarm(sched_root_task_t * __restrict root, sched_ else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskALARM]); -#endif - TAILQ_INSERT_TAIL(&root->root_alarm, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskALARM]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_alarm); + else task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } #ifdef AIO_SUPPORT @@ -574,6 +580,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -584,7 +594,7 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskAIO; TASK_ROOT(task) = root; @@ -599,18 +609,13 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskAIO]); -#endif - TAILQ_INSERT_TAIL(&root->root_aio, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskAIO]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_aio); + else task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -629,6 +634,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct aiocb *acb; off_t off; @@ -644,7 +653,7 @@ schedAIORead(sched_root_task_t * __restrict root, sche } else off = offset; - if (!(acb = malloc(sizeof(struct aiocb)))) { + if (!(acb = e_malloc(sizeof(struct aiocb)))) { LOGERR; return NULL; } else @@ -660,11 +669,12 @@ schedAIORead(sched_root_task_t * __restrict root, sche if (aio_read(acb)) { LOGERR; - free(acb); + e_free(acb); return NULL; } return schedAIO(root, func, arg, acb, buffer, buflen); +#endif /* KQ_SUPPORT */ } /* @@ -683,6 +693,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct aiocb *acb; off_t off; @@ -698,7 +712,7 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch } else off = offset; - if (!(acb = malloc(sizeof(struct aiocb)))) { + if (!(acb = e_malloc(sizeof(struct aiocb)))) { LOGERR; return NULL; } else @@ -714,11 +728,12 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch if (aio_write(acb)) { LOGERR; - free(acb); + e_free(acb); return NULL; } return schedAIO(root, func, arg, acb, buffer, buflen); +#endif /* KQ_SUPPORT */ } #ifdef EVFILT_LIO @@ -737,6 +752,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else sched_task_t *task; void *ptr; @@ -747,7 +766,7 @@ schedLIO(sched_root_task_t * __restrict root, sched_ta if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskLIO; TASK_ROOT(task) = root; @@ -762,18 +781,13 @@ schedLIO(sched_root_task_t * __restrict root, sched_ta 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 + if (!ptr) + insert_task_to(task, &root->root_lio); + else task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -792,6 +806,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct sigevent sig; struct aiocb **acb; off_t off; @@ -809,19 +827,19 @@ schedLIORead(sched_root_task_t * __restrict root, sche } else off = offset; - if (!(acb = calloc(sizeof(void*), nbufs))) { + if (!(acb = e_calloc(sizeof(void*), nbufs))) { LOGERR; return NULL; } else memset(acb, 0, sizeof(void*) * nbufs); for (i = 0; i < nbufs; off += bufs[i++].iov_len) { - acb[i] = malloc(sizeof(struct aiocb)); + acb[i] = e_malloc(sizeof(struct aiocb)); if (!acb[i]) { LOGERR; for (i = 0; i < nbufs; i++) if (acb[i]) - free(acb[i]); - free(acb); + e_free(acb[i]); + e_free(acb); return NULL; } else memset(acb[i], 0, sizeof(struct aiocb)); @@ -840,12 +858,13 @@ schedLIORead(sched_root_task_t * __restrict root, sche LOGERR; for (i = 0; i < nbufs; i++) if (acb[i]) - free(acb[i]); - free(acb); + e_free(acb[i]); + e_free(acb); return NULL; } return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); +#endif /* KQ_SUPPORT */ } /* @@ -864,6 +883,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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct sigevent sig; struct aiocb **acb; off_t off; @@ -881,19 +904,19 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch } else off = offset; - if (!(acb = calloc(sizeof(void*), nbufs))) { + if (!(acb = e_calloc(sizeof(void*), nbufs))) { LOGERR; return NULL; } else memset(acb, 0, sizeof(void*) * nbufs); for (i = 0; i < nbufs; off += bufs[i++].iov_len) { - acb[i] = malloc(sizeof(struct aiocb)); + acb[i] = e_malloc(sizeof(struct aiocb)); if (!acb[i]) { LOGERR; for (i = 0; i < nbufs; i++) if (acb[i]) - free(acb[i]); - free(acb); + e_free(acb[i]); + e_free(acb); return NULL; } else memset(acb[i], 0, sizeof(struct aiocb)); @@ -912,12 +935,13 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch LOGERR; for (i = 0; i < nbufs; i++) if (acb[i]) - free(acb[i]); - free(acb); + e_free(acb[i]); + e_free(acb); return NULL; } return schedLIO(root, func, arg, (void*) acb, bufs, nbufs); +#endif /* KQ_SUPPORT */ } #endif /* EVFILT_LIO */ #endif /* AIO_SUPPORT */ @@ -948,7 +972,7 @@ schedTimer(sched_root_task_t * __restrict root, sched_ if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskTIMER; TASK_ROOT(task) = root; @@ -976,23 +1000,19 @@ schedTimer(sched_root_task_t * __restrict root, sched_ ptr = NULL; if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskTIMER]); -#endif + SCHED_QLOCK(root, taskTIMER); #ifdef TIMER_WITHOUT_SORT - TAILQ_INSERT_TAIL(&root->root_timer, TASK_ID(task), task_node); + TAILQ_INSERT_TAIL(&root->root_timer, task, task_node); #else TAILQ_FOREACH_SAFE(t, &root->root_timer, task_node, tmp) if (sched_timespeccmp(&TASK_TS(task), &TASK_TS(t), -) < 1) break; if (!t) - TAILQ_INSERT_TAIL(&root->root_timer, TASK_ID(task), task_node); + TAILQ_INSERT_TAIL(&root->root_timer, task, task_node); else - TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node); + TAILQ_INSERT_BEFORE(t, task, task_node); #endif -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskTIMER]); -#endif + SCHED_QUNLOCK(root, taskTIMER); } else task = sched_unuseTask(task); @@ -1024,7 +1044,7 @@ schedEvent(sched_root_task_t * __restrict root, sched_ if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskEVENT; TASK_ROOT(task) = root; @@ -1039,15 +1059,9 @@ schedEvent(sched_root_task_t * __restrict root, sched_ else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskEVENT]); -#endif - TAILQ_INSERT_TAIL(&root->root_event, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskEVENT]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_event); + else task = sched_unuseTask(task); return task; @@ -1079,7 +1093,7 @@ schedTask(sched_root_task_t * __restrict root, sched_t if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskTASK; TASK_ROOT(task) = root; @@ -1095,19 +1109,15 @@ schedTask(sched_root_task_t * __restrict root, sched_t ptr = NULL; if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskTASK]); -#endif + SCHED_QLOCK(root, taskTASK); 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); + TAILQ_INSERT_TAIL(&root->root_task, task, task_node); else - TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskTASK]); -#endif + TAILQ_INSERT_BEFORE(t, task, task_node); + SCHED_QUNLOCK(root, taskTASK); } else task = sched_unuseTask(task); @@ -1139,7 +1149,7 @@ schedSuspend(sched_root_task_t * __restrict root, sche if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskSUSPEND; TASK_ROOT(task) = root; @@ -1154,15 +1164,9 @@ schedSuspend(sched_root_task_t * __restrict root, sche else ptr = NULL; - if (!ptr) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskSUSPEND]); -#endif - TAILQ_INSERT_TAIL(&root->root_suspend, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]); -#endif - } else + if (!ptr) + insert_task_to(task, &root->root_suspend); + else task = sched_unuseTask(task); return task; @@ -1193,7 +1197,7 @@ schedCallOnce(sched_root_task_t * __restrict root, sch if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskEVENT; TASK_ROOT(task) = root; @@ -1215,14 +1219,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 @@ -1230,95 +1233,56 @@ 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; + void *ptr; 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); - + if (!(task = sched_useTask(root))) return NULL; - } - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskTHREAD; 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_CREATE_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); - if ((errno = pthread_attr_setguardsize(&attr, ss))) { - LOGERR; - pthread_attr_destroy(&attr); - sem_destroy(s); - free(s); - return sched_unuseTask(task); - } + TASK_FLAG(task) = ss; + #ifdef SCHED_RR pthread_attr_setschedpolicy(&attr, SCHED_RR); #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]); - - /* wait for init thread actions */ - sem_wait(s); - } else + if (!ptr) + insert_task_to(task, &root->root_thread); + else task = sched_unuseTask(task); - sem_destroy(s); - free(s); + pthread_attr_destroy(&attr); return task; } @@ -1330,13 +1294,15 @@ schedThread(sched_root_task_t * __restrict root, sched * @arg = 1st func argument * @ts = timeout argument structure, minimum alarm timer resolution is 1msec! * @opt_data = Optional RTC ID - * @opt_dlen = Optional Signal No. + * @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_LIBRT) && defined(HAVE_TIMER_CREATE) && \ + defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) sched_task_t *task; void *ptr; @@ -1347,7 +1313,7 @@ schedRTC(sched_root_task_t * __restrict root, sched_ta if (!(task = sched_useTask(root))) return NULL; - task->task_func = func; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskRTC; TASK_ROOT(task) = root; @@ -1362,16 +1328,14 @@ schedRTC(sched_root_task_t * __restrict root, sched_ta else ptr = NULL; - if (!ptr) { -#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 + if (!ptr) + insert_task_to(task, &root->root_rtc); + else task = sched_unuseTask(task); return task; +#else + sched_SetErr(ENOTSUP, "Not supported realtime clock extensions"); + return NULL; +#endif }