OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Improve stability in packet-server mode

Browse source 
Use buffers reported by clients so they can better check their own conditions when determining how to stabilize when outpacing the host.
This commit is contained in:
Boondorl 2025-06-30 14:46:17 -04:00 • committed by Ricardo Luís Vaz Silva
commit 492c83cf2c
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/engine/i_net.h
View file

@ -11,7 +11,7 @@ enum ENetConstants
BACKUPTICS = 35 * 5, // Remember up to 5 seconds of data.
MAXTICDUP = 3,
MAXSENDTICS = 35 * 1, // Only send up to 1 second of data at a time.
STABILITYTICS = 12,
STABILITYTICS = 17,
LOCALCMDTICS = (BACKUPTICS * MAXTICDUP),
MAX_MSGLEN = 14000,
};

27
src/d_net.cpp
View file

@ -378,7 +378,7 @@ void Net_ClearBuffers()
memset(state.RecvTime, 0, sizeof(state.RecvTime));
state.bNewLatency = true;
state.ResendID = 0u;
state.ResendID = state.StabilityBuffer = 0u;
state.CurrentNetConsistency = state.LastVerifiedConsistency = state.ConsistencyAck = state.ResendConsistencyFrom = -1;
state.CurrentSequence = state.SequenceAck = state.ResendSequenceFrom = -1;
state.Flags = 0;
@ -535,6 +535,7 @@ void Net_ResetCommands(bool midTic)
{
auto& state = ClientStates[client];
state.Flags &= CF_QUIT;
state.StabilityBuffer = 0u;
state.CurrentSequence = min<int>(state.CurrentSequence, tic);
state.SequenceAck = min<int>(state.SequenceAck, tic);
if (state.ResendSequenceFrom >= tic)
@ -589,7 +590,8 @@ static size_t GetNetBufferSize()
const int ranTics = NetBuffer[totalBytes++];
if (ranTics > 0)
totalBytes += 4;
if (NetMode == NET_PacketServer && RemoteClient == Net_Arbitrator)
// Stability buffer/commands ahead
if (NetMode == NET_PacketServer)
++totalBytes;
// Minimum additional packet size per player:
@ -931,12 +933,16 @@ static void GetPackets()
if (ranTics > 0)
baseConsistency = (NetBuffer[curByte++] << 24) | (NetBuffer[curByte++] << 16) | (NetBuffer[curByte++] << 8) | NetBuffer[curByte++];
if (NetMode == NET_PacketServer && clientNum == Net_Arbitrator)
if (NetMode == NET_PacketServer)
{
if (validID)
CommandsAhead = NetBuffer[curByte++];
else
++curByte;
{
if (clientNum == Net_Arbitrator)
CommandsAhead = NetBuffer[curByte];
else if (consoleplayer == Net_Arbitrator)
clientState.StabilityBuffer = NetBuffer[curByte];
}
++curByte;
}
for (int p = 0; p < playerCount; ++p)
@ -1696,8 +1702,13 @@ void NetUpdate(int tics)
NetBuffer[size++] = baseConsistency + curTicOfs;
}
if (NetMode == NET_PacketServer && consoleplayer == Net_Arbitrator)
NetBuffer[size++] = client == Net_Arbitrator ? 0 : max<int>(curState.CurrentSequence - newestTic, 0);
if (NetMode == NET_PacketServer)
{
if (consoleplayer == Net_Arbitrator)
NetBuffer[size++] = client == Net_Arbitrator ? 0 : max<int>(curState.CurrentSequence + curState.StabilityBuffer - newestTic, 0);
else
NetBuffer[size++] = max<int>(StabilityBuffer, 0);
}
// Client commands.

1
src/d_net.h
View file

@ -109,6 +109,7 @@ struct FClientNetState
int Flags = 0; // State of this client.
uint8_t StabilityBuffer = 0u; // If in packet-server mode, account for if the client is trying to stabilize when measuring their performance.
uint8_t ResendID = 0u; // Make sure that if the retransmit happened on a wait barrier, it can be properly resent back over.
int ResendSequenceFrom = -1; // If >= 0, send from this sequence up to the most recent one, capped to MAXSENDTICS.
int SequenceAck = -1; // The last sequence the client reported from us.