X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=blktrace.c;h=8ebbae6f2fbe788c3c2ee353385535dac68c90ce;hp=fc98091868566531b6cc2a3069d5d5c38c79a20b;hb=c69aa91fa88fe1f0372afe2a56c4e79c62fc49e0;hpb=e28875637094451a3c5ec4071f964c1a02dd8f5b diff --git a/blktrace.c b/blktrace.c index fc980918..8ebbae6f 100644 --- a/blktrace.c +++ b/blktrace.c @@ -3,12 +3,14 @@ */ #include #include +#include +#include #include "list.h" #include "fio.h" #include "blktrace_api.h" -#define TRACE_FIFO_SIZE (sizeof(struct blk_io_trace) * 1000) +#define TRACE_FIFO_SIZE 65536 /* * fifo refill frontend, to avoid reading data in trace sized bites @@ -16,28 +18,23 @@ static int refill_fifo(struct thread_data *td, struct fifo *fifo, int fd) { char buf[TRACE_FIFO_SIZE]; - unsigned int total, left; - void *ptr; + unsigned int total; int ret; - total = 0; - ptr = buf; - while (total < TRACE_FIFO_SIZE) { - left = TRACE_FIFO_SIZE - total; + total = sizeof(buf); + if (total > fifo_room(fifo)) + total = fifo_room(fifo); - ret = read(fd, ptr, left); - if (ret < 0) { - td_verror(td, errno, "read blktrace file"); - return -1; - } else if (!ret) - break; - - fifo_put(fifo, ptr, ret); - ptr += ret; - total += ret; + ret = read(fd, buf, total); + if (ret < 0) { + td_verror(td, errno, "read blktrace file"); + return -1; } - return 0; + if (ret > 0) + ret = fifo_put(fifo, buf, ret); + + return ret; } /* @@ -46,17 +43,12 @@ static int refill_fifo(struct thread_data *td, struct fifo *fifo, int fd) static int trace_fifo_get(struct thread_data *td, struct fifo *fifo, int fd, void *buf, unsigned int len) { - int ret; - - if (fifo_len(fifo) >= len) - return fifo_get(fifo, buf, len); - - ret = refill_fifo(td, fifo, fd); - if (ret < 0) - return ret; + if (fifo_len(fifo) < len) { + int ret = refill_fifo(td, fifo, fd); - if (fifo_len(fifo) < len) - return 0; + if (ret < 0) + return ret; + } return fifo_get(fifo, buf, len); } @@ -64,15 +56,13 @@ static int trace_fifo_get(struct thread_data *td, struct fifo *fifo, int fd, /* * Just discard the pdu by seeking past it. */ -static int discard_pdu(int fd, struct blk_io_trace *t) +static int discard_pdu(struct thread_data *td, struct fifo *fifo, int fd, + struct blk_io_trace *t) { if (t->pdu_len == 0) return 0; - if (lseek(fd, t->pdu_len, SEEK_CUR) < 0) - return errno; - - return 0; + return trace_fifo_get(td, fifo, fd, NULL, t->pdu_len); } /* @@ -107,6 +97,83 @@ int is_blktrace(const char *filename) return 0; } +static int lookup_device(char *path, unsigned int maj, unsigned int min) +{ + struct dirent *dir; + struct stat st; + int found = 0; + DIR *D; + + D = opendir(path); + if (!D) + return 0; + + while ((dir = readdir(D)) != NULL) { + char full_path[256]; + + if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) + continue; + + sprintf(full_path, "%s/%s", path, dir->d_name); + if (lstat(full_path, &st) == -1) { + perror("lstat"); + break; + } + + if (S_ISDIR(st.st_mode)) { + found = lookup_device(full_path, maj, min); + if (found) { + strcpy(path, full_path); + break; + } + } + + if (!S_ISBLK(st.st_mode)) + continue; + + if (maj == major(st.st_rdev) && min == minor(st.st_rdev)) { + strcpy(path, full_path); + found = 1; + break; + } + } + + closedir(D); + return found; +} + +#define FMINORBITS 20 +#define FMINORMASK ((1U << FMINORBITS) - 1) +#define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS)) +#define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK)) + +static void trace_add_file(struct thread_data *td, __u32 device) +{ + static unsigned int last_maj, last_min; + unsigned int maj = FMAJOR(device); + unsigned int min = FMINOR(device); + struct fio_file *f; + char dev[256]; + unsigned int i; + + if (last_maj == maj && last_min == min) + return; + + last_maj = maj; + last_min = min; + + /* + * check for this file in our list + */ + for_each_file(td, f, i) + if (f->major == maj && f->minor == min) + return; + + strcpy(dev, "/dev"); + if (lookup_device(dev, maj, min)) + add_file(td, dev); +} + /* * Store blk_io_trace data in an ipo for later retrieval. */ @@ -145,13 +212,11 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t, return; if (t->action & BLK_TC_ACT(BLK_TC_PC)) return; - - /* - * should not happen, need to look into that... - */ - if (!t->bytes) + if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY)) return; + trace_add_file(td, t->device); + rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; if (t->bytes > bs[rw]) @@ -203,17 +268,20 @@ 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\n"); + 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); goto err; } - ret = discard_pdu(fd, &t); - if (ret) { + ret = discard_pdu(td, fifo, fd, &t); + if (ret < 0) { td_verror(td, ret, "blktrace lseek"); goto err; + } else if (t.pdu_len != ret) { + log_err("fio: discarded %d of %d\n", ret, t.pdu_len); + goto err; } if (!ttime) { ttime = t.time; @@ -227,6 +295,7 @@ int load_blktrace(struct thread_data *td, const char *filename) cpu = t.cpu; } while (1); + fifo_free(fifo); close(fd); if (!ios[DDIR_READ] && !ios[DDIR_WRITE]) { @@ -253,5 +322,6 @@ int load_blktrace(struct thread_data *td, const char *filename) return 0; err: close(fd); + fifo_free(fifo); return 1; }