--- libaitsched/inc/aitsched.h 2012/01/08 00:51:17 1.4 +++ libaitsched/inc/aitsched.h 2012/01/24 21:59:46 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.4 2012/01/08 00:51:17 misho Exp $ +* $Id: aitsched.h,v 1.5 2012/01/24 21:59:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -51,6 +51,7 @@ SUCH DAMAGE. #include #include #include +#include /* criteria type */ @@ -70,6 +71,7 @@ typedef enum { taskWRITE, taskTIMER, taskEVENT, + taskEVENTLO, taskREADY, taskUNUSE, taskMAX @@ -87,7 +89,7 @@ struct sched_HooksTask { sched_hook_func_t event; /* eventlo(sched_task_t *task, NULL) -> int */ sched_hook_func_t eventlo; - /* timer(sched_task_t *task, struct timeval *tv) -> int */ + /* timer(sched_task_t *task, struct timespec *ts) -> int */ sched_hook_func_t timer; } hook_add; struct { @@ -124,6 +126,7 @@ struct sched_Task { volatile int task_lock; unsigned int task_id; sched_task_type_t task_type; +#define TASK_TYPE(x) (x)->task_type sched_root_task_t *task_root; #define TASK_ROOT(x) (x)->task_root @@ -133,12 +136,12 @@ struct sched_Task { union { unsigned long v; intptr_t fd; - struct timeval tv; + struct timespec ts; } task_val; #define TASK_ARG(x) (x)->task_arg #define TASK_VAL(x) (x)->task_val.v #define TASK_FD(x) (x)->task_val.fd -#define TASK_TV(x) (x)->task_val.tv +#define TASK_TS(x) (x)->task_val.ts struct iovec task_data; #define TASK_DATA(x) (x)->task_data.iov_base @@ -147,11 +150,19 @@ struct sched_Task { TAILQ_ENTRY(sched_Task) task_node; }; typedef TAILQ_HEAD(, sched_Task) sched_queue_t; +#define TASK_DATA_SET(x, _dp, _dl) do { \ + if ((x)) { \ + (x)->task_data.iov_base = (_dp); \ + (x)->task_data.iov_len = _dl; \ + } \ + while (0) /* root task */ struct sched_RootTask { int root_kq; - struct timeval root_wait; + struct timespec root_wait; + struct timespec root_poll; + pthread_mutex_t root_mtx[taskMAX]; sched_queue_t root_read; sched_queue_t root_write; @@ -194,6 +205,15 @@ int schedEnd(sched_root_task_t ** __restrict root); */ int schedRegisterHooks(sched_root_task_t * __restrict root); /* + * schedPolling() - Polling timeout period if no timer task is present + * @root = root task + * @ts = timeout polling period, if ==NULL INFINIT timeout + * @tsold = old timeout polling if !=NULL + * return: -1 error or 0 ok + */ +inline int schedPolling(sched_root_task_t * __restrict root, + struct timespec * __restrict ts, struct timespec * __restrict tsold); +/* * schedCall() - Call task execution function * @task = current task * return: !=NULL error or =NULL ok @@ -221,13 +241,13 @@ int schedCancel(sched_task_t * __restrict task); /* * schedCancelby() - Cancel task from scheduler by criteria * @root = root task - * @queue = cancel from queue, if =NULL cancel same task from all queues + * @type = cancel from queue type, if =taskMAX cancel same task from all queues * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TV] * @param = search parameter * @hook = custom cleanup hook function, may be NULL * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok */ -int schedCancelby(sched_root_task_t * __restrict root, sched_queue_t * __restrict queue, +int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, u_char criteria, void *param, sched_hook_func_t hook); @@ -237,54 +257,72 @@ int schedCancelby(sched_root_task_t * __restrict root, * @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); +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); /* * 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); +sched_task_t *schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + int fd, void *opt_data, size_t opt_dlen); /* * schedTimer() - Add TIMER task to scheduler queue * @root = root task * @func = task execution function * @arg = 1st func argument - * @tv = timeout argument structure + * @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, struct timeval tv); +sched_task_t *schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + struct timespec ts, void *opt_data, size_t opt_dlen); /* * 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, unsigned long val); +sched_task_t *schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + unsigned long val, void *opt_data, size_t opt_dlen); /* * 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, unsigned long val); +sched_task_t *schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + unsigned long val, void *opt_data, size_t opt_dlen); /* * 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, unsigned long val); +sched_task_t *schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + unsigned long val, void *opt_data, size_t opt_dlen); #endif