From: Jens Axboe <axboe@suse.de>
Date: Thu, 6 Oct 2005 12:25:52 +0000 (+0200)
Subject: [PATCH] blkparse: fix remap sectors dump, it was in kb
X-Git-Tag: blktrace-0.99~30
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ae957cbc4f0d0eb7b442dc3c4693db996bcd5170;p=blktrace.git

[PATCH] blkparse: fix remap sectors dump, it was in kb

Add t_kb(t) and t_sec(t) macros to help with this.
---

diff --git a/blkparse.c b/blkparse.c
index 60292e3..3f2f851 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -511,16 +511,16 @@ static void log_track_frontmerge(struct per_dev_info *pdi,
 	if (!track_ios)
 		return;
 
-	iot = __find_track(pdi, t->sector + (t->bytes >> 9));
+	iot = __find_track(pdi, t->sector + t_sec(t));
 	if (!iot) {
 		fprintf(stderr, "merge not found for (%d,%d): %llu\n",
 			MAJOR(pdi->dev), MINOR(pdi->dev),
-			(unsigned long long) t->sector + (t->bytes >> 9));
+			(unsigned long long) t->sector + t_sec(t));
 		return;
 	}
 
 	rb_erase(&iot->rb_node, &pdi->rb_track);
-	iot->sector -= t->bytes >> 9;
+	iot->sector -= t_sec(t);
 	track_rb_insert(pdi, iot);
 }
 
@@ -761,10 +761,10 @@ static inline void __account_m(struct io_stats *ios, struct blk_io_trace *t,
 {
 	if (rw) {
 		ios->mwrites++;
-		ios->qwrite_kb += t->bytes >> 10;
+		ios->qwrite_kb += t_kb(t);
 	} else {
 		ios->mreads++;
-		ios->qread_kb += t->bytes >> 10;
+		ios->qread_kb += t_kb(t);
 	}
 }
 
@@ -785,10 +785,10 @@ static inline void __account_queue(struct io_stats *ios, struct blk_io_trace *t,
 {
 	if (rw) {
 		ios->qwrites++;
-		ios->qwrite_kb += t->bytes >> 10;
+		ios->qwrite_kb += t_kb(t);
 	} else {
 		ios->qreads++;
-		ios->qread_kb += t->bytes >> 10;
+		ios->qread_kb += t_kb(t);
 	}
 }
 
diff --git a/blkparse_fmt.c b/blkparse_fmt.c
index b8f90de..c445d0d 100644
--- a/blkparse_fmt.c
+++ b/blkparse_fmt.c
@@ -159,7 +159,7 @@ static void print_field(char *act, struct per_cpu_info *pci,
 		fprintf(ofp, strcat(format, "d"), MINOR(t->device));
 		break;
 	case 'n':
-		fprintf(ofp, strcat(format, "u"), t->bytes >> 9);
+		fprintf(ofp, strcat(format, "u"), t_sec(t));
 		break;
 	case 'N':
 		fprintf(ofp, strcat(format, "u"), t->bytes);
@@ -257,11 +257,11 @@ static void process_default(char *act, struct per_cpu_info *pci,
 			if (elapsed != -1ULL) {
 				fprintf(ofp, "%llu + %u (%8llu) [%d]\n",
 					(unsigned long long) t->sector,
-					t->bytes >> 9, elapsed, t->error);
+					t_sec(t), elapsed, t->error);
 			} else {
 				fprintf(ofp, "%llu + %u [%d]\n",
 					(unsigned long long) t->sector,
-					t->bytes >> 9, t->error);
+					t_sec(t), t->error);
 			}
 		}
 		break;
@@ -281,11 +281,11 @@ static void process_default(char *act, struct per_cpu_info *pci,
 			if (elapsed != -1ULL) {
 				fprintf(ofp, "%llu + %u (%8llu) [%s]\n",
 					(unsigned long long) t->sector,
-					t->bytes >> 9, elapsed, t->comm);
+					t_sec(t), elapsed, t->comm);
 			} else {
 				fprintf(ofp, "%llu + %u [%s]\n",
 					(unsigned long long) t->sector,
-					t->bytes >> 9, t->comm);
+					t_sec(t), t->comm);
 			}
 		}
 		break;
@@ -296,7 +296,7 @@ static void process_default(char *act, struct per_cpu_info *pci,
 	case 'G':	/* Get request */
 	case 'S':	/* Sleep request */
 		fprintf(ofp, "%llu + %u [%s]\n", (unsigned long long) t->sector,
-			t->bytes >> 9, t->comm);
+			t_sec(t), t->comm);
 		break;
 
 	case 'P':	/* Plug */
@@ -313,7 +313,7 @@ static void process_default(char *act, struct per_cpu_info *pci,
 
 		get_pdu_remap(t, &r);
 		fprintf(ofp, "%llu + %u <- (%d,%d) %llu\n",
-			(unsigned long long) r.sector, t->bytes >> 10,
+			(unsigned long long) r.sector, t_sec(t),
 			MAJOR(r.device), MINOR(r.device),
 			(unsigned long long) t->sector);
 		break;
diff --git a/blktrace.h b/blktrace.h
index 9bc3de6..cd0caa8 100644
--- a/blktrace.h
+++ b/blktrace.h
@@ -18,6 +18,9 @@
 
 #define min(a, b)	((a) < (b) ? (a) : (b))
 
+#define t_sec(t)	((t)->bytes >> 9)
+#define t_kb(t)		((t)->bytes >> 10)
+
 typedef __u32 u32;
 typedef __u8 u8;