diff options
| author | Wei Wang <wvw@google.com> | 2018-08-29 14:04:30 -0700 |
|---|---|---|
| committer | Wei Wang <wvw@google.com> | 2018-08-30 13:29:06 -0700 |
| commit | c80018f8775ae62741aff7741038547cfc5ff409 (patch) | |
| tree | aaab9c22241d34bdb7f87923edc8b0483d9922e4 /btt/bno_dump.c | |
| parent | d345431f16b8f76f30a58193ff2b26d5853e1109 (diff) | |
| download | blktrace-c80018f8775ae62741aff7741038547cfc5ff409.tar.gz | |
Update to blktrace-1.2.0 and fix the build
Test: Build and run
Bug: 113540458
Change-Id: Ie17f737d23dca429431d0114485254b6d91d3984
Diffstat (limited to 'btt/bno_dump.c')
| -rw-r--r-- | btt/bno_dump.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/btt/bno_dump.c b/btt/bno_dump.c index 7365300..00c9ac2 100644 --- a/btt/bno_dump.c +++ b/btt/bno_dump.c @@ -24,20 +24,17 @@ struct bno_dump { FILE *rfp, *wfp, *cfp; }; -static FILE *bno_dump_open(__u32 device, char rwc) +static FILE *bno_dump_open(struct d_info *dip, char rwc) { FILE *fp; char *oname; - int mjr, mnr; - mjr = device >> MINORBITS; - mnr = device & ((1 << MINORBITS) - 1); - - oname = malloc(strlen(bno_dump_name) + 32); - sprintf(oname, "%s_%03d,%03d_%c.dat", bno_dump_name, mjr, mnr, rwc); - if ((fp = my_fopen(oname, "w")) == NULL) + oname = malloc(strlen(bno_dump_name) + strlen(dip->dip_name) + 32); + sprintf(oname, "%s_%s_%c.dat", bno_dump_name, dip->dip_name, rwc); + if ((fp = my_fopen(oname, "w")) == NULL) { perror(oname); - else + free(oname); + } else add_file(fp, oname); return fp; } @@ -48,16 +45,16 @@ static inline void bno_dump_write(FILE *fp, struct io *iop) (long long)BIT_START(iop), (long long)BIT_END(iop)); } -void *bno_dump_alloc(__u32 device) +void *bno_dump_alloc(struct d_info *dip) { struct bno_dump *bdp; if (bno_dump_name == NULL) return NULL; bdp = malloc(sizeof(*bdp)); - bdp->rfp = bno_dump_open(device, 'r'); - bdp->wfp = bno_dump_open(device, 'w'); - bdp->cfp = bno_dump_open(device, 'c'); + bdp->rfp = bno_dump_open(dip, 'r'); + bdp->wfp = bno_dump_open(dip, 'w'); + bdp->cfp = bno_dump_open(dip, 'c'); return bdp; } |