#include <sys/poll.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_SGIO
static int fio_sgio_getevents(struct thread_data *td, int min, int max,
struct timespec fio_unused *t)
{
- /*
- * normally hard coding &td->files[0] is a bug that needs to be fixed,
- * but it's ok here as all files should point to the same device.
- */
- struct fio_file *f = &td->files[0];
struct sgio_data *sd = td->io_ops->data;
int left = max, ret, r = 0;
void *buf = sd->sgbuf;
unsigned int i, events;
+ struct fio_file *f;
/*
* Fill in the file descriptors
if (!min)
break;
- ret = poll(sd->pfds, td->nr_files, -1);
+ ret = poll(sd->pfds, td->o.nr_files, -1);
if (ret < 0) {
if (!r)
r = -errno;
} else if (!ret)
continue;
- if (pollin_events(sd->pfds, td->nr_files))
+ if (pollin_events(sd->pfds, td->o.nr_files))
break;
} while (1);
ret = ioctl(f->fd, SG_IO, hdr);
if (ret < 0)
- return -errno;
+ return ret;
return FIO_Q_COMPLETED;
}
ret = write(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
- return errno;
+ return ret;
if (sync) {
ret = read(f->fd, hdr, sizeof(*hdr));
if (ret < 0)
- return -errno;
+ return ret;
return FIO_Q_COMPLETED;
}
sd = malloc(sizeof(*sd));
memset(sd, 0, sizeof(*sd));
- sd->cmds = malloc(td->iodepth * sizeof(struct sgio_cmd));
- 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);
+ sd->cmds = malloc(td->o.iodepth * sizeof(struct sgio_cmd));
+ memset(sd->cmds, 0, td->o.iodepth * sizeof(struct sgio_cmd));
+ sd->events = malloc(td->o.iodepth * sizeof(struct io_u *));
+ memset(sd->events, 0, td->o.iodepth * sizeof(struct io_u *));
+ sd->pfds = malloc(sizeof(struct pollfd) * td->o.nr_files);
+ memset(sd->pfds, 0, sizeof(struct pollfd) * td->o.nr_files);
+ sd->fd_flags = malloc(sizeof(int) * td->o.nr_files);
+ memset(sd->fd_flags, 0, sizeof(int) * td->o.nr_files);
+ sd->sgbuf = malloc(sizeof(struct sg_io_hdr) * td->o.iodepth);
+ memset(sd->sgbuf, 0, sizeof(struct sg_io_hdr) * td->o.iodepth);
td->io_ops->data = sd;
/*
* we want to do it, regardless of whether odirect is set or not
*/
- td->override_sync = 1;
+ td->o.override_sync = 1;
return 0;
}
if (ret)
return ret;
- if (!sd->type_checked && fio_sgio_type_check(td, f)) {
+ if (sd && !sd->type_checked && fio_sgio_type_check(td, f)) {
generic_close_file(td, f);
return 1;
}