gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: do not pass the socket when the receiver already knows it

Browse Source
This commit is contained in:
Rubidium 2024-02-06 18:56:56 +01:00 committed by rubidium42
parent 3e625b5b1a
commit ec4104ec6c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/network_server.cpp
View File

@ -116,10 +116,9 @@ struct PacketWriter : SaveFilter {
/** /**
* Transfer all packets from here to the network's queue while holding * Transfer all packets from here to the network's queue while holding
* the lock on our mutex. * the lock on our mutex.
* @param socket The network socket to write to.
* @return True iff the last packet of the map has been sent. * @return True iff the last packet of the map has been sent.
*/ */
bool TransferToNetworkQueue(ServerNetworkGameSocketHandler *socket) bool TransferToNetworkQueue()
{ {
/* Unsafe check for the queue being empty or not. */ /* Unsafe check for the queue being empty or not. */
if (this->packets.empty()) return false; if (this->packets.empty()) return false;
@ -128,7 +127,7 @@ struct PacketWriter : SaveFilter {
while (!this->packets.empty()) { while (!this->packets.empty()) {
bool last_packet = this->packets.front()->GetPacketType() == PACKET_SERVER_MAP_DONE; bool last_packet = this->packets.front()->GetPacketType() == PACKET_SERVER_MAP_DONE;
socket->SendPacket(std::move(this->packets.front())); this->cs->SendPacket(std::move(this->packets.front()));
this->packets.pop_front(); this->packets.pop_front();
if (last_packet) return true; if (last_packet) return true;
@ -577,7 +576,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap()
} }
if (this->status == STATUS_MAP) { if (this->status == STATUS_MAP) {
bool last_packet = this->savegame->TransferToNetworkQueue(this); bool last_packet = this->savegame->TransferToNetworkQueue();
if (last_packet) { if (last_packet) {
Debug(net, 9, "client[{}] SendMap(): last_packet", this->client_id); Debug(net, 9, "client[{}] SendMap(): last_packet", this->client_id);