Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Improved tracing of the allocations at block level.

Browse Source 
* Turned on extra check on allocation when KDEBUG is set.
* The "bfs" KDL command now also prints the block bitmap block for the
  specified block.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30079 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-04-09 19:50:03 +00:00
parent 039878c152
commit 9ec59fc934
2 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2008, Axel Dörfler, axeld@pinc-software.de. * Copyright 2001-2009, Axel Dörfler, axeld@pinc-software.de.
* This file may be used under the terms of the MIT License. * This file may be used under the terms of the MIT License.
*/ */
@ -103,9 +103,9 @@ public:
fBlock(blockNumber), fBlock(blockNumber),
fData(data), fData(data),
fStart(start), fStart(start),
fLength(length) fLength(length),
fLabel(label)
{ {
strlcpy(fLabel, label, sizeof(fLabel));
fSum = checksum(data, size); fSum = checksum(data, size);
Initialized(); Initialized();
} }
@ -122,7 +122,33 @@ private:
uint32 fStart; uint32 fStart;
uint32 fLength; uint32 fLength;
uint32 fSum; uint32 fSum;
char fLabel[12]; const char* fLabel;
};
class BlockChange : public AbstractTraceEntry {
public:
BlockChange(const char* label, int32 block, uint32 oldData, uint32 newData)
:
fBlock(block),
fOldData(oldData),
fNewData(newData),
fLabel(label)
{
Initialized();
}
virtual void AddDump(TraceOutput& out)
{
out.Print("bfs:%s: block %ld, %08lx -> %08lx", fLabel,
fBlock, fOldData, fNewData);
}
private:
int32 fBlock;
uint32 fOldData;
uint32 fNewData;
const char* fLabel;
}; };
} // namespace BFSBlockTracing } // namespace BFSBlockTracing
@ -263,12 +289,6 @@ AllocationBlock::Allocate(uint16 start, uint16 numBlocks)
ASSERT(fWritable); ASSERT(fWritable);
#endif #endif
if (uint32(start + numBlocks) > fNumBits) {
FATAL(("Allocation::Allocate(): tried to allocate too many blocks: %u "
"(numBlocks = %u)!\n", numBlocks, (unsigned)fNumBits));
DIE(("Allocation::Allocate(): tried to allocate too many blocks"));
}
T(Block("b-alloc-in", fBlockNumber, fBlock, fVolume->BlockSize(), T(Block("b-alloc-in", fBlockNumber, fBlock, fVolume->BlockSize(),
start, numBlocks)); start, numBlocks));
@ -278,14 +298,19 @@ AllocationBlock::Allocate(uint16 start, uint16 numBlocks)
uint32 mask = 0; uint32 mask = 0;
for (int32 i = start % 32; i < 32 && numBlocks; i++, numBlocks--) for (int32 i = start % 32; i < 32 && numBlocks; i++, numBlocks--)
mask |= 1UL << i; mask |= 1UL << i;
#ifdef DEBUG
T(BlockChange("b-alloc", block, Block(block),
Block(block) | HOST_ENDIAN_TO_BFS_INT32(mask)));
#if KDEBUG
// check for already set blocks // check for already set blocks
if (HOST_ENDIAN_TO_BFS_INT32(mask) & ((uint32*)fBlock)[block]) { if (HOST_ENDIAN_TO_BFS_INT32(mask) & ((uint32*)fBlock)[block]) {
FATAL(("AllocationBlock::Allocate(): some blocks are already " FATAL(("AllocationBlock::Allocate(): some blocks are already "
"allocated, start = %u, numBlocks = %u\n", start, numBlocks)); "allocated, start = %u, numBlocks = %u\n", start, numBlocks));
DEBUGGER(("blocks already set!")); panic("blocks already set!");
} }
#endif #endif
Block(block++) |= HOST_ENDIAN_TO_BFS_INT32(mask); Block(block++) |= HOST_ENDIAN_TO_BFS_INT32(mask);
start = 0; start = 0;
} }
@ -303,12 +328,6 @@ AllocationBlock::Free(uint16 start, uint16 numBlocks)
ASSERT(fWritable); ASSERT(fWritable);
#endif #endif
if (uint32(start + numBlocks) > fNumBits) {
FATAL(("Allocation::Free(): tried to free too many blocks: %u "
"(numBlocks = %u)!\n", numBlocks, (unsigned)fNumBits));
DIE(("Allocation::Free(): tried to free too many blocks"));
}
int32 block = start >> 5; int32 block = start >> 5;
while (numBlocks > 0) { while (numBlocks > 0) {
@ -316,6 +335,9 @@ AllocationBlock::Free(uint16 start, uint16 numBlocks)
for (int32 i = start % 32; i < 32 && numBlocks; i++, numBlocks--) for (int32 i = start % 32; i < 32 && numBlocks; i++, numBlocks--)
mask |= 1UL << (i % 32); mask |= 1UL << (i % 32);
T(BlockChange("b-free", block, Block(block),
Block(block) & HOST_ENDIAN_TO_BFS_INT32(~mask)));
Block(block++) &= HOST_ENDIAN_TO_BFS_INT32(~mask); Block(block++) &= HOST_ENDIAN_TO_BFS_INT32(~mask);
start = 0; start = 0;
} }

14
src/add-ons/kernel/file_systems/bfs/Debug.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2008, Axel Dörfler, axeld@pinc-software.de. * Copyright 2001-2009, Axel Dörfler, axeld@pinc-software.de.
* Some code is based on work previously done by Marcus Overhagen. * Some code is based on work previously done by Marcus Overhagen.
* *
* This file may be used under the terms of the MIT License. * This file may be used under the terms of the MIT License.
@ -329,15 +329,19 @@ dump_volume(int argc, char** argv)
run.start = HOST_ENDIAN_TO_BFS_INT16(strtoul(arg + 1, NULL, 0)); run.start = HOST_ENDIAN_TO_BFS_INT16(strtoul(arg + 1, NULL, 0));
run.length = 0; run.length = 0;
kprintf("%ld.%u -> block %Ld\n", run.AllocationGroup(), kprintf("%ld.%u -> block %Ld, bitmap block %ld\n",
run.Start(), volume->ToBlock(run)); run.AllocationGroup(), run.Start(), volume->ToBlock(run),
volume->SuperBlock().BlocksPerAllocationGroup()
* run.AllocationGroup() + 1);
} else { } else {
// offset to block_run // offset to block_run
off_t offset = parse_expression(arg); off_t offset = parse_expression(arg);
block_run run = volume->ToBlockRun(offset); block_run run = volume->ToBlockRun(offset);
kprintf("block %Ld -> %ld.%u\n", offset, run.AllocationGroup(), kprintf("block %Ld -> %ld.%u, bitmap block %ld\n", offset,
run.Start()); run.AllocationGroup(), run.Start(),
volume->SuperBlock().BlocksPerAllocationGroup()
* run.AllocationGroup() + 1);
} }
} }
return 0; return 0;