summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-05-19 14:26:14 +0000
committerrubidium <rubidium@openttd.org>2013-05-19 14:26:14 +0000
commitbe4f85766c6c2d6adb0690d77de113b7dc88fc1e (patch)
treeb87c80dab41afdfb2991ce0aaf12ec87a92a6380
parent39474532777a1f7beadfd940abf29292bc39879a (diff)
downloadopenttd-be4f85766c6c2d6adb0690d77de113b7dc88fc1e.tar.xz
(svn r25260) -Codechange: occasionally clear dead links and compress link graphs (fonsinchen)
-rw-r--r--src/date_type.h1
-rw-r--r--src/station_cmd.cpp38
2 files changed, 39 insertions, 0 deletions
diff --git a/src/date_type.h b/src/date_type.h
index a004413a7..b20ace91e 100644
--- a/src/date_type.h
+++ b/src/date_type.h
@@ -33,6 +33,7 @@ static const int DAYS_IN_LEAP_YEAR = 366; ///< sometimes, you need one day more.
static const int STATION_RATING_TICKS = 185; ///< cycle duration for updating station rating
static const int STATION_ACCEPTANCE_TICKS = 250; ///< cycle duration for updating station acceptance
+static const int STATION_LINKGRAPH_TICKS = 504; ///< cycle duration for cleaning dead links
static const int CARGO_AGING_TICKS = 185; ///< cycle duration for aging cargo
static const int INDUSTRY_PRODUCE_TICKS = 256; ///< cycle duration for industry production
static const int TOWN_GROWTH_TICKS = 70; ///< cycle duration for towns trying to grow. (this originates from the size of the town array in TTD
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 10af5519e..03003a518 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -3347,6 +3347,39 @@ static void UpdateStationRating(Station *st)
}
/**
+ * Check all next hops of cargo packets in this station for existance of a
+ * a valid link they may use to travel on. Reroute any cargo not having a valid
+ * link and remove timed out links found like this from the linkgraph. We're
+ * not all links here as that is expensive and useless. A link no one is using
+ * doesn't hurt either.
+ * @param from Station to check.
+ */
+void DeleteStaleLinks(Station *from)
+{
+ for (CargoID c = 0; c < NUM_CARGO; ++c) {
+ GoodsEntry &ge = from->goods[c];
+ LinkGraph *lg = LinkGraph::GetIfValid(ge.link_graph);
+ if (lg == NULL) continue;
+ Node node = (*lg)[ge.node];
+ for (EdgeIterator it(node.Begin()); it != node.End();) {
+ Edge edge = it->second;
+ Station *to = Station::Get((*lg)[it->first].Station());
+ assert(to->goods[c].node == it->first);
+ ++it; // Do that before removing the node. Anything else may crash.
+ assert(_date >= edge.LastUpdate());
+ if ((uint)(_date - edge.LastUpdate()) > LinkGraph::MIN_TIMEOUT_DISTANCE +
+ (DistanceManhattan(from->xy, to->xy) >> 2)) {
+ node.RemoveEdge(to->goods[c].node);
+ }
+ }
+ assert(_date >= lg->LastCompression());
+ if ((uint)(_date - lg->LastCompression()) > LinkGraph::COMPRESSION_INTERVAL) {
+ lg->Compress();
+ }
+ }
+}
+
+/**
* Increase capacity for a link stat given by station cargo and next hop.
* @param st Station to get the link stats from.
* @param cargo Cargo to increase stat for.
@@ -3439,6 +3472,11 @@ void OnTick_Station()
FOR_ALL_BASE_STATIONS(st) {
StationHandleSmallTick(st);
+ /* Clean up the link graph about once a week. */
+ if (Station::IsExpected(st) && (_tick_counter + st->index) % STATION_LINKGRAPH_TICKS == 0) {
+ DeleteStaleLinks(Station::From(st));
+ };
+
/* Run STATION_ACCEPTANCE_TICKS = 250 tick interval trigger for station animation.
* Station index is included so that triggers are not all done
* at the same time. */