--- libaitsched/src/tasks.c 2011/10/04 12:34:33 1.2 +++ libaitsched/src/tasks.c 2012/01/23 15:56:23 1.4.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tasks.c,v 1.2 2011/10/04 12:34:33 misho Exp $ +* $Id: tasks.c,v 1.4.2.2 2012/01/23 15:56:23 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -46,16 +46,70 @@ SUCH DAMAGE. #include "global.h" +#pragma GCC visibility push(hidden) + +inline sched_task_t * +_sched_useTask(sched_root_task_t * __restrict root) +{ + sched_task_t *task; + + TAILQ_FOREACH(task, &root->root_unuse, task_node) { + 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; + } + } + + if (!task) { + task = malloc(sizeof(sched_task_t)); + if (!task) { + LOGERR; + return NULL; + } + } + + return task; +} + +inline 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, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[taskUNUSE]); +#endif + task = NULL; + + return task; +} + +#pragma GCC visibility pop + + /* * schedRead() - Add READ I/O task 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 * -schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd) +schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, + void *opt_data, size_t opt_dlen) { sched_task_t *task; void *ptr; @@ -64,37 +118,37 @@ schedRead(sched_root_task_t * __restrict root, sched_t return NULL; /* get new task */ - if ((task = TAILQ_FIRST(&root->root_unuse))) - TAILQ_REMOVE(&root->root_unuse, task, task_node); - else { - task = malloc(sizeof(sched_task_t)); - if (!task) { - LOGERR; - return NULL; - } - } + if (!(task = _sched_useTask(root))) + return NULL; memset(task, 0, sizeof(sched_task_t)); task->task_id = 0; - task->task_type = taskREAD; - task->task_root = root; + task->task_lock = 0; task->task_func = func; + TASK_TYPE(task) = taskREAD; + 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.read) ptr = root->root_hooks.hook_add.read(task, NULL); else ptr = NULL; - if (!ptr) + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskREAD]); +#endif TAILQ_INSERT_TAIL(&root->root_read, task, task_node); - else { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node); - task = NULL; - } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskREAD]); +#endif + } else + task = _sched_unuseTask(task); return task; } @@ -105,10 +159,13 @@ schedRead(sched_root_task_t * __restrict root, sched_t * @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 * -schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd) +schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, + void *opt_data, size_t opt_dlen) { sched_task_t *task; void *ptr; @@ -117,37 +174,37 @@ schedWrite(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if ((task = TAILQ_FIRST(&root->root_unuse))) - TAILQ_REMOVE(&root->root_unuse, task, task_node); - else { - task = malloc(sizeof(sched_task_t)); - if (!task) { - LOGERR; - return NULL; - } - } + if (!(task = _sched_useTask(root))) + return NULL; memset(task, 0, sizeof(sched_task_t)); task->task_id = 0; - task->task_type = taskWRITE; - task->task_root = root; + task->task_lock = 0; task->task_func = func; + TASK_TYPE(task) = taskWRITE; + 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.write) ptr = root->root_hooks.hook_add.write(task, NULL); else ptr = NULL; - if (!ptr) + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskWRITE]); +#endif TAILQ_INSERT_TAIL(&root->root_write, task, task_node); - else { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node); - task = NULL; - } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskWRITE]); +#endif + } else + task = _sched_unuseTask(task); return task; } @@ -157,11 +214,14 @@ schedWrite(sched_root_task_t * __restrict root, sched_ * @root = root task * @func = task execution function * @arg = 1st func argument - * @ms = arguments in microSecs, define period 1sec == 1000000 + * @tv = timeout argument structure + * @opt_data = Optional data + * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ sched_task_t * -schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_int ms) +schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv, + void *opt_data, size_t opt_dlen) { sched_task_t *task, *t = NULL; void *ptr; @@ -172,28 +232,25 @@ schedTimer(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if ((task = TAILQ_FIRST(&root->root_unuse))) - TAILQ_REMOVE(&root->root_unuse, task, task_node); - else { - task = malloc(sizeof(sched_task_t)); - if (!task) { - LOGERR; - return NULL; - } - } + if (!(task = _sched_useTask(root))) + return NULL; memset(task, 0, sizeof(sched_task_t)); task->task_id = 0; - task->task_type = taskTIMER; - task->task_root = root; + task->task_lock = 0; task->task_func = func; + TASK_TYPE(task) = taskTIMER; + TASK_ROOT(task) = root; TASK_ARG(task) = arg; + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + /* calculate timeval structure */ clock_gettime(CLOCK_MONOTONIC, &nw); - now.tv_sec = nw.tv_sec + ms / 1000000; - now.tv_usec = nw.tv_nsec / 1000 + (ms % 1000000); + now.tv_sec = nw.tv_sec + tv.tv_sec; + now.tv_usec = nw.tv_nsec / 1000 + tv.tv_usec; if (now.tv_usec >= 1000000) { now.tv_sec++; now.tv_usec -= 1000000; @@ -209,6 +266,9 @@ schedTimer(sched_root_task_t * __restrict root, sched_ ptr = NULL; if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskTIMER]); +#endif #ifdef TIMER_WITHOUT_SORT TAILQ_INSERT_TAIL(&root->root_timer, task, task_node); #else @@ -220,11 +280,11 @@ schedTimer(sched_root_task_t * __restrict root, sched_ else TAILQ_INSERT_BEFORE(t, task, task_node); #endif - } else { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node); - task = NULL; - } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskTIMER]); +#endif + } else + task = _sched_unuseTask(task); return task; } @@ -235,10 +295,13 @@ schedTimer(sched_root_task_t * __restrict root, sched_ * @func = task execution function * @arg = 1st func argument * @val = additional func argument + * @opt_data = Optional data + * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ sched_task_t * -schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val) +schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, + void *opt_data, size_t opt_dlen) { sched_task_t *task; void *ptr; @@ -247,37 +310,37 @@ schedEvent(sched_root_task_t * __restrict root, sched_ return NULL; /* get new task */ - if ((task = TAILQ_FIRST(&root->root_unuse))) - TAILQ_REMOVE(&root->root_unuse, task, task_node); - else { - task = malloc(sizeof(sched_task_t)); - if (!task) { - LOGERR; - return NULL; - } - } + if (!(task = _sched_useTask(root))) + return NULL; memset(task, 0, sizeof(sched_task_t)); task->task_id = 0; - task->task_type = taskEVENT; - task->task_root = root; + task->task_lock = 0; task->task_func = func; + TASK_TYPE(task) = taskEVENT; + TASK_ROOT(task) = root; TASK_ARG(task) = arg; TASK_VAL(task) = val; + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + if (root->root_hooks.hook_add.event) ptr = root->root_hooks.hook_add.event(task, NULL); else ptr = NULL; - if (!ptr) + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskEVENT]); +#endif TAILQ_INSERT_TAIL(&root->root_event, task, task_node); - else { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node); - task = NULL; - } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskEVENT]); +#endif + } else + task = _sched_unuseTask(task); return task; } @@ -289,10 +352,13 @@ schedEvent(sched_root_task_t * __restrict root, sched_ * @func = task execution function * @arg = 1st func argument * @val = additional func argument + * @opt_data = Optional data + * @opt_dlen = Optional data length * return: NULL error or !=NULL new queued task */ sched_task_t * -schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val) +schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, + void *opt_data, size_t opt_dlen) { sched_task_t *task; void *ptr; @@ -301,37 +367,37 @@ schedEventLo(sched_root_task_t * __restrict root, sche return NULL; /* get new task */ - if ((task = TAILQ_FIRST(&root->root_unuse))) - TAILQ_REMOVE(&root->root_unuse, task, task_node); - else { - task = malloc(sizeof(sched_task_t)); - if (!task) { - LOGERR; - return NULL; - } - } + if (!(task = _sched_useTask(root))) + return NULL; memset(task, 0, sizeof(sched_task_t)); task->task_id = 0; - task->task_type = taskEVENT; - task->task_root = root; + task->task_lock = 0; task->task_func = func; + TASK_TYPE(task) = taskEVENT; + TASK_ROOT(task) = root; TASK_ARG(task) = arg; TASK_VAL(task) = val; + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + if (root->root_hooks.hook_add.eventlo) ptr = root->root_hooks.hook_add.eventlo(task, NULL); else ptr = NULL; - if (!ptr) + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskEVENTLO]); +#endif TAILQ_INSERT_TAIL(&root->root_eventlo, task, task_node); - else { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node); - task = NULL; - } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskEVENTLO]); +#endif + } else + task = _sched_unuseTask(task); return task; } @@ -342,10 +408,13 @@ schedEventLo(sched_root_task_t * __restrict root, sche * @func = task execution function * @arg = 1st func argument * @val = additional func argument + * @opt_data = Optional data + * @opt_dlen = Optional data length * return: return value from called func */ sched_task_t * -schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val) +schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, + void *opt_data, size_t opt_dlen) { sched_task_t *task; void *ret; @@ -354,28 +423,24 @@ schedCallOnce(sched_root_task_t * __restrict root, sch return NULL; /* get new task */ - if ((task = TAILQ_FIRST(&root->root_unuse))) - TAILQ_REMOVE(&root->root_unuse, task, task_node); - else { - task = malloc(sizeof(sched_task_t)); - if (!task) { - LOGERR; - return NULL; - } - } + if (!(task = _sched_useTask(root))) + return NULL; memset(task, 0, sizeof(sched_task_t)); task->task_id = 0; - task->task_type = taskEVENT; - task->task_root = root; + task->task_lock = 0; task->task_func = func; + TASK_TYPE(task) = taskEVENT; + TASK_ROOT(task) = root; TASK_ARG(task) = arg; TASK_VAL(task) = val; + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + ret = schedCall(task); - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node); + _sched_unuseTask(task); return ret; }