mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r6988) Remove a layer of indirection when using the Savegame pool

release/0.5
tron 2006-10-28 12:07:32 +00:00
parent 97cc0fcdd4
commit 24cc7d4656
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
saveload.c
View File

@ -1011,7 +1011,6 @@ static void UninitNoComp(void)
#include "gui.h" #include "gui.h"
typedef struct ThreadedSave { typedef struct ThreadedSave {
MemoryPool *save;
uint count; uint count;
bool ff_state; bool ff_state;
bool saveinprogress; bool saveinprogress;
@ -1024,30 +1023,28 @@ static ThreadedSave _ts;
static bool InitMem(void) static bool InitMem(void)
{ {
_ts.save = &_Savegame_pool;
_ts.count = 0; _ts.count = 0;
CleanPool(_ts.save); CleanPool(&_Savegame_pool);
AddBlockToPool(_ts.save); AddBlockToPool(&_Savegame_pool);
/* A block from the pool is a contigious area of memory, so it is safe to write to it sequentially */ /* A block from the pool is a contigious area of memory, so it is safe to write to it sequentially */
_sl.bufsize = _ts.save->total_items; _sl.bufsize = GetSavegamePoolSize();
_sl.buf = (byte*)GetItemFromPool(_ts.save, _ts.count); _sl.buf = GetSavegame(_ts.count);
return true; return true;
} }
static void UnInitMem(void) static void UnInitMem(void)
{ {
CleanPool(_ts.save); CleanPool(&_Savegame_pool);
_ts.save = NULL;
} }
static void WriteMem(uint size) static void WriteMem(uint size)
{ {
_ts.count += size; _ts.count += size;
/* Allocate new block and new buffer-pointer */ /* Allocate new block and new buffer-pointer */
AddBlockIfNeeded(_ts.save, _ts.count); AddBlockIfNeeded(&_Savegame_pool, _ts.count);
_sl.buf = (byte*)GetItemFromPool(_ts.save, _ts.count); _sl.buf = GetSavegame(_ts.count);
} }
//******************************************** //********************************************
@ -1423,17 +1420,17 @@ static void* SaveFileToDisk(void *arg)
{ {
uint i; uint i;
uint count = 1 << _ts.save->block_size_bits; uint count = 1 << Savegame_POOL_BLOCK_SIZE_BITS;
assert(_ts.count == _sl.offs_base); assert(_ts.count == _sl.offs_base);
for (i = 0; i != _ts.save->current_blocks - 1; i++) { for (i = 0; i != _Savegame_pool.current_blocks - 1; i++) {
_sl.buf = _ts.save->blocks[i]; _sl.buf = _Savegame_pool.blocks[i];
fmt->writer(count); fmt->writer(count);
} }
/* The last block is (almost) always not fully filled, so only write away /* The last block is (almost) always not fully filled, so only write away
* as much data as it is in there */ * as much data as it is in there */
_sl.buf = _ts.save->blocks[i]; _sl.buf = _Savegame_pool.blocks[i];
fmt->writer(_ts.count - (i * count)); fmt->writer(_ts.count - (i * count));
} }