projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Always set ->real_file_size to -1 when failed to get file size"
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 7b51dd2ee19c3cd2e29a9bbcd4ac96a01ec1eba7..69bec4bf4bcf83d57d1edf40e63c0a34f912bd02 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-576,10
+576,6
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
}
}
}
}
- if (td->o.verify != VERIFY_NONE)
- buflen = (buflen + td->o.verify_interval - 1) &
- ~(td->o.verify_interval - 1);
-
if (!td->o.bs_unaligned && is_power_of_2(minbs))
buflen &= ~(minbs - 1);
if (!td->o.bs_unaligned && is_power_of_2(minbs))
buflen &= ~(minbs - 1);
@@
-653,13
+649,17
@@
int io_u_quiesce(struct thread_data *td)
completed += ret;
}
completed += ret;
}
+ if (td->flags & TD_F_REGROW_LOGS)
+ regrow_logs(td);
+
return completed;
}
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
{
enum fio_ddir odir = ddir ^ 1;
return completed;
}
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
{
enum fio_ddir odir = ddir ^ 1;
- long usec, now;
+ long usec;
+ uint64_t now;
assert(ddir_rw(ddir));
now = utime_since_now(&td->start);
assert(ddir_rw(ddir));
now = utime_since_now(&td->start);
@@
-758,8
+758,10
@@
static enum fio_ddir get_rw_ddir(struct thread_data *td)
ddir = DDIR_READ;
else if (td_write(td))
ddir = DDIR_WRITE;
ddir = DDIR_READ;
else if (td_write(td))
ddir = DDIR_WRITE;
- else
+ else
if (td_trim(td))
ddir = DDIR_TRIM;
ddir = DDIR_TRIM;
+ else
+ ddir = DDIR_INVAL;
td->rwmix_ddir = rate_ddir(td, ddir);
return td->rwmix_ddir;
td->rwmix_ddir = rate_ddir(td, ddir);
return td->rwmix_ddir;
@@
-1902,7
+1904,7
@@
static void init_icd(struct thread_data *td, struct io_completion_data *icd,
icd->nr = nr;
icd->error = 0;
icd->nr = nr;
icd->error = 0;
- for (ddir =
DDIR_READ
; ddir < DDIR_RWDIR_CNT; ddir++)
+ for (ddir =
0
; ddir < DDIR_RWDIR_CNT; ddir++)
icd->bytes_done[ddir] = 0;
}
icd->bytes_done[ddir] = 0;
}
@@
-1941,7
+1943,7
@@
int io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
return -1;
}
return -1;
}
- for (ddir =
DDIR_READ
; ddir < DDIR_RWDIR_CNT; ddir++)
+ for (ddir =
0
; ddir < DDIR_RWDIR_CNT; ddir++)
td->bytes_done[ddir] += icd.bytes_done[ddir];
return 0;
td->bytes_done[ddir] += icd.bytes_done[ddir];
return 0;
@@
-1980,7
+1982,7
@@
int io_u_queued_complete(struct thread_data *td, int min_evts)
return -1;
}
return -1;
}
- for (ddir =
DDIR_READ
; ddir < DDIR_RWDIR_CNT; ddir++)
+ for (ddir =
0
; ddir < DDIR_RWDIR_CNT; ddir++)
td->bytes_done[ddir] += icd.bytes_done[ddir];
return ret;
td->bytes_done[ddir] += icd.bytes_done[ddir];
return ret;