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

kill gc_add and gc_done, they were terrible ideas.

This commit is contained in:
Enno Rehling 2014-12-25 22:38:01 +01:00
parent 4e94a95835
commit 108a909131
7 changed files with 1730 additions and 1738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/economy.c
View File

@ -1647,17 +1647,16 @@ static void expandbuying(region * r, request * buyorders)
const luxury_type *type;
int number;
int multi;
} *trades, *trade;
} trades[MAXLUXURIES], *trade;
static int ntrades = 0;
int i, j;
const luxury_type *ltype;
if (ntrades == 0) {
for (ltype = luxurytypes; ltype; ltype = ltype->next)
++ntrades;
trades = gc_add(calloc(sizeof(struct trade), ntrades));
for (i = 0, ltype = luxurytypes; i != ntrades; ++i, ltype = ltype->next)
trades[i].type = ltype;
for (ntrades = 0, ltype = luxurytypes; ltype; ltype = ltype->next) {
assert(ntrades < MAXLUXURIES);
trades[ntrades++].type = ltype;
}
}
for (i = 0; i != ntrades; ++i) {
trades[i].number = 0;
@ -1887,18 +1886,17 @@ static void expandselling(region * r, request * sellorders, int limit)
building *b;
unit *u;
unit *hafenowner;
static int *counter;
static int counter[MAXLUXURIES];
static int ncounter = 0;
if (ncounter == 0) {
const luxury_type *ltype;
for (ltype = luxurytypes; ltype; ltype = ltype->next)
for (ltype = luxurytypes; ltype; ltype = ltype->next) {
assert(ncounter < MAXLUXURIES);
++ncounter;
counter = (int *)gc_add(calloc(sizeof(int), ncounter));
}
else {
}
memset(counter, 0, sizeof(int) * ncounter);
}
if (!sellorders) { /* NEIN, denn Insekten können in || !r->buildings) */
return; /* Sümpfen und Wüsten auch so handeln */
@ -1958,6 +1956,7 @@ static void expandselling(region * r, request * sellorders, int limit)
int i;
int use = 0;
for (i = 0, search = luxurytypes; search != ltype; search = search->next) {
// TODO: this is slow and lame!
++i;
}
if (counter[i] >= limit)

34
src/kernel/config.c
View File

@ -916,36 +916,6 @@ int maxworkingpeasants(const struct region *r)
return _max(size-treespace, _min(size / 10 , 200));
}
void **blk_list[1024];
int list_index;
int blk_index;
static void gc_done(void)
{
int i, k;
for (i = 0; i != list_index; ++i) {
for (k = 0; k != 1024; ++k)
free(blk_list[i][k]);
free(blk_list[i]);
}
for (k = 0; k != blk_index; ++k)
free(blk_list[list_index][k]);
free(blk_list[list_index]);
}
void *gc_add(void *p)
{
if (blk_index == 0) {
blk_list[list_index] = (void **)malloc(1024 * sizeof(void *));
}
blk_list[list_index][blk_index] = p;
blk_index = (blk_index + 1) % 1024;
if (!blk_index)
++list_index;
return p;
}
static const char * parameter_key(int i)
{
assert(i < MAXPARAMS && i >= 0);
@ -1173,7 +1143,6 @@ void kernel_done(void)
* calling it is optional, e.g. a release server will most likely not do it.
*/
translation_done();
gc_done();
}
attrib_type at_germs = {
@ -1186,9 +1155,6 @@ attrib_type at_germs = {
ATF_UNIQUE
};
/*********************/
/* at_guard */
/*********************/
attrib_type at_guard = {
"guard",
DEFAULT_INIT,

4
src/kernel/config.h
View File

@ -40,6 +40,7 @@ extern "C" {
#ifndef MAXUNITS
# define MAXUNITS 1048573 /* must be prime for hashing. 524287 was >90% full */
#endif
#define MAXLUXURIES 16 /* there must be no more than MAXLUXURIES kinds of luxury goods in any game */
#define TREESIZE (8) /* space used by trees (in #peasants) */
@ -183,9 +184,6 @@ extern "C" {
bool idle(struct faction *f);
bool unit_has_cursed_item(const struct unit *u);
/* simple garbage collection: */
void *gc_add(void *p);
/* grammatik-flags: */
#define GF_NONE 0
/* singular, ohne was dran */

100
src/kernel/region.c
View File

@ -1,7 +1,7 @@
/*
Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
Katja Zedel <katze@felidae.kn-bremen.de
Christian Schlittchen <corwin@amber.kn-bremen.de>
Katja Zedel <katze@felidae.kn-bremen.de
Christian Schlittchen <corwin@amber.kn-bremen.de>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
@ -118,7 +118,8 @@ const char *write_regionname(const region * r, const faction * f, char *buffer,
const struct locale *lang = f ? f->locale : 0;
if (r == NULL) {
strlcpy(buf, "(null)", size);
} else {
}
else {
plane *pl = rplane(r);
int nx = r->x, ny = r->y;
pnormalize(&nx, &ny, pl);
@ -132,7 +133,7 @@ const char *regionname(const region * r, const faction * f)
{
static int index = 0;
static char buf[2][NAMESIZE];
index = 1-index;
index = 1 - index;
return write_regionname(r, f, buf[index], sizeof(buf[index]));
}
@ -179,18 +180,18 @@ void a_initmoveblock(attrib * a)
int a_readmoveblock(attrib * a, void *owner, struct storage *store)
{
moveblock *m = (moveblock *) (a->data.v);
moveblock *m = (moveblock *)(a->data.v);
int i;
READ_INT(store, &i);
m->dir = (direction_t) i;
m->dir = (direction_t)i;
return AT_READ_OK;
}
void
a_writemoveblock(const attrib * a, const void *owner, struct storage *store)
{
moveblock *m = (moveblock *) (a->data.v);
moveblock *m = (moveblock *)(a->data.v);
WRITE_INT(store, (int)m->dir);
}
@ -202,7 +203,7 @@ attrib_type at_moveblock = {
#define RMAXHASH MAXREGIONS
static region *regionhash[RMAXHASH];
static int dummy_data;
static region *dummy_ptr = (region *) & dummy_data; /* a funny hack */
static region *dummy_ptr = (region *)& dummy_data; /* a funny hack */
typedef struct uidhashentry {
int uid;
@ -214,7 +215,7 @@ struct region *findregionbyid(int uid)
{
int key = uid % MAXREGIONS;
while (uidhash[key].uid != 0 && uidhash[key].uid != uid) {
if (++key==MAXREGIONS) key = 0;
if (++key == MAXREGIONS) key = 0;
}
return uidhash[key].r;
}
@ -335,7 +336,7 @@ region *r_connect(const region * r, direction_t dir)
region *result;
int x, y;
#ifdef FAST_CONNECT
region *rmodify = (region *) r;
region *rmodify = (region *)r;
assert(dir >= 0 && dir < MAXDIRECTIONS);
if (r->connect[dir])
return r->connect[dir];
@ -381,10 +382,12 @@ static int koor_distance_orig(int x1, int y1, int x2, int y2)
if (dx >= 0) {
int result = dx + dy;
return result;
} else if (-dx >= dy) {
}
else if (-dx >= dy) {
int result = -dx;
return result;
} else {
}
else {
return dy;
}
}
@ -441,7 +444,8 @@ int koor_distance(int x1, int y1, int x2, int y2)
int height = plane_height(p1);
if (width && height) {
return koor_distance_wrap_xy(x1, y1, x2, y2, width, height);
} else {
}
else {
return koor_distance_orig(x1, y1, x2, y2);
}
}
@ -463,7 +467,7 @@ void free_regionlist(region_list * rl)
void add_regionlist(region_list ** rl, region * r)
{
region_list *rl2 = (region_list *) malloc(sizeof(region_list));
region_list *rl2 = (region_list *)malloc(sizeof(region_list));
rl2->data = r;
rl2->next = *rl;
@ -553,7 +557,8 @@ void rsetroad(region * r, direction_t d, short val)
}
if (r == b->from) {
b->data.sa[0] = val;
} else {
}
else {
b->data.sa[1] = val;
}
}
@ -598,7 +603,7 @@ bool is_coastregion(region * r)
if (rn && fval(rn->terrain, SEA_REGION))
res++;
}
return res!=0;
return res != 0;
}
int rpeasants(const region * r)
@ -791,7 +796,7 @@ void region_setresource(region * r, const resource_type * rtype, int value)
int i;
for (i = 0; r->terrain->production[i].type; ++i) {
const terrain_production *production = r->terrain->production + i;
if (production->type==rtype) {
if (production->type == rtype) {
add_resource(r, 1, value, dice_rand(production->divisor), rtype);
break;
}
@ -923,7 +928,8 @@ static char *makename(void)
k = rng_int() % (int)nk;
name[p] = kons[k];
p++;
} else {
}
else {
k = rng_int() % (int)ns;
name[p] = start[k];
p++;
@ -936,7 +942,8 @@ static char *makename(void)
name[p] = end[e];
p++;
x = 1;
} else
}
else
x = 0;
}
name[p] = '\0';
@ -989,7 +996,8 @@ void terraform_region(region * r, const terrain_type * terrain)
if (rtype == NULL) {
*lrm = rm->next;
free(rm);
} else {
}
else {
lrm = &rm->next;
}
}
@ -1018,11 +1026,12 @@ void terraform_region(region * r, const terrain_type * terrain)
if (r->land) {
int d;
for (d=0;d!=MAXDIRECTIONS;++d) {
for (d = 0; d != MAXDIRECTIONS; ++d) {
rsetroad(r, d, 0);
}
i_freeall(&r->land->items);
} else {
}
else {
static struct surround {
struct surround *next;
const luxury_type *type;
@ -1050,20 +1059,23 @@ void terraform_region(region * r, const terrain_type * terrain)
if (trash) {
sr = trash;
trash = trash->next;
} else {
}
else {
sr = calloc(1, sizeof(struct surround));
}
sr->next = nb;
sr->type = sale->type;
sr->value = 1;
nb = sr;
} else
}
else
sr->value++;
++mnr;
}
}
}
if (!nb) {
// TODO: this is really lame
int i = get_maxluxuries();
if (i > 0) {
i = rng_int() % i;
@ -1071,7 +1083,8 @@ void terraform_region(region * r, const terrain_type * terrain)
while (i--)
ltype = ltype->next;
}
} else {
}
else {
int i = rng_int() % mnr;
struct surround *srd = nb;
while (i > srd->value) {
@ -1106,7 +1119,8 @@ void terraform_region(region * r, const terrain_type * terrain)
if (itype != NULL) {
rsetherbtype(r, itype);
rsetherbs(r, (short)(50 + rng_int() % 31));
} else {
}
else {
rsetherbtype(r, NULL);
}
if (oldterrain == NULL || !fval(oldterrain, LAND_REGION)) {
@ -1126,9 +1140,11 @@ void terraform_region(region * r, const terrain_type * terrain)
if (rng_int() % 100 < 40) {
rsettrees(r, 2, terrain->size * (30 + rng_int() % 40) / 1000);
}
} else if (chance(0.2)) {
}
else if (chance(0.2)) {
rsettrees(r, 2, terrain->size * (30 + rng_int() % 40) / 1000);
} else {
}
else {
rsettrees(r, 2, 0);
}
rsettrees(r, 1, rtrees(r, 2) / 4);
@ -1164,10 +1180,10 @@ int resolve_region_coor(variant id, void *address)
{
region *r = findregion(id.sa[0], id.sa[1]);
if (r) {
*(region **) address = r;
*(region **)address = r;
return 0;
}
*(region **) address = NULL;
*(region **)address = NULL;
return -1;
}
@ -1177,11 +1193,11 @@ int resolve_region_id(variant id, void *address)
if (id.i != 0) {
r = findregionbyid(id.i);
if (r == NULL) {
*(region **) address = NULL;
*(region **)address = NULL;
return -1;
}
}
*(region **) address = r;
*(region **)address = r;
return 0;
}
@ -1194,7 +1210,8 @@ variant read_region_reference(struct storage * store)
result.sa[0] = (short)n;
READ_INT(store, &n);
result.sa[1] = (short)n;
} else {
}
else {
READ_INT(store, &result.i);
}
return result;
@ -1204,7 +1221,8 @@ void write_region_reference(const region * r, struct storage *store)
{
if (r) {
WRITE_INT(store, r->uid);
} else {
}
else {
WRITE_INT(store, 0);
}
}
@ -1221,7 +1239,7 @@ struct message_list *r_getmessages(const struct region *r,
}
struct message *r_addmessage(struct region *r, const struct faction *viewer,
struct message *msg)
struct message *msg)
{
assert(r);
if (viewer) {
@ -1299,16 +1317,19 @@ faction *update_owners(region * r)
r->land->ownership->flags |= OWNER_MOURNING;
f = NULL;
}
} else if (u->faction != f) {
}
else if (u->faction != f) {
if (!r->land->ownership) {
/* there has never been a prior owner */
region_set_morale(r, MORALE_DEFAULT, turn);
} else {
}
else {
alliance *al = region_get_alliance(r);
if (al && u->faction->alliance == al) {
int morale = _max(0, r->land->morale - MORALE_TRANSFER);
region_set_morale(r, morale, turn);
} else {
}
else {
region_set_morale(r, MORALE_TAKEOVER, turn);
if (f) {
r->land->ownership->flags |= OWNER_MOURNING;
@ -1319,7 +1340,8 @@ faction *update_owners(region * r)
f = u->faction;
}
}
} else if (r->land->ownership && r->land->ownership->owner) {
}
else if (r->land->ownership && r->land->ownership->owner) {
r->land->ownership->flags |= OWNER_MOURNING;
region_set_owner(r, NULL, turn);
f = NULL;

3
src/kernel/save.c
View File

@ -1030,11 +1030,12 @@ void writeregion(struct gamedata *data, const region * r)
WRITE_INT(data->store, rherbs(r));
WRITE_INT(data->store, rpeasants(r));
WRITE_INT(data->store, rmoney(r));
if (r->land)
if (r->land) {
for (demand = r->land->demands; demand; demand = demand->next) {
WRITE_TOK(data->store, resourcename(demand->type->itype->rtype, 0));
WRITE_INT(data->store, demand->value);
}
}
WRITE_TOK(data->store, "end");
write_items(data->store, r->land->items);
WRITE_SECTION(data->store);

2
src/kernel/xmlreader.c
View File

@ -644,7 +644,7 @@ static weapon_type *xml_readweapon(xmlXPathContextPtr xpath, item_type * itype)
xmlFree(propValue);
propValue = xmlGetProp(node, BAD_CAST "value");
wtype->damage[pos] = gc_add(_strdup((const char *)propValue));
wtype->damage[pos] = _strdup((const char *)propValue); // TODO: this is a memory leak
if (k == 0)
wtype->damage[1 - pos] = wtype->damage[pos];
xmlFree(propValue);

84
src/modules/autoseed.c
View File

@ -8,7 +8,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
*/
#include <platform.h>
#include <kernel/config.h>
@ -70,7 +70,8 @@ const terrain_type *random_terrain(const terrain_type * terrains[],
}
assert(i < size);
terrain = terrains[i];
} else {
}
else {
terrain = terrains[n];
}
return terrain;
@ -103,7 +104,7 @@ static int count_demand(const region * r)
static int
recurse_regions(region * r, region_list ** rlist,
bool(*fun) (const region * r))
bool(*fun) (const region * r))
{
if (!fun(r))
return 0;
@ -134,30 +135,27 @@ static bool f_nolux(const region * r)
int fix_demand(region * rd)
{
region_list *rl, *rlist = NULL;
static const struct luxury_type **mlux = 0, **ltypes;
static const luxury_type *mlux[MAXLUXURIES];
const luxury_type *ltypes[MAXLUXURIES];
const luxury_type *sale = NULL;
int maxlux = 0;
int maxluxuries = get_maxluxuries();
static int maxluxuries = 0;
if (maxluxuries == 0)
return 0;
recurse_regions(rd, &rlist, f_nolux);
if (mlux == 0) {
if (maxluxuries == 0) {
int i = 0;
mlux =
(const luxury_type **)gc_add(calloc(maxluxuries,
sizeof(const luxury_type *)));
ltypes =
(const luxury_type **)gc_add(calloc(maxluxuries,
sizeof(const luxury_type *)));
for (sale = luxurytypes; sale; sale = sale->next) {
mlux[i] = 0;
ltypes[i++] = sale;
}
} else {
maxluxuries = i;
}
else {
int i;
for (i = 0; i != maxluxuries; ++i)
for (i = 0; i != maxluxuries; ++i) {
mlux[i] = 0;
}
}
for (rl = rlist; rl; rl = rl->next) {
region *r = rl->data;
direction_t d;
@ -173,7 +171,8 @@ int fix_demand(region * rd)
maxlux = i;
mlux[i] = dmd->type;
break;
} else if (mlux[i] == dmd->type) {
}
else if (mlux[i] == dmd->type) {
break;
}
}
@ -274,7 +273,8 @@ newfaction *read_newfactions(const char *filename)
al = makealliance(alliance, zText);
}
nf->allies = al;
} else {
}
else {
nf->allies = NULL;
}
if (nf->race == NULL) {
@ -360,13 +360,13 @@ static bool virgin_region(const region * r)
static quicklist * get_island(region * root)
{
quicklist * ql, * result = 0;
quicklist * ql, *result = 0;
int qi = 0;
fset(root, RF_MARK);
ql_push(&result, root);
for (ql=result,qi=0; ql; ql_advance(&ql, &qi, 1)) {
for (ql = result, qi = 0; ql; ql_advance(&ql, &qi, 1)) {
int dir;
region *r = (region *)ql_get(ql, qi);
region * next[MAXDIRECTIONS];
@ -382,7 +382,7 @@ static quicklist * get_island(region * root)
}
}
for (ql=result,qi=0; ql; ql_advance(&ql, &qi, 1)) {
for (ql = result, qi = 0; ql; ql_advance(&ql, &qi, 1)) {
region *r = (region *)ql_get(ql, qi);
freset(r, RF_MARK);
}
@ -398,7 +398,7 @@ get_island_info(region * root, int *size_p, int *inhabited_p, int *maxage_p)
ql_push(&island, root);
fset(root, RF_MARK);
for (ql=island,qi=0; ql; ql_advance(&ql, &qi, 1)) {
for (ql = island, qi = 0; ql; ql_advance(&ql, &qi, 1)) {
int d;
region *r = (region *)ql_get(ql, qi);
if (r->units) {
@ -419,7 +419,7 @@ get_island_info(region * root, int *size_p, int *inhabited_p, int *maxage_p)
}
}
}
for (ql=island,qi=0; ql; ql_advance(&ql, &qi, 1)) {
for (ql = island, qi = 0; ql; ql_advance(&ql, &qi, 1)) {
region *r = (region *)ql_get(ql, qi);
freset(r, RF_MARK);
}
@ -568,7 +568,7 @@ int autoseed(newfaction ** players, int nsize, int max_agediff)
quicklist *ql, *rlist = get_island(rmin);
int qi;
for (ql=rlist,qi=0;ql;ql_advance(&ql, &qi, 1)) {
for (ql = rlist, qi = 0; ql; ql_advance(&ql, &qi, 1)) {
region *r = (region *)ql_get(ql, qi);
unit *u;
for (u = r->units; u; u = u->next) {
@ -667,7 +667,8 @@ int autoseed(newfaction ** players, int nsize, int max_agediff)
}
if (volcano_terrain != NULL && (rng_int() % VOLCANO_CHANCE == 0)) {
terraform_region(r, volcano_terrain);
} else if (nsize && (rng_int() % isize == 0 || rsize == 0)) {
}
else if (nsize && (rng_int() % isize == 0 || rsize == 0)) {
newfaction **nfp, *nextf = *players;
faction *f;
unit *u;
@ -690,7 +691,8 @@ int autoseed(newfaction ** players, int nsize, int max_agediff)
if (strcmp(nextf->email, nf->email) == 0) {
*nfp = nf->next;
free_newfaction(nf);
} else
}
else
nfp = &nf->next;
}
*players = nextf->next;
@ -701,7 +703,8 @@ int autoseed(newfaction ** players, int nsize, int max_agediff)
--isize;
if (psize >= PLAYERS_PER_ISLAND)
break;
} else {
}
else {
terraform_region(r, random_terrain(terrainarr, distribution, nterrains));
--isize;
}
@ -740,7 +743,8 @@ int autoseed(newfaction ** players, int nsize, int max_agediff)
if (rng_int() % SPECIALCHANCE < special) {
terrain = random_terrain(terrainarr, distribution, nterrains);
special = SPECIALCHANCE / 3; /* 33% chance auf noch eines */
} else {
}
else {
special = 1;
}
terraform_region(rn, terrain);
@ -821,14 +825,14 @@ static struct geo {
terrain_t type;
} geography_e3[GEOMAX] = {
{
8, T_OCEAN}, {
3, T_SWAMP}, {
1, T_VOLCANO}, {
3, T_DESERT}, {
4, T_HIGHLAND}, {
3, T_MOUNTAIN}, {
2, T_GLACIER}, {
1, T_PLAIN}
8, T_OCEAN }, {
3, T_SWAMP }, {
1, T_VOLCANO }, {
3, T_DESERT }, {
4, T_HIGHLAND }, {
3, T_MOUNTAIN }, {
2, T_GLACIER }, {
1, T_PLAIN }
};
const terrain_type *random_terrain_e3(direction_t dir)
@ -851,7 +855,7 @@ const terrain_type *random_terrain_e3(direction_t dir)
int
random_neighbours(region * r, region_list ** rlist,
const terrain_type * (*terraformer) (direction_t))
const terrain_type * (*terraformer) (direction_t))
{
int nsize = 0;
direction_t dir;
@ -993,7 +997,8 @@ int build_island_e3(int x, int y, int numfactions, int minsize)
if (r->land) {
if (nsize < minsize) {
nsize += random_neighbours(r, &rlist, &random_terrain_e3);
} else {
}
else {
nsize += random_neighbours(r, &rlist, &get_ocean);
}
}
@ -1047,7 +1052,8 @@ int build_island_e3(int x, int y, int numfactions, int minsize)
prepare_starting_region(r);
}
r->land->money = 50000; /* 2% = 1000 silver */
} else if (r->land) {
}
else if (r->land) {
r->land->money *= 4;
}
}