From 9f684eac928e7e089bd9c2d80571c9cf3485805c Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 5 Jan 2024 11:46:32 +0100 Subject: [PATCH] Remove weird command procession limit it was set to 1 too, wtf?! --- src/network/connection.cpp | 5 +---- src/network/connection.h | 1 - src/network/connectionthreads.cpp | 4 +--- src/network/connectionthreads.h | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/network/connection.cpp b/src/network/connection.cpp index 5bc22db74760..f75364f5ca5c 100644 --- a/src/network/connection.cpp +++ b/src/network/connection.cpp @@ -1158,16 +1158,13 @@ bool UDPPeer::processReliableSendCommand( void UDPPeer::RunCommandQueues( unsigned int max_packet_size, - unsigned int maxcommands, unsigned int maxtransfer) { for (Channel &channel : channels) { - unsigned int commands_processed = 0; if ((!channel.queued_commands.empty()) && - (channel.queued_reliables.size() < maxtransfer) && - (commands_processed < maxcommands)) { + (channel.queued_reliables.size() < maxtransfer)) { try { ConnectionCommandPtr c = channel.queued_commands.front(); diff --git a/src/network/connection.h b/src/network/connection.h index 6704cecddf32..d5664e8bb5a1 100644 --- a/src/network/connection.h +++ b/src/network/connection.h @@ -645,7 +645,6 @@ class UDPPeer : public Peer void RunCommandQueues( unsigned int max_packet_size, - unsigned int maxcommands, unsigned int maxtransfer); float getResendTimeout() diff --git a/src/network/connectionthreads.cpp b/src/network/connectionthreads.cpp index b5128a893d16..afe897918aa4 100644 --- a/src/network/connectionthreads.cpp +++ b/src/network/connectionthreads.cpp @@ -248,9 +248,7 @@ void ConnectionSendThread::runTimeouts(float dtime) rawSendAsPacket(udpPeer->id, 0, data, true); } - udpPeer->RunCommandQueues(m_max_packet_size, - m_max_commands_per_iteration, - m_max_packets_requeued); + udpPeer->RunCommandQueues(m_max_packet_size, m_max_packets_requeued); } // Remove timed out peers diff --git a/src/network/connectionthreads.h b/src/network/connectionthreads.h index 594891a2b93c..d8e083351171 100644 --- a/src/network/connectionthreads.h +++ b/src/network/connectionthreads.h @@ -102,7 +102,6 @@ class ConnectionSendThread : public Thread Semaphore m_send_sleep_semaphore; unsigned int m_iteration_packets_avaialble; - unsigned int m_max_commands_per_iteration = 1; unsigned int m_max_data_packets_per_iteration; unsigned int m_max_packets_requeued = 256; };