projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix FreeBSD/Solaris linkage
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 7698e84581c3399eb771d9ecf1f5df472d688311..558b0b072cef200dd140020c47008d29a1a01fcc 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-88,7
+88,7
@@
static int get_next_offset(struct thread_data *td, struct fio_file *f,
long r;
if (!td->sequential) {
long r;
if (!td->sequential) {
- unsigned long long max_blocks =
td->io
_size / td->min_bs[ddir];
+ unsigned long long max_blocks =
f->file
_size / td->min_bs[ddir];
int loops = 50;
do {
int loops = 50;
do {
@@
-123,7
+123,7
@@
static unsigned int get_next_buflen(struct thread_data *td, int ddir)
buflen = td->min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
buflen = td->min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
- buflen = (1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+ buflen = (
unsigned int) (
1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
if (!td->bs_unaligned)
buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
}
if (!td->bs_unaligned)
buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
}
@@
-147,13
+147,13
@@
static unsigned int get_next_buflen(struct thread_data *td, int ddir)
* mixed read/write workload, check the rwmix cycle and switch if
* necessary.
*/
* mixed read/write workload, check the rwmix cycle and switch if
* necessary.
*/
-static
int
get_rw_ddir(struct thread_data *td)
+static
enum fio_ddir
get_rw_ddir(struct thread_data *td)
{
if (td_rw(td)) {
struct timeval now;
unsigned long elapsed;
{
if (td_rw(td)) {
struct timeval now;
unsigned long elapsed;
-
gettimeofday
(&now, NULL);
+
fio_gettime
(&now, NULL);
elapsed = mtime_since_now(&td->rwmix_switch);
/*
elapsed = mtime_since_now(&td->rwmix_switch);
/*
@@
-296,14
+296,13
@@
struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
return NULL;
}
return NULL;
}
-
gettimeofday
(&io_u->start_time, NULL);
+
fio_gettime
(&io_u->start_time, NULL);
return io_u;
}
void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
return io_u;
}
void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
- struct timeval e;
unsigned long msec;
if (io_u->ddir == DDIR_SYNC) {
unsigned long msec;
if (io_u->ddir == DDIR_SYNC) {
@@
-313,21
+312,21
@@
void io_completed(struct thread_data *td, struct io_u *io_u,
td->last_was_sync = 0;
td->last_was_sync = 0;
- gettimeofday(&e, NULL);
-
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
- const
int
idx = io_u->ddir;
+ const
enum fio_ddir
idx = io_u->ddir;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
- msec = mtime_since(&io_u->issue_time, &e);
+ io_u->file->last_completed_pos = io_u->offset + io_u->buflen;
+
+ msec = mtime_since(&io_u->issue_time, &icd->time);
add_clat_sample(td, idx, msec);
add_clat_sample(td, idx, msec);
- add_bw_sample(td, idx);
+ add_bw_sample(td, idx
, &icd->time
);
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
@@
-342,6
+341,8
@@
void ios_completed(struct thread_data *td, struct io_completion_data *icd)
struct io_u *io_u;
int i;
struct io_u *io_u;
int i;
+ fio_gettime(&icd->time, NULL);
+
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;