X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=ba52f0768744df5ea19cec1c2758a399e0cc8db9;hp=01e4ad0b37c8fd5e954106bb86079856345ce579;hb=7eb36574da703ebdfac414d7428712320f552a96;hpb=c12f6dabdb82e63e1020f1e61c366ca552cc9ac8 diff --git a/log.c b/log.c index 01e4ad0b..ba52f076 100644 --- a/log.c +++ b/log.c @@ -8,6 +8,7 @@ #include #include "flist.h" #include "fio.h" +#include "verify.h" static const char iolog_ver2[] = "fio version 2 iolog"; @@ -19,7 +20,7 @@ void queue_io_piece(struct thread_data *td, struct io_piece *ipo) void log_io_u(struct thread_data *td, struct io_u *io_u) { - const char *act[] = { "read", "write", "sync" }; + const char *act[] = { "read", "write", "sync", "datasync" }; assert(io_u->ddir < 3); @@ -85,10 +86,8 @@ static int ipo_special(struct thread_data *td, struct io_piece *ipo) switch (ipo->file_action) { case FIO_LOG_OPEN_FILE: ret = td_io_open_file(td, f); - if (!ret) { - free(ipo); + if (!ret) break; - } td_verror(td, ret, "iolog open file"); return -1; case FIO_LOG_CLOSE_FILE: @@ -108,7 +107,8 @@ static int ipo_special(struct thread_data *td, struct io_piece *ipo) int read_iolog_get(struct thread_data *td, struct io_u *io_u) { struct io_piece *ipo; - + unsigned long elapsed; + while (!flist_empty(&td->io_log_list)) { int ret; @@ -124,20 +124,27 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u) continue; } - io_u->offset = ipo->offset; - io_u->buflen = ipo->len; io_u->ddir = ipo->ddir; - io_u->file = td->files[ipo->fileno]; - get_file(io_u->file); - - dprint(FD_IO, "iolog: get %llu/%lu/%s\n", io_u->offset, - io_u->buflen, io_u->file->file_name); - - if (ipo->delay) - iolog_delay(td, ipo->delay); + if (ipo->ddir != DDIR_WAIT) { + io_u->offset = ipo->offset; + io_u->buflen = ipo->len; + io_u->file = td->files[ipo->fileno]; + get_file(io_u->file); + + dprint(FD_IO, "iolog: get %llu/%lu/%s\n", io_u->offset, + io_u->buflen, io_u->file->file_name); + if (ipo->delay) iolog_delay(td, ipo->delay); + } else { + elapsed = mtime_since_genesis(); + if (ipo->delay > elapsed) + usec_sleep(td, (ipo->delay - elapsed) * 1000); + + } free(ipo); - return 0; + + if (ipo->ddir != DDIR_WAIT) + return 0; } td->done = 1; @@ -183,28 +190,40 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u) * * For both these cases, just reading back data in the order we * wrote it out is the fastest. + * + * One exception is if we don't have a random map AND we are doing + * verifies, in that case we need to check for duplicate blocks and + * drop the old one, which we rely on the rb insert/lookup for + * handling. */ - if (!td_random(td) || !td->o.overwrite) { + if ((!td_random(td) || !td->o.overwrite) && + (file_randommap(td, ipo->file) || td->o.verify == VERIFY_NONE)) { INIT_FLIST_HEAD(&ipo->list); flist_add_tail(&ipo->list, &td->io_hist_list); return; } RB_CLEAR_NODE(&ipo->rb_node); - p = &td->io_hist_tree.rb_node; - parent = NULL; /* * Sort the entry into the verification list */ +restart: + p = &td->io_hist_tree.rb_node; + parent = NULL; while (*p) { parent = *p; __ipo = rb_entry(parent, struct io_piece, rb_node); - if (ipo->offset <= __ipo->offset) + if (ipo->offset < __ipo->offset) p = &(*p)->rb_left; - else + else if (ipo->offset > __ipo->offset) p = &(*p)->rb_right; + else { + assert(ipo->len == __ipo->len); + rb_erase(parent, &td->io_hist_tree); + goto restart; + } } rb_link_node(&ipo->rb_node, parent, p); @@ -228,7 +247,7 @@ static int read_iolog2(struct thread_data *td, FILE *f) { unsigned long long offset; unsigned int bytes; - int reads, writes, fileno = 0, file_action = 0; /* stupid gcc */ + int reads, writes, waits, fileno = 0, file_action = 0; /* stupid gcc */ char *fname, *act; char *str, *p; enum fio_ddir rw; @@ -243,7 +262,7 @@ static int read_iolog2(struct thread_data *td, FILE *f) fname = malloc(256+16); act = malloc(256+16); - reads = writes = 0; + reads = writes = waits = 0; while ((p = fgets(str, 4096, f)) != NULL) { struct io_piece *ipo; int r; @@ -254,12 +273,16 @@ static int read_iolog2(struct thread_data *td, FILE *f) /* * Check action first */ - if (!strcmp(act, "read")) + if (!strcmp(act, "wait")) + rw = DDIR_WAIT; + else if (!strcmp(act, "read")) rw = DDIR_READ; else if (!strcmp(act, "write")) rw = DDIR_WRITE; else if (!strcmp(act, "sync")) rw = DDIR_SYNC; + else if (!strcmp(act, "datasync")) + rw = DDIR_DATASYNC; else { log_err("fio: bad iolog file action: %s\n", act); @@ -297,7 +320,10 @@ static int read_iolog2(struct thread_data *td, FILE *f) if (read_only) continue; writes++; - } else if (rw != DDIR_SYNC && rw != DDIR_INVAL) { + } else if (rw == DDIR_WAIT) { + waits++; + } else if (rw == DDIR_INVAL) { + } else if (!ddir_sync(rw)) { log_err("bad ddir: %d\n", rw); continue; } @@ -308,15 +334,18 @@ static int read_iolog2(struct thread_data *td, FILE *f) ipo = malloc(sizeof(*ipo)); memset(ipo, 0, sizeof(*ipo)); INIT_FLIST_HEAD(&ipo->list); - ipo->offset = offset; - ipo->len = bytes; ipo->ddir = rw; - if (bytes > td->o.max_bs[rw]) - td->o.max_bs[rw] = bytes; - if (rw == DDIR_INVAL) { + if (rw == DDIR_WAIT) { + ipo->delay = offset; + } else { + ipo->offset = offset; + ipo->len = bytes; + if (bytes > td->o.max_bs[rw]) + td->o.max_bs[rw] = bytes; ipo->fileno = fileno; ipo->file_action = file_action; } + queue_io_piece(td, ipo); } @@ -330,7 +359,7 @@ static int read_iolog2(struct thread_data *td, FILE *f) writes = 0; } - if (!reads && !writes) + if (!reads && !writes && !waits) return 1; else if (reads && !writes) td->o.td_ddir = TD_DDIR_READ; @@ -422,9 +451,6 @@ int init_iolog(struct thread_data *td) { int ret = 0; - if (td->io_ops->flags & FIO_DISKLESSIO) - return 0; - if (td->o.read_iolog_file) { /* * Check if it's a blktrace file and load that if possible. @@ -462,8 +488,10 @@ void __finish_log(struct io_log *log, const char *name) } for (i = 0; i < log->nr_samples; i++) { - fprintf(f, "%lu, %lu, %u\n", log->log[i].time, log->log[i].val, - log->log[i].ddir); + fprintf(f, "%lu, %lu, %u, %u\n", log->log[i].time, + log->log[i].val, + log->log[i].ddir, + log->log[i].bs); } fclose(f);