--- libaitsched/inc/aitsched.h 2012/01/23 15:56:23 1.4.2.5 +++ libaitsched/inc/aitsched.h 2012/01/24 14:34:49 1.4.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.4.2.5 2012/01/23 15:56:23 misho Exp $ +* $Id: aitsched.h,v 1.4.2.7 2012/01/24 14:34:49 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -89,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 { @@ -136,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 @@ -160,7 +160,8 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* 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; @@ -204,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 @@ -270,13 +280,13 @@ sched_task_t *schedWrite(sched_root_task_t * __restric * @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, void *opt_data, size_t opt_dlen); + struct timespec ts, void *opt_data, size_t opt_dlen); /* * schedEvent() - Add EVENT task to scheduler queue * @root = root task