--- libaitsched/inc/aitsched.h 2012/08/02 11:37:08 1.11.2.7 +++ libaitsched/inc/aitsched.h 2012/08/02 12:58:02 1.11.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.11.2.7 2012/08/02 11:37:08 misho Exp $ +* $Id: aitsched.h,v 1.11.2.10 2012/08/02 12:58:02 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -53,7 +53,7 @@ SUCH DAMAGE. #include #include #include -#ifdef EVFILT_AIO +#ifdef EVFILT_LIO #include #endif @@ -406,7 +406,7 @@ sched_task_t *schedSignal(sched_root_task_t * __restri #define schedSignalSelf(x) schedSignal(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) -#ifdef EVFILT_AIO +#ifdef EVFILT_LIO /* * schedAIO() - Add AIO task to scheduler queue * @@ -429,10 +429,11 @@ sched_task_t *schedAIO(sched_root_task_t * __restrict * @fd = file descriptor * @buffer = Buffer * @buflen = Buffer length + * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ inline sched_task_t *schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, - void *arg, int fd, void *buffer, size_t buflen); + void *arg, int fd, void *buffer, size_t buflen, off_t offset); /* * schedAIOWrite() - Add AIO write task to scheduler queue * @@ -442,11 +443,11 @@ inline sched_task_t *schedAIORead(sched_root_task_t * * @fd = file descriptor * @buffer = Buffer * @buflen = Buffer length + * @offset = Offset from start of file, if =-1 from current position * return: NULL error or !=NULL new queued task */ inline sched_task_t *schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, - void *arg, int fd, void *buffer, size_t buflen); -#ifdef EVFILT_LIO + void *arg, int fd, void *buffer, size_t buflen, off_t offset); /* * schedLIORead() - Add list of AIO read tasks to scheduler queue * @@ -476,7 +477,6 @@ inline sched_task_t *schedLIORead(sched_root_task_t * inline 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); #endif /* EVFILT_LIO */ -#endif /* EVFILT_AIO */ /* * schedUser() - Add trigger USER task to scheduler queue