mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #9535: Maintain a reverse dependency map of network content (#9538) 

Fixes performance issues with dependency lookup when retrieving
content list from the content server.
pull/9541/head
Jonathan G Rennison 2021-09-09 17:06:00 +01:00 committed by GitHub
parent 7469f00c5b
commit 6e3d023e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/network/network_content.cpp
View File

@ -68,7 +68,11 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet *p)
uint dependency_count = p->Recv_uint8(); uint dependency_count = p->Recv_uint8();
ci->dependencies.reserve(dependency_count); ci->dependencies.reserve(dependency_count);
for (uint i = 0; i < dependency_count; i++) ci->dependencies.push_back((ContentID)p->Recv_uint32()); for (uint i = 0; i < dependency_count; i++) {
ContentID dependency_cid = (ContentID)p->Recv_uint32();
ci->dependencies.push_back(dependency_cid);
this->reverse_dependency_map.insert({ dependency_cid, ci->id });
}
uint tag_count = p->Recv_uint8(); uint tag_count = p->Recv_uint8();
ci->tags.reserve(tag_count); ci->tags.reserve(tag_count);
@ -168,8 +172,10 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet *p)
this->infos.push_back(ci); this->infos.push_back(ci);
/* Incoming data means that we might need to reconsider dependencies */ /* Incoming data means that we might need to reconsider dependencies */
for (ContentInfo *ici : this->infos) { ConstContentVector parents;
this->CheckDependencyState(ici); this->ReverseLookupTreeDependency(parents, ci);
for (const ContentInfo *ici : parents) {
this->CheckDependencyState(const_cast<ContentInfo *>(ici));
} }
this->OnReceiveContentInfo(ci); this->OnReceiveContentInfo(ci);
@ -833,7 +839,7 @@ void ClientNetworkContentSocketHandler::DownloadContentInfo(ContentID cid)
* @param cid the ContentID to search for * @param cid the ContentID to search for
* @return the ContentInfo or nullptr if not found * @return the ContentInfo or nullptr if not found
*/ */
ContentInfo *ClientNetworkContentSocketHandler::GetContent(ContentID cid) ContentInfo *ClientNetworkContentSocketHandler::GetContent(ContentID cid) const
{ {
for (ContentInfo *ci : this->infos) { for (ContentInfo *ci : this->infos) {
if (ci->id == cid) return ci; if (ci->id == cid) return ci;
@ -923,15 +929,10 @@ void ClientNetworkContentSocketHandler::ToggleSelectedState(const ContentInfo *c
*/ */
void ClientNetworkContentSocketHandler::ReverseLookupDependency(ConstContentVector &parents, const ContentInfo *child) const void ClientNetworkContentSocketHandler::ReverseLookupDependency(ConstContentVector &parents, const ContentInfo *child) const
{ {
for (const ContentInfo *ci : this->infos) { auto range = this->reverse_dependency_map.equal_range(child->id);
if (ci == child) continue;
for (auto &dependency : ci->dependencies) { for (auto iter = range.first; iter != range.second; ++iter) {
if (dependency == child->id) { parents.push_back(GetContent(iter->second));
parents.push_back(ci);
break;
}
}
} }
} }
@ -1056,6 +1057,7 @@ void ClientNetworkContentSocketHandler::Clear()
this->infos.clear(); this->infos.clear();
this->requested.clear(); this->requested.clear();
this->reverse_dependency_map.clear();
} }
/*** CALLBACK ***/ /*** CALLBACK ***/

4
src/network/network_content.h
View File

@ -12,6 +12,7 @@
#include "core/tcp_content.h" #include "core/tcp_content.h"
#include "core/tcp_http.h" #include "core/tcp_http.h"
#include <unordered_map>
/** Vector with content info */ /** Vector with content info */
typedef std::vector<ContentInfo *> ContentVector; typedef std::vector<ContentInfo *> ContentVector;
@ -68,6 +69,7 @@ protected:
std::vector<ContentCallback *> callbacks; ///< Callbacks to notify "the world" std::vector<ContentCallback *> callbacks; ///< Callbacks to notify "the world"
ContentIDList requested; ///< ContentIDs we already requested (so we don't do it again) ContentIDList requested; ///< ContentIDs we already requested (so we don't do it again)
ContentVector infos; ///< All content info we received ContentVector infos; ///< All content info we received
std::unordered_multimap<ContentID, ContentID> reverse_dependency_map; ///< Content reverse dependency map
std::vector<char> http_response; ///< The HTTP response to the requests we've been doing std::vector<char> http_response; ///< The HTTP response to the requests we've been doing
int http_response_index; ///< Where we are, in the response, with handling it int http_response_index; ///< Where we are, in the response, with handling it
@ -81,7 +83,7 @@ protected:
bool Receive_SERVER_INFO(Packet *p) override; bool Receive_SERVER_INFO(Packet *p) override;
bool Receive_SERVER_CONTENT(Packet *p) override; bool Receive_SERVER_CONTENT(Packet *p) override;
ContentInfo *GetContent(ContentID cid); ContentInfo *GetContent(ContentID cid) const;
void DownloadContentInfo(ContentID cid); void DownloadContentInfo(ContentID cid);
void OnConnect(bool success) override; void OnConnect(bool success) override;