projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fio.h cleanups
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 8c2f33b5e85e1e16bb3d6aea7564cbd5181a5e62..5cf2526b35ea4536ac978e1a727ab6bf8e8a6043 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-7,6
+7,7
@@
#include "fio.h"
#include "hash.h"
#include "fio.h"
#include "hash.h"
+#include "verify.h"
struct io_completion_data {
int nr; /* input */
struct io_completion_data {
int nr; /* input */
@@
-621,8
+622,8
@@
static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
/*
* Get next file to service by choosing one at random
*/
/*
* Get next file to service by choosing one at random
*/
-static struct fio_file *get_next_file_rand(struct thread_data *td,
int
goodf,
-
int
badf)
+static struct fio_file *get_next_file_rand(struct thread_data *td,
enum fio_file_flags
goodf,
+
enum fio_file_flags
badf)
{
struct fio_file *f;
int fno;
{
struct fio_file *f;
int fno;
@@
-634,10
+635,10
@@
static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
fno = (unsigned int) ((double) td->o.nr_files
* (r / (OS_RAND_MAX + 1.0)));
f = td->files[fno];
fno = (unsigned int) ((double) td->o.nr_files
* (r / (OS_RAND_MAX + 1.0)));
f = td->files[fno];
- if (f
->flags & FIO_FILE_DONE
)
+ if (f
io_file_done(f)
)
continue;
continue;
- if (!
(f->flags & FIO_FILE_OPEN
)) {
+ if (!
fio_file_open(f
)) {
int err;
err = td_io_open_file(td, f);
int err;
err = td_io_open_file(td, f);
@@
-674,18
+675,19
@@
static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
td->next_file = 0;
dprint(FD_FILE, "trying file %s %x\n", f->file_name, f->flags);
td->next_file = 0;
dprint(FD_FILE, "trying file %s %x\n", f->file_name, f->flags);
- if (f
->flags & FIO_FILE_DONE
) {
+ if (f
io_file_done(f)
) {
f = NULL;
continue;
}
f = NULL;
continue;
}
- if (!
(f->flags & FIO_FILE_OPEN
)) {
+ if (!
fio_file_open(f
)) {
int err;
err = td_io_open_file(td, f);
if (err) {
dprint(FD_FILE, "error %d on open of %s\n",
err, f->file_name);
int err;
err = td_io_open_file(td, f);
if (err) {
dprint(FD_FILE, "error %d on open of %s\n",
err, f->file_name);
+ f = NULL;
continue;
}
opened = 1;
continue;
}
opened = 1;
@@
-720,7
+722,7
@@
static struct fio_file *get_next_file(struct thread_data *td)
}
f = td->file_service_file;
}
f = td->file_service_file;
- if (f &&
(f->flags & FIO_FILE_OPEN) && !(f->flags & FIO_FILE_CLOSING
)) {
+ if (f &&
fio_file_open(f) && !fio_file_closing(f
)) {
if (td->o.file_service_type == FIO_FSERVICE_SEQ)
goto out;
if (td->file_service_left--)
if (td->o.file_service_type == FIO_FSERVICE_SEQ)
goto out;
if (td->file_service_left--)
@@
-729,9
+731,9
@@
static struct fio_file *get_next_file(struct thread_data *td)
if (td->o.file_service_type == FIO_FSERVICE_RR ||
td->o.file_service_type == FIO_FSERVICE_SEQ)
if (td->o.file_service_type == FIO_FSERVICE_RR ||
td->o.file_service_type == FIO_FSERVICE_SEQ)
- f = get_next_file_rr(td, FIO_FILE_
OPEN, FIO_FILE_CLOSING
);
+ f = get_next_file_rr(td, FIO_FILE_
open, FIO_FILE_closing
);
else
else
- f = get_next_file_rand(td, FIO_FILE_
OPEN, FIO_FILE_CLOSING
);
+ f = get_next_file_rand(td, FIO_FILE_
open, FIO_FILE_closing
);
td->file_service_file = f;
td->file_service_left = td->file_service_nr - 1;
td->file_service_file = f;
td->file_service_left = td->file_service_nr - 1;
@@
-758,7
+760,7
@@
static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
put_file_log(td, f);
td_io_close_file(td, f);
io_u->file = NULL;
put_file_log(td, f);
td_io_close_file(td, f);
io_u->file = NULL;
- f
->flags |= FIO_FILE_DONE
;
+ f
io_file_set_done(f)
;
td->nr_done_files++;
dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name, td->nr_done_files, td->o.nr_files);
} while (1);
td->nr_done_files++;
dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name, td->nr_done_files, td->o.nr_files);
} while (1);
@@
-828,7
+830,7
@@
struct io_u *get_io_u(struct thread_data *td)
}
f = io_u->file;
}
f = io_u->file;
- assert(f
->flags & FIO_FILE_OPEN
);
+ assert(f
io_file_open(f)
);
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen && !(td->io_ops->flags & FIO_NOIO)) {
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen && !(td->io_ops->flags & FIO_NOIO)) {
@@
-847,7
+849,6
@@
struct io_u *get_io_u(struct thread_data *td)
/*
* Set io data pointers.
*/
/*
* Set io data pointers.
*/
- io_u->endpos = io_u->offset + io_u->buflen;
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
@@
-917,11
+918,11
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
&icd->time);
if (!td->o.disable_clat) {
&icd->time);
if (!td->o.disable_clat) {
- add_clat_sample(td, idx, usec);
+ add_clat_sample(td, idx, usec
, bytes
);
io_u_mark_latency(td, usec);
}
if (!td->o.disable_bw)
io_u_mark_latency(td, usec);
}
if (!td->o.disable_bw)
- add_bw_sample(td, idx, &icd->time);
+ add_bw_sample(td, idx,
bytes,
&icd->time);
}
if (td_write(td) && idx == DDIR_WRITE &&
}
if (td_write(td) && idx == DDIR_WRITE &&
@@
-1026,7
+1027,7
@@
void io_u_queued(struct thread_data *td, struct io_u *io_u)
unsigned long slat_time;
slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
unsigned long slat_time;
slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
- add_slat_sample(td, io_u->ddir, slat_time);
+ add_slat_sample(td, io_u->ddir,
io_u->xfer_buflen,
slat_time);
}
}
}
}