projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Poll server idle loop any time the main status thread sleeps
[fio.git]
/
engines
/
splice.c
diff --git
a/engines/splice.c
b/engines/splice.c
index ca43e4343df66f0ddb2e3a10fc4f2f691a7090d7..aa00234e4576f17098e14ea2ace651b6b771a61c 100644
(file)
--- a/
engines/splice.c
+++ b/
engines/splice.c
@@
-223,8
+223,10
@@
static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
ret = fio_splice_read_old(td, io_u);
} else if (io_u->ddir == DDIR_WRITE)
ret = fio_splice_write(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
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) {
if (ret != (int) io_u->xfer_buflen) {
if (ret >= 0) {
@@
-282,7
+284,7
@@
static int fio_spliceio_init(struct thread_data *td)
* buffers. Just set ->odirect to force that.
*/
if (td_read(td))
* 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;
return 0;
td->io_ops->data = sd;
return 0;
@@
-309,7
+311,7
@@
static struct ioengine_ops ioengine = {
*/
static int fio_spliceio_init(struct thread_data fio_unused *td)
{
*/
static int fio_spliceio_init(struct thread_data fio_unused *td)
{
-
fprintf(stderr,
"fio: splice not available\n");
+
log_err(
"fio: splice not available\n");
return 1;
}
return 1;
}