projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
init: use o-> instead of td->o
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index 180348f841267df45bb2c9d7852d3e70097545ba..c52eba58fa10eb4e02768a74d693cc2eee8b3241 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-432,9
+432,7
@@
static int wait_for_completions(struct thread_data *td, struct timespec *time)
if ((full && !min_evts) || !td->o.iodepth_batch_complete_min)
min_evts = 1;
if ((full && !min_evts) || !td->o.iodepth_batch_complete_min)
min_evts = 1;
- if (time && (__should_check_rate(td, DDIR_READ) ||
- __should_check_rate(td, DDIR_WRITE) ||
- __should_check_rate(td, DDIR_TRIM)))
+ if (time && __should_check_rate(td))
fio_gettime(time, NULL);
do {
fio_gettime(time, NULL);
do {
@@
-463,7
+461,7
@@
int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret,
*bytes_issued += bytes;
if (!from_verify)
*bytes_issued += bytes;
if (!from_verify)
- trim_io_piece(
td,
io_u);
+ trim_io_piece(io_u);
/*
* zero read, fail
/*
* zero read, fail
@@
-489,9
+487,7
@@
int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret,
requeue_io_u(td, &io_u);
} else {
sync_done:
requeue_io_u(td, &io_u);
} else {
sync_done:
- if (comp_time && (__should_check_rate(td, DDIR_READ) ||
- __should_check_rate(td, DDIR_WRITE) ||
- __should_check_rate(td, DDIR_TRIM)))
+ if (comp_time && __should_check_rate(td))
fio_gettime(comp_time, NULL);
*ret = io_u_sync_complete(td, io_u);
fio_gettime(comp_time, NULL);
*ret = io_u_sync_complete(td, io_u);
@@
-1038,7
+1034,7
@@
static void do_io(struct thread_data *td, uint64_t *bytes_done)
if (td->o.io_submit_mode == IO_MODE_OFFLOAD) {
const unsigned long blen = io_u->xfer_buflen;
if (td->o.io_submit_mode == IO_MODE_OFFLOAD) {
const unsigned long blen = io_u->xfer_buflen;
- const enum fio_ddir ddir = acct_ddir(io_u);
+ const enum fio_ddir
__
ddir = acct_ddir(io_u);
if (td->error)
break;
if (td->error)
break;
@@
-1046,14
+1042,14
@@
static void do_io(struct thread_data *td, uint64_t *bytes_done)
workqueue_enqueue(&td->io_wq, &io_u->work);
ret = FIO_Q_QUEUED;
workqueue_enqueue(&td->io_wq, &io_u->work);
ret = FIO_Q_QUEUED;
- if (ddir_rw(ddir)) {
- td->io_issues[ddir]++;
- td->io_issue_bytes[ddir] += blen;
- td->rate_io_issue_bytes[ddir] += blen;
+ if (ddir_rw(
__
ddir)) {
+ td->io_issues[
__
ddir]++;
+ td->io_issue_bytes[
__
ddir] += blen;
+ td->rate_io_issue_bytes[
__
ddir] += blen;
}
if (should_check_rate(td))
}
if (should_check_rate(td))
- td->rate_next_io_time[
ddir] = usec_for_io(td,
ddir);
+ td->rate_next_io_time[
__ddir] = usec_for_io(td, __
ddir);
} else {
ret = io_u_submit(td, io_u);
} else {
ret = io_u_submit(td, io_u);
@@
-1533,7
+1529,7
@@
static void *thread_main(void *data)
} else
td->pid = gettid();
} else
td->pid = gettid();
- fio_local_clock_init(
o->use_thread
);
+ fio_local_clock_init();
dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);