#include <sys/poll.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_SGIO
return 0;
}
-static int fio_sgio_getevents(struct thread_data *td, int min, int max,
- struct timespec fio_unused *t)
+static int fio_sgio_getevents(struct thread_data *td, unsigned int min,
+ unsigned 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
static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
{
struct sg_io_hdr *hdr = &io_u->hdr;
- int ret;
+ int ret, do_sync = 0;
+
+ fio_ro_check(td, io_u);
- ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
+ if (td->o.sync_io || td->o.odirect || ddir_sync(io_u->ddir))
+ do_sync = 1;
+
+ ret = fio_sgio_doio(td, io_u, do_sync);
if (ret < 0)
io_u->error = errno;
int ret;
io_u = __get_io_u(td);
- io_u->file = &td->files[0];
+ io_u->file = td->files[0];
assert(io_u);
hdr = &io_u->hdr;
free(sd->pfds);
free(sd->sgbuf);
free(sd);
-
- td->io_ops->data = NULL;
}
}
if (ret)
return 1;
} else {
- log_err("ioengine sgio only works on block devices\n");
+ log_err("ioengine sg only works on block devices\n");
return 1;
}
return ret;
if (sd && !sd->type_checked && fio_sgio_type_check(td, f)) {
- generic_close_file(td, f);
+ ret = generic_close_file(td, f);
return 1;
}
.cleanup = fio_sgio_cleanup,
.open_file = fio_sgio_open,
.close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
.flags = FIO_SYNCIO | FIO_RAWIO,
};
*/
static int fio_sgio_init(struct thread_data fio_unused *td)
{
- fprintf(stderr, "fio: sgio not available\n");
+ fprintf(stderr, "fio: ioengine sg not available\n");
return 1;
}
static struct ioengine_ops ioengine = {
- .name = "sgio",
+ .name = "sg",
.version = FIO_IOOPS_VERSION,
.init = fio_sgio_init,
};