projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of syslet-rw compile warnings on 32-bit
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index b9c6d71400ec672b0288e0abe17f6cff345f9941..d34d2f4303764566da297e327670d935e23de7ea 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-157,6
+157,8
@@
void close_ioengine(struct thread_data *td)
int td_io_prep(struct thread_data *td, struct io_u *io_u)
{
int td_io_prep(struct thread_data *td, struct io_u *io_u)
{
+ fio_ro_check(td, io_u);
+
if (td->io_ops->prep)
return td->io_ops->prep(td, io_u);
if (td->io_ops->prep)
return td->io_ops->prep(td, io_u);
@@
-182,6
+184,8
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
{
int ret;
{
int ret;
+ fio_ro_check(td, io_u);
+
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
io_u->flags |= IO_U_F_FLIGHT;
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
io_u->flags |= IO_U_F_FLIGHT;
@@
-192,6
+196,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
+212,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
+225,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
@@
-242,7
+245,7
@@
int td_io_init(struct thread_data *td)
if (td->io_ops->init) {
ret = td->io_ops->init(td);
if (ret && td->o.iodepth > 1)
if (td->io_ops->init) {
ret = td->io_ops->init(td);
if (ret && td->o.iodepth > 1)
- log_err("fio: io engine init failed. Perhaps try reducing io d
pe
th?\n");
+ log_err("fio: io engine init failed. Perhaps try reducing io d
ep
th?\n");
}
return ret;
}
return ret;
@@
-271,9
+274,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
+293,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,6
+313,7
@@
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;
td->nr_open_files++;
get_file(f);
return 0;
@@
-312,6
+325,9
@@
err:
void td_io_close_file(struct thread_data *td, struct fio_file *f)
{
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
*/