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

Link graph: Explicitly flag invalidated flow stats instead of minimising their flows

Browse Source 
Entirely exclude invalidated flow stats from link stats

Delete invalidated flow stats if they stay invalid for 32 link graph jobs

This is to prevent large numbers of invalidated flow stats from
unduly influencing link statistics
This commit is contained in:
Jonathan G Rennison
2019-10-20 07:46:21 +01:00
parent 115af44f3a
commit b6e9817edb
7 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/station_base.h
View File

@@ -93,6 +93,7 @@ public:
this->unrestricted = restricted ? 0 : flow;
this->count = 1;
this->origin = origin;
this->flags = 0;
}
private:
@@ -117,6 +118,7 @@ private:
free(this->storage.ptr_shares.buffer);
}
this->count = 0;
this->flags = 0;
}
iterator erase_item(iterator iter, uint flow_reduction);
@@ -131,6 +133,7 @@ private:
MemCpyT(this->data(), other.data(), this->count);
this->unrestricted = other.unrestricted;
this->origin = other.origin;
this->flags = other.flags;
}
public:
@@ -234,6 +237,7 @@ public:
std::swap(this->storage, other.storage);
std::swap(this->unrestricted, other.unrestricted);
std::swap(this->count, other.count);
std::swap(this->flags, other.flags);
}
/**
@@ -269,13 +273,39 @@ public:
StationID GetVia(StationID excluded, StationID excluded2 = INVALID_STATION) const;
void Invalidate();
/**
* Mark this flow stat as invalid, such that it is not included in link statistics.
* @return True if the flow stat should be deleted.
*/
inline bool Invalidate()
{
if ((this->flags & 0x1F) == 0x1F) return true;
this->flags++;
return false;
}
inline StationID GetOrigin() const
{
return this->origin;
}
inline bool IsInvalid() const
{
return (this->flags & 0x1F) != 0;
}
/* for save/load use only */
inline uint16 GetRawFlags() const
{
return this->flags;
}
/* for save/load use only */
inline void SetRawFlags(uint16 flags)
{
this->flags = flags;;
}
private:
uint32 GetLastKey() const
{
@@ -302,10 +332,11 @@ private:
uint unrestricted; ///< Limit for unrestricted shares.
uint16 count;
StationID origin;
uint16 flags;
};
static_assert(std::is_nothrow_move_constructible<FlowStat>::value, "FlowStat must be nothrow move constructible");
#if OTTD_ALIGNMENT == 0 && (defined(__GNUC__) || defined(__clang__))
static_assert(sizeof(FlowStat) == 20, "");
static_assert(sizeof(FlowStat) == 24, "");
#endif
template<typename cv_value, typename cv_container, typename cv_index_iter>
@@ -397,7 +428,12 @@ public:
bool empty() const
{
return this->flows_index.empty();
return this->flows_storage.empty();
}
size_t size() const
{
return this->flows_storage.size();
}
void erase(StationID st)