* NewBlock(), and Allocate() will now try to reuse existing memory in low
resource situations. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33892 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+16
-1
@@ -988,6 +988,12 @@ block_cache::Free(void* buffer)
|
||||
void*
|
||||
block_cache::Allocate()
|
||||
{
|
||||
if (low_resource_state(B_KERNEL_RESOURCE_PAGES | B_KERNEL_RESOURCE_MEMORY)
|
||||
!= B_NO_LOW_RESOURCE) {
|
||||
// recycle existing before allocating a new one
|
||||
RemoveUnusedBlocks(1, 2);
|
||||
}
|
||||
|
||||
return object_cache_alloc(buffer_cache, 0);
|
||||
}
|
||||
|
||||
@@ -1014,7 +1020,15 @@ block_cache::FreeBlock(cached_block* block)
|
||||
cached_block*
|
||||
block_cache::NewBlock(off_t blockNumber)
|
||||
{
|
||||
cached_block* block = (cached_block*)object_cache_alloc(sBlockCache, 0);
|
||||
cached_block* block = NULL;
|
||||
|
||||
if (low_resource_state(B_KERNEL_RESOURCE_PAGES | B_KERNEL_RESOURCE_MEMORY)
|
||||
!= B_NO_LOW_RESOURCE) {
|
||||
// recycle existing instead of allocating a new one
|
||||
block = _GetUnusedBlock();
|
||||
}
|
||||
if (block == NULL) {
|
||||
block = (cached_block*)object_cache_alloc(sBlockCache, 0);
|
||||
if (block == NULL) {
|
||||
TB(Error(this, blockNumber, "allocation failed"));
|
||||
dprintf("block allocation failed, unused list is %sempty.\n",
|
||||
@@ -1028,6 +1042,7 @@ block_cache::NewBlock(off_t blockNumber)
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
block->current_data = Allocate();
|
||||
if (block->current_data == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user