projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure io_u->buflen is aligned to the verify_interval
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index a87175a23aa74999999ec18a64edf823e84aff90..d71e372048112e19010c1dd494a7a4b2872eb5fa 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-236,7
+236,7
@@
int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
out:
if (r >= 0) {
/*
out:
if (r >= 0) {
/*
- * Reflect that our submitted requests were retrieved with
+ * Reflect that our submitted requests were retrieved with
* whatever OS async calls are in the underlying engine.
*/
td->io_u_in_flight -= r;
* whatever OS async calls are in the underlying engine.
*/
td->io_u_in_flight -= r;
@@
-260,6
+260,11
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
assert(fio_file_open(io_u->file));
assert(fio_file_open(io_u->file));
+ /*
+ * If using a write iolog, store this entry.
+ */
+ log_io_u(td, io_u);
+
io_u->error = 0;
io_u->resid = 0;
io_u->error = 0;
io_u->resid = 0;
@@
-275,13
+280,20
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
sizeof(struct timeval));
}
sizeof(struct timeval));
}
- if (ddir_rw(
io_u->ddir
))
- td->io_issues[
io_u->ddir
]++;
+ if (ddir_rw(
acct_ddir(io_u)
))
+ td->io_issues[
acct_ddir(io_u)
]++;
ret = td->io_ops->queue(td, io_u);
unlock_file(td, io_u->file);
ret = td->io_ops->queue(td, io_u);
unlock_file(td, io_u->file);
+ /*
+ * If an error was seen and the io engine didn't propagate it
+ * back to 'td', do so.
+ */
+ if (io_u->error && !td->error)
+ td_verror(td, io_u->error, "td_io_queue");
+
/*
* Add warning for O_DIRECT so that users have an easier time
* spotting potentially bad alignment. If this triggers for the first
/*
* Add warning for O_DIRECT so that users have an easier time
* spotting potentially bad alignment. If this triggers for the first
@@
-361,14
+373,14
@@
int td_io_commit(struct thread_data *td)
if (!td->cur_depth || !td->io_u_queued)
return 0;
if (!td->cur_depth || !td->io_u_queued)
return 0;
- io_u_mark_depth(td, td->io_u_queued);
+ io_u_mark_depth(td, td->io_u_queued);
if (td->io_ops->commit) {
ret = td->io_ops->commit(td);
if (ret)
td_verror(td, -ret, "io commit");
}
if (td->io_ops->commit) {
ret = td->io_ops->commit(td);
if (ret)
td_verror(td, -ret, "io commit");
}
-
+
/*
* Reflect that events were submitted as async IO requests.
*/
/*
* Reflect that events were submitted as async IO requests.
*/
@@
-397,7
+409,7
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
return 1;
}
return 1;
}
- fio_file_reset(f);
+ fio_file_reset(
td,
f);
fio_file_set_open(f);
fio_file_clear_closing(f);
disk_util_inc(f->du);
fio_file_set_open(f);
fio_file_clear_closing(f);
disk_util_inc(f->du);
@@
-470,7
+482,9
@@
int td_io_close_file(struct thread_data *td, struct fio_file *f)
fio_file_set_closing(f);
disk_util_dec(f->du);
fio_file_set_closing(f);
disk_util_dec(f->du);
- unlock_file_all(td, f);
+
+ if (td->o.file_lock_mode != FILE_LOCK_NONE)
+ unlock_file_all(td, f);
return put_file(td, f);
}
return put_file(td, f);
}
@@
-533,7
+547,7
@@
int do_io_u_trim(struct thread_data *td, struct io_u *io_u)
ret = os_trim(f->fd, io_u->offset, io_u->xfer_buflen);
if (!ret)
ret = os_trim(f->fd, io_u->offset, io_u->xfer_buflen);
if (!ret)
- return io_u->xfer_buflen;
;
+ return io_u->xfer_buflen;
io_u->error = ret;
return 0;
io_u->error = ret;
return 0;