libaitsched/src/tasks.c - diff

Return to tasks.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitsched / src

Diff for /libaitsched/src/tasks.c between versions 1.10 and 1.10.2.11

-version 1.10, 2012/07/24 14:06:11
+version 1.10.2.11, 2012/08/02 13:45:02
  Line 482  schedAlarm(sched_root_task_t * __restrict root, sched_
          return task;
  }
+ #ifdef AIO_SUPPORT
+ /*
+  * schedAIO() - Add AIO task to scheduler queue
+  *
+  * @root = root task
+  * @func = task execution function
+  * @arg = 1st func argument
+  * @acb = AIO cb structure address
+  * @opt_data = Optional data
+  * @opt_dlen = Optional data length
+  * return: NULL error or !=NULL new queued task
+  */
+ sched_task_t *
+ schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,
+                 struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen)
+ {
+         sched_task_t *task;
+         void *ptr;
+         if (!root || !func || !acb || !opt_dlen)
+                 return NULL;
+         /* get new task */
+         if (!(task = _sched_useTask(root)))
+                 return NULL;
+         task->task_func = func;
+         TASK_TYPE(task) = taskAIO;
+         TASK_ROOT(task) = root;
+         TASK_ARG(task) = arg;
+         TASK_VAL(task) = (u_long) acb;
+         TASK_DATA(task) = opt_data;
+         TASK_DATLEN(task) = opt_dlen;
+         if (root->root_hooks.hook_add.aio)
+                 ptr = root->root_hooks.hook_add.aio(task, NULL);
+         else
+                 ptr = NULL;
+         if (!ptr) {
+ #ifdef HAVE_LIBPTHREAD
+                 pthread_mutex_lock(&root->root_mtx[taskAIO]);
+ #endif
+                 TAILQ_INSERT_TAIL(&root->root_aio, TASK_ID(task), task_node);
+ #ifdef HAVE_LIBPTHREAD
+                 pthread_mutex_unlock(&root->root_mtx[taskAIO]);
+ #endif
+         } else
+                 task = _sched_unuseTask(task);
+         return task;
+ }
+ /*
+  * schedAIORead() - Add AIO read task to scheduler queue
+  *
+  * @root = root task
+  * @func = task execution function
+  * @arg = 1st func argument
+  * @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, off_t offset)
+ {
+         struct aiocb *acb;
+         off_t off;
+         if (!root || !func || !buffer || !buflen)
+                 return NULL;
+         if (offset == (off_t) -1) {
+                 off = lseek(fd, 0, SEEK_CUR);
+                 if (off == -1) {
+                         LOGERR;
+                         return NULL;
+                 }
+         } else
+                 off = offset;
+         if (!(acb = malloc(sizeof(struct aiocb)))) {
+                 LOGERR;
+                 return NULL;
+         } else
+                 memset(acb, 0, sizeof(struct aiocb));
+         acb->aio_fildes = fd;
+         acb->aio_nbytes = buflen;
+         acb->aio_buf = buffer;
+         acb->aio_offset = off;
+         acb->aio_sigevent.sigev_notify = SIGEV_KEVENT;
+         acb->aio_sigevent.sigev_notify_kqueue = root->root_kq;
+         acb->aio_sigevent.sigev_value.sival_ptr = acb;
+         if (aio_read(acb)) {
+                 LOGERR;
+                 free(acb);
+                 return NULL;
+         }
+         return schedAIO(root, func, arg, acb, buffer, buflen);
+ }
+ /*
+  * schedAIOWrite() - Add AIO write task to scheduler queue
+  *
+  * @root = root task
+  * @func = task execution function
+  * @arg = 1st func argument
+  * @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, off_t offset)
+ {
+         struct aiocb *acb;
+         off_t off;
+         if (!root || !func || !buffer || !buflen)
+                 return NULL;
+         if (offset == (off_t) -1) {
+                 off = lseek(fd, 0, SEEK_CUR);
+                 if (off == -1) {
+                         LOGERR;
+                         return NULL;
+                 }
+         } else
+                 off = offset;
+         if (!(acb = malloc(sizeof(struct aiocb)))) {
+                 LOGERR;
+                 return NULL;
+         } else
+                 memset(acb, 0, sizeof(struct aiocb));
+         acb->aio_fildes = fd;
+         acb->aio_nbytes = buflen;
+         acb->aio_buf = buffer;
+         acb->aio_offset = off;
+         acb->aio_sigevent.sigev_notify = SIGEV_KEVENT;
+         acb->aio_sigevent.sigev_notify_kqueue = root->root_kq;
+         acb->aio_sigevent.sigev_value.sival_ptr = acb;
+         if (aio_write(acb)) {
+                 LOGERR;
+                 free(acb);
+                 return NULL;
+         }
+         return schedAIO(root, func, arg, acb, buffer, buflen);
+ }
+ #ifdef EVFILT_LIO
+ /*
+  * schedLIO() - Add AIO bulk tasks to scheduler queue
+  *
+  * @root = root task
+  * @func = task execution function
+  * @arg = 1st func argument
+  * @acbs = AIO cb structure addresses
+  * @opt_data = Optional data
+  * @opt_dlen = Optional data length
+  * return: NULL error or !=NULL new queued task
+  */
+ sched_task_t *
+ schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,
+                 struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen)
+ {
+         sched_task_t *task;
+         void *ptr;
+         if (!root || !func || !acbs || !opt_dlen)
+                 return NULL;
+         /* get new task */
+         if (!(task = _sched_useTask(root)))
+                 return NULL;
+         task->task_func = func;
+         TASK_TYPE(task) = taskLIO;
+         TASK_ROOT(task) = root;
+         TASK_ARG(task) = arg;
+         TASK_VAL(task) = (u_long) acbs;
+         TASK_DATA(task) = opt_data;
+         TASK_DATLEN(task) = opt_dlen;
+         if (root->root_hooks.hook_add.lio)
+                 ptr = root->root_hooks.hook_add.lio(task, NULL);
+         else
+                 ptr = NULL;
+         if (!ptr) {
+ #ifdef HAVE_LIBPTHREAD
+                 pthread_mutex_lock(&root->root_mtx[taskLIO]);
+ #endif
+                 TAILQ_INSERT_TAIL(&root->root_lio, TASK_ID(task), task_node);
+ #ifdef HAVE_LIBPTHREAD
+                 pthread_mutex_unlock(&root->root_mtx[taskLIO]);
+ #endif
+         } else
+                 task = _sched_unuseTask(task);
+         return task;
+ }
+ /*
+  * schedLIORead() - Add list of AIO read tasks to scheduler queue
+  *
+  * @root = root task
+  * @func = task execution function
+  * @arg = 1st func argument
+  * @fd = file descriptor
+  * @bufs = Buffer's list
+  * @nbufs = Number of Buffers
+  * @offset = Offset from start of file, if =-1 from current position
+  * return: NULL error or !=NULL new queued task
+  */
+ sched_task_t *
+ schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,
+                 struct iovec *bufs, size_t nbufs, off_t offset)
+ {
+         struct sigevent sig;
+         struct aiocb **acb;
+         off_t off;
+         register int i;
+         if (!root || !func || !bufs || !nbufs)
+                 return NULL;
+         if (offset == (off_t) -1) {
+                 off = lseek(fd, 0, SEEK_CUR);
+                 if (off == -1) {
+                         LOGERR;
+                         return NULL;
+                 }
+         } else
+                 off = offset;
+         if (!(acb = calloc(sizeof(void*), nbufs))) {
+                 LOGERR;
+                 return NULL;
+         } else
+                 memset(acb, 0, sizeof(void*) * nbufs);
+         for (i = 0; i < nbufs; off += bufs[i++].iov_len) {
+                 acb[i] = malloc(sizeof(struct aiocb));
+                 if (!acb[i]) {
+                         LOGERR;
+                         for (i = 0; i < nbufs; i++)
+                                 if (acb[i])
+                                         free(acb[i]);
+                                 free(acb);
+                         return NULL;
+                 } else
+                         memset(acb[i], 0, sizeof(struct aiocb));
+                 acb[i]->aio_fildes = fd;
+                 acb[i]->aio_nbytes = bufs[i].iov_len;
+                 acb[i]->aio_buf = bufs[i].iov_base;
+                 acb[i]->aio_offset = off;
+                 acb[i]->aio_lio_opcode = LIO_READ;
+         }
+         memset(&sig, 0, sizeof sig);
+         sig.sigev_notify = SIGEV_KEVENT;
+         sig.sigev_notify_kqueue = root->root_kq;
+         sig.sigev_value.sival_ptr = acb;
+         if (lio_listio(LIO_NOWAIT, acb, nbufs, &sig)) {
+                 LOGERR;
+                 return NULL;
+         }
+         return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
+ }
+ /*
+  * schedLIOWrite() - Add list of AIO write tasks to scheduler queue
+  *
+  * @root = root task
+  * @func = task execution function
+  * @arg = 1st func argument
+  * @fd = file descriptor
+  * @bufs = Buffer's list
+  * @nbufs = Number of Buffers
+  * @offset = Offset from start of file, if =-1 from current position
+  * return: NULL error or !=NULL new queued task
+  */
+ 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)
+ {
+         struct sigevent sig;
+         struct aiocb **acb;
+         off_t off;
+         register int i;
+         if (!root || !func || !bufs || !nbufs)
+                 return NULL;
+         if (offset == (off_t) -1) {
+                 off = lseek(fd, 0, SEEK_CUR);
+                 if (off == -1) {
+                         LOGERR;
+                         return NULL;
+                 }
+         } else
+                 off = offset;
+         if (!(acb = calloc(sizeof(void*), nbufs))) {
+                 LOGERR;
+                 return NULL;
+         } else
+                 memset(acb, 0, sizeof(void*) * nbufs);
+         for (i = 0; i < nbufs; off += bufs[i++].iov_len) {
+                 acb[i] = malloc(sizeof(struct aiocb));
+                 if (!acb[i]) {
+                         LOGERR;
+                         for (i = 0; i < nbufs; i++)
+                                 if (acb[i])
+                                         free(acb[i]);
+                                 free(acb);
+                         return NULL;
+                 } else
+                         memset(acb[i], 0, sizeof(struct aiocb));
+                 acb[i]->aio_fildes = fd;
+                 acb[i]->aio_nbytes = bufs[i].iov_len;
+                 acb[i]->aio_buf = bufs[i].iov_base;
+                 acb[i]->aio_offset = off;
+                 acb[i]->aio_lio_opcode = LIO_WRITE;
+         }
+         memset(&sig, 0, sizeof sig);
+         sig.sigev_notify = SIGEV_KEVENT;
+         sig.sigev_notify_kqueue = root->root_kq;
+         sig.sigev_value.sival_ptr = acb;
+         if (lio_listio(LIO_NOWAIT, acb, nbufs, &sig)) {
+                 LOGERR;
+                 return NULL;
+         }
+         return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
+ }
+ #endif  /* EVFILT_LIO */
+ #endif  /* AIO_SUPPORT */
  /*
   * schedTimer() - Add TIMER task to scheduler queue
   *

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.10
changed lines
	Added in v.1.10.2.11