mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r1762) -Codechange: renamed 'MemoryPool' to 'SettingsMemoryPool' (we need 

MemoryPool for general-dynamic-arrays)
This commit is contained in:
truelight 2005-02-01 17:48:20 +00:00
parent 20d1f357dd
commit c02c35e256
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
settings.c
View File

@ -8,40 +8,40 @@
typedef struct IniFile IniFile; typedef struct IniFile IniFile;
typedef struct IniItem IniItem; typedef struct IniItem IniItem;
typedef struct IniGroup IniGroup; typedef struct IniGroup IniGroup;
typedef struct MemoryPool MemoryPool; typedef struct SettingsMemoryPool SettingsMemoryPool;
static void pool_init(MemoryPool **pool); static void pool_init(SettingsMemoryPool **pool);
static void *pool_alloc(MemoryPool **pool, uint size); static void *pool_alloc(SettingsMemoryPool **pool, uint size);
static void *pool_strdup(MemoryPool **pool, const char *mem, uint size); static void *pool_strdup(SettingsMemoryPool **pool, const char *mem, uint size);
static void pool_free(MemoryPool **pool); static void pool_free(SettingsMemoryPool **pool);
struct MemoryPool { struct SettingsMemoryPool {
uint pos,size; uint pos,size;
MemoryPool *next; SettingsMemoryPool *next;
byte mem[1]; byte mem[1];
}; };
static MemoryPool *pool_new(uint minsize) static SettingsMemoryPool *pool_new(uint minsize)
{ {
MemoryPool *p; SettingsMemoryPool *p;
if (minsize < 4096 - 12) minsize = 4096 - 12; if (minsize < 4096 - 12) minsize = 4096 - 12;
p = malloc(sizeof(MemoryPool) - 1 + minsize); p = malloc(sizeof(SettingsMemoryPool) - 1 + minsize);
p->pos = 0; p->pos = 0;
p->size = minsize; p->size = minsize;
p->next = NULL; p->next = NULL;
return p; return p;
} }
static void pool_init(MemoryPool **pool) static void pool_init(SettingsMemoryPool **pool)
{ {
*pool = pool_new(0); *pool = pool_new(0);
} }
static void *pool_alloc(MemoryPool **pool, uint size) static void *pool_alloc(SettingsMemoryPool **pool, uint size)
{ {
uint pos; uint pos;
MemoryPool *p = *pool; SettingsMemoryPool *p = *pool;
size = (size + 3) & ~3; // align everything to a 32 bit boundary size = (size + 3) & ~3; // align everything to a 32 bit boundary
@ -50,7 +50,7 @@ static void *pool_alloc(MemoryPool **pool, uint size)
p = p->next; p = p->next;
// then check if there's not memory in the cur pool // then check if there's not memory in the cur pool
} else if (p->pos + size > p->size) { } else if (p->pos + size > p->size) {
MemoryPool *n = pool_new(size); SettingsMemoryPool *n = pool_new(size);
*pool = n; *pool = n;
n->next = p; n->next = p;
p = n; p = n;
@ -61,7 +61,7 @@ static void *pool_alloc(MemoryPool **pool, uint size)
return p->mem + pos; return p->mem + pos;
} }
static void *pool_strdup(MemoryPool **pool, const char *mem, uint size) static void *pool_strdup(SettingsMemoryPool **pool, const char *mem, uint size)
{ {
byte *p = pool_alloc(pool, size + 1); byte *p = pool_alloc(pool, size + 1);
p[size] = 0; p[size] = 0;
@ -69,9 +69,9 @@ static void *pool_strdup(MemoryPool **pool, const char *mem, uint size)
return p; return p;
} }
static void pool_free(MemoryPool **pool) static void pool_free(SettingsMemoryPool **pool)
{ {
MemoryPool *p = *pool, *n; SettingsMemoryPool *p = *pool, *n;
*pool = NULL; *pool = NULL;
while (p) { while (p) {
n = p->next; n = p->next;
@ -98,7 +98,7 @@ struct IniGroup {
}; };
struct IniFile { struct IniFile {
MemoryPool *pool; SettingsMemoryPool *pool;
IniGroup *group, **last_group; IniGroup *group, **last_group;
char *comment; // last comment in file char *comment; // last comment in file
}; };
@ -107,7 +107,7 @@ struct IniFile {
static IniFile *ini_alloc(void) static IniFile *ini_alloc(void)
{ {
IniFile *ini; IniFile *ini;
MemoryPool *pool; SettingsMemoryPool *pool;
pool_init(&pool); pool_init(&pool);
ini = (IniFile*)pool_alloc(&pool, sizeof(IniFile)); ini = (IniFile*)pool_alloc(&pool, sizeof(IniFile));
ini->pool = pool; ini->pool = pool;