X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=5c468ad9f96c0a708fde126482f01a3bb6a430c3;hp=aea0398ec691bb034910f0c545bc5bd214dc8306;hb=9a9c63f1608c6f63b10cd5575dee868c2d269c87;hpb=5ec10eaad3b09875b91e19a20bbdfa06f2117562 diff --git a/log.c b/log.c index aea0398e..5c468ad9 100644 --- a/log.c +++ b/log.c @@ -4,12 +4,19 @@ */ #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) +{ + flist_add_tail(&ipo->list, &td->io_log_list); + td->total_io_size += ipo->len; +} + void log_io_u(struct thread_data *td, struct io_u *io_u) { const char *act[] = { "read", "write", "sync" }; @@ -34,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]); } @@ -55,29 +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]; + ipo = flist_entry(td->io_log_list.next, struct io_piece, list); + flist_del(&ipo->list); - if (ipo->file_action == FIO_LOG_OPEN_FILE) { - assert(!td_io_open_file(td, f)); - free(ipo); - continue; - } else if (ipo->file_action == FIO_LOG_CLOSE_FILE) { - td_io_close_file(td, f); - free(ipo); - continue; - } + ret = ipo_special(td, ipo); + if (ret < 0) { + free(ipo); + break; + } else if (ret > 0) { + free(ipo); + continue; } io_u->offset = ipo->offset; @@ -111,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); } } @@ -141,8 +185,8 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u) * wrote it out is the fastest. */ if (!td_random(td) || !td->o.overwrite) { - INIT_LIST_HEAD(&ipo->list); - list_add_tail(&ipo->list, &td->io_hist_list); + INIT_FLIST_HEAD(&ipo->list); + flist_add_tail(&ipo->list, &td->io_hist_list); return; } @@ -247,12 +291,12 @@ static int read_iolog2(struct thread_data *td, FILE *f) if (rw == DDIR_READ) reads++; else if (rw == DDIR_WRITE) { - writes++; /* * Don't add a write for ro mode */ if (read_only) continue; + writes++; } else if (rw != DDIR_SYNC && rw != DDIR_INVAL) { log_err("bad ddir: %d\n", rw); continue; @@ -263,7 +307,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; @@ -273,8 +317,7 @@ static int read_iolog2(struct thread_data *td, FILE *f) ipo->fileno = fileno; ipo->file_action = file_action; } - list_add_tail(&ipo->list, &td->io_log_list); - td->total_io_size += bytes; + queue_io_piece(td, ipo); } free(str); @@ -299,76 +342,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) -{ - unsigned long long offset; - unsigned int bytes; - char *str, *p; - int reads, writes; - int rw; - - /* - * Read in the read iolog and store it, reuse the infrastructure - * for doing verifications. - */ - str = malloc(4096); - reads = writes = 0; - while ((p = fgets(str, 4096, f)) != NULL) { - struct io_piece *ipo; - - if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) { - log_err("bad iolog: %s\n", p); - continue; - } - if (rw == DDIR_READ) - reads++; - else if (rw == DDIR_WRITE) { - writes++; - /* - * Don't add a write for ro mode - */ - if (read_only) - continue; - } else if (rw != DDIR_SYNC) { - log_err("bad ddir: %d\n", rw); - continue; - } - - ipo = malloc(sizeof(*ipo)); - memset(ipo, 0, sizeof(*ipo)); - INIT_LIST_HEAD(&ipo->list); - ipo->offset = offset; - ipo->len = bytes; - ipo->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); - td->total_io_size += bytes; - } - - free(str); - - if (writes && read_only) { - log_err("fio: <%s> skips replay of %d writes due to" - " read-only\n", td->o.name, writes); - writes = 0; - } - - if (!reads && !writes) - return 1; - else if (reads && !writes) - td->o.td_ddir = TD_DDIR_READ; - else if (!reads && writes) - td->o.td_ddir = TD_DDIR_WRITE; - else - td->o.td_ddir = TD_DDIR_RW; - - return 0; -} - /* * open iolog, check version, and call appropriate parser */ @@ -398,16 +371,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); @@ -508,8 +473,9 @@ void __finish_log(struct io_log *log, const char *name) void finish_log(struct thread_data *td, struct io_log *log, const char *name) { - char file_name[256]; + char file_name[256], *p; - snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name); - __finish_log(log, file_name); + snprintf(file_name, 200, "%s_%s.log", td->o.name, name); + p = basename(file_name); + __finish_log(log, p); }