#include "../fio.h"
-#ifdef FIO_HAVE_SPLICE
-
struct spliceio_data {
int pipe[2];
int vmsplice_to_user;
*/
static int fio_splice_read_old(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops->data;
+ struct spliceio_data *sd = td->io_ops_data;
struct fio_file *f = io_u->file;
int ret, ret2, buflen;
off_t offset;
*/
static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops->data;
+ struct spliceio_data *sd = td->io_ops_data;
struct fio_file *f = io_u->file;
struct iovec iov;
int ret , buflen, mmap_len;
off_t offset;
void *p, *map;
-restart:
ret = 0;
offset = io_u->offset;
mmap_len = buflen = io_u->xfer_buflen;
buflen -= ret;
iov.iov_base = p;
iov.iov_len = ret;
- p += ret;
while (iov.iov_len) {
ret = vmsplice(sd->pipe[0], &iov, 1, SPLICE_F_MOVE);
if (ret < 0) {
- if (errno == EFAULT && sd->vmsplice_to_user_map) {
+ if (errno == EFAULT &&
+ sd->vmsplice_to_user_map) {
sd->vmsplice_to_user_map = 0;
munmap(map, mmap_len);
- goto restart;
+ map = NULL;
+ p = io_u->xfer_buf;
+ iov.iov_base = p;
+ continue;
}
if (errno == EBADF) {
ret = -EBADF;
iov.iov_len -= ret;
iov.iov_base += ret;
+ p += ret;
}
if (ret < 0)
break;
*/
static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops->data;
+ struct spliceio_data *sd = td->io_ops_data;
struct iovec iov = {
.iov_base = io_u->xfer_buf,
.iov_len = io_u->xfer_buflen,
static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
{
- struct spliceio_data *sd = td->io_ops->data;
- int ret;
+ struct spliceio_data *sd = td->io_ops_data;
+ int ret = 0;
fio_ro_check(td, io_u);
ret = fio_splice_read_old(td, io_u);
} else if (io_u->ddir == DDIR_WRITE)
ret = fio_splice_write(td, io_u);
+ else if (io_u->ddir == DDIR_TRIM)
+ ret = do_io_u_trim(td, io_u);
else
- ret = fsync(io_u->file->fd);
+ ret = do_io_u_sync(td, io_u);
if (ret != (int) io_u->xfer_buflen) {
if (ret >= 0) {
io_u->error = errno;
}
- if (io_u->error)
+ if (io_u->error) {
td_verror(td, io_u->error, "xfer");
+ if (io_u->error == EINVAL)
+ log_err("fio: looks like splice doesn't work on this"
+ " file system\n");
+ }
return FIO_Q_COMPLETED;
}
static void fio_spliceio_cleanup(struct thread_data *td)
{
- struct spliceio_data *sd = td->io_ops->data;
+ struct spliceio_data *sd = td->io_ops_data;
if (sd) {
close(sd->pipe[0]);
* buffers. Just set ->odirect to force that.
*/
if (td_read(td))
- td->o.odirect = 1;
+ td->o.mem_align = 1;
- td->io_ops->data = sd;
+ td->io_ops_data = sd;
return 0;
}
.cleanup = fio_spliceio_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
- .flags = FIO_SYNCIO,
+ .get_file_size = generic_get_file_size,
+ .flags = FIO_SYNCIO | FIO_PIPEIO,
};
-#else /* FIO_HAVE_SPLICE */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_spliceio_init(struct thread_data fio_unused *td)
-{
- fprintf(stderr, "fio: splice not available\n");
- return 1;
-}
-
-static struct ioengine_ops ioengine = {
- .name = "splice",
- .version = FIO_IOOPS_VERSION,
- .init = fio_spliceio_init,
-};
-
-#endif
-
static void fio_init fio_spliceio_register(void)
{
register_ioengine(&ioengine);