dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move StationCargoList and FlowStatMap out of GoodsEntry struct

Browse Source 
Move them into a new GoodsEntryData struct referenced
using a std::unique_ptr from GoodsEntry.
The unique_ptr may be nullptr if the cargo list and flow stat map
are both empty (this is the case for unused cargoes).

This reduces GoodsEntry from 128 to 24 bytes,
and Station from 8680 to 2024 bytes,
(on Linux x86_64).
This commit is contained in:
Jonathan G Rennison
2023-08-19 21:21:31 +01:00
parent cd2ab6430b
commit 19835b51ee
24 changed files with 283 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/script/api/script_station.cpp
View File

@@ -58,7 +58,10 @@ template<bool Tfrom, bool Tvia>
return -1;
}
const StationCargoList &cargo_list = ::Station::Get(station_id)->goods[cargo_id].cargo;
const GoodsEntry &ge = ::Station::Get(station_id)->goods[cargo_id];
if (ge.data == nullptr) return 0;
const StationCargoList &cargo_list = ge.data->cargo;
if (!Tfrom && !Tvia) return cargo_list.TotalCount();
uint16 cargo_count = 0;
@@ -106,7 +109,10 @@ template<bool Tfrom, bool Tvia>
return -1;
}
const FlowStatMap &flows = ::Station::Get(station_id)->goods[cargo_id].flows;
const GoodsEntry &ge = ::Station::Get(station_id)->goods[cargo_id];
if (ge.data == nullptr) return 0;
const FlowStatMap &flows = ge.data->flows;
if (Tfrom) {
return Tvia ? flows.GetFlowFromVia(from_station_id, via_station_id) :
flows.GetFlowFrom(from_station_id);

26
src/script/api/script_stationlist.cpp
View File

@@ -171,8 +171,11 @@ void ScriptStationList_CargoWaiting::Add(StationID station_id, CargoID cargo, St
CargoCollector collector(this, station_id, cargo, other_station);
if (collector.GE() == nullptr) return;
StationCargoList::ConstIterator iter = collector.GE()->cargo.Packets()->begin();
StationCargoList::ConstIterator end = collector.GE()->cargo.Packets()->end();
const GoodsEntry *ge = collector.GE();
if (ge->data == nullptr) return;
StationCargoList::ConstIterator iter = ge->data->cargo.Packets()->begin();
StationCargoList::ConstIterator end = ge->data->cargo.Packets()->end();
for (; iter != end; ++iter) {
collector.Update<Tselector>((*iter)->SourceStation(), iter.GetKey(), (*iter)->Count());
}
@@ -185,8 +188,11 @@ void ScriptStationList_CargoPlanned::Add(StationID station_id, CargoID cargo, St
CargoCollector collector(this, station_id, cargo, other_station);
if (collector.GE() == nullptr) return;
FlowStatMap::const_iterator iter = collector.GE()->flows.begin();
FlowStatMap::const_iterator end = collector.GE()->flows.end();
const GoodsEntry *ge = collector.GE();
if (ge->data == nullptr) return;
FlowStatMap::const_iterator iter = ge->data->flows.begin();
FlowStatMap::const_iterator end = ge->data->flows.end();
for (; iter != end; ++iter) {
uint prev = 0;
for (FlowStat::const_iterator flow_iter = iter->begin();
@@ -209,8 +215,11 @@ ScriptStationList_CargoWaitingViaByFrom::ScriptStationList_CargoWaitingViaByFrom
CargoCollector collector(this, station_id, cargo, via);
if (collector.GE() == nullptr) return;
const GoodsEntry *ge = collector.GE();
if (ge->data == nullptr) return;
std::pair<StationCargoList::ConstIterator, StationCargoList::ConstIterator> range =
collector.GE()->cargo.Packets()->equal_range(via);
ge->data->cargo.Packets()->equal_range(via);
for (StationCargoList::ConstIterator iter = range.first; iter != range.second; ++iter) {
collector.Update<CS_VIA_BY_FROM>((*iter)->SourceStation(), iter.GetKey(), (*iter)->Count());
}
@@ -255,8 +264,11 @@ ScriptStationList_CargoPlannedFromByVia::ScriptStationList_CargoPlannedFromByVia
CargoCollector collector(this, station_id, cargo, from);
if (collector.GE() == nullptr) return;
FlowStatMap::const_iterator iter = collector.GE()->flows.find(from);
if (iter == collector.GE()->flows.end()) return;
const GoodsEntry *ge = collector.GE();
if (ge->data == nullptr) return;
FlowStatMap::const_iterator iter = ge->data->flows.find(from);
if (iter == ge->data->flows.end()) return;
uint prev = 0;
for (FlowStat::const_iterator flow_iter = iter->begin();
flow_iter != iter->end(); ++flow_iter) {