--- libaitsched/src/tasks.c 2012/08/08 08:25:39 1.12 +++ 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.12 2012/08/08 08:25: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 +Copyright 2004 - 2022 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,28 +46,28 @@ 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; + SCHED_QLOCK(root, taskUNUSE); TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) { if (!TASK_ISLOCKED(task)) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskUNUSE]); -#endif TAILQ_REMOVE(&root->root_unuse, task, task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskUNUSE]); -#endif break; } } + SCHED_QUNLOCK(root, taskUNUSE); if (!task) { - task = malloc(sizeof(sched_task_t)); + task = e_malloc(sizeof(sched_task_t)); if (!task) { LOGERR; return NULL; @@ -79,26 +79,45 @@ _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; -#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 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 * @@ -114,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; @@ -121,10 +159,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskREAD; TASK_ROOT(task) = root; @@ -134,21 +172,18 @@ 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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_read); + else + task = sched_unuseTask(task); return task; } @@ -175,10 +210,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskWRITE; TASK_ROOT(task) = root; @@ -193,16 +228,10 @@ 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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_write); + else + task = sched_unuseTask(task); return task; } @@ -222,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; @@ -229,10 +262,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskNODE; TASK_ROOT(task) = root; @@ -247,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 - task = _sched_unuseTask(task); + else + ptr = NULL; + if (!ptr) + insert_task_to(task, &root->root_node); + else + task = sched_unuseTask(task); + return task; +#endif /* KQ_SUPPORT */ } /* @@ -276,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; @@ -283,10 +373,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskPROC; TASK_ROOT(task) = root; @@ -301,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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_proc); + else + task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -330,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; @@ -341,10 +430,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskUSER; TASK_ROOT(task) = root; @@ -359,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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_user); + else + task = sched_unuseTask(task); return task; -#endif +#endif /* EVFILT_USER */ +#endif /* KQ_SUPPORT */ } /* @@ -389,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; @@ -396,10 +484,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskSIGNAL; TASK_ROOT(task) = root; @@ -414,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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_signal); + else + task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -435,7 +518,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 */ @@ -443,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; @@ -450,10 +537,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskALARM; TASK_ROOT(task) = root; @@ -468,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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_alarm); + else + task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } #ifdef AIO_SUPPORT @@ -498,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; @@ -505,10 +591,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskAIO; TASK_ROOT(task) = root; @@ -523,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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_aio); + else + task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -549,10 +630,14 @@ 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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct aiocb *acb; off_t off; @@ -568,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 @@ -584,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 */ } /* @@ -603,10 +689,14 @@ 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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct aiocb *acb; off_t off; @@ -622,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 @@ -638,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 @@ -661,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; @@ -668,10 +763,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskLIO; TASK_ROOT(task) = root; @@ -686,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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_lio); + else + task = sched_unuseTask(task); return task; +#endif /* KQ_SUPPORT */ } /* @@ -716,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; @@ -733,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)); @@ -764,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 */ } /* @@ -784,10 +879,14 @@ 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) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return NULL; +#else struct sigevent sig; struct aiocb **acb; off_t off; @@ -805,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)); @@ -836,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 */ @@ -869,10 +969,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskTIMER; TASK_ROOT(task) = root; @@ -900,25 +1000,21 @@ 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); + task = sched_unuseTask(task); return task; } @@ -945,10 +1041,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskEVENT; TASK_ROOT(task) = root; @@ -963,16 +1059,10 @@ 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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_event); + else + task = sched_unuseTask(task); return task; } @@ -1000,10 +1090,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskTASK; TASK_ROOT(task) = root; @@ -1019,21 +1109,17 @@ 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); + task = sched_unuseTask(task); return task; } @@ -1060,10 +1146,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskSUSPEND; TASK_ROOT(task) = root; @@ -1078,16 +1164,10 @@ 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 - task = _sched_unuseTask(task); + if (!ptr) + insert_task_to(task, &root->root_suspend); + else + task = sched_unuseTask(task); return task; } @@ -1114,10 +1194,10 @@ 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; + TASK_FUNC(task) = func; TASK_TYPE(task) = taskEVENT; TASK_ROOT(task) = root; @@ -1129,6 +1209,133 @@ 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 + * @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, + 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; + pthread_attr_t attr; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = sched_useTask(root))) + return NULL; + + TASK_FUNC(task) = func; + TASK_TYPE(task) = taskTHREAD; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_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; + +#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; + + if (!ptr) + insert_task_to(task, &root->root_thread); + else + task = sched_unuseTask(task); + + 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_LIBRT) && defined(HAVE_TIMER_CREATE) && \ + defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) + 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) = 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) + 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 }