i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ID() instead of BlockNumber() for the debug output.

Browse Source
This commit is contained in:
Axel Dörfler
2012-03-31 00:09:46 +02:00
parent b81ce43017
commit aed54a9a46
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
+20 -22
View File
@@ -708,7 +708,7 @@ BPlusTree::Validate(bool repair, bool& _errorsFound)
if (check.Visited(freeOffset)) { if (check.Visited(freeOffset)) {
dprintf("inode %" B_PRIdOFF ": free node at %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": free node at %" B_PRIdOFF
" circular!\n", fStream->BlockNumber(), freeOffset); " circular!\n", fStream->ID(), freeOffset);
break; break;
} }
@@ -716,7 +716,7 @@ BPlusTree::Validate(bool repair, bool& _errorsFound)
if (node->OverflowLink() != BPLUSTREE_FREE) { if (node->OverflowLink() != BPLUSTREE_FREE) {
dprintf("inode %" B_PRIdOFF ": free node at %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": free node at %" B_PRIdOFF
" misses free mark!\n", fStream->BlockNumber(), freeOffset); " misses free mark!\n", fStream->ID(), freeOffset);
} }
freeOffset = node->LeftLink(); freeOffset = node->LeftLink();
} }
@@ -738,14 +738,14 @@ BPlusTree::Validate(bool repair, bool& _errorsFound)
if (check.MaxLevels() + 1 != fHeader.MaxNumberOfLevels()) { if (check.MaxLevels() + 1 != fHeader.MaxNumberOfLevels()) {
dprintf("inode %" B_PRIdOFF ": found %" B_PRIu32 " max levels, " dprintf("inode %" B_PRIdOFF ": found %" B_PRIu32 " max levels, "
"declared %" B_PRIu32 "!\n", fStream->BlockNumber(), "declared %" B_PRIu32 "!\n", fStream->ID(), check.MaxLevels(),
check.MaxLevels(), fHeader.MaxNumberOfLevels()); fHeader.MaxNumberOfLevels());
} }
if (check.VisitedCount() != fHeader.MaximumSize() / fNodeSize) { if (check.VisitedCount() != fHeader.MaximumSize() / fNodeSize) {
dprintf("inode %" B_PRIdOFF ": visited %" B_PRIuSIZE " from %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": visited %" B_PRIuSIZE " from %" B_PRIdOFF
" nodes.\n", fStream->BlockNumber(), " nodes.\n", fStream->ID(), check.VisitedCount(),
check.VisitedCount(), fHeader.MaximumSize() / fNodeSize); fHeader.MaximumSize() / fNodeSize);
} }
return B_OK; return B_OK;
@@ -2177,13 +2177,13 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
{ {
if (parent->CheckIntegrity(fNodeSize) != B_OK) { if (parent->CheckIntegrity(fNodeSize) != B_OK) {
dprintf("inode %" B_PRIdOFF ": node %" B_PRIdOFF " integrity check " dprintf("inode %" B_PRIdOFF ": node %" B_PRIdOFF " integrity check "
"failed!\n", fStream->BlockNumber(), offset); "failed!\n", fStream->ID(), offset);
check.FoundError(); check.FoundError();
return B_OK; return B_OK;
} }
if (level >= fHeader.MaxNumberOfLevels()) { if (level >= fHeader.MaxNumberOfLevels()) {
dprintf("inode %" B_PRIdOFF ": maximum level surpassed at %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": maximum level surpassed at %" B_PRIdOFF
"!\n", fStream->BlockNumber(), offset); "!\n", fStream->ID(), offset);
check.FoundError(); check.FoundError();
return B_OK; return B_OK;
} }
@@ -2192,7 +2192,7 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
if (check.Visited(offset)) { if (check.Visited(offset)) {
dprintf("inode %" B_PRIdOFF ": node %" B_PRIdOFF " already visited!\n", dprintf("inode %" B_PRIdOFF ": node %" B_PRIdOFF " already visited!\n",
fStream->BlockNumber(), offset); fStream->ID(), offset);
check.FoundError(); check.FoundError();
return B_OK; return B_OK;
} }
@@ -2213,7 +2213,7 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
if (result >= 0) { if (result >= 0) {
dprintf("inode %" B_PRIdOFF ": node %" B_PRIdOFF " key %" dprintf("inode %" B_PRIdOFF ": node %" B_PRIdOFF " key %"
B_PRIu32 " larger than it should!\n", B_PRIu32 " larger than it should!\n",
fStream->BlockNumber(), offset, i); fStream->ID(), offset, i);
check.FoundError(); check.FoundError();
} }
} }
@@ -2237,7 +2237,7 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
if (!isKnownFragment && check.Visited(duplicateOffset)) { if (!isKnownFragment && check.Visited(duplicateOffset)) {
dprintf("inode %" B_PRIdOFF ": duplicate node at %" dprintf("inode %" B_PRIdOFF ": duplicate node at %"
B_PRIdOFF " already visited!\n", fStream->BlockNumber(), B_PRIdOFF " already visited!\n", fStream->ID(),
duplicateOffset); duplicateOffset);
check.FoundError(); check.FoundError();
break; break;
@@ -2265,7 +2265,7 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
if (arrayCount < 1 || arrayCount > maxSize) { if (arrayCount < 1 || arrayCount > maxSize) {
dprintf("inode %" B_PRIdOFF ": duplicate at %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": duplicate at %" B_PRIdOFF
" has invalid array size %" B_PRId32 "!\n", " has invalid array size %" B_PRId32 "!\n",
fStream->BlockNumber(), duplicateOffset, arrayCount); fStream->ID(), duplicateOffset, arrayCount);
check.FoundError(); check.FoundError();
} else { } else {
// Simple check if the values in the array may be valid // Simple check if the values in the array may be valid
@@ -2274,7 +2274,7 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
array->ValueAt(j))) { array->ValueAt(j))) {
dprintf("inode %" B_PRIdOFF ": duplicate at %" dprintf("inode %" B_PRIdOFF ": duplicate at %"
B_PRIdOFF " contains invalid block %" B_PRIdOFF B_PRIdOFF " contains invalid block %" B_PRIdOFF
" at %" B_PRId32 "!\n", fStream->BlockNumber(), " at %" B_PRId32 "!\n", fStream->ID(),
duplicateOffset, array->ValueAt(j), j); duplicateOffset, array->ValueAt(j), j);
check.FoundError(); check.FoundError();
break; break;
@@ -2289,8 +2289,8 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
if (node->LeftLink() != lastDuplicateOffset) { if (node->LeftLink() != lastDuplicateOffset) {
dprintf("inode %" B_PRIdOFF ": duplicate at %" B_PRIdOFF dprintf("inode %" B_PRIdOFF ": duplicate at %" B_PRIdOFF
" has wrong left link %" B_PRIdOFF ", expected %" " has wrong left link %" B_PRIdOFF ", expected %"
B_PRIdOFF "!\n", fStream->BlockNumber(), B_PRIdOFF "!\n", fStream->ID(), duplicateOffset,
duplicateOffset, node->LeftLink(), lastDuplicateOffset); node->LeftLink(), lastDuplicateOffset);
check.FoundError(); check.FoundError();
} }
@@ -2312,8 +2312,8 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
if (previous->RightLink() != childOffset) { if (previous->RightLink() != childOffset) {
dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " has " dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " has "
"wrong right link %" B_PRIdOFF ", expected %" B_PRIdOFF "wrong right link %" B_PRIdOFF ", expected %" B_PRIdOFF
"!\n", fStream->BlockNumber(), lastOffset, "!\n", fStream->ID(), lastOffset, previous->RightLink(),
previous->RightLink(), childOffset); childOffset);
check.FoundError(); check.FoundError();
} }
} }
@@ -2325,7 +2325,7 @@ BPlusTree::_ValidateChildren(TreeCheck& check, uint32 level, off_t offset,
} else if (!fStream->GetVolume()->IsValidInodeBlock(childOffset)) { } else if (!fStream->GetVolume()->IsValidInodeBlock(childOffset)) {
dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " contains " dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " contains "
"invalid block %" B_PRIdOFF " at %" B_PRId32 "!\n", "invalid block %" B_PRIdOFF " at %" B_PRId32 "!\n",
fStream->BlockNumber(), offset, childOffset, i); fStream->ID(), offset, childOffset, i);
check.FoundError(); check.FoundError();
} }
@@ -2359,16 +2359,14 @@ BPlusTree::_ValidateChild(TreeCheck& check, CachedNode& cached, uint32 level,
if (node->LeftLink() != lastOffset) { if (node->LeftLink() != lastOffset) {
dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " has " dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " has "
"wrong left link %" B_PRIdOFF ", expected %" B_PRIdOFF "wrong left link %" B_PRIdOFF ", expected %" B_PRIdOFF
"!\n", fStream->BlockNumber(), offset, node->LeftLink(), "!\n", fStream->ID(), offset, node->LeftLink(), lastOffset);
lastOffset);
check.FoundError(); check.FoundError();
} }
if (nextOffset != 0 && node->RightLink() != nextOffset) { if (nextOffset != 0 && node->RightLink() != nextOffset) {
dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " has " dprintf("inode %" B_PRIdOFF ": node at %" B_PRIdOFF " has "
"wrong right link %" B_PRIdOFF ", expected %" B_PRIdOFF "wrong right link %" B_PRIdOFF ", expected %" B_PRIdOFF
"!\n", fStream->BlockNumber(), offset, node->RightLink(), "!\n", fStream->ID(), offset, node->RightLink(), nextOffset);
nextOffset);
check.FoundError(); check.FoundError();
} }