projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net engine: cleanup the splice handling
[fio.git]
/
engines
/
sync.c
diff --git
a/engines/sync.c
b/engines/sync.c
index 6a5b7d391ed206a465f8b2d1cbd7fcf550305c8f..ee8e3c367360166b7f95b312988ff89c07b5e09e 100644
(file)
--- a/
engines/sync.c
+++ b/
engines/sync.c
@@
-1,5
+1,8
@@
/*
/*
- * regular read/write sync io engine
+ * sync engine
+ *
+ * IO engine that does regular read(2)/write(2) with lseek(2) to transfer
+ * data.
*
*/
#include <stdio.h>
*
*/
#include <stdio.h>
@@
-9,7
+12,6
@@
#include <assert.h>
#include "../fio.h"
#include <assert.h>
#include "../fio.h"
-#include "../os.h"
static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
{
static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
{
@@
-21,7
+23,7
@@
static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
return 0;
if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
return 0;
if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
- td_verror(td, errno);
+ td_verror(td, errno
, "lseek"
);
return 1;
}
return 1;
}
@@
-41,7
+43,7
@@
static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
ret = fsync(f->fd);
if (ret != (int) io_u->xfer_buflen) {
ret = fsync(f->fd);
if (ret != (int) io_u->xfer_buflen) {
- if (ret > 0) {
+ if (ret >
=
0) {
io_u->resid = io_u->xfer_buflen - ret;
io_u->error = 0;
return FIO_Q_COMPLETED;
io_u->resid = io_u->xfer_buflen - ret;
io_u->error = 0;
return FIO_Q_COMPLETED;
@@
-50,7
+52,7
@@
static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
}
if (io_u->error)
}
if (io_u->error)
- td_verror(td, io_u->error);
+ td_verror(td, io_u->error
, "xfer"
);
return FIO_Q_COMPLETED;
}
return FIO_Q_COMPLETED;
}
@@
-60,6
+62,8
@@
static struct ioengine_ops ioengine = {
.version = FIO_IOOPS_VERSION,
.prep = fio_syncio_prep,
.queue = fio_syncio_queue,
.version = FIO_IOOPS_VERSION,
.prep = fio_syncio_prep,
.queue = fio_syncio_queue,
+ .open_file = generic_open_file,
+ .close_file = generic_close_file,
.flags = FIO_SYNCIO,
};
.flags = FIO_SYNCIO,
};