From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 21 Feb 2011 22:13:07 +0000 (+0100)
Subject: Compute distribution paths center by center
X-Git-Tag: v4.3.27~93
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=bbd6e9182f9b7fd1aeefa71be2f087dee32c2a26

Compute distribution paths center by center

This way, we compute all distribution paths from the same center in
one go, and thus fully exploit the fast multiple paths from same
source capability of Dijkstra's algorithm.

Sorting by dist center increases the average length of runs from 4.5
to 73 for my continental test case, and from 3 to 10 for my island
test case.

Compared to the commit before the previous one, distribution path
assembly runs more than 40 times faster for my continental test case,
and more than 5 times faster for my island test case.

The new path finder now runs my continental test case more than 30
times faster than the old A*, and the island test case more than 6
times, in a fraction of the memory.  This makes the continental
updates run 3.5 times faster, and the island updates 6% faster.
Distribution path assembly no longer dominates the continental
update's run time: it takes less than 10% instead of more than 70%.

In a sense, this is the path cache done right.
---

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index c8d85dbae..6ea7b7702 100644
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -110,18 +110,54 @@ finish_sects(int etu)
 
 }
 
+static int
+distcmp(const void *p, const void *q)
+{
+    int a = *(int *)p;
+    int b = *(int *)q;
+    struct sctstr *sp = (void *)empfile[EF_SECTOR].cache;
+    int d;
+
+    d = sp[b].sct_dist_y - sp[a].sct_dist_y;
+    if (d)
+	return d;
+    d = sp[b].sct_dist_x - sp[a].sct_dist_x;
+    if (d)
+	return d;
+    return b - a;
+}
+
 static void
 assemble_dist_paths(double *import_cost)
 {
     struct sctstr *sp;
     struct sctstr *dist;
     int n;
+    static int *job;
+    int uid, i;
     coord dx = 1, dy = 0;	/* invalid */
 
-    for (n = 0; NULL != (sp = getsectid(n)); n++) {
-	import_cost[n] = -1;
+    if (!job)
+	job = malloc(WORLD_SZ() * sizeof(*job));
+
+    n = 0;
+    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;
+	job[n++] = uid;
+    }
+
+#ifdef PATH_FIND_STATS
+    printf("dist path reuse %zu bytes, %d/%d used\n",
+	   WORLD_SZ() * sizeof(*job), n, WORLD_SZ());
+#endif
+
+    qsort(job, n, sizeof(*job), distcmp);
+
+    for (i = 0; i < n; i++) {
+	uid = job[i];
+	sp = getsectid(uid);
 	dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
 	if (CANT_HAPPEN(!dist))
 	    continue;
@@ -132,7 +168,7 @@ assemble_dist_paths(double *import_cost)
 	    dy = sp->sct_dist_y;
 	    path_find_from(dx, dy, dist->sct_own, MOB_MOVE);
 	}
-	import_cost[n] = path_find_to(sp->sct_x, sp->sct_y);
+	import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y);
     }
     path_find_print_stats();
 }