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

* Made cache_end_transaction(), cache_detach_sub_transaction(), and 

block_cache_discard() use the BlockWriter directly as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35496 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-02-16 14:00:44 +00:00
parent 599b988100
commit 66a1a16cbc
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/system/kernel/cache/block_cache.cpp vendored
View File

@ -1101,7 +1101,7 @@ BlockWriter::_WriteBlock(cached_block* block)
{ {
ASSERT(block->busy_writing); ASSERT(block->busy_writing);
TRACE(("write_cached_block(block %Ld)\n", block->block_number)); TRACE(("BlockWriter::_WriteBlock(block %Ld)\n", block->block_number));
TB(Write(fCache, block)); TB(Write(fCache, block));
TB2(BlockData(fCache, block, "before write")); TB2(BlockData(fCache, block, "before write"));
@ -2673,14 +2673,20 @@ cache_end_transaction(void* _cache, int32 id,
BlockWriter writer(cache); BlockWriter writer(cache);
cached_block* block = transaction->first_block; cached_block* block = transaction->first_block;
cached_block* next; for (; block != NULL; block = block->transaction_next) {
for (; block != NULL; block = next) {
next = block->transaction_next;
if (block->previous_transaction != NULL) { if (block->previous_transaction != NULL) {
// need to write back pending changes // need to write back pending changes
write_cached_block(cache, block); writer.Add(block);
} }
}
writer.Write();
cached_block* next;
for (block = transaction->first_block; block != NULL; block = next) {
next = block->transaction_next;
ASSERT(block->previous_transaction == NULL);
if (block->discard) { if (block->discard) {
// This block has been discarded in the transaction // This block has been discarded in the transaction
cache->DiscardBlock(block); cache->DiscardBlock(block);
@ -2798,16 +2804,23 @@ cache_detach_sub_transaction(void* _cache, int32 id,
// iterate through all blocks and free the unchanged original contents // iterate through all blocks and free the unchanged original contents
BlockWriter writer(cache);
cached_block* block = transaction->first_block; cached_block* block = transaction->first_block;
cached_block* last = NULL; for (; block != NULL; block = block->transaction_next) {
cached_block* next;
for (; block != NULL; block = next) {
next = block->transaction_next;
if (block->previous_transaction != NULL) { if (block->previous_transaction != NULL) {
// need to write back pending changes // need to write back pending changes
write_cached_block(cache, block); writer.Add(block);
} }
}
writer.Write();
cached_block* last = NULL;
cached_block* next;
for (block = transaction->first_block; block != NULL; block = next) {
next = block->transaction_next;
ASSERT(block->previous_transaction == NULL);
if (block->discard) { if (block->discard) {
cache->DiscardBlock(block); cache->DiscardBlock(block);
transaction->main_num_blocks--; transaction->main_num_blocks--;
@ -3251,7 +3264,18 @@ void
block_cache_discard(void* _cache, off_t blockNumber, size_t numBlocks) block_cache_discard(void* _cache, off_t blockNumber, size_t numBlocks)
{ {
block_cache* cache = (block_cache*)_cache; block_cache* cache = (block_cache*)_cache;
MutexLocker locker(&cache->lock); TransactionLocker locker(cache);
BlockWriter writer(cache);
for (; numBlocks > 0; numBlocks--, blockNumber++) {
cached_block* block = (cached_block*)hash_lookup(cache->hash,
&blockNumber);
if (block != NULL && block->previous_transaction != NULL)
writer.Add(block);
}
writer.Write();
for (; numBlocks > 0; numBlocks--, blockNumber++) { for (; numBlocks > 0; numBlocks--, blockNumber++) {
cached_block* block = (cached_block*)hash_lookup(cache->hash, cached_block* block = (cached_block*)hash_lookup(cache->hash,
@ -3259,8 +3283,7 @@ block_cache_discard(void* _cache, off_t blockNumber, size_t numBlocks)
if (block == NULL) if (block == NULL)
continue; continue;
if (block->previous_transaction != NULL) ASSERT(block->previous_transaction == NULL);
write_cached_block(cache, block);
if (block->unused) { if (block->unused) {
cache->unused_blocks.Remove(block); cache->unused_blocks.Remove(block);