projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix md5 verify
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 998c13ee7ce96c1123ec913e550ef0d6519d63d7..8cdabe6f2551dd5217d1927f46a0836b8ac8a053 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-192,6
+192,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
if (td->io_ops->flags & FIO_SYNCIO) {
fio_gettime(&io_u->issue_time, NULL);
if (td->io_ops->flags & FIO_SYNCIO) {
fio_gettime(&io_u->issue_time, NULL);
+ memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
/*
* for a sync engine, set the timeout upfront
/*
* for a sync engine, set the timeout upfront
@@
-207,9
+208,6
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
ret = td->io_ops->queue(td, io_u);
ret = td->io_ops->queue(td, io_u);
- if (ret == FIO_Q_QUEUED || ret == FIO_Q_COMPLETED)
- get_file(io_u->file);
-
if (ret == FIO_Q_QUEUED) {
int r;
if (ret == FIO_Q_QUEUED) {
int r;
@@
-223,6
+221,7
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
fio_gettime(&io_u->issue_time, NULL);
if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
fio_gettime(&io_u->issue_time, NULL);
+ memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
/*
* async engine, set the timeout here
/*
* async engine, set the timeout here
@@
-271,9
+270,16
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
return 1;
}
return 1;
}
+ if (f->filetype == FIO_TYPE_PIPE) {
+ if (td_random(td)) {
+ log_err("fio: can't seek on pipes (no random io)\n");
+ goto err;
+ }
+ }
+
f->last_free_lookup = 0;
f->last_completed_pos = 0;
f->last_free_lookup = 0;
f->last_completed_pos = 0;
- f->last_pos =
0
;
+ f->last_pos =
f->file_offset
;
f->flags |= FIO_FILE_OPEN;
f->flags &= ~FIO_FILE_CLOSING;
f->flags |= FIO_FILE_OPEN;
f->flags &= ~FIO_FILE_CLOSING;
@@
-283,7
+289,9
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
if (td->o.invalidate_cache && file_invalidate_cache(td, f))
goto err;
if (td->o.invalidate_cache && file_invalidate_cache(td, f))
goto err;
- if (td->o.fadvise_hint) {
+ if (td->o.fadvise_hint &&
+ (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
+
int flags;
if (td_random(td))
int flags;
if (td_random(td))
@@
-301,16
+309,21
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
memset(f->file_map, 0, f->num_maps * sizeof(long));
done:
memset(f->file_map, 0, f->num_maps * sizeof(long));
done:
+ log_file(td, f, FIO_LOG_OPEN_FILE);
td->nr_open_files++;
get_file(f);
return 0;
err:
td->nr_open_files++;
get_file(f);
return 0;
err:
- td->io_ops->close_file(td, f);
+ if (td->io_ops->close_file)
+ td->io_ops->close_file(td, f);
return 1;
}
void td_io_close_file(struct thread_data *td, struct fio_file *f)
{
return 1;
}
void td_io_close_file(struct thread_data *td, struct fio_file *f)
{
+ if (!(f->flags & FIO_FILE_CLOSING))
+ log_file(td, f, FIO_LOG_CLOSE_FILE);
+
/*
* mark as closing, do real close when last io on it has completed
*/
/*
* mark as closing, do real close when last io on it has completed
*/
@@
-318,4
+331,3
@@
void td_io_close_file(struct thread_data *td, struct fio_file *f)
put_file(td, f);
}
put_file(td, f);
}
-