diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-05-30 13:02:01 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-05-30 13:02:01 +0200 |
| commit | d57450af7817f35ddaa3241426a6213689a3eec6 (patch) | |
| tree | 0d379b2be7a5237babd85ab0bafdca6c29af2f84 /blkparse_fmt.c | |
| parent | fb2ec7961d3cfc7fb8f84bcf6ae803ed1c7bd180 (diff) | |
| download | blktrace-d57450af7817f35ddaa3241426a6213689a3eec6.tar.gz blktrace-d57450af7817f35ddaa3241426a6213689a3eec6.tar.bz2 | |
Small format update for empty requests
The kernel can use empty bio's or requests for signalling purposes
(such as sending a barrier down with no data attached), update the
format to output more appropriately for those.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'blkparse_fmt.c')
| -rw-r--r-- | blkparse_fmt.c | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/blkparse_fmt.c b/blkparse_fmt.c index 4560e56..0ca5c60 100644 --- a/blkparse_fmt.c +++ b/blkparse_fmt.c @@ -65,8 +65,10 @@ static inline void fill_rwbs(char *rwbs, struct blk_io_trace *t) if (w) rwbs[i++] = 'W'; - else + else if (t->bytes) rwbs[i++] = 'R'; + else + rwbs[i++] = 'N'; if (a) rwbs[i++] = 'A'; if (b) @@ -314,13 +316,23 @@ static void process_default(char *act, struct per_cpu_info *pci, fprintf(ofp, "[%d]\n", t->error); } else { if (elapsed != -1ULL) { - fprintf(ofp, "%llu + %u (%8llu) [%d]\n", - (unsigned long long) t->sector, - t_sec(t), elapsed, t->error); + if (t_sec(t)) + fprintf(ofp, "%llu + %u (%8llu) [%d]\n", + (unsigned long long) t->sector, + t_sec(t), elapsed, t->error); + else + fprintf(ofp, "%llu (%8llu) [%d]\n", + (unsigned long long) t->sector, + elapsed, t->error); } else { - fprintf(ofp, "%llu + %u [%d]\n", - (unsigned long long) t->sector, - t_sec(t), t->error); + if (t_sec(t)) + fprintf(ofp, "%llu + %u [%d]\n", + (unsigned long long) t->sector, + t_sec(t), t->error); + else + fprintf(ofp, "%llu [%d]\n", + (unsigned long long) t->sector, + t->error); } } break; @@ -338,13 +350,20 @@ static void process_default(char *act, struct per_cpu_info *pci, fprintf(ofp, "[%s]\n", name); } else { if (elapsed != -1ULL) { - fprintf(ofp, "%llu + %u (%8llu) [%s]\n", - (unsigned long long) t->sector, - t_sec(t), elapsed, name); + if (t_sec(t)) + fprintf(ofp, "%llu + %u (%8llu) [%s]\n", + (unsigned long long) t->sector, + t_sec(t), elapsed, name); + else + fprintf(ofp, "(%8llu) [%s]\n", elapsed, + name); } else { - fprintf(ofp, "%llu + %u [%s]\n", - (unsigned long long) t->sector, - t_sec(t), name); + if (t_sec(t)) + fprintf(ofp, "%llu + %u [%s]\n", + (unsigned long long) t->sector, + t_sec(t), name); + else + fprintf(ofp, "[%s]\n", name); } } break; @@ -353,8 +372,11 @@ static void process_default(char *act, struct per_cpu_info *pci, case 'F': /* Front merge */ case 'G': /* Get request */ case 'S': /* Sleep request */ - fprintf(ofp, "%llu + %u [%s]\n", (unsigned long long) t->sector, - t_sec(t), name); + if (t_sec(t)) + fprintf(ofp, "%llu + %u [%s]\n", + (unsigned long long) t->sector, t_sec(t), name); + else + fprintf(ofp, "[%s]\n", name); break; case 'P': /* Plug */ |