gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-03 12:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10768) -Codechange: allow to specify from which index to search for a free pool item.

Browse Source
This commit is contained in:
rubidium 2007-08-03 18:34:47 +00:00
parent 93bedce286
commit aa9869e2de
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/oldpool.h
View File

@ -254,16 +254,28 @@ struct PoolItem {
return false; return false;
} }
private: protected:
/** /**
* Allocate a pool item; possibly allocate a new block in the pool. * Allocate a pool item; possibly allocate a new block in the pool.
* @return the allocated pool item (or NULL when the pool is full). * @return the allocated pool item (or NULL when the pool is full).
*/ */
static T *AllocateRaw() static T *AllocateRaw()
{ {
for (T *t = Tpool->Get(Tpool->first_free_index); t != NULL; t = (t->index + 1U < Tpool->GetSize()) ? Tpool->Get(t->index + 1U) : NULL) { return AllocateRaw(Tpool->first_free_index);
}
/**
* Allocate a pool item; possibly allocate a new block in the pool.
* @param first the first pool item to start searching
* @return the allocated pool item (or NULL when the pool is full).
*/
static T *AllocateRaw(uint &first)
{
uint last_minus_one = Tpool->GetSize();
for (T *t = Tpool->Get(first); t != NULL; t = (t->index < last_minus_one) ? Tpool->Get(t->index + 1U) : NULL) {
if (!t->IsValid()) { if (!t->IsValid()) {
Tpool->first_free_index = t->index; first = t->index;
Tid index = t->index; Tid index = t->index;
memset(t, 0, Tpool->item_size); memset(t, 0, Tpool->item_size);
@ -273,7 +285,7 @@ private:
} }
/* Check if we can add a block to the pool */ /* Check if we can add a block to the pool */
if (Tpool->AddBlockToPool()) return AllocateRaw(); if (Tpool->AddBlockToPool()) return AllocateRaw(first);
return NULL; return NULL;
} }