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

Cleaned up locking and fixed a related bug: put_cached_block() could have been called without holding the cache lock.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15695 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-12-28 16:24:09 +00:00
parent a31b66b768
commit 3dcaf063c2
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/cache/block_cache.cpp
Vendored
+23 -13
View File
@@ -29,7 +29,6 @@
// 2) the locking could be improved; getting a block should not need to // 2) the locking could be improved; getting a block should not need to
// wait for blocks to be written // wait for blocks to be written
// 3) dirty blocks are only written back if asked for // 3) dirty blocks are only written back if asked for
// 4) blocks are never removed yet
//#define TRACE_BLOCK_CACHE //#define TRACE_BLOCK_CACHE
#ifdef TRACE_BLOCK_CACHE #ifdef TRACE_BLOCK_CACHE
@@ -527,7 +526,7 @@ get_cached_block(block_cache *cache, off_t blockNumber, bool &allocated, bool re
} }
if (block->unused) { if (block->unused) {
TRACE(("remove block %Ld from unused\n", blockNumber)); //TRACE(("remove block %Ld from unused\n", blockNumber));
block->unused = false; block->unused = false;
cache->unused_blocks.Remove(block); cache->unused_blocks.Remove(block);
} }
@@ -543,8 +542,6 @@ static void *
get_writable_cached_block(block_cache *cache, off_t blockNumber, off_t base, off_t length, get_writable_cached_block(block_cache *cache, off_t blockNumber, off_t base, off_t length,
int32 transactionID, bool cleared) int32 transactionID, bool cleared)
{ {
BenaphoreLocker locker(&cache->lock);
TRACE(("get_writable_cached_block(blockNumber = %Ld, transaction = %ld)\n", blockNumber, transactionID)); TRACE(("get_writable_cached_block(blockNumber = %Ld, transaction = %ld)\n", blockNumber, transactionID));
bool allocated; bool allocated;
@@ -679,6 +676,7 @@ extern "C" int32
cache_start_transaction(void *_cache) cache_start_transaction(void *_cache)
{ {
block_cache *cache = (block_cache *)_cache; block_cache *cache = (block_cache *)_cache;
BenaphoreLocker locker(&cache->lock);
if (cache->last_transaction && cache->last_transaction->open) if (cache->last_transaction && cache->last_transaction->open)
panic("last transaction (%ld) still open!\n", cache->last_transaction->id); panic("last transaction (%ld) still open!\n", cache->last_transaction->id);
@@ -692,7 +690,6 @@ cache_start_transaction(void *_cache)
TRACE(("cache_transaction_start(): id %ld started\n", transaction->id)); TRACE(("cache_transaction_start(): id %ld started\n", transaction->id));
BenaphoreLocker locker(&cache->lock);
hash_insert(cache->transaction_hash, transaction); hash_insert(cache->transaction_hash, transaction);
return transaction->id; return transaction->id;
@@ -1112,8 +1109,12 @@ block_cache_sync(void *_cache)
extern "C" status_t extern "C" status_t
block_cache_make_writable(void *_cache, off_t blockNumber, int32 transaction) block_cache_make_writable(void *_cache, off_t blockNumber, int32 transaction)
{ {
block_cache *cache = (block_cache *)_cache;
BenaphoreLocker locker(&cache->lock);
// ToDo: this can be done better! // ToDo: this can be done better!
void *block = block_cache_get_writable_etc(_cache, blockNumber, blockNumber, 1, transaction); void *block = get_writable_cached_block(cache, blockNumber,
blockNumber, 1, transaction, false);
if (block != NULL) { if (block != NULL) {
put_cached_block((block_cache *)_cache, blockNumber); put_cached_block((block_cache *)_cache, blockNumber);
return B_OK; return B_OK;
@@ -1124,27 +1125,36 @@ block_cache_make_writable(void *_cache, off_t blockNumber, int32 transaction)
extern "C" void * extern "C" void *
block_cache_get_writable_etc(void *_cache, off_t blockNumber, off_t base, off_t length, block_cache_get_writable_etc(void *_cache, off_t blockNumber, off_t base,
int32 transaction) off_t length, int32 transaction)
{ {
TRACE(("block_cache_get_writable_etc(block = %Ld, transaction = %ld)\n", blockNumber, transaction)); block_cache *cache = (block_cache *)_cache;
BenaphoreLocker locker(&cache->lock);
return get_writable_cached_block((block_cache *)_cache, blockNumber, TRACE(("block_cache_get_writable_etc(block = %Ld, transaction = %ld)\n",
base, length, transaction, false); blockNumber, transaction));
return get_writable_cached_block(cache, blockNumber, base, length,
transaction, false);
} }
extern "C" void * extern "C" void *
block_cache_get_writable(void *_cache, off_t blockNumber, int32 transaction) block_cache_get_writable(void *_cache, off_t blockNumber, int32 transaction)
{ {
return block_cache_get_writable_etc(_cache, blockNumber, blockNumber, 1, transaction); return block_cache_get_writable_etc(_cache, blockNumber,
blockNumber, 1, transaction);
} }
extern "C" void * extern "C" void *
block_cache_get_empty(void *_cache, off_t blockNumber, int32 transaction) block_cache_get_empty(void *_cache, off_t blockNumber, int32 transaction)
{ {
TRACE(("block_cache_get_empty(block = %Ld, transaction = %ld)\n", blockNumber, transaction)); block_cache *cache = (block_cache *)_cache;
BenaphoreLocker locker(&cache->lock);
TRACE(("block_cache_get_empty(block = %Ld, transaction = %ld)\n",
blockNumber, transaction));
return get_writable_cached_block((block_cache *)_cache, blockNumber, return get_writable_cached_block((block_cache *)_cache, blockNumber,
blockNumber, 1, transaction, true); blockNumber, 1, transaction, true);