From 231111ce3d3d37c05a71591a4760a6dc95beac69 Mon Sep 17 00:00:00 2001 From: matthijs Date: Sun, 3 Dec 2006 17:27:43 +0000 Subject: [PATCH] (svn r7331) - Codechange: Rename all memory pool macro's and types to "old pool", so the new pool implementation can be committed alongside it. - Codechange: Rename pool.[ch] to oldpool.[ch]. --- Makefile | 2 +- depot.c | 2 +- depot.h | 4 ++-- engine.c | 2 +- engine.h | 4 ++-- industry.h | 4 ++-- industry_cmd.c | 2 +- newgrf_sound.c | 4 ++-- newgrf_spritegroup.c | 4 ++-- pool.c => oldpool.c | 8 ++++---- pool.h => oldpool.h | 44 ++++++++++++++++++++++---------------------- openttd.tgt | 2 +- openttd.vcproj | 4 ++-- openttd_vs80.vcproj | 4 ++-- order.h | 4 ++-- order_cmd.c | 2 +- player.h | 2 +- saveload.c | 2 +- signs.c | 2 +- signs.h | 4 ++-- station.h | 6 +++--- station_cmd.c | 4 ++-- town.h | 4 ++-- town_cmd.c | 2 +- vehicle.c | 2 +- vehicle.h | 4 ++-- waypoint.c | 2 +- waypoint.h | 4 ++-- 28 files changed, 67 insertions(+), 67 deletions(-) rename pool.c => oldpool.c (93%) rename pool.h => oldpool.h (62%) diff --git a/Makefile b/Makefile index 5d29b8bcbd..85ce7a4bfd 100644 --- a/Makefile +++ b/Makefile @@ -741,6 +741,7 @@ SRCS += newgrf_text.c SRCS += news_gui.c SRCS += npf.c SRCS += oldloader.c +SRCS += oldpool.c SRCS += openttd.c SRCS += order_cmd.c SRCS += order_gui.c @@ -748,7 +749,6 @@ SRCS += os_timer.c SRCS += pathfind.c SRCS += player_gui.c SRCS += players.c -SRCS += pool.c SRCS += queue.c SRCS += rail.c SRCS += rail_cmd.c diff --git a/depot.c b/depot.c index b838b66c2a..49fdfa21cd 100644 --- a/depot.c +++ b/depot.c @@ -23,7 +23,7 @@ static void DepotPoolNewBlock(uint start_item) for (d = GetDepot(start_item); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) d->index = start_item++; } -DEFINE_POOL(Depot, Depot, DepotPoolNewBlock, NULL) +DEFINE_OLD_POOL(Depot, Depot, DepotPoolNewBlock, NULL) /** diff --git a/depot.h b/depot.h index 0c69ab7000..c52c3292aa 100644 --- a/depot.h +++ b/depot.h @@ -7,7 +7,7 @@ * @see depot.c */ #include "direction.h" -#include "pool.h" +#include "oldpool.h" #include "tile.h" #include "variables.h" @@ -17,7 +17,7 @@ struct Depot { DepotID index; }; -DECLARE_POOL(Depot, Depot, 3, 8000) +DECLARE_OLD_POOL(Depot, Depot, 3, 8000) /** * Check if a depot really exists. diff --git a/engine.c b/engine.c index d6acd5d05e..9ac2ad7ac5 100644 --- a/engine.c +++ b/engine.c @@ -431,7 +431,7 @@ bool IsEngineBuildable(EngineID engine, byte type, PlayerID player) static void EngineRenewPoolNewBlock(uint start_item); -DEFINE_POOL(EngineRenew, EngineRenew, EngineRenewPoolNewBlock, NULL) +DEFINE_OLD_POOL(EngineRenew, EngineRenew, EngineRenewPoolNewBlock, NULL) static void EngineRenewPoolNewBlock(uint start_item) { diff --git a/engine.h b/engine.h index 9675ca396d..a0b355874f 100644 --- a/engine.h +++ b/engine.h @@ -5,7 +5,7 @@ /** @file engine.h */ -#include "pool.h" +#include "oldpool.h" typedef struct RailVehicleInfo { byte image_index; @@ -235,7 +235,7 @@ typedef struct EngineRenew EngineRenew; * placed here so the only exception to this rule, the saveload code, can use * it. */ -DECLARE_POOL(EngineRenew, EngineRenew, 3, 8000) +DECLARE_OLD_POOL(EngineRenew, EngineRenew, 3, 8000) /** * Check if a EngineRenew really exists. diff --git a/industry.h b/industry.h index 7369450db6..db1b915f39 100644 --- a/industry.h +++ b/industry.h @@ -3,7 +3,7 @@ #ifndef INDUSTRY_H #define INDUSTRY_H -#include "pool.h" +#include "oldpool.h" typedef byte IndustryGfx; typedef uint8 IndustryType; @@ -80,7 +80,7 @@ typedef struct IndustrySpec { const IndustrySpec *GetIndustrySpec(IndustryType thistype); -DECLARE_POOL(Industry, Industry, 3, 8000) +DECLARE_OLD_POOL(Industry, Industry, 3, 8000) /** * Check if an Industry really exists. diff --git a/industry_cmd.c b/industry_cmd.c index 5d6c78d673..4516de189c 100644 --- a/industry_cmd.c +++ b/industry_cmd.c @@ -45,7 +45,7 @@ static void IndustryPoolNewBlock(uint start_item) for (i = GetIndustry(start_item); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) i->index = start_item++; } -DEFINE_POOL(Industry, Industry, IndustryPoolNewBlock, NULL) +DEFINE_OLD_POOL(Industry, Industry, IndustryPoolNewBlock, NULL) /** * Retrieve the type for this industry. Although it is accessed by a tile, diff --git a/newgrf_sound.c b/newgrf_sound.c index b21ce7a4ea..e96934104e 100644 --- a/newgrf_sound.c +++ b/newgrf_sound.c @@ -2,7 +2,7 @@ #include "stdafx.h" #include "openttd.h" -#include "pool.h" +#include "oldpool.h" #include "sound.h" #include "engine.h" #include "vehicle.h" @@ -11,7 +11,7 @@ #include "newgrf_sound.h" static uint _sound_count = 0; -STATIC_POOL(SoundInternal, FileEntry, 3, 1000, NULL, NULL) +STATIC_OLD_POOL(SoundInternal, FileEntry, 3, 1000, NULL, NULL) /* Allocate a new FileEntry */ diff --git a/newgrf_spritegroup.c b/newgrf_spritegroup.c index 48985a2c5b..ef2ca90914 100644 --- a/newgrf_spritegroup.c +++ b/newgrf_spritegroup.c @@ -4,14 +4,14 @@ #include "openttd.h" #include "variables.h" #include "macros.h" -#include "pool.h" +#include "oldpool.h" #include "newgrf_spritegroup.h" #include "date.h" static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item); static uint _spritegroup_count = 0; -STATIC_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock) +STATIC_OLD_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock) static void DestroySpriteGroup(SpriteGroup *group) { diff --git a/pool.c b/oldpool.c similarity index 93% rename from pool.c rename to oldpool.c index 828aa87d9d..e857907f17 100644 --- a/pool.c +++ b/oldpool.c @@ -4,12 +4,12 @@ #include "openttd.h" #include "debug.h" #include "functions.h" -#include "pool.h" +#include "oldpool.h" /** * Clean a pool in a safe way (does free all blocks) */ -void CleanPool(MemoryPool *pool) +void CleanPool(OldMemoryPool *pool) { uint i; @@ -38,7 +38,7 @@ void CleanPool(MemoryPool *pool) * * @return Returns false if the pool could not be increased */ -bool AddBlockToPool(MemoryPool *pool) +bool AddBlockToPool(OldMemoryPool *pool) { /* Is the pool at his max? */ if (pool->max_blocks == pool->current_blocks) @@ -76,7 +76,7 @@ bool AddBlockToPool(MemoryPool *pool) * * @return Returns false if adding failed */ -bool AddBlockIfNeeded(MemoryPool *pool, uint index) +bool AddBlockIfNeeded(OldMemoryPool *pool, uint index) { while (index >= pool->total_items) { if (!AddBlockToPool(pool)) diff --git a/pool.h b/oldpool.h similarity index 62% rename from pool.h rename to oldpool.h index 8ee7bd2df7..bd067a6f1a 100644 --- a/pool.h +++ b/oldpool.h @@ -3,19 +3,19 @@ #ifndef POOL_H #define POOL_H -typedef struct MemoryPool MemoryPool; +typedef struct OldMemoryPool OldMemoryPool; /* The function that is called after a new block is added start_item is the first item of the new made block */ -typedef void MemoryPoolNewBlock(uint start_item); +typedef void OldMemoryPoolNewBlock(uint start_item); /* The function that is called before a block is cleaned up */ -typedef void MemoryPoolCleanBlock(uint start_item, uint end_item); +typedef void OldMemoryPoolCleanBlock(uint start_item, uint end_item); /** - * Stuff for dynamic vehicles. Use the wrappers to access the MemoryPool + * Stuff for dynamic vehicles. Use the wrappers to access the OldMemoryPool * please try to avoid manual calls! */ -struct MemoryPool { +struct OldMemoryPool { const char* const name; ///< Name of the pool (just for debugging) const uint max_blocks; ///< The max amount of blocks this pool can have @@ -23,9 +23,9 @@ struct MemoryPool { const uint item_size; ///< How many bytes one block is /// Pointer to a function that is called after a new block is added - MemoryPoolNewBlock *new_block_proc; + OldMemoryPoolNewBlock *new_block_proc; /// Pointer to a function that is called to clean a block - MemoryPoolCleanBlock *clean_block_proc; + OldMemoryPoolCleanBlock *clean_block_proc; uint current_blocks; ///< How many blocks we have in our pool uint total_items; ///< How many items we now have in this pool @@ -40,25 +40,25 @@ struct MemoryPool { * AddBlockToPool adds 1 more block to the pool. Returns false if there is no * more room */ -void CleanPool(MemoryPool *array); -bool AddBlockToPool(MemoryPool *array); +void CleanPool(OldMemoryPool *array); +bool AddBlockToPool(OldMemoryPool *array); /** * Adds blocks to the pool if needed (and possible) till index fits inside the pool * * @return Returns false if adding failed */ -bool AddBlockIfNeeded(MemoryPool *array, uint index); +bool AddBlockIfNeeded(OldMemoryPool *array, uint index); -#define POOL_ENUM(name, type, block_size_bits, max_blocks) \ +#define OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \ enum { \ name##_POOL_BLOCK_SIZE_BITS = block_size_bits, \ name##_POOL_MAX_BLOCKS = max_blocks \ }; -#define POOL_ACCESSORS(name, type) \ +#define OLD_POOL_ACCESSORS(name, type) \ static inline type* Get##name(uint index) \ { \ assert(index < _##name##_pool.total_items); \ @@ -74,23 +74,23 @@ bool AddBlockIfNeeded(MemoryPool *array, uint index); } -#define DECLARE_POOL(name, type, block_size_bits, max_blocks) \ - POOL_ENUM(name, type, block_size_bits, max_blocks) \ - extern MemoryPool _##name##_pool; \ - POOL_ACCESSORS(name, type) +#define DECLARE_OLD_POOL(name, type, block_size_bits, max_blocks) \ + OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \ + extern OldMemoryPool _##name##_pool; \ + OLD_POOL_ACCESSORS(name, type) -#define DEFINE_POOL(name, type, new_block_proc, clean_block_proc) \ - MemoryPool _##name##_pool = { \ +#define DEFINE_OLD_POOL(name, type, new_block_proc, clean_block_proc) \ + OldMemoryPool _##name##_pool = { \ #name, name##_POOL_MAX_BLOCKS, name##_POOL_BLOCK_SIZE_BITS, sizeof(type), \ new_block_proc, clean_block_proc, \ 0, 0, NULL \ }; -#define STATIC_POOL(name, type, block_size_bits, max_blocks, new_block_proc, clean_block_proc) \ - POOL_ENUM(name, type, block_size_bits, max_blocks) \ - static DEFINE_POOL(name, type, new_block_proc, clean_block_proc) \ - POOL_ACCESSORS(name, type) +#define STATIC_OLD_POOL(name, type, block_size_bits, max_blocks, new_block_proc, clean_block_proc) \ + OLD_POOL_ENUM(name, type, block_size_bits, max_blocks) \ + static DEFINE_OLD_POOL(name, type, new_block_proc, clean_block_proc) \ + OLD_POOL_ACCESSORS(name, type) #endif /* POOL_H */ diff --git a/openttd.tgt b/openttd.tgt index 0d3fa1dd31..dc2c110899 100644 --- a/openttd.tgt +++ b/openttd.tgt @@ -1687,7 +1687,7 @@ WVList 387 MItem 6 -pool.c +oldpool.c 388 WString 4 diff --git a/openttd.vcproj b/openttd.vcproj index 46746b3af8..25154a5524 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -361,7 +361,7 @@ RelativePath="players.c"> + RelativePath=".\oldpool.c"> @@ -611,7 +611,7 @@ RelativePath=".\player.h"> + RelativePath=".\oldpool.h"> diff --git a/openttd_vs80.vcproj b/openttd_vs80.vcproj index 79f8ec3d06..c1dc2d0a9d 100644 --- a/openttd_vs80.vcproj +++ b/openttd_vs80.vcproj @@ -729,7 +729,7 @@ > index + 1U < GetOrderPoolSize()) ? GetOrder(order->index + 1U) : NULL) order->index = start_item++; } -DEFINE_POOL(Order, Order, OrderPoolNewBlock, NULL) +DEFINE_OLD_POOL(Order, Order, OrderPoolNewBlock, NULL) /** * diff --git a/player.h b/player.h index a359b10644..c06900257e 100644 --- a/player.h +++ b/player.h @@ -3,7 +3,7 @@ #ifndef PLAYER_H #define PLAYER_H -#include "pool.h" +#include "oldpool.h" #include "aystar.h" #include "rail.h" #include "engine.h" diff --git a/saveload.c b/saveload.c index 0b492c076c..3a5a7889dc 100644 --- a/saveload.c +++ b/saveload.c @@ -1056,7 +1056,7 @@ typedef struct ThreadedSave { } ThreadedSave; /* A maximum size of of 128K * 500 = 64.000KB savegames */ -STATIC_POOL(Savegame, byte, 17, 500, NULL, NULL) +STATIC_OLD_POOL(Savegame, byte, 17, 500, NULL, NULL) static ThreadedSave _ts; static bool InitMem(void) diff --git a/signs.c b/signs.c index 7c7c85f329..4b2d48cd12 100644 --- a/signs.c +++ b/signs.c @@ -25,7 +25,7 @@ static void SignPoolNewBlock(uint start_item) } /* Initialize the sign-pool */ -DEFINE_POOL(Sign, Sign, SignPoolNewBlock, NULL) +DEFINE_OLD_POOL(Sign, Sign, SignPoolNewBlock, NULL) /** * diff --git a/signs.h b/signs.h index bfcf9d95af..0ded78353b 100644 --- a/signs.h +++ b/signs.h @@ -3,7 +3,7 @@ #ifndef SIGNS_H #define SIGNS_H -#include "pool.h" +#include "oldpool.h" typedef struct Sign { StringID str; @@ -16,7 +16,7 @@ typedef struct Sign { SignID index; } Sign; -DECLARE_POOL(Sign, Sign, 2, 16000) +DECLARE_OLD_POOL(Sign, Sign, 2, 16000) static inline SignID GetSignArraySize(void) { diff --git a/station.h b/station.h index c2594f7e8e..0499c8aa8d 100644 --- a/station.h +++ b/station.h @@ -4,7 +4,7 @@ #define STATION_H #include "player.h" -#include "pool.h" +#include "oldpool.h" #include "sprite.h" #include "tile.h" #include "newgrf_station.h" @@ -142,7 +142,7 @@ void UpdateAllStationVirtCoord(void); void RebuildStationLists(void); void ResortStationLists(void); -DECLARE_POOL(Station, Station, 6, 1000) +DECLARE_OLD_POOL(Station, Station, 6, 1000) static inline StationID GetStationArraySize(void) { @@ -181,7 +181,7 @@ static inline void DeleteStation(Station *st) /* Stuff for ROADSTOPS */ -DECLARE_POOL(RoadStop, RoadStop, 5, 2000) +DECLARE_OLD_POOL(RoadStop, RoadStop, 5, 2000) /** * Check if a RaodStop really exists. diff --git a/station_cmd.c b/station_cmd.c index 7de77721ed..3c82289d9f 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -68,8 +68,8 @@ static void RoadStopPoolNewBlock(uint start_item) for (rs = GetRoadStop(start_item); rs != NULL; rs = (rs->index + 1U < GetRoadStopPoolSize()) ? GetRoadStop(rs->index + 1U) : NULL) rs->index = start_item++; } -DEFINE_POOL(Station, Station, StationPoolNewBlock, StationPoolCleanBlock) -DEFINE_POOL(RoadStop, RoadStop, RoadStopPoolNewBlock, NULL) +DEFINE_OLD_POOL(Station, Station, StationPoolNewBlock, StationPoolCleanBlock) +DEFINE_OLD_POOL(RoadStop, RoadStop, RoadStopPoolNewBlock, NULL) extern void UpdateAirplanesOnNewStation(Station *st); diff --git a/town.h b/town.h index 73155c855a..896e3415c1 100644 --- a/town.h +++ b/town.h @@ -3,7 +3,7 @@ #ifndef TOWN_H #define TOWN_H -#include "pool.h" +#include "oldpool.h" #include "player.h" struct Town { @@ -152,7 +152,7 @@ bool CheckforTownRating(uint32 flags, Town *t, byte type); VARDEF const Town** _town_sort; -DECLARE_POOL(Town, Town, 3, 8000) +DECLARE_OLD_POOL(Town, Town, 3, 8000) /** * Check if a Town really exists. diff --git a/town_cmd.c b/town_cmd.c index 20be3354a0..d5c0b10b23 100644 --- a/town_cmd.c +++ b/town_cmd.c @@ -43,7 +43,7 @@ static void TownPoolNewBlock(uint start_item) } /* Initialize the town-pool */ -DEFINE_POOL(Town, Town, TownPoolNewBlock, NULL) +DEFINE_OLD_POOL(Town, Town, TownPoolNewBlock, NULL) void DestroyTown(Town *t) { diff --git a/vehicle.c b/vehicle.c index 8cb22c7cfe..8af9b19602 100644 --- a/vehicle.c +++ b/vehicle.c @@ -95,7 +95,7 @@ static void VehiclePoolNewBlock(uint start_item) } /* Initialize the vehicle-pool */ -DEFINE_POOL(Vehicle, Vehicle, VehiclePoolNewBlock, NULL) +DEFINE_OLD_POOL(Vehicle, Vehicle, VehiclePoolNewBlock, NULL) void VehicleServiceInDepot(Vehicle *v) { diff --git a/vehicle.h b/vehicle.h index 3dde485487..9f842b1550 100644 --- a/vehicle.h +++ b/vehicle.h @@ -3,7 +3,7 @@ #ifndef VEHICLE_H #define VEHICLE_H -#include "pool.h" +#include "oldpool.h" #include "order.h" #include "rail.h" @@ -368,7 +368,7 @@ Direction GetDirectionTowards(const Vehicle* v, int x, int y); #define BEGIN_ENUM_WAGONS(v) do { #define END_ENUM_WAGONS(v) } while ( (v=v->next) != NULL); -DECLARE_POOL(Vehicle, Vehicle, 9, 125) +DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125) static inline VehicleID GetVehicleArraySize(void) { diff --git a/waypoint.c b/waypoint.c index cb3195e5f5..499faa3a13 100644 --- a/waypoint.c +++ b/waypoint.c @@ -36,7 +36,7 @@ static void WaypointPoolNewBlock(uint start_item) for (wp = GetWaypoint(start_item); wp != NULL; wp = (wp->index + 1U < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1U) : NULL) wp->index = start_item++; } -DEFINE_POOL(Waypoint, Waypoint, WaypointPoolNewBlock, NULL) +DEFINE_OLD_POOL(Waypoint, Waypoint, WaypointPoolNewBlock, NULL) /* Create a new waypoint */ static Waypoint* AllocateWaypoint(void) diff --git a/waypoint.h b/waypoint.h index 59ffa84adf..0b689b3176 100644 --- a/waypoint.h +++ b/waypoint.h @@ -3,7 +3,7 @@ #ifndef WAYPOINT_H #define WAYPOINT_H -#include "pool.h" +#include "oldpool.h" #include "rail_map.h" struct Waypoint { @@ -24,7 +24,7 @@ struct Waypoint { byte deleted; ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted. }; -DECLARE_POOL(Waypoint, Waypoint, 3, 8000) +DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000) /** * Check if a Waypoint really exists.