BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

master #7

Merged
BRNSystems merged 95 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-28 00:16:42 +01:00
Conversation 0 Commits 95 Files Changed 224 +2 -9
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f684eac92 - Show all commits

5
src/network/connection.cpp
View File

@ -1158,16 +1158,13 @@ bool UDPPeer::processReliableSendCommand(
void UDPPeer::RunCommandQueues( void UDPPeer::RunCommandQueues(
unsigned int max_packet_size, unsigned int max_packet_size,
unsigned int maxcommands,
unsigned int maxtransfer) unsigned int maxtransfer)
{ {
for (Channel &channel : channels) { for (Channel &channel : channels) {
unsigned int commands_processed = 0;
if ((!channel.queued_commands.empty()) && if ((!channel.queued_commands.empty()) &&
(channel.queued_reliables.size() < maxtransfer) && (channel.queued_reliables.size() < maxtransfer)) {
(commands_processed < maxcommands)) {
try { try {
ConnectionCommandPtr c = channel.queued_commands.front(); ConnectionCommandPtr c = channel.queued_commands.front();

1
src/network/connection.h
View File

@ -645,7 +645,6 @@ protected:
void RunCommandQueues( void RunCommandQueues(
unsigned int max_packet_size, unsigned int max_packet_size,
unsigned int maxcommands,
unsigned int maxtransfer); unsigned int maxtransfer);
float getResendTimeout() float getResendTimeout()

4
src/network/connectionthreads.cpp
View File

@ -248,9 +248,7 @@ void ConnectionSendThread::runTimeouts(float dtime)
rawSendAsPacket(udpPeer->id, 0, data, true); rawSendAsPacket(udpPeer->id, 0, data, true);
} }
udpPeer->RunCommandQueues(m_max_packet_size, udpPeer->RunCommandQueues(m_max_packet_size, m_max_packets_requeued);
m_max_commands_per_iteration,
m_max_packets_requeued);
} }
// Remove timed out peers // Remove timed out peers

1
src/network/connectionthreads.h
View File

@ -102,7 +102,6 @@ private:
Semaphore m_send_sleep_semaphore; Semaphore m_send_sleep_semaphore;
unsigned int m_iteration_packets_avaialble; 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_data_packets_per_iteration;
unsigned int m_max_packets_requeued = 256; unsigned int m_max_packets_requeued = 256;
}; };