Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up the dead faction hashtable between tests.

This commit is contained in:
Enno Rehling 2016-09-08 21:15:29 +02:00
parent 87328a0e92
commit 053f8a6e09
1 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/kernel/faction.c
View File

@ -336,7 +336,39 @@ void write_faction_reference(const faction * f, struct storage *store)
WRITE_INT(store, f ? f->no : 0); WRITE_INT(store, f ? f->no : 0);
} }
static faction *dead_factions; #define DMAXHASH 7919
typedef struct dead {
struct dead *nexthash;
faction *f;
int no;
} dead;
static dead *deadhash[DMAXHASH];
void dhash(int no, faction * f)
{
dead *hash = (dead *)calloc(1, sizeof(dead));
dead *old = deadhash[no % DMAXHASH];
hash->no = no;
hash->f = f;
deadhash[no % DMAXHASH] = hash;
hash->nexthash = old;
}
faction *dfindhash(int no)
{
dead *old;
if (no < 0)
return 0;
for (old = deadhash[no % DMAXHASH]; old; old = old->nexthash) {
if (old->no == no) {
return old->f;
}
}
return 0;
}
void free_flist(faction **fp) { void free_flist(faction **fp) {
faction * flist = *fp; faction * flist = *fp;
@ -349,10 +381,7 @@ void free_flist(faction **fp) {
*fp = 0; *fp = 0;
} }
void free_factions(void) { static faction *dead_factions;
free_flist(&factions);
free_flist(&dead_factions);
}
void destroyfaction(faction ** fp) void destroyfaction(faction ** fp)
{ {
@ -814,40 +843,6 @@ int max_magicians(const faction * f)
return m; return m;
} }
#define DMAXHASH 7919
typedef struct dead {
struct dead *nexthash;
faction *f;
int no;
} dead;
static dead *deadhash[DMAXHASH];
void dhash(int no, faction * f)
{
dead *hash = (dead *)calloc(1, sizeof(dead));
dead *old = deadhash[no % DMAXHASH];
hash->no = no;
hash->f = f;
deadhash[no % DMAXHASH] = hash;
hash->nexthash = old;
}
faction *dfindhash(int no)
{
dead *old;
if (no < 0)
return 0;
for (old = deadhash[no % DMAXHASH]; old; old = old->nexthash) {
if (old->no == no) {
return old->f;
}
}
return 0;
}
int writepasswd(void) int writepasswd(void)
{ {
FILE *F; FILE *F;
@ -872,3 +867,15 @@ int writepasswd(void)
return 1; return 1;
} }
void free_factions(void) {
int i;
for (i = 0; i != DMAXHASH; ++i) {
while (deadhash[i]) {
dead *d = deadhash[i];
deadhash[i] = d->nexthash;
}
}
free_flist(&factions);
free_flist(&dead_factions);
}