projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Seperate ioprio value from setting
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index fcf3ae80c1fd5316c0ce121434eef2426b4471fe..e71537fc9d45c379d53c001d1ae160e42b6eb435 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-446,6
+446,13
@@
static void do_io(struct thread_data *td)
break;
}
break;
}
+ /*
+ * Add verification end_io handler, if asked to verify
+ * a previously written file.
+ */
+ if (td->o.verify != VERIFY_NONE)
+ io_u->end_io = verify_io_u;
+
ret = td_io_queue(td, io_u);
switch (ret) {
case FIO_Q_COMPLETED:
ret = td_io_queue(td, io_u);
switch (ret) {
case FIO_Q_COMPLETED:
@@
-614,7
+621,6
@@
static void fill_io_buf(struct thread_data *td, struct io_u *io_u, int max_bs)
static int init_io_u(struct thread_data *td)
{
static int init_io_u(struct thread_data *td)
{
- unsigned long long buf_size;
struct io_u *io_u;
unsigned int max_bs;
int i, max_units;
struct io_u *io_u;
unsigned int max_bs;
int i, max_units;
@@
-626,24
+632,24
@@
static int init_io_u(struct thread_data *td)
max_units = td->o.iodepth;
max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
max_units = td->o.iodepth;
max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
- buf_size = (unsigned long long) max_bs * (unsigned long long) max_units;
- buf_size += page_mask;
- if (buf_size != (size_t) buf_size) {
- log_err("fio: IO memory too large. Reduce max_bs or iodepth\n");
- return 1;
- }
-
- td->orig_buffer_size = buf_size;
+ td->orig_buffer_size = (unsigned long long) max_bs * (unsigned long long) max_units;
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE)
td->orig_buffer_size = (td->orig_buffer_size + td->o.hugepage_size - 1) & ~(td->o.hugepage_size - 1);
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE)
td->orig_buffer_size = (td->orig_buffer_size + td->o.hugepage_size - 1) & ~(td->o.hugepage_size - 1);
- else if (td->orig_buffer_size & page_mask)
- td->orig_buffer_size = (td->orig_buffer_size + page_mask) & ~page_mask;
+
+ if (td->orig_buffer_size != (size_t) td->orig_buffer_size) {
+ log_err("fio: IO memory too large. Reduce max_bs or iodepth\n");
+ return 1;
+ }
if (allocate_io_mem(td))
return 1;
if (allocate_io_mem(td))
return 1;
- p = ALIGN(td->orig_buffer);
+ if (td->o.odirect)
+ p = ALIGN(td->orig_buffer);
+ else
+ p = td->orig_buffer;
+
for (i = 0; i < max_units; i++) {
if (td->terminate)
return 1;
for (i = 0; i < max_units; i++) {
if (td->terminate)
return 1;
@@
-651,10
+657,12
@@
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 + max_bs * i;
+ if (!(td->io_ops->flags & FIO_NOIO)) {
+ io_u->buf = p + max_bs * i;
- if (td_write(td))
- fill_io_buf(td, io_u, max_bs);
+ if (td_write(td))
+ fill_io_buf(td, io_u, max_bs);
+ }
io_u->index = i;
io_u->flags = IO_U_F_FREE;
io_u->index = i;
io_u->flags = IO_U_F_FREE;
@@
-725,6
+733,8
@@
static int keep_running(struct thread_data *td)
{
unsigned long long io_done;
{
unsigned long long io_done;
+ if (td->done)
+ return 0;
if (td->o.time_based)
return 1;
if (td->o.loops) {
if (td->o.time_based)
return 1;
if (td->o.loops) {
@@
-732,7
+742,7
@@
static int keep_running(struct thread_data *td)
return 1;
}
return 1;
}
- io_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
+ io_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE]
+ td->io_skip_bytes
;
if (io_done < td->o.size)
return 1;
if (io_done < td->o.size)
return 1;
@@
-754,7
+764,8
@@
static int clear_io_state(struct thread_data *td)
td->last_was_sync = 0;
td->last_was_sync = 0;
- td->nr_done_files = 0;
+ if (td->o.time_based)
+ td->nr_done_files = 0;
for_each_file(td, f, i)
td_io_close_file(td, f);
for_each_file(td, f, i)
td_io_close_file(td, f);
@@
-818,7
+829,7
@@
static void *thread_main(void *data)
goto err;
}
goto err;
}
- if (td->ioprio) {
+ if (td->ioprio
_set
) {
if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
td_verror(td, errno, "ioprio_set");
goto err;
if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
td_verror(td, errno, "ioprio_set");
goto err;
@@
-892,7
+903,9
@@
static void *thread_main(void *data)
if (td->error || td->terminate)
break;
if (td->error || td->terminate)
break;
- if (td->o.verify == VERIFY_NONE)
+ if (!td->o.do_verify ||
+ td->o.verify == VERIFY_NONE ||
+ (td->io_ops->flags & FIO_UNIDIR))
continue;
if (clear_io_state(td))
continue;
if (clear_io_state(td))
@@
-909,8
+922,8
@@
static void *thread_main(void *data)
}
update_rusage_stat(td);
}
update_rusage_stat(td);
- td->ts.runtime[0] =
runtime[0]
/ 1000;
- td->ts.runtime[1] =
runtime[1]
/ 1000;
+ td->ts.runtime[0] =
(runtime[0] + 999)
/ 1000;
+ td->ts.runtime[1] =
(runtime[1] + 999)
/ 1000;
td->ts.total_run_time = mtime_since_now(&td->epoch);
td->ts.io_bytes[0] = td->io_bytes[0];
td->ts.io_bytes[1] = td->io_bytes[1];
td->ts.total_run_time = mtime_since_now(&td->epoch);
td->ts.io_bytes[0] = td->io_bytes[0];
td->ts.io_bytes[1] = td->io_bytes[1];
@@
-921,8
+934,6
@@
static void *thread_main(void *data)
finish_log(td, td->ts.slat_log, "slat");
if (td->ts.clat_log)
finish_log(td, td->ts.clat_log, "clat");
finish_log(td, td->ts.slat_log, "slat");
if (td->ts.clat_log)
finish_log(td, td->ts.clat_log, "clat");
- if (td->o.write_iolog_file)
- write_iolog_close(td);
if (td->o.exec_postrun) {
if (system(td->o.exec_postrun) < 0)
log_err("fio: postrun %s failed\n", td->o.exec_postrun);
if (td->o.exec_postrun) {
if (system(td->o.exec_postrun) < 0)
log_err("fio: postrun %s failed\n", td->o.exec_postrun);
@@
-937,6
+948,13
@@
err:
close_files(td);
close_ioengine(td);
cleanup_io_u(td);
close_files(td);
close_ioengine(td);
cleanup_io_u(td);
+
+ /*
+ * do this very late, it will log file closing as well
+ */
+ if (td->o.write_iolog_file)
+ write_iolog_close(td);
+
options_mem_free(td);
td_set_runstate(td, TD_EXITED);
return (void *) (unsigned long) td->error;
options_mem_free(td);
td_set_runstate(td, TD_EXITED);
return (void *) (unsigned long) td->error;
@@
-971,12
+989,12
@@
static int fork_main(int shmid, int offset)
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
{
struct thread_data *td;
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
{
struct thread_data *td;
- int i, cputhreads, pending, status, ret;
+ int i, cputhreads,
realthreads,
pending, status, ret;
/*
* reap exited threads (TD_EXITED -> TD_REAPED)
*/
/*
* reap exited threads (TD_EXITED -> TD_REAPED)
*/
- pending = cputhreads = 0;
+
realthreads =
pending = cputhreads = 0;
for_each_td(td, i) {
int flags = 0;
for_each_td(td, i) {
int flags = 0;
@@
-986,6
+1004,8
@@
static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
*/
if (td->io_ops && !strcmp(td->io_ops->name, "cpuio"))
cputhreads++;
*/
if (td->io_ops && !strcmp(td->io_ops->name, "cpuio"))
cputhreads++;
+ else
+ realthreads++;
if (!td->pid || td->runstate == TD_REAPED)
continue;
if (!td->pid || td->runstate == TD_REAPED)
continue;
@@
-1052,7
+1072,7
@@
reaped:
exit_value++;
}
exit_value++;
}
- if (*nr_running == cputhreads && !pending)
+ if (*nr_running == cputhreads && !pending
&& realthreads
)
terminate_threads(TERMINATE_ALL);
}
terminate_threads(TERMINATE_ALL);
}