X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=t%2Fbtrace2fio.c;h=a8a9d6291430296d42f15555db244650e4ecfa14;hp=93874d70f8a020f9fc7ecba8796d1188c17cc801;hb=a76e1995b08ffe645b2d9f81d258afc38688884b;hpb=17bf085367b5005f3fd05e30ce1c8075633fb901 diff --git a/t/btrace2fio.c b/t/btrace2fio.c index 93874d70..a8a9d629 100644 --- a/t/btrace2fio.c +++ b/t/btrace2fio.c @@ -1,7 +1,7 @@ #include -#include #include #include +#include #include #include "../io_ddir.h" @@ -11,15 +11,29 @@ #include "../blktrace_api.h" #include "../os/os.h" #include "../log.h" -#include "../lib/linux-dev-lookup.h" +#include "../minmax.h" +#include "../oslib/linux-dev-lookup.h" #define TRACE_FIFO_SIZE 8192 static unsigned int rt_threshold = 1000000; static unsigned int ios_threshold = 10; +static unsigned int rate_threshold; +static unsigned int set_rate; +static unsigned int max_depth = 256; static int output_ascii = 1; static char *filename; +static char **add_opts; +static int n_add_opts; + +/* + * Collapse defaults + */ +static unsigned int collapse_entries = 0; +static unsigned int depth_diff = 1; +static unsigned int random_diff = 5; + struct bs { unsigned int bs; unsigned int nr; @@ -33,7 +47,6 @@ struct trace_file { struct btrace_out { unsigned long ios[DDIR_RWDIR_CNT]; - unsigned long rw_bs[DDIR_RWDIR_CNT]; unsigned long merges[DDIR_RWDIR_CNT]; uint64_t last_end[DDIR_RWDIR_CNT]; @@ -44,12 +57,12 @@ struct btrace_out { int inflight; unsigned int depth; - uint64_t first_ttime; - uint64_t last_ttime; + int depth_disabled; + int complete_seen; - struct trace_file *files; - int nr_files; - unsigned int last_major, last_minor; + uint64_t first_ttime[DDIR_RWDIR_CNT]; + uint64_t last_ttime[DDIR_RWDIR_CNT]; + uint64_t kib[DDIR_RWDIR_CNT]; uint64_t start_delay; }; @@ -58,6 +71,16 @@ struct btrace_pid { struct flist_head hash_list; struct flist_head pid_list; pid_t pid; + + pid_t *merge_pids; + unsigned int nr_merge_pids; + + struct trace_file *files; + int nr_files; + unsigned int last_major, last_minor; + int numjobs; + int ignore; + struct btrace_out o; }; @@ -122,7 +145,13 @@ static void inflight_add(struct btrace_pid *p, uint64_t sector, uint32_t len) i = calloc(1, sizeof(*i)); i->p = p; o->inflight++; - o->depth = max((int) o->depth, o->inflight); + if (!o->depth_disabled) { + o->depth = max((int) o->depth, o->inflight); + if (o->depth >= max_depth && !o->complete_seen) { + o->depth_disabled = 1; + o->depth = max_depth; + } + } i->end_sector = sector + (len >> 9); __inflight_add(i); } @@ -189,7 +218,7 @@ static int discard_pdu(struct fifo *fifo, int fd, struct blk_io_trace *t) return trace_fifo_get(fifo, fd, NULL, t->pdu_len); } -static void handle_trace_notify(struct blk_io_trace *t) +static int handle_trace_notify(struct blk_io_trace *t) { switch (t->action) { case BLK_TN_PROCESS: @@ -202,8 +231,10 @@ static void handle_trace_notify(struct blk_io_trace *t) break; default: log_err("unknown trace act %x\n", t->action); - break; + return 1; } + + return 0; } static void __add_bs(struct btrace_out *o, unsigned int len, int rw) @@ -239,7 +270,7 @@ static void add_bs(struct btrace_out *o, unsigned int len, int rw) #define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS)) #define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK)) -static void btrace_add_file(struct btrace_out *o, uint32_t devno) +static int btrace_add_file(struct btrace_pid *p, uint32_t devno) { unsigned int maj = FMAJOR(devno); unsigned int min = FMINOR(devno); @@ -248,61 +279,80 @@ static void btrace_add_file(struct btrace_out *o, uint32_t devno) char dev[256]; if (filename) - return; - if (o->last_major == maj && o->last_minor == min) - return; + return 0; + if (p->last_major == maj && p->last_minor == min) + return 0; - o->last_major = maj; - o->last_minor = min; + p->last_major = maj; + p->last_minor = min; /* * check for this file in our list */ - for (i = 0; i < o->nr_files; i++) { - f = &o->files[i]; + for (i = 0; i < p->nr_files; i++) { + f = &p->files[i]; if (f->major == maj && f->minor == min) - return; + return 0; } strcpy(dev, "/dev"); if (!blktrace_lookup_device(NULL, dev, maj, min)) { log_err("fio: failed to find device %u/%u\n", maj, min); - return; + if (!output_ascii) { + log_err("fio: use -d to specify device\n"); + return 1; + } + return 0; } - o->files = realloc(o->files, (o->nr_files + 1) * sizeof(*f)); - f = &o->files[o->nr_files]; + p->files = realloc(p->files, (p->nr_files + 1) * sizeof(*f)); + f = &p->files[p->nr_files]; f->name = strdup(dev); f->major = maj; f->minor = min; - o->nr_files++; + p->nr_files++; + return 0; } -static void handle_trace_discard(struct blk_io_trace *t, struct btrace_out *o) +static int t_to_rwdir(struct blk_io_trace *t) { - btrace_add_file(o, t->device); + if (t->action & BLK_TC_ACT(BLK_TC_DISCARD)) + return DDIR_TRIM; - if (o->first_ttime == -1ULL) - o->first_ttime = t->time; + return (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; +} + +static int handle_trace_discard(struct blk_io_trace *t, struct btrace_pid *p) +{ + struct btrace_out *o = &p->o; + + if (btrace_add_file(p, t->device)) + return 1; + + if (o->first_ttime[2] == -1ULL) + o->first_ttime[2] = t->time; o->ios[DDIR_TRIM]++; add_bs(o, t->bytes, DDIR_TRIM); + return 0; } -static void handle_trace_fs(struct blk_io_trace *t, struct btrace_out *o) +static int handle_trace_fs(struct blk_io_trace *t, struct btrace_pid *p) { + struct btrace_out *o = &p->o; int rw; - btrace_add_file(o, t->device); + if (btrace_add_file(p, t->device)) + return 1; first_ttime = min(first_ttime, (uint64_t) t->time); - if (o->first_ttime == -1ULL) - o->first_ttime = t->time; - rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; + if (o->first_ttime[rw] == -1ULL) + o->first_ttime[rw] = t->time; + add_bs(o, t->bytes, rw); o->ios[rw]++; @@ -310,27 +360,27 @@ static void handle_trace_fs(struct blk_io_trace *t, struct btrace_out *o) o->seq[rw]++; o->last_end[rw] = t->sector + (t->bytes >> 9); + return 0; } -static void handle_queue_trace(struct blk_io_trace *t, struct btrace_out *o) +static int handle_queue_trace(struct blk_io_trace *t, struct btrace_pid *p) { if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY)) - handle_trace_notify(t); + return handle_trace_notify(t); else if (t->action & BLK_TC_ACT(BLK_TC_DISCARD)) - handle_trace_discard(t, o); + return handle_trace_discard(t, p); else - handle_trace_fs(t, o); + return handle_trace_fs(t, p); } -static void handle_trace(struct blk_io_trace *t, struct btrace_pid *p) +static int handle_trace(struct blk_io_trace *t, struct btrace_pid *p) { unsigned int act = t->action & 0xffff; + int ret = 0; if (act == __BLK_TA_QUEUE) { inflight_add(p, t->sector, t->bytes); - handle_queue_trace(t, &p->o); - } else if (act == __BLK_TA_REQUEUE) { - p->o.inflight--; + ret = handle_queue_trace(t, p); } else if (act == __BLK_TA_BACKMERGE) { struct inflight *i; @@ -339,11 +389,8 @@ static void handle_trace(struct blk_io_trace *t, struct btrace_pid *p) inflight_remove(i); i = inflight_find(t->sector); - if (i) { - int rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; - - inflight_merge(i, rw, t->bytes); - } + if (i) + inflight_merge(i, t_to_rwdir(t), t->bytes); } else if (act == __BLK_TA_FRONTMERGE) { struct inflight *i; @@ -352,18 +399,20 @@ static void handle_trace(struct blk_io_trace *t, struct btrace_pid *p) inflight_remove(i); i = inflight_find(t->sector); - if (i) { - int rw = (t->action & BLK_TC_ACT(BLK_TC_WRITE)) != 0; - - inflight_merge(i, rw, 0); - } + if (i) + inflight_merge(i, t_to_rwdir(t), 0); } else if (act == __BLK_TA_COMPLETE) { struct inflight *i; i = inflight_find(t->sector + (t->bytes >> 9)); - if (i) + if (i) { + i->p->o.kib[t_to_rwdir(t)] += (t->bytes >> 10); + i->p->o.complete_seen = 1; inflight_remove(i); + } } + + return ret; } static void byteswap_trace(struct blk_io_trace *t) @@ -407,13 +456,15 @@ static struct btrace_pid *pid_hash_get(pid_t pid) int i; p = calloc(1, sizeof(*p)); - p->o.first_ttime = -1ULL; - p->o.last_ttime = -1ULL; - for (i = 0; i < DDIR_RWDIR_CNT; i++) + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + p->o.first_ttime[i] = -1ULL; + p->o.last_ttime[i] = -1ULL; p->o.last_end[i] = -1ULL; + } p->pid = pid; + p->numjobs = 1; flist_add_tail(&p->hash_list, hash_list); flist_add_tail(&p->pid_list, &pid_list); } @@ -425,15 +476,15 @@ static struct btrace_pid *pid_hash_get(pid_t pid) * 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. */ -static int load_blktrace(const char *filename, int need_swap) +static int load_blktrace(const char *fname, int need_swap) { struct btrace_pid *p; unsigned long traces; struct blk_io_trace t; struct fifo *fifo; - int fd; + int fd, ret = 0; - fd = open(filename, O_RDONLY); + fd = open(fname, O_RDONLY); if (fd < 0) { perror("open trace file\n"); return 1; @@ -443,8 +494,7 @@ static int load_blktrace(const char *filename, int need_swap) traces = 0; do { - int ret = trace_fifo_get(fifo, fd, &t, sizeof(t)); - + ret = trace_fifo_get(fifo, fd, &t, sizeof(t)); if (ret < 0) goto err; else if (!ret) @@ -475,14 +525,19 @@ static int load_blktrace(const char *filename, int need_swap) } p = pid_hash_get(t.pid); - handle_trace(&t, p); - p->o.last_ttime = t.time; + ret = handle_trace(&t, p); + if (ret) + break; + p->o.last_ttime[t_to_rwdir(&t)] = t.time; traces++; } while (1); fifo_free(fifo); close(fd); + if (ret) + return ret; + if (output_ascii) printf("Traces loaded: %lu\n", traces); @@ -501,14 +556,57 @@ static int bs_cmp(const void *ba, const void *bb) return bsb->nr - bsa->nr; } +static unsigned long o_to_kib_rate(struct btrace_out *o, int rw) +{ + uint64_t usec = (o->last_ttime[rw] - o->first_ttime[rw]) / 1000ULL; + uint64_t val; + + if (!usec) + return 0; + + usec /= 1000; + if (!usec) + return 0; + + val = o->kib[rw] * 1000ULL; + return val / usec; +} + +static uint64_t o_first_ttime(struct btrace_out *o) +{ + uint64_t first; + + first = min(o->first_ttime[0], o->first_ttime[1]); + return min(first, o->first_ttime[2]); +} + +static uint64_t o_longest_ttime(struct btrace_out *o) +{ + uint64_t ret = 0; + int i; + + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + uint64_t diff; + + diff = o->last_ttime[i] - o->first_ttime[i]; + ret = max(diff, ret); + } + + return ret; +} + static void __output_p_ascii(struct btrace_pid *p, unsigned long *ios) { const char *msg[] = { "reads", "writes", "trims" }; struct btrace_out *o = &p->o; - unsigned long total; + unsigned long total, usec; int i, j; - printf("[pid:\t%u]\n", p->pid); + printf("[pid:\t%u", p->pid); + if (p->nr_merge_pids) + for (i = 0; i < p->nr_merge_pids; i++) + printf(", %u", p->merge_pids[i]); + printf("]\n"); total = ddir_rw_sum(o->ios); for (i = 0; i < DDIR_RWDIR_CNT; i++) { @@ -524,7 +622,8 @@ static void __output_p_ascii(struct btrace_pid *p, unsigned long *ios) perc = ((float) o->merges[i] * 100.0) / (float) total; printf("\tmerges: %lu (perc=%3.2f%%)\n", o->merges[i], perc); perc = ((float) o->seq[i] * 100.0) / (float) o->ios[i]; - printf("\tseq: %lu (perc=%3.2f%%)\n", o->seq[i], perc); + printf("\tseq: %lu (perc=%3.2f%%)\n", (unsigned long) o->seq[i], perc); + printf("\trate: %lu KiB/sec\n", o_to_kib_rate(o, i)); for (j = 0; j < o->nr_bs[i]; j++) { struct bs *bs = &o->bs[i][j]; @@ -535,11 +634,12 @@ static void __output_p_ascii(struct btrace_pid *p, unsigned long *ios) } printf("depth:\t%u\n", o->depth); - printf("usec:\t%llu (delay=%llu)\n", (o->last_ttime - o->first_ttime) / 1000ULL, (unsigned long long) o->start_delay); + usec = o_longest_ttime(o) / 1000ULL; + printf("usec:\t%lu (delay=%llu)\n", usec, (unsigned long long) o->start_delay); printf("files:\t"); - for (i = 0; i < o->nr_files; i++) - printf("%s,", o->files[i].name); + for (i = 0; i < p->nr_files; i++) + printf("%s,", p->files[i].name); printf("\n"); printf("\n"); @@ -557,8 +657,18 @@ static int __output_p_fio(struct btrace_pid *p, unsigned long *ios) log_err("fio: trace has both read/write and trim\n"); return 1; } + if (!p->nr_files) { + log_err("fio: no devices found\n"); + return 1; + } + + printf("[pid%u", p->pid); + if (p->nr_merge_pids) + for (i = 0; i < p->nr_merge_pids; i++) + printf(",pid%u", p->merge_pids[i]); + printf("]\n"); - printf("[pid%u]\n", p->pid); + printf("numjobs=%u\n", p->numjobs); printf("direct=1\n"); if (o->depth == 1) printf("ioengine=sync\n"); @@ -575,7 +685,7 @@ static int __output_p_fio(struct btrace_pid *p, unsigned long *ios) printf("rw=randrw\n"); total = ddir_rw_sum(o->ios); perc = ((float) o->ios[0] * 100.0) / (float) total; - printf("rwmixread=%u\n", (int) (perc + 0.99)); + printf("rwmixread=%u\n", (int) floor(perc + 0.50)); } printf("percentage_random="); @@ -590,21 +700,22 @@ static int __output_p_fio(struct btrace_pid *p, unsigned long *ios) if (i) printf(","); perc = 100.0 - perc; - printf("%u", (int) perc); + printf("%u", (int) floor(perc + 0.5)); } printf("\n"); printf("filename="); - for (i = 0; i < o->nr_files; i++) { + for (i = 0; i < p->nr_files; i++) { if (i) printf(":"); - printf("%s", o->files[i].name); + printf("%s", p->files[i].name); } printf("\n"); - printf("startdelay=%llus\n", o->start_delay / 1000000ULL); + if (o->start_delay / 1000000ULL) + printf("startdelay=%llus\n", o->start_delay / 1000000ULL); - time = o->last_ttime - o->first_ttime; + time = o_longest_ttime(o); time = (time + 1000000000ULL - 1) / 1000000000ULL; printf("runtime=%llus\n", time); @@ -625,11 +736,30 @@ static int __output_p_fio(struct btrace_pid *p, unsigned long *ios) if (j + 1 == o->nr_bs[i]) printf("%u/", bs->bs); else - printf("%u/%u", bs->bs, (int) perc); + printf("%u/%u", bs->bs, (int) floor(perc + 0.5)); } } - printf("\n\n"); + printf("\n"); + if (set_rate) { + printf("rate="); + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + unsigned long rate; + + rate = o_to_kib_rate(o, i); + if (i) + printf(","); + if (rate) + printf("%luk", rate); + } + printf("\n"); + } + + if (n_add_opts) + for (i = 0; i < n_add_opts; i++) + printf("%s\n", add_opts[i]); + + printf("\n"); return 0; } @@ -645,9 +775,9 @@ static int __output_p(struct btrace_pid *p, unsigned long *ios) } if (filename) { - o->files = malloc(sizeof(struct trace_file)); - o->nr_files++; - o->files[0].name = filename; + p->files = malloc(sizeof(struct trace_file)); + p->nr_files++; + p->files[0].name = filename; } if (output_ascii) @@ -658,17 +788,39 @@ static int __output_p(struct btrace_pid *p, unsigned long *ios) return ret; } +static void remove_ddir(struct btrace_out *o, int rw) +{ + o->ios[rw] = 0; +} + static int prune_entry(struct btrace_out *o) { + unsigned long rate; uint64_t time; + int i; if (ddir_rw_sum(o->ios) < ios_threshold) return 1; - time = (o->last_ttime - o->first_ttime) / 1000ULL; + time = o_longest_ttime(o) / 1000ULL; if (time < rt_threshold) return 1; + rate = 0; + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + unsigned long this_rate; + + this_rate = o_to_kib_rate(o, i); + if (this_rate < rate_threshold) { + remove_ddir(o, i); + this_rate = 0; + } + rate += this_rate; + } + + if (rate < rate_threshold) + return 1; + return 0; } @@ -685,24 +837,132 @@ static void free_p(struct btrace_pid *p) struct btrace_out *o = &p->o; int i; - for (i = 0; i < o->nr_files; i++) { - if (o->files[i].name && o->files[i].name != filename) - free(o->files[i].name); + for (i = 0; i < p->nr_files; i++) { + if (p->files[i].name && p->files[i].name != filename) + free(p->files[i].name); } for (i = 0; i < DDIR_RWDIR_CNT; i++) free(o->bs[i]); - free(o->files); + free(p->files); flist_del(&p->pid_list); flist_del(&p->hash_list); free(p); } +static int entries_close(struct btrace_pid *pida, struct btrace_pid *pidb) +{ + float perca, percb, fdiff; + int i, idiff; + + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + if ((pida->o.ios[i] && !pidb->o.ios[i]) || + (pidb->o.ios[i] && !pida->o.ios[i])) + return 0; + if (pida->o.ios[i] && pidb->o.ios[i]) { + perca = ((float) pida->o.seq[i] * 100.0) / (float) pida->o.ios[i]; + percb = ((float) pidb->o.seq[i] * 100.0) / (float) pidb->o.ios[i]; + fdiff = perca - percb; + if (fabs(fdiff) > random_diff) + return 0; + } + + idiff = pida->o.depth - pidb->o.depth; + if (abs(idiff) > depth_diff) + return 0; + } + + return 1; +} + +static void merge_bs(struct bs **bsap, unsigned int *nr_bsap, + struct bs *bsb, unsigned int nr_bsb) +{ + struct bs *bsa = *bsap; + unsigned int nr_bsa = *nr_bsap; + int a, b; + + for (b = 0; b < nr_bsb; b++) { + int next, found = 0; + + for (a = 0; a < nr_bsa; a++) { + if (bsb[b].bs != bsa[a].bs) + continue; + + bsa[a].nr += bsb[b].nr; + bsa[a].merges += bsb[b].merges; + found = 1; + break; + } + + if (found) + continue; + + next = *nr_bsap; + bsa = realloc(bsa, (next + 1) * sizeof(struct bs)); + bsa[next].bs = bsb[b].bs; + bsa[next].nr = bsb[b].nr; + (*nr_bsap)++; + *bsap = bsa; + } +} + +static int merge_entries(struct btrace_pid *pida, struct btrace_pid *pidb) +{ + int i; + + if (!entries_close(pida, pidb)) + return 0; + + pida->nr_merge_pids++; + pida->merge_pids = realloc(pida->merge_pids, pida->nr_merge_pids * sizeof(pid_t)); + pida->merge_pids[pida->nr_merge_pids - 1] = pidb->pid; + + for (i = 0; i < DDIR_RWDIR_CNT; i++) { + struct btrace_out *oa = &pida->o; + struct btrace_out *ob = &pidb->o; + + oa->ios[i] += ob->ios[i]; + oa->merges[i] += ob->merges[i]; + oa->seq[i] += ob->seq[i]; + oa->kib[i] += ob->kib[i]; + oa->first_ttime[i] = min(oa->first_ttime[i], ob->first_ttime[i]); + oa->last_ttime[i] = max(oa->last_ttime[i], ob->last_ttime[i]); + merge_bs(&oa->bs[i], &oa->nr_bs[i], ob->bs[i], ob->nr_bs[i]); + } + + pida->o.start_delay = min(pida->o.start_delay, pidb->o.start_delay); + pida->o.depth = (pida->o.depth + pidb->o.depth) / 2; + return 1; +} + +static void check_merges(struct btrace_pid *p, struct flist_head *pidlist) +{ + struct flist_head *e, *tmp; + + if (p->ignore) + return; + + flist_for_each_safe(e, tmp, pidlist) { + struct btrace_pid *pidb; + + pidb = flist_entry(e, struct btrace_pid, pid_list); + if (pidb == p) + continue; + + if (merge_entries(p, pidb)) { + pidb->ignore = 1; + p->numjobs++; + } + } +} + static int output_p(void) { unsigned long ios[DDIR_RWDIR_CNT]; struct flist_head *e, *tmp; + int depth_disabled = 0; int ret = 0; flist_for_each_safe(e, tmp, &pid_list) { @@ -713,9 +973,28 @@ static int output_p(void) free_p(p); continue; } - p->o.start_delay = (p->o.first_ttime / 1000ULL) - first_ttime; + p->o.start_delay = (o_first_ttime(&p->o) / 1000ULL) - first_ttime; + depth_disabled += p->o.depth_disabled; + } + + if (collapse_entries) { + struct btrace_pid *p; + + flist_for_each_safe(e, tmp, &pid_list) { + p = flist_entry(e, struct btrace_pid, pid_list); + check_merges(p, &pid_list); + } + + flist_for_each_safe(e, tmp, &pid_list) { + p = flist_entry(e, struct btrace_pid, pid_list); + if (p->ignore) + free_p(p); + } } + if (depth_disabled) + log_err("fio: missing completion traces, depths capped at %u\n", max_depth); + memset(ios, 0, sizeof(ios)); flist_sort(NULL, &pid_list, entry_cmp); @@ -725,6 +1004,8 @@ static int output_p(void) p = flist_entry(e, struct btrace_pid, pid_list); ret |= __output_p(p, ios); + if (ret && !output_ascii) + break; } if (output_ascii) @@ -735,11 +1016,18 @@ static int output_p(void) static int usage(char *argv[]) { - log_err("%s: \n", argv[0]); + log_err("%s: [options] \n", argv[0]); log_err("\t-t\tUsec threshold to ignore task\n"); log_err("\t-n\tNumber IOS threshold to ignore task\n"); log_err("\t-f\tFio job file output\n"); log_err("\t-d\tUse this file/device for replay\n"); + log_err("\t-r\tIgnore jobs with less than this KiB/sec rate\n"); + log_err("\t-R\tSet rate in fio job (def=%u)\n", set_rate); + log_err("\t-D\tCap queue depth at this value (def=%u)\n", max_depth); + log_err("\t-c\tCollapse \"identical\" jobs (def=%u)\n", collapse_entries); + log_err("\t-u\tDepth difference for collapse (def=%u)\n", depth_diff); + log_err("\t-x\tRandom difference for collapse (def=%u)\n", random_diff); + log_err("\t-a\tAdditional fio option to add to job file\n"); return 1; } @@ -758,9 +1046,11 @@ static int trace_needs_swap(const char *trace_file, int *swap) ret = read(fd, &t, sizeof(t)); if (ret < 0) { + close(fd); perror("read"); return 1; } else if (ret != sizeof(t)) { + close(fd); log_err("fio: short read on trace file\n"); return 1; } @@ -793,8 +1083,14 @@ int main(int argc, char *argv[]) if (argc < 2) return usage(argv); - while ((c = getopt(argc, argv, "t:n:fd:")) != -1) { + while ((c = getopt(argc, argv, "t:n:fd:r:RD:c:u:x:a:")) != -1) { switch (c) { + case 'R': + set_rate = 1; + break; + case 'r': + rate_threshold = atoi(optarg); + break; case 't': rt_threshold = atoi(optarg); break; @@ -807,6 +1103,23 @@ int main(int argc, char *argv[]) case 'd': filename = strdup(optarg); break; + case 'D': + max_depth = atoi(optarg); + break; + case 'c': + collapse_entries = atoi(optarg); + break; + case 'u': + depth_diff = atoi(optarg); + break; + case 'x': + random_diff = atoi(optarg); + break; + case 'a': + add_opts = realloc(add_opts, (n_add_opts + 1) * sizeof(char *)); + add_opts[n_add_opts] = strdup(optarg); + n_add_opts++; + break; case '?': default: return usage(argv);