cpp/openttd-patchpack/source Changeset - r7397:b40396c24dc0

Changeset - r7397:b40396c24dc0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2007-08-03 18:34:47
rubidium@openttd.org

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

1 file changed with 16 insertions and 4 deletions:

src/oldpool.h

0 comments (0 inline, 0 general)

src/oldpool.h

➞

Show inline comments

@@ @@ -254,16 +254,28 @@ struct PoolItem { @@
 		return false;
+	}
-private:
+protected:
 	/**
 	 * Allocate a pool item; possibly allocate a new block in the pool.
 	 * @return the allocated pool item (or NULL when the pool is full).
 	 */
 	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()) {
-				Tpool->first_free_index = t->index;
+				first = t->index;
 				Tid index = t->index;
 				memset(t, 0, Tpool->item_size);
@@ @@ -273,7 +285,7 @@ private: @@
+		}
 		/* Check if we can add a block to the pool */
 		if (Tpool->AddBlockToPool()) return AllocateRaw();
+		if (Tpool->AddBlockToPool()) return AllocateRaw(first);
 		return NULL;
+	}

0 comments (0 inline, 0 general)