X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=blktrace.c;h=68ba964a3a363c6f5e85ac19e5410134e1943238;hp=538bcd71b9091b02b558d362fafabc6b15b630c2;hb=49ffb4a2e1ac3026d77d9e1c03edc2753fcec41b;hpb=bd6f78b2f0b6375383948f126368804612ec0035 diff --git a/blktrace.c b/blktrace.c index 538bcd71..68ba964a 100644 --- a/blktrace.c +++ b/blktrace.c @@ -6,11 +6,11 @@ #include #include -#include "list.h" +#include "flist.h" #include "fio.h" #include "blktrace_api.h" -#define TRACE_FIFO_SIZE 65536 +#define TRACE_FIFO_SIZE 8192 /* * fifo refill frontend, to avoid reading data in trace sized bites @@ -132,7 +132,7 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min) continue; if (maj == major(st.st_rdev) && min == minor(st.st_rdev)) { - dprint(FD_BLKTRACE, "device lookup: %d/%d\n", maj,min); + dprint(FD_BLKTRACE, "device lookup: %d/%d\n", maj, min); strcpy(path, full_path); found = 1; break; @@ -148,6 +148,18 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min) #define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS)) #define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK)) +static void trace_add_open_event(struct thread_data *td, int fileno) +{ + struct io_piece *ipo; + + ipo = calloc(1, sizeof(*ipo)); + + ipo->ddir = DDIR_INVAL; + ipo->fileno = fileno; + ipo->file_action = FIO_LOG_OPEN_FILE; + flist_add_tail(&ipo->list, &td->io_log_list); +} + static void trace_add_file(struct thread_data *td, __u32 device) { static unsigned int last_maj, last_min; @@ -172,8 +184,11 @@ static void trace_add_file(struct thread_data *td, __u32 device) strcpy(dev, "/dev"); if (lookup_device(dev, maj, min)) { + int fileno; + dprint(FD_BLKTRACE, "add devices %s\n", dev); - add_file(td, dev); + fileno = add_file_exclusive(td, dev); + trace_add_open_event(td, fileno); } } @@ -186,7 +201,7 @@ static void store_ipo(struct thread_data *td, unsigned long long offset, struct io_piece *ipo = malloc(sizeof(*ipo)); memset(ipo, 0, sizeof(*ipo)); - INIT_LIST_HEAD(&ipo->list); + INIT_FLIST_HEAD(&ipo->list); /* * the 512 is wrong here, it should be the hardware sector size... */ @@ -201,25 +216,29 @@ static void store_ipo(struct thread_data *td, unsigned long long offset, dprint(FD_BLKTRACE, "store ddir=%d, off=%llu, len=%lu, delay=%lu\n", ipo->ddir, ipo->offset, ipo->len, ipo->delay); - list_add_tail(&ipo->list, &td->io_log_list); + queue_io_piece(td, ipo); } -/* - * We only care for queue traces, most of the others are side effects - * due to internal workings of the block layer. - */ -static void handle_trace(struct thread_data *td, struct blk_io_trace *t, - unsigned long long ttime, unsigned long *ios, - unsigned int *bs) +static void handle_trace_notify(struct blk_io_trace *t) { - int rw; + switch (t->action) { + case BLK_TN_PROCESS: + printf("got process notify: %x, %d\n", t->action, t->pid); + break; + case BLK_TN_TIMESTAMP: + printf("got timestamp notify: %x, %d\n", t->action, t->pid); + break; + default: + dprint(FD_BLKTRACE, "unknown trace act %x\n", t->action); + break; + } +} - if ((t->action & 0xffff) != __BLK_TA_QUEUE) - return; - if (t->action & BLK_TC_ACT(BLK_TC_PC)) - return; - if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY)) - return; +static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t, + unsigned long long ttime, unsigned long *ios, + unsigned int *bs) +{ + int rw; trace_add_file(td, t->device); @@ -233,6 +252,25 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t, store_ipo(td, t->sector, t->bytes, rw, ttime); } +/* + * We only care for queue traces, most of the others are side effects + * due to internal workings of the block layer. + */ +static void handle_trace(struct thread_data *td, struct blk_io_trace *t, + unsigned long long ttime, unsigned long *ios, + unsigned int *bs) +{ + if ((t->action & 0xffff) != __BLK_TA_QUEUE) + return; + if (t->action & BLK_TC_ACT(BLK_TC_PC)) + return; + + if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY)) + handle_trace_notify(t); + else + handle_trace_fs(td, t, ttime, ios, bs); +} + /* * Load a blktrace file by reading all the blk_io_trace entries, and storing * them as io_pieces like the fio text version would do. @@ -275,11 +313,13 @@ int load_blktrace(struct thread_data *td, const char *filename) } if ((t.magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) { - log_err("fio: bad magic in blktrace data: %x\n", t.magic); + log_err("fio: bad magic in blktrace data: %x\n", + t.magic); goto err; } if ((t.magic & 0xff) != BLK_IO_TRACE_VERSION) { - log_err("fio: bad blktrace version %d\n", t.magic & 0xff); + log_err("fio: bad blktrace version %d\n", + t.magic & 0xff); goto err; } ret = discard_pdu(td, fifo, fd, &t); @@ -290,28 +330,34 @@ int load_blktrace(struct thread_data *td, const char *filename) log_err("fio: discarded %d of %d\n", ret, t.pdu_len); goto err; } - if (t.action & BLK_TC_ACT(BLK_TC_NOTIFY)) - continue; - if (!ttime) { + if ((t.action & BLK_TC_ACT(BLK_TC_NOTIFY)) == 0) { + if (!ttime) { + ttime = t.time; + cpu = t.cpu; + } + + delay = 0; + if (cpu == t.cpu) + delay = t.time - ttime; + if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only) + skipped_writes++; + else + handle_trace(td, &t, delay, ios, rw_bs); + ttime = t.time; cpu = t.cpu; - } - delay = 0; - if (cpu == t.cpu) - delay = t.time - ttime; - if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only) - skipped_writes++; - else + } else { + delay = 0; handle_trace(td, &t, delay, ios, rw_bs); - ttime = t.time; - cpu = t.cpu; + } } while (1); fifo_free(fifo); close(fd); if (skipped_writes) - log_err("fio: <%s> skips replay of %lu writes due to read-only\n", td->o.name, skipped_writes); + log_err("fio: %s skips replay of %lu writes due to read-only\n", + td->o.name, skipped_writes); if (!ios[DDIR_READ] && !ios[DDIR_WRITE]) { log_err("fio: found no ios in blktrace data\n");