zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- dynamically allocate the large networking buffers.

Browse source 
These waste a whopping 800MB of address space, which on 32 bit could be the deciding factor for exhausting available memory.
This commit is contained in:
Christoph Oelckers 2020-01-15 18:36:53 +01:00
parent 4aacd6d958
commit c0c18db7cd
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/duke3d/src/network.cpp
View file

@ -457,12 +457,12 @@ static uint32_t g_cl_InterpolatedRevision = 0;
static netmapstate_t g_mapStartState; static netmapstate_t g_mapStartState;
static netmapstate_t g_cl_InterpolatedMapStateHistory[NET_REVISIONS]; static TArray<netmapstate_t> g_cl_InterpolatedMapStateHistory;
// note that the map state number is not an index into here, // note that the map state number is not an index into here,
// to get the index into this array out of a map state number, do <Map state number> % NET_REVISONS // to get the index into this array out of a map state number, do <Map state number> % NET_REVISONS
static netmapstate_t g_mapStateHistory[NET_REVISIONS]; static TArray<netmapstate_t> g_mapStateHistory;
static uint8_t tempnetbuf[MAX_WORLDBUFFER]; static TArray<uint8_t> tempnetbuf;
// Remember that this constant needs to be one bit longer than a struct index, so it can't be mistaken for a valid wall, sprite, or sector index // Remember that this constant needs to be one bit longer than a struct index, so it can't be mistaken for a valid wall, sprite, or sector index
static const int32_t cSTOP_PARSING_CODE = ((1 << NETINDEX_BITS) - 1); static const int32_t cSTOP_PARSING_CODE = ((1 << NETINDEX_BITS) - 1);
@ -4211,8 +4211,8 @@ static void Net_SendWorldUpdate(uint32_t fromRevisionNumber, uint32_t toRevision
return; return;
} }
Bassert(MAX_WORLDBUFFER == ARRAY_SIZE(tempnetbuf)); //Bassert(MAX_WORLDBUFFER == ARRAY_SIZE(tempnetbuf));
Bassert(NET_REVISIONS == ARRAY_SIZE(g_mapStateHistory)); //Bassert(NET_REVISIONS == ARRAY_SIZE(g_mapStateHistory));
uint32_t playerRevisionIsTooOld = (toRevisionNumber - fromRevisionNumber) > NET_REVISIONS; uint32_t playerRevisionIsTooOld = (toRevisionNumber - fromRevisionNumber) > NET_REVISIONS;
@ -4950,7 +4950,7 @@ void Net_SendServerUpdates(void)
serverupdate.pause_on = ud.pause_on; serverupdate.pause_on = ud.pause_on;
serverupdate.numplayers = 0; serverupdate.numplayers = 0;
updatebuf = tempnetbuf + sizeof(serverupdate_t); updatebuf = tempnetbuf.Data() + sizeof(serverupdate_t);
for (TRAVERSE_CONNECT(i)) for (TRAVERSE_CONNECT(i))
{ {
@ -4988,7 +4988,7 @@ void Net_SendServerUpdates(void)
return; return;
} }
Bmemcpy(tempnetbuf, &serverupdate, sizeof(serverupdate_t)); Bmemcpy(tempnetbuf.Data(), &serverupdate, sizeof(serverupdate_t));
enet_host_broadcast( enet_host_broadcast(
g_netServer, CHAN_MOVE, g_netServer, CHAN_MOVE,
@ -5155,6 +5155,9 @@ void Net_InitMapStateHistory()
void Net_StartNewGame() void Net_StartNewGame()
{ {
g_mapStateHistory.Resize(NET_REVISIONS);
g_cl_InterpolatedMapStateHistory.Resize(NET_REVISIONS);
tempnetbuf.Resize(MAX_WORLDBUFFER);
Net_ResetPlayers(); Net_ResetPlayers();
Net_ExtractNewGame(&pendingnewgame, 0); Net_ExtractNewGame(&pendingnewgame, 0);