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

Shuffled functions a bit, so that they are in a reasonable order.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35198 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-01-20 10:56:34 +00:00
parent 53a87b035b
commit d66916e33b
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/system/kernel/slab/Slab.cpp
View File

@ -60,9 +60,6 @@ static uint8* sInitialBegin;
static uint8* sInitialLimit; static uint8* sInitialLimit;
static uint8* sInitialPointer; static uint8* sInitialPointer;
static status_t object_cache_reserve_internal(ObjectCache* cache,
size_t object_count, uint32 flags, bool unlockWhileAllocating);
static mutex sResizeRequestsLock static mutex sResizeRequestsLock
= MUTEX_INITIALIZER("object cache resize requests"); = MUTEX_INITIALIZER("object cache resize requests");
static ResizeRequestQueue sResizeRequests; static ResizeRequestQueue sResizeRequests;
@ -299,6 +296,46 @@ slab_internal_free(void* _buffer)
} }
// #pragma mark -
static void
increase_object_reserve(ObjectCache* cache)
{
if (cache->resize_request->pending)
return;
cache->resize_request->pending = true;
MutexLocker locker(sResizeRequestsLock);
sResizeRequests.Add(cache->resize_request);
sResizeRequestsCondition.NotifyAll();
}
static status_t
object_cache_reserve_internal(ObjectCache* cache, size_t objectCount,
uint32 flags, bool unlockWhileAllocating)
{
size_t numBytes = objectCount * cache->object_size;
size_t slabCount = ((numBytes - 1) / cache->slab_size) + 1;
// TODO: This also counts the unusable space of each slab, which can
// sum up.
while (slabCount > 0) {
slab* newSlab = cache->CreateSlab(flags, unlockWhileAllocating);
if (newSlab == NULL)
return B_NO_MEMORY;
cache->empty.Add(newSlab);
cache->empty_count++;
slabCount--;
}
return B_OK;
}
static void static void
object_cache_low_memory(void* _self, uint32 resources, int32 level) object_cache_low_memory(void* _self, uint32 resources, int32 level)
{ {
@ -414,18 +451,7 @@ object_cache_resizer(void*)
} }
static void // #pragma mark - public API
increase_object_reserve(ObjectCache* cache)
{
if (cache->resize_request->pending)
return;
cache->resize_request->pending = true;
MutexLocker locker(sResizeRequestsLock);
sResizeRequests.Add(cache->resize_request);
sResizeRequestsCondition.NotifyAll();
}
object_cache* object_cache*
@ -601,29 +627,6 @@ object_cache_free(object_cache* cache, void* object)
} }
static status_t
object_cache_reserve_internal(ObjectCache* cache, size_t objectCount,
uint32 flags, bool unlockWhileAllocating)
{
size_t numBytes = objectCount* cache->object_size;
size_t slabCount = ((numBytes - 1) / cache->slab_size) + 1;
// TODO: This also counts the unusable space of each slab, which can
// sum up.
while (slabCount > 0) {
slab* newSlab = cache->CreateSlab(flags, unlockWhileAllocating);
if (newSlab == NULL)
return B_NO_MEMORY;
cache->empty.Add(newSlab);
cache->empty_count++;
slabCount--;
}
return B_OK;
}
status_t status_t
object_cache_reserve(object_cache* cache, size_t objectCount, uint32 flags) object_cache_reserve(object_cache* cache, size_t objectCount, uint32 flags)
{ {