From 5868dfb9890cb4790f1fd4f6d9f8013c1b64337d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 1 Apr 2012 00:39:01 +0200
Subject: [PATCH] Reverted r43922, and instead improved bfs_block_runs command.

* Calling FindBlockRun() would only work for the direct range anyway, as it
  would need to call into the block cache for anything else.
* bfs_block_runs now accepts a few more arguments that make finding an offset
  much easier.
---
 src/add-ons/kernel/file_systems/bfs/Debug.cpp | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/bfs/Debug.cpp b/src/add-ons/kernel/file_systems/bfs/Debug.cpp
index 3864f62381..f9c6cf71b8 100644
--- a/src/add-ons/kernel/file_systems/bfs/Debug.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Debug.cpp
@@ -280,41 +280,20 @@ dump_inode(int argc, char** argv)
 	if (argc >= 3 && !strcmp(argv[1], "-b"))
 		block = true;
 
-	if (argc > 3 || !strcmp(argv[1], "--help")) {
-		kprintf("usage: bfsinode [-b] <ptr-to-inode> [<offset>]\n"
+	if (argc != 2 + (block ? 1 : 0) || !strcmp(argv[1], "--help")) {
+		kprintf("usage: bfsinode [-b] <ptr-to-inode>\n"
 			"  -b the address is regarded as pointer to a block instead of one "
-			"to an inode.\n"
-			"  If <offset> is given, the block_run containing the offset in "
-			"the data stream is printed -- this does not work with -b.\n");
+			"to an inode.\n");
 		return 0;
 	}
 
-	addr_t address = parse_expression(argv[block ? 2 : 1]);
+	addr_t address = parse_expression(argv[argc - 1]);
 	bfs_inode* node;
 	if (block)
 		node = (bfs_inode*)address;
 	else {
 		Inode* inode = (Inode*)address;
 
-		if (argc == 3) {
-			off_t offset = parse_expression(argv[2]);
-			if (offset < 0) {
-				kprintf("invalid offset %" B_PRIdOFF "\n", offset);
-				return 0;
-			}
-			off_t baseOffset;
-			block_run run;
-			status_t status = inode->FindBlockRun(offset, run, baseOffset);
-			if (status != B_OK) {
-				kprintf("find block run failed: %s\n", strerror(status));
-				return 0;
-			}
-
-			dump_block_run("block run:   ", run);
-			kprintf("base offset: %" B_PRIdOFF "\n", baseOffset);
-			return 0;
-		}
-
 		kprintf("INODE %p\n", inode);
 		kprintf("  rw lock:           %p\n", &inode->Lock());
 		kprintf("  tree:              %p\n", inode->Tree());
@@ -394,7 +373,8 @@ static int
 dump_block_run_array(int argc, char** argv)
 {
 	if (argc < 2 || !strcmp(argv[1], "--help")) {
-		kprintf("usage: %s <ptr-to-array> [number-of-runs]\n", argv[0]);
+		kprintf("usage: %s <ptr-to-array> [number-of-runs] [block-size] "
+			"[start-offset] [search-offset]\n", argv[0]);
 		return 0;
 	}
 
@@ -403,9 +383,32 @@ dump_block_run_array(int argc, char** argv)
 	if (argc > 2)
 		count = parse_expression(argv[2]);
 
+	uint32 blockSize = 0;
+	if (argc > 3)
+		blockSize = parse_expression(argv[3]);
+
+	off_t offset = 0;
+	if (argc > 4)
+		offset = parse_expression(argv[4]);
+
+	off_t searchOffset = 0;
+	if (argc > 5)
+		searchOffset = parse_expression(argv[5]);
+
 	for (uint32 i = 0; i < count; i++) {
-		dprintf("[%3lu]  ", i);
+		if (blockSize != 0)
+			dprintf("[%3lu]  %10" B_PRIdOFF "  ", i, offset);
+		else
+			dprintf("[%3lu]  ", i);
+
+		uint32 size = runs[i].Length() * blockSize;
+		if (searchOffset != 0 && searchOffset >= offset
+			&& searchOffset < offset + size)
+			dprintf("*  ");
+
 		dump_block_run("", runs[i]);
+
+		offset += size;
 	}
 
 	return 0;