empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compile-time option to switch off "multiple paths same source"

Browse source 
Just to facilitate benchmarking.
This commit is contained in:
Markus Armbruster 2011-02-21 23:52:42 +01:00
parent e9307b7b1d
commit 70ef6066f2
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/update/finish.c
View file

@ -124,7 +124,7 @@ finish_sects(int etu)
} }
#if defined(USE_PATH_FIND) || defined(TEST_PATH_FIND) #if (defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)) && !defined(DIST_PATH_NO_REUSE)
static int static int
distcmp(const void *p, const void *q) distcmp(const void *p, const void *q)
{ {
@ -154,6 +154,12 @@ assemble_dist_paths(double *import_cost)
int uid, i; int uid, i;
coord dx = 1, dy = 0; /* invalid */ coord dx = 1, dy = 0; /* invalid */
#ifdef DIST_PATH_NO_REUSE
for (uid = 0; NULL != (sp = getsectid(uid)); uid++) {
import_cost[uid] = -1;
if (sp->sct_dist_x == sp->sct_x && sp->sct_dist_y == sp->sct_y)
continue;
#else
if (!job) if (!job)
job = malloc(WORLD_SZ() * sizeof(*job)); job = malloc(WORLD_SZ() * sizeof(*job));
@ -174,18 +180,25 @@ assemble_dist_paths(double *import_cost)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
uid = job[i]; uid = job[i];
#endif /* !DIST_PATH_NO_REUSE */
sp = getsectid(uid); sp = getsectid(uid);
dist = getsectp(sp->sct_dist_x, sp->sct_dist_y); dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
if (CANT_HAPPEN(!dist)) if (CANT_HAPPEN(!dist))
continue; continue;
if (sp->sct_own != dist->sct_own) if (sp->sct_own != dist->sct_own)
continue; continue;
#ifdef DIST_PATH_NO_REUSE
import_cost[uid] = path_find(sp->sct_dist_x, sp->sct_dist_y,
sp->sct_x, sp->sct_y, dist->sct_own,
MOB_MOVE);
#else
if (sp->sct_dist_x != dx || sp->sct_dist_y != dy) { if (sp->sct_dist_x != dx || sp->sct_dist_y != dy) {
dx = sp->sct_dist_x; dx = sp->sct_dist_x;
dy = sp->sct_dist_y; dy = sp->sct_dist_y;
path_find_from(dx, dy, dist->sct_own, MOB_MOVE); path_find_from(dx, dy, dist->sct_own, MOB_MOVE);
} }
import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y); import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y);
#endif
} }
#endif /* USE_PATH_FIND || TEST_PATH_FIND */ #endif /* USE_PATH_FIND || TEST_PATH_FIND */
#if !defined(USE_PATH_FIND) || defined(TEST_PATH_FIND) #if !defined(USE_PATH_FIND) || defined(TEST_PATH_FIND)