/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* finish.c: Finish the update
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Thomas Ruschak, 1993
* Steve McClure, 1998
+ * Markus Armbruster, 2004-2016
*/
#include <config.h>
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
-#include "file.h"
-#include "xy.h"
+#include <stdlib.h>
+#include <sys/resource.h>
+#include "optlist.h"
#include "path.h"
-#include "distribute.h"
+#include "sect.h"
+#include "prototypes.h"
#include "update.h"
-#include "common.h"
-#include "optlist.h"
-/* Used for building up distribution info */
-struct distinfo {
- s_char *path; /* path to take */
- double imcost; /* import cost */
- double excost; /* export cost */
-};
-
-/* This is our global buffer of distribution pointers. Note that
- * We only malloc this once, and never again (until reboot time
- * of course :) ) We do clear it each and every time. */
-static struct distinfo *g_distptrs;
-
-/* Note that even though we malloc and save the path, it is never
- * used. Thus, this option. If you want to malloc and save every
- * path and then free when done, just enable this. Or, if the
- * dodistribute ever uses the path for something other than checking
- * to see that a path exists, enable this */
-/* #define SAVE_FINISH_PATHS */
-
-#ifndef SAVE_FINISH_PATHS
-static s_char *finish_path = "h"; /* Placeholder indicating path exists */
-#endif /* SAVE_FINISH_PATHS */
-
-static void assemble_dist_paths(struct distinfo *distptrs);
-static s_char *ReversePath(s_char *path);
+static void assemble_dist_paths(double *);
void
finish_sects(int etu)
{
+ static double *import_cost;
struct sctstr *sp;
- struct natstr *np;
int n;
- struct distinfo *infptr;
+ struct rusage rus1, rus2;
- if (g_distptrs == (struct distinfo *)0) {
+ if (import_cost == NULL) {
logerror("First update since reboot, allocating buffer\n");
- /* Allocate the information buffer */
- g_distptrs = (struct distinfo *)(malloc((WORLD_X * WORLD_Y) *
- sizeof(struct distinfo)));
- if (g_distptrs == (struct distinfo *)0) {
+ import_cost = malloc(WORLD_SZ() * sizeof(*import_cost));
+ if (import_cost == NULL) {
logerror("malloc failed in finish_sects.\n");
return;
}
-
- logerror("Allocated '%lu' bytes '%d' indices\n",
- (unsigned long)(WORLD_X * WORLD_Y * sizeof(struct distinfo)),
- WORLD_X * WORLD_Y);
}
- /* Wipe it clean */
- memset(g_distptrs, 0, ((WORLD_X * WORLD_Y) * sizeof(struct distinfo)));
-
logerror("delivering...\n");
/* Do deliveries */
for (n = 0; NULL != (sp = getsectid(n)); n++) {
- if (sp->sct_type == SCT_WATER)
- continue;
- if (sp->sct_own == 0)
+ if (!sp->sct_own || sp->sct_type == SCT_SANCT)
continue;
- np = getnatp(sp->sct_own);
- if (np->nat_money < 0)
+ if (nat_budget[sp->sct_own].money < 0)
continue;
dodeliver(sp);
}
logerror("done delivering\n");
logerror("assembling paths...\n");
-
- /* First, enable the best_path cacheing */
- bp_enable_cachepath();
-
- /* Now assemble the paths */
- assemble_dist_paths(g_distptrs);
-
- /* Now disable the best_path cacheing */
- bp_disable_cachepath();
-
- /* Now, clear the best_path cache that may have been created */
- bp_clear_cachepath();
-
- logerror("done assembling paths\n");
+ getrusage(RUSAGE_SELF, &rus1);
+ assemble_dist_paths(import_cost);
+ getrusage(RUSAGE_SELF, &rus2);
+ logerror("done assembling paths %g user %g system",
+ rus2.ru_utime.tv_sec + rus2.ru_utime.tv_usec / 1e6
+ - (rus1.ru_utime.tv_sec + rus1.ru_utime.tv_usec / 1e6),
+ rus2.ru_stime.tv_sec + rus2.ru_stime.tv_usec / 1e6
+ - (rus1.ru_stime.tv_sec + rus1.ru_stime.tv_usec / 1e6));
logerror("exporting...");
for (n = 0; NULL != (sp = getsectid(n)); n++) {
- if (sp->sct_type == SCT_WATER || sp->sct_own == 0)
+ if (!sp->sct_own || sp->sct_type == SCT_SANCT)
continue;
- np = getnatp(sp->sct_own);
- if (np->nat_money < 0)
+ if (nat_budget[sp->sct_own].money < 0)
continue;
- /* Get the pointer */
- infptr = &g_distptrs[XYOFFSET(sp->sct_x, sp->sct_y)];
- dodistribute(sp, EXPORT,
- infptr->path, infptr->imcost, infptr->excost);
+ dodistribute(sp, EXPORT, import_cost[n]);
}
logerror("done exporting\n");
- /* Note that we free the paths (if allocated) as we loop here */
logerror("importing...");
for (n = 0; NULL != (sp = getsectid(n)); n++) {
- /* Get the pointer (we do it first so we can free if needed) */
- infptr = &g_distptrs[XYOFFSET(sp->sct_x, sp->sct_y)];
- if (sp->sct_type == SCT_WATER || sp->sct_own == 0) {
-#ifdef SAVE_FINISH_PATHS
- if (infptr->path)
- free(infptr->path);
-#endif /* SAVE_FINISH_PATHS */
+ sp->sct_off = 0;
+ if (!sp->sct_own || sp->sct_type == SCT_SANCT)
continue;
- }
- np = getnatp(sp->sct_own);
- if (np->nat_money < 0) {
-#ifdef SAVE_FINISH_PATHS
- if (infptr->path)
- free(infptr->path);
-#endif /* SAVE_FINISH_PATHS */
+ if (nat_budget[sp->sct_own].money < 0)
continue;
- }
- dodistribute(sp, IMPORT,
- infptr->path, infptr->imcost, infptr->excost);
-#ifdef SAVE_FINISH_PATHS
- if (infptr->path)
- free(infptr->path);
-#endif /* SAVE_FINISH_PATHS */
+ dodistribute(sp, IMPORT, import_cost[n]);
}
logerror("done importing\n");
}
+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(struct distinfo *distptrs)
+assemble_dist_paths(double *import_cost)
{
- s_char *path, *p;
- double d;
struct sctstr *sp;
struct sctstr *dist;
- struct distinfo *infptr;
int n;
- s_char buf[512];
+ static int *job;
+ int uid, i;
+ coord dx = 1, dy = 0; /* invalid */
- for (n = 0; NULL != (sp = getsectid(n)); n++) {
- if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
- continue;
- /* Set the pointer */
- infptr = &distptrs[XYOFFSET(sp->sct_x, sp->sct_y)];
- /* now, get the dist sector */
- dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
- if (dist == (struct sctstr *)0) {
- logerror("Bad dist sect %d,%d for %d,%d !\n", sp->sct_dist_x,
- sp->sct_dist_y, sp->sct_x, sp->sct_y);
- continue;
- }
- /* Now, get the best distribution path over roads */
- /* Note we go from the dist center to the sector. This gives
- us the import path for that sector. */
- path = BestDistPath(buf, dist, sp, &d, MOB_ROAD);
+ if (!job)
+ job = malloc(WORLD_SZ() * sizeof(*job));
- /* Now, we have a path */
- if (path != (s_char *)0) {
-#ifdef SAVE_FINISH_PATHS
- int len;
- /* Here we malloc a buffer and save it */
- len = strlen(path);
- infptr->path = malloc(len);
- if (infptr->path == (s_char *)0) {
- logerror("malloc failed in assemble_dist_path!\n");
- return;
- }
-#endif /* SAVE_FINISH_PATHS */
- /* Save the import cost */
- infptr->imcost = d;
- /* Now, reverse the path */
- p = ReversePath(path);
- /* And walk the path back to the dist center to get the export
- cost */
- infptr->excost = pathcost(sp, p, MOB_ROAD);
-#ifdef SAVE_FINISH_PATHS
- memcpy(infptr->path, p, len);
-#else
- infptr->path = finish_path;
-#endif /* SAVE_FINISH_PATHS */
- }
+ 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;
}
-}
-static s_char *
-ReversePath(s_char *path)
-{
- s_char *patharray = "aucdefjhigklmyopqrstbvwxnz";
- static s_char new_path[512];
- int ind;
-
- if (path == (s_char *)0)
- return (s_char *)0;
-
- ind = strlen(path);
- if (ind == 0)
- return (s_char *)0;
+#ifdef PATH_FIND_STATS
+ printf("dist path reuse %zu bytes, %d/%d used\n",
+ WORLD_SZ() * sizeof(*job), n, WORLD_SZ());
+#endif
- if (path[ind - 1] == 'h')
- ind--;
+ qsort(job, n, sizeof(*job), distcmp);
- new_path[ind--] = '\0';
- new_path[ind] = '\0';
-
- while (ind >= 0) {
- new_path[ind--] = patharray[*(path++) - 'a'];
+ 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;
+ if (sp->sct_own != dist->sct_own)
+ continue;
+ if (sp->sct_dist_x != dx || sp->sct_dist_y != dy) {
+ dx = sp->sct_dist_x;
+ dy = sp->sct_dist_y;
+ path_find_from(dx, dy, dist->sct_own, MOB_MOVE);
+ }
+ import_cost[uid] = path_find_to(sp->sct_x, sp->sct_y);
}
-
- return new_path;
+ path_find_print_stats();
}
projects / empserver / blobdiff