projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to disable fadvise() hints
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 134355603cb14e417344d5b4058b8a9ee14874cf..dbca3ccb7f023f37df7d4a9a52aa291cfd45a7a7 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-5,7
+5,7
@@
void write_iolog_put(struct thread_data *td, struct io_u *io_u)
{
void write_iolog_put(struct thread_data *td, struct io_u *io_u)
{
- fprintf(td->iolog_f, "%
d,%llu,%
u\n", io_u->ddir, io_u->offset, io_u->buflen);
+ fprintf(td->iolog_f, "%
u,%llu,%l
u\n", io_u->ddir, io_u->offset, io_u->buflen);
}
int read_iolog_get(struct thread_data *td, struct io_u *io_u)
}
int read_iolog_get(struct thread_data *td, struct io_u *io_u)
@@
-39,7
+39,7
@@
void prune_io_piece_log(struct thread_data *td)
}
/*
}
/*
- * log a succesful write, so we can unwind the log for verify
+ * log a succes
s
ful write, so we can unwind the log for verify
*/
void log_io_piece(struct thread_data *td, struct io_u *io_u)
{
*/
void log_io_piece(struct thread_data *td, struct io_u *io_u)
{
@@
-56,7
+56,7
@@
void log_io_piece(struct thread_data *td, struct io_u *io_u)
* be laid out with the block scattered as written. it's faster to
* read them in in that order again, so don't sort
*/
* be laid out with the block scattered as written. it's faster to
* read them in in that order again, so don't sort
*/
- if (
td->sequential || !td->
overwrite) {
+ if (
!td_random(td) || !td->o.
overwrite) {
list_add_tail(&ipo->list, &td->io_hist_list);
return;
}
list_add_tail(&ipo->list, &td->io_hist_list);
return;
}
@@
-93,7
+93,7
@@
static int init_iolog_read(struct thread_data *td)
FILE *f;
int rw, reads, writes;
FILE *f;
int rw, reads, writes;
- f = fopen(td->read_iolog_file, "r");
+ f = fopen(td->
o.
read_iolog_file, "r");
if (!f) {
perror("fopen read iolog");
return 1;
if (!f) {
perror("fopen read iolog");
return 1;
@@
-125,9
+125,9
@@
static int init_iolog_read(struct thread_data *td)
INIT_LIST_HEAD(&ipo->list);
ipo->offset = offset;
ipo->len = bytes;
INIT_LIST_HEAD(&ipo->list);
ipo->offset = offset;
ipo->len = bytes;
- i
f (bytes > td->max_bs)
- td->max_bs = bytes;
-
ipo->ddir = rw
;
+ i
po->ddir = (enum fio_ddir) rw;
+ if (bytes > td->o.max_bs[rw])
+
td->o.max_bs[rw] = bytes
;
list_add_tail(&ipo->list, &td->io_log_list);
}
list_add_tail(&ipo->list, &td->io_log_list);
}
@@
-137,11
+137,11
@@
static int init_iolog_read(struct thread_data *td)
if (!reads && !writes)
return 1;
else if (reads && !writes)
if (!reads && !writes)
return 1;
else if (reads && !writes)
- td->
ddir =
DDIR_READ;
+ td->
o.td_ddir = TD_
DDIR_READ;
else if (!reads && writes)
else if (!reads && writes)
- td->
ddir =
DDIR_READ;
+ td->
o.td_ddir = TD_
DDIR_READ;
else
else
- td->
iomix = 1
;
+ td->
o.td_ddir = TD_DDIR_RW
;
return 0;
}
return 0;
}
@@
-153,7
+153,7
@@
static int init_iolog_write(struct thread_data *td)
{
FILE *f;
{
FILE *f;
- f = fopen(td->write_iolog_file, "w+");
+ f = fopen(td->
o.
write_iolog_file, "w+");
if (!f) {
perror("fopen write iolog");
return 1;
if (!f) {
perror("fopen write iolog");
return 1;
@@
-172,30
+172,15
@@
int init_iolog(struct thread_data *td)
{
int ret = 0;
{
int ret = 0;
- if (td->read_iolog_file)
- ret = init_iolog_read(td);
- else if (td->write_iolog_file)
- ret = init_iolog_write(td);
-
- return 0;
-}
-
-int setup_rate(struct thread_data *td)
-{
- int nr_reads_per_sec;
-
- if (!td->rate)
+ if (td->io_ops->flags & FIO_DISKLESSIO)
return 0;
return 0;
- if (td->
rate < td->ratemin) {
-
log_err("min rate larger than nominal rate\n"
);
- return -1;
- }
+ if (td->
o.read_iolog_file)
+
ret = init_iolog_read(td
);
+ else if (td->o.write_iolog_file)
+ ret = init_iolog_write(td);
- nr_reads_per_sec = (td->rate * 1024) / td->min_bs;
- td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
- td->rate_pending_usleep = 0;
- return 0;
+ return ret;
}
void setup_log(struct io_log **log)
}
void setup_log(struct io_log **log)
@@
-208,14
+193,12
@@
void setup_log(struct io_log **log)
*log = l;
}
*log = l;
}
-void
finish_log(struct thread_data *td,
struct io_log *log, const char *name)
+void
__finish_log(
struct io_log *log, const char *name)
{
{
- char file_name[256];
- FILE *f;
unsigned int i;
unsigned int i;
+ FILE *f;
- snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
- f = fopen(file_name, "w");
+ f = fopen(name, "w");
if (!f) {
perror("fopen log");
return;
if (!f) {
perror("fopen log");
return;
@@
-228,3
+211,11
@@
void finish_log(struct thread_data *td, struct io_log *log, const char *name)
free(log->log);
free(log);
}
free(log->log);
free(log);
}
+
+void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+{
+ char file_name[256];
+
+ snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
+ __finish_log(log, file_name);
+}