gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10297) -Codechange: increase the performance of CargoPacket::AllocateRaw using a very simple "caching" system.

Browse Source
This commit is contained in:
rubidium 2007-06-23 20:38:28 +00:00
parent e1958a1d59
commit be35df3f03
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cargopacket.cpp
View File

@ -8,6 +8,9 @@
#include "cargopacket.h" #include "cargopacket.h"
#include "saveload.h" #include "saveload.h"
/** Cache for speeding up lookups in AllocateRaw */
static uint _first_free_cargo_packet_index;
/** /**
* Called if a new block is added to the station-pool * Called if a new block is added to the station-pool
*/ */
@ -31,6 +34,7 @@ DEFINE_OLD_POOL(CargoPacket, CargoPacket, CargoPacketPoolNewBlock, CargoPacketPo
void InitializeCargoPackets() void InitializeCargoPackets()
{ {
_first_free_cargo_packet_index = 0;
/* Clean the cargo packet pool and create 1 block in it */ /* Clean the cargo packet pool and create 1 block in it */
CleanPool(&_CargoPacket_pool); CleanPool(&_CargoPacket_pool);
AddBlockToPool(&_CargoPacket_pool); AddBlockToPool(&_CargoPacket_pool);
@ -55,6 +59,7 @@ CargoPacket::CargoPacket(StationID source, uint16 count)
CargoPacket::~CargoPacket() CargoPacket::~CargoPacket()
{ {
if (this->index < _first_free_cargo_packet_index) _first_free_cargo_packet_index = this->index;
this->count = 0; this->count = 0;
} }
@ -92,12 +97,13 @@ void CargoPacket::operator delete(void *p, CargoPacket::ID cp_idx)
/* We don't use FOR_ALL here, because FOR_ALL skips invalid items. /* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
* TODO - This is just a temporary stage, this will be removed. */ * TODO - This is just a temporary stage, this will be removed. */
for (cp = GetCargoPacket(0); cp != NULL; cp = (cp->index + 1U < GetCargoPacketPoolSize()) ? GetCargoPacket(cp->index + 1U) : NULL) { for (cp = GetCargoPacket(_first_free_cargo_packet_index); cp != NULL; cp = (cp->index + 1U < GetCargoPacketPoolSize()) ? GetCargoPacket(cp->index + 1U) : NULL) {
if (!cp->IsValid()) { if (!cp->IsValid()) {
CargoPacket::ID index = cp->index; CargoPacket::ID index = cp->index;
memset(cp, 0, sizeof(CargoPacket)); memset(cp, 0, sizeof(CargoPacket));
cp->index = index; cp->index = index;
_first_free_cargo_packet_index = cp->index;
return cp; return cp;
} }
} }