X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=6d5e68da580b5ac72d3dfde8c47c3df85ae722f4;hp=8ac8ec3238c473c48bc34a68225d073b2ef2a9fb;hb=b0f65863844b4de92d10fefaabde80ea5bc3e5cc;hpb=691c8fb014da9dd82e999a90b5511423f4eee188 diff --git a/log.c b/log.c index 8ac8ec32..6d5e68da 100644 --- a/log.c +++ b/log.c @@ -4,15 +4,16 @@ */ #include #include +#include #include -#include "list.h" +#include "flist.h" #include "fio.h" static const char iolog_ver2[] = "fio version 2 iolog"; void queue_io_piece(struct thread_data *td, struct io_piece *ipo) { - list_add_tail(&ipo->list, &td->io_log_list); + flist_add_tail(&ipo->list, &td->io_log_list); td->total_io_size += ipo->len; } @@ -40,6 +41,13 @@ void log_file(struct thread_data *td, struct fio_file *f, if (!td->o.write_iolog_file) return; + + /* + * this happens on the pre-open/close done before the job starts + */ + if (!td->iolog_f) + return; + fprintf(td->iolog_f, "%s %s\n", f->file_name, act[what]); } @@ -61,35 +69,59 @@ static void iolog_delay(struct thread_data *td, unsigned long delay) usec_sleep(td, delay); } +static int ipo_special(struct thread_data *td, struct io_piece *ipo) +{ + struct fio_file *f; + int ret; + + /* + * Not a special ipo + */ + if (ipo->ddir != DDIR_INVAL) + return 0; + + f = td->files[ipo->fileno]; + + switch (ipo->file_action) { + case FIO_LOG_OPEN_FILE: + ret = td_io_open_file(td, f); + if (!ret) { + free(ipo); + break; + } + td_verror(td, ret, "iolog open file"); + return -1; + case FIO_LOG_CLOSE_FILE: + td_io_close_file(td, f); + break; + case FIO_LOG_UNLINK_FILE: + unlink(f->file_name); + break; + default: + log_err("fio: bad file action %d\n", ipo->file_action); + break; + } + + return 1; +} + int read_iolog_get(struct thread_data *td, struct io_u *io_u) { struct io_piece *ipo; - while (!list_empty(&td->io_log_list)) { - ipo = list_entry(td->io_log_list.next, struct io_piece, list); - list_del(&ipo->list); + while (!flist_empty(&td->io_log_list)) { + int ret; - /* - * invalid ddir, this is a file action - */ - if (ipo->ddir == DDIR_INVAL) { - struct fio_file *f = td->files[ipo->fileno]; - - if (ipo->file_action == FIO_LOG_OPEN_FILE) { - int ret; - - ret = td_io_open_file(td, f); - if (!ret) { - free(ipo); - continue; - } - td_verror(td, ret, "iolog open file"); - return 1; - } else if (ipo->file_action == FIO_LOG_CLOSE_FILE) { - td_io_close_file(td, f); - free(ipo); - continue; - } + ipo = flist_entry(td->io_log_list.next, struct io_piece, list); + flist_del(&ipo->list); + + ret = ipo_special(td, ipo); + if (ret < 0) { + free(ipo); + break; + } else if (ret > 0) { + free(ipo); + continue; } io_u->offset = ipo->offset; @@ -123,9 +155,9 @@ void prune_io_piece_log(struct thread_data *td) free(ipo); } - while (!list_empty(&td->io_hist_list)) { - ipo = list_entry(td->io_hist_list.next, struct io_piece, list); - list_del(&ipo->list); + while (!flist_empty(&td->io_hist_list)) { + ipo = flist_entry(td->io_hist_list.next, struct io_piece, list); + flist_del(&ipo->list); free(ipo); } } @@ -151,28 +183,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) { - INIT_LIST_HEAD(&ipo->list); - list_add_tail(&ipo->list, &td->io_hist_list); + 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); @@ -275,7 +319,7 @@ static int read_iolog2(struct thread_data *td, FILE *f) */ ipo = malloc(sizeof(*ipo)); memset(ipo, 0, sizeof(*ipo)); - INIT_LIST_HEAD(&ipo->list); + INIT_FLIST_HEAD(&ipo->list); ipo->offset = offset; ipo->len = bytes; ipo->ddir = rw; @@ -310,15 +354,6 @@ static int read_iolog2(struct thread_data *td, FILE *f) return 0; } -/* - * Read version 1 iolog data. - */ -static int read_iolog(struct thread_data *td, FILE *f) -{ - log_err("fio: iolog version 1 is no longer supported\n"); - return 1; -} - /* * open iolog, check version, and call appropriate parser */ @@ -348,16 +383,8 @@ static int init_iolog_read(struct thread_data *td) if (!strncmp(iolog_ver2, buffer, strlen(iolog_ver2))) ret = read_iolog2(td, f); else { - /* - * seek back to the beginning - */ - if (fseek(f, 0, SEEK_SET) < 0) { - td_verror(td, errno, "iolog read"); - log_err("fio: unable to read iolog\n"); - return 1; - } - - ret = read_iolog(td, f); + log_err("fio: iolog version 1 is no longer supported\n"); + ret = 1; } fclose(f); @@ -373,7 +400,7 @@ static int init_iolog_write(struct thread_data *td) FILE *f; unsigned int i; - f = fopen(td->o.write_iolog_file, "w+"); + f = fopen(td->o.write_iolog_file, "a"); if (!f) { perror("fopen write iolog"); return 1; @@ -407,9 +434,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. @@ -440,15 +464,17 @@ void __finish_log(struct io_log *log, const char *name) unsigned int i; FILE *f; - f = fopen(name, "w"); + f = fopen(name, "a"); if (!f) { perror("fopen log"); return; } 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); @@ -456,10 +482,17 @@ void __finish_log(struct io_log *log, const char *name) free(log); } -void finish_log(struct thread_data *td, struct io_log *log, const char *name) +void finish_log_named(struct thread_data *td, struct io_log *log, + const char *prefix, const char *postfix) { - char file_name[256]; + char file_name[256], *p; + + snprintf(file_name, 200, "%s_%s.log", prefix, postfix); + p = basename(file_name); + __finish_log(log, p); +} - snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name); - __finish_log(log, file_name); +void finish_log(struct thread_data *td, struct io_log *log, const char *name) +{ + finish_log_named(td, log, td->o.name, name); }