struct sgio_data {
struct sgio_cmd *cmds;
struct io_u **events;
+ struct pollfd *pfds;
+ int *fd_flags;
+ void *sgbuf;
unsigned int bs;
};
}
}
-static int fio_sgio_ioctl_getevents(struct thread_data *td, int fio_unused min,
- int max, struct timespec fio_unused *t)
-{
- assert(max <= 1);
-
- /*
- * we can only have one finished io_u for sync io, since the depth
- * is always 1
- */
- if (list_empty(&td->io_u_busylist))
- return 0;
-
- return 1;
-}
-
static int pollin_events(struct pollfd *pfds, int fds)
{
int i;
*/
struct fio_file *f = &td->files[0];
struct sgio_data *sd = td->io_ops->data;
- int left = max, ret, events, i, r = 0, *fl;
- struct pollfd *pfds;
- void *buf;
+ int left = max, ret, events, i, r = 0;
+ void *buf = sd->sgbuf;
/*
* Fill in the file descriptors
*/
- pfds = malloc(sizeof(struct pollfd) * td->nr_files);
- fl = malloc(sizeof(int) * td->nr_files);
-
for_each_file(td, f, i) {
/*
* don't block for min events == 0
*/
if (!min) {
- fl[i] = fcntl(f->fd, F_GETFL);
- fcntl(f->fd, F_SETFL, fl[i] | O_NONBLOCK);
+ sd->fd_flags[i] = fcntl(f->fd, F_GETFL);
+ fcntl(f->fd, F_SETFL, sd->fd_flags[i] | O_NONBLOCK);
}
- pfds[i].fd = f->fd;
- pfds[i].events = POLLIN;
+ sd->pfds[i].fd = f->fd;
+ sd->pfds[i].events = POLLIN;
}
- buf = malloc(max * sizeof(struct sg_io_hdr));
while (left) {
void *p;
if (!min)
break;
- ret = poll(pfds, td->nr_files, -1);
+ ret = poll(sd->pfds, td->nr_files, -1);
if (ret < 0) {
- td_verror(td, errno);
if (!r)
- r = -1;
+ r = -errno;
+ td_verror(td, errno, "poll");
break;
} else if (!ret)
continue;
- if (pollin_events(pfds, td->nr_files))
+ if (pollin_events(sd->pfds, td->nr_files))
break;
} while (1);
if (ret < 0) {
if (errno == EAGAIN)
continue;
- td_verror(td, errno);
- r = -1;
+ r = -errno;
+ td_verror(td, errno, "read");
break;
} else if (ret) {
p += ret;
if (!min) {
for_each_file(td, f, i)
- fcntl(f->fd, F_SETFL, fl[i]);
+ fcntl(f->fd, F_SETFL, sd->fd_flags[i]);
}
- free(buf);
- free(pfds);
- free(fl);
return r;
}
{
struct sgio_data *sd = td->io_ops->data;
struct sg_io_hdr *hdr = &io_u->hdr;
+ int ret;
sd->events[0] = io_u;
- return ioctl(f->fd, SG_IO, hdr);
+ ret = ioctl(f->fd, SG_IO, hdr);
+ if (ret < 0)
+ return -errno;
+
+ return FIO_Q_COMPLETED;
}
static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
if (sync) {
ret = read(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
- return errno;
+ return -errno;
+ return FIO_Q_COMPLETED;
}
- return 0;
+ return FIO_Q_QUEUED;
}
static int fio_sgio_doio(struct thread_data *td, struct io_u *io_u, int sync)
io_u->error = EIO;
}
- return io_u->error;
+ if (io_u->error) {
+ td_verror(td, io_u->error, "xfer");
+ return FIO_Q_COMPLETED;
+ }
+
+ return ret;
}
static struct io_u *fio_sgio_event(struct thread_data *td, int event)
int ret;
io_u = __get_io_u(td);
+ io_u->file = &td->files[0];
assert(io_u);
hdr = &io_u->hdr;
static void fio_sgio_cleanup(struct thread_data *td)
{
- if (td->io_ops->data) {
- free(td->io_ops->data);
+ struct sgio_data *sd = td->io_ops->data;
+
+ if (sd) {
+ free(sd->events);
+ free(sd->cmds);
+ free(sd->fd_flags);
+ free(sd->pfds);
+ free(sd->sgbuf);
+ free(sd);
+
td->io_ops->data = NULL;
}
}
memset(sd->cmds, 0, td->iodepth * sizeof(struct sgio_cmd));
sd->events = malloc(td->iodepth * sizeof(struct io_u *));
memset(sd->events, 0, td->iodepth * sizeof(struct io_u *));
+ sd->pfds = malloc(sizeof(struct pollfd) * td->nr_files);
+ memset(sd->pfds, 0, sizeof(struct pollfd) * td->nr_files);
+ sd->fd_flags = malloc(sizeof(int) * td->nr_files);
+ memset(sd->fd_flags, 0, sizeof(int) * td->nr_files);
+ sd->sgbuf = malloc(sizeof(struct sg_io_hdr) * td->iodepth);
+ memset(sd->sgbuf, 0, sizeof(struct sg_io_hdr) * td->iodepth);
+
td->io_ops->data = sd;
if (td->filetype == FIO_TYPE_BD) {
if (ioctl(f->fd, BLKSSZGET, &bs) < 0) {
- td_verror(td, errno);
+ td_verror(td, errno, "ioctl");
goto err;
}
} else if (td->filetype == FIO_TYPE_CHAR) {
int version;
if (ioctl(f->fd, SG_GET_VERSION_NUM, &version) < 0) {
- td_verror(td, errno);
+ td_verror(td, errno, "ioctl");
goto err;
}
sd->bs = bs;
- if (td->filetype == FIO_TYPE_BD)
- td->io_ops->getevents = fio_sgio_ioctl_getevents;
- else
- td->io_ops->getevents = fio_sgio_getevents;
+ if (td->filetype == FIO_TYPE_BD) {
+ td->io_ops->getevents = NULL;
+ td->io_ops->event = NULL;
+ }
/*
* we want to do it, regardless of whether odirect is set or not
err:
free(sd->events);
free(sd->cmds);
+ free(sd->fd_flags);
+ free(sd->pfds);
+ free(sd->sgbuf);
free(sd);
td->io_ops->data = NULL;
return 1;