Skip to content

Commit

Permalink
btrace2fio: add support for collapsing close entries
Browse files Browse the repository at this point in the history 
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
@axboe
axboe committed Dec 10, 2014
1 parent 1527dc5 commit ccfcf5b
Showing 1 changed file with 168 additions and 9 deletions.
177 changes: 168 additions & 9 deletions t/btrace2fio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stdio.h>
#include <unistd.h>
#include <inttypes.h>
#include <math.h>
#include <assert.h>

#include "../io_ddir.h"
Expand All @@ -23,6 +24,13 @@ static unsigned int max_depth = 256;
static int output_ascii = 1;
static char *filename;

/*
* 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;
Expand Down Expand Up @@ -61,9 +69,14 @@ struct btrace_pid {
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;
};
Expand Down Expand Up @@ -448,6 +461,7 @@ static struct btrace_pid *pid_hash_get(pid_t pid)
}

p->pid = pid;
p->numjobs = 1;
flist_add_tail(&p->hash_list, hash_list);
flist_add_tail(&p->pid_list, &pid_list);
}
Expand Down Expand Up @@ -585,7 +599,11 @@ static void __output_p_ascii(struct btrace_pid *p, unsigned long *ios)
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++) {
Expand Down Expand Up @@ -641,7 +659,13 @@ static int __output_p_fio(struct btrace_pid *p, unsigned long *ios)
return 1;
}

printf("[pid%u]\n", p->pid);
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("numjobs=%u\n", p->numjobs);
printf("direct=1\n");
if (o->depth == 1)
printf("ioengine=sync\n");
Expand All @@ -658,7 +682,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=");
Expand All @@ -673,7 +697,7 @@ 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");

Expand All @@ -685,7 +709,8 @@ static int __output_p_fio(struct btrace_pid *p, unsigned long *ios)
}
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_longest_ttime(o);
time = (time + 1000000000ULL - 1) / 1000000000ULL;
Expand All @@ -708,7 +733,7 @@ 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");
Expand Down Expand Up @@ -819,6 +844,113 @@ static void free_p(struct btrace_pid *p)
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->kb[i] += ob->kb[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 *pid_list)
{
struct flist_head *e, *tmp;

if (p->ignore)
return;

flist_for_each_safe(e, tmp, pid_list) {
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];
Expand All @@ -838,6 +970,21 @@ static int output_p(void)
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);

Expand All @@ -862,14 +1009,17 @@ static int output_p(void)

static int usage(char *argv[])
{
log_err("%s: <blktrace bin file>\n", argv[0]);
log_err("%s: [options] <blktrace bin file>\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 KB/sec rate\n");
log_err("\t-R\tSet rate in fio job\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);
return 1;
}

Expand Down Expand Up @@ -925,7 +1075,7 @@ int main(int argc, char *argv[])
if (argc < 2)
return usage(argv);

while ((c = getopt(argc, argv, "t:n:fd:r:RD:")) != -1) {
while ((c = getopt(argc, argv, "t:n:fd:r:RD:c:u:x:")) != -1) {
switch (c) {
case 'R':
set_rate = 1;
Expand All @@ -948,6 +1098,15 @@ int main(int argc, char *argv[])
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 '?':
default:
return usage(argv);
Expand Down

0 comments on commit ccfcf5b

Please sign in to comment.