--- libaitsched/src/tasks.c 2011/10/04 12:34:33 1.2 +++ libaitsched/src/tasks.c 2012/05/31 14:17:59 1.8.2.1 @@ -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.8.2.1 2012/05/31 14:17:59 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,16 +46,71 @@ 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, *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]); +#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,51 +119,55 @@ 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; } /* * schedWrite() - Add WRITE 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 * -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,91 +176,376 @@ 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; } /* + * schedNode() - Add NODE 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 * +schedNode(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; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = _sched_useTask(root))) + return NULL; + + memset(task, 0, sizeof(sched_task_t)); + task->task_id = 0; + task->task_lock = 0; + task->task_func = 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) + ptr = root->root_hooks.hook_add.node(task, NULL); + else + ptr = NULL; + + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskNODE]); +#endif + TAILQ_INSERT_TAIL(&root->root_node, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskNODE]); +#endif + } else + task = _sched_unuseTask(task); + + return task; +} + +/* + * schedProc() - Add PROC task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @pid = PID + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +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) +{ + sched_task_t *task; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = _sched_useTask(root))) + return NULL; + + memset(task, 0, sizeof(sched_task_t)); + task->task_id = 0; + task->task_lock = 0; + task->task_func = func; + TASK_TYPE(task) = taskPROC; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_VAL(task) = pid; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + if (root->root_hooks.hook_add.proc) + ptr = root->root_hooks.hook_add.proc(task, NULL); + else + ptr = NULL; + + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskPROC]); +#endif + TAILQ_INSERT_TAIL(&root->root_proc, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskPROC]); +#endif + } else + task = _sched_unuseTask(task); + + return task; +} + +/* + * schedUser() - Add trigger USER task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @id = Trigger ID + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +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) +{ + sched_task_t *task; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = _sched_useTask(root))) + return NULL; + + memset(task, 0, sizeof(sched_task_t)); + task->task_id = 0; + task->task_lock = 0; + task->task_func = func; + TASK_TYPE(task) = taskUSER; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_VAL(task) = id; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + if (root->root_hooks.hook_add.user) + ptr = root->root_hooks.hook_add.user(task, NULL); + else + ptr = NULL; + + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskUSER]); +#endif + TAILQ_INSERT_TAIL(&root->root_user, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskUSER]); +#endif + } else + task = _sched_unuseTask(task); + + return task; +} + +/* + * schedSignal() - Add SIGNAL task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @sig = Signal + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +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) +{ + sched_task_t *task; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = _sched_useTask(root))) + return NULL; + + memset(task, 0, sizeof(sched_task_t)); + task->task_id = 0; + task->task_lock = 0; + task->task_func = func; + TASK_TYPE(task) = taskSIGNAL; + TASK_ROOT(task) = root; + + TASK_ARG(task) = arg; + TASK_VAL(task) = sig; + + TASK_DATA(task) = opt_data; + TASK_DATLEN(task) = opt_dlen; + + if (root->root_hooks.hook_add.signal) + ptr = root->root_hooks.hook_add.signal(task, NULL); + else + ptr = NULL; + + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskSIGNAL]); +#endif + TAILQ_INSERT_TAIL(&root->root_signal, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]); +#endif + } else + task = _sched_unuseTask(task); + + return task; +} + +/* + * schedAlarm() - Add ALARM 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 data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +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) +{ + sched_task_t *task; + void *ptr; + + if (!root || !func) + return NULL; + + /* get new task */ + if (!(task = _sched_useTask(root))) + return NULL; + + memset(task, 0, sizeof(sched_task_t)); + task->task_id = 0; + task->task_lock = 0; + task->task_func = func; + TASK_TYPE(task) = taskALARM; + 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.alarm) + ptr = root->root_hooks.hook_add.alarm(task, NULL); + else + ptr = NULL; + + if (!ptr) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskALARM]); +#endif + TAILQ_INSERT_TAIL(&root->root_alarm, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskALARM]); +#endif + } else + task = _sched_unuseTask(task); + + return task; +} + +/* * schedTimer() - Add TIMER task to scheduler queue + * * @root = root task * @func = task execution function * @arg = 1st func argument - * @ms = arguments in microSecs, define period 1sec == 1000000 + * @ts = 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 timespec ts, + void *opt_data, size_t opt_dlen) { sched_task_t *task, *t = NULL; void *ptr; - struct timeval now; - struct timespec nw; + struct timespec now; if (!root || !func) 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); - if (now.tv_usec >= 1000000) { + clock_gettime(CLOCK_MONOTONIC, &now); + now.tv_sec += ts.tv_sec; + now.tv_nsec += ts.tv_nsec; + if (now.tv_nsec >= 1000000000L) { now.tv_sec++; - now.tv_usec -= 1000000; - } else if (now.tv_usec < 0) { + now.tv_nsec -= 1000000000L; + } else if (now.tv_nsec < 0) { now.tv_sec--; - now.tv_usec += 1000000; + now.tv_nsec += 1000000000L; } - TASK_TV(task) = now; + TASK_TS(task) = now; if (root->root_hooks.hook_add.timer) ptr = root->root_hooks.hook_add.timer(task, NULL); @@ -209,36 +553,43 @@ 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 TAILQ_FOREACH(t, &root->root_timer, task_node) - if (timercmp(&TASK_TV(task), &TASK_TV(t), -) < 1) + if (sched_timespeccmp(&TASK_TS(task), &TASK_TS(t), -) < 1) break; if (!t) TAILQ_INSERT_TAIL(&root->root_timer, task, task_node); 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; } /* * schedEvent() - Add EVENT task to scheduler queue + * * @root = root task * @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 +598,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; } @@ -285,14 +636,18 @@ schedEvent(sched_root_task_t * __restrict root, sched_ /* * schedEventLo() - Add EVENT_Lo task to scheduler queue + * * @root = root task * @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,51 +656,55 @@ 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; } /* * schedCallOnce() - Call once from scheduler + * * @root = root task * @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 +713,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; }