projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Remove rate_quit remnants
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 76710e19fba08166902c52cdb8218cda45235928..0221ca5b959440952783ffcd7fb98e957e9d02d8 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-45,7
+45,7
@@
int groupid = 0;
int thread_number = 0;
int shm_id = 0;
int temp_stall_ts;
int thread_number = 0;
int shm_id = 0;
int temp_stall_ts;
-char *fio_inst_prefix = _INST_PREFIX;
+c
onst c
har *fio_inst_prefix = _INST_PREFIX;
static volatile int startup_sem;
static volatile int startup_sem;
@@
-436,10
+436,10
@@
static void do_io(struct thread_data *td)
gettimeofday(&e, NULL);
usec = utime_since(&s, &e);
gettimeofday(&e, NULL);
usec = utime_since(&s, &e);
- rate_throttle(td, usec, icd.bytes_done[td->ddir]);
+ rate_throttle(td, usec, icd.bytes_done[td->ddir]
, td->ddir
);
if (check_min_rate(td, &e)) {
if (check_min_rate(td, &e)) {
- if (
rate_quit
)
+ if (
exitall_on_terminate
)
terminate_threads(td->groupid);
td_verror(td, ENOMEM);
break;
terminate_threads(td->groupid);
td_verror(td, ENOMEM);
break;
@@
-495,6
+495,7
@@
static void fill_rand_buf(struct io_u *io_u, int max_bs)
static int init_io_u(struct thread_data *td)
{
struct io_u *io_u;
static int init_io_u(struct thread_data *td)
{
struct io_u *io_u;
+ unsigned int max_bs;
int i, max_units;
char *p;
int i, max_units;
char *p;
@@
-506,7
+507,8
@@
static int init_io_u(struct thread_data *td)
else
max_units = td->iodepth;
else
max_units = td->iodepth;
- td->orig_buffer_size = td->max_bs * max_units + MASK;
+ max_bs = max(td->max_bs[DDIR_READ], td->max_bs[DDIR_WRITE]);
+ td->orig_buffer_size = max_bs * max_units + MASK;
if (allocate_io_mem(td))
return 1;
if (allocate_io_mem(td))
return 1;
@@
-517,9
+519,9
@@
static int init_io_u(struct thread_data *td)
memset(io_u, 0, sizeof(*io_u));
INIT_LIST_HEAD(&io_u->list);
memset(io_u, 0, sizeof(*io_u));
INIT_LIST_HEAD(&io_u->list);
- io_u->buf = p +
td->
max_bs * i;
+ io_u->buf = p + max_bs * i;
if (td_write(td) || td_rw(td))
if (td_write(td) || td_rw(td))
- fill_rand_buf(io_u,
td->
max_bs);
+ fill_rand_buf(io_u, max_bs);
io_u->index = i;
list_add(&io_u->list, &td->io_u_freelist);
io_u->index = i;
list_add(&io_u->list, &td->io_u_freelist);