Use single buffer size (#113)

* Use single buffer size

* more

* more

* more

* more

Author: loganmc10

internal/gameServer/server.go

@@ -94,18 +94,28 @@ func (g *GameServer) ManageBuffer() {
 			g.Logger.Info("done managing buffers")
 			return
 		}
-		// Adjust the buffer size for the lead player(s)
+
+		// Find the largest buffer health
+		var bufferHealth int32 = -1
 		for i := range 4 {
 			if g.GameData.BufferHealth[i] != -1 && g.GameData.CountLag[i] == 0 {
-				if g.GameData.BufferHealth[i] > g.BufferTarget && g.GameData.BufferSize[i] > 0 {
-					g.GameData.BufferSize[i]--
-					// g.Logger.Info("reducing buffer size", "player", i, "bufferSize", g.GameData.BufferSize[i])
-				} else if g.GameData.BufferHealth[i] < g.BufferTarget {
-					g.GameData.BufferSize[i]++
-					// g.Logger.Info("increasing buffer size", "player", i, "bufferSize", g.GameData.BufferSize[i])
+				if g.GameData.BufferHealth[i] > bufferHealth {
+					bufferHealth = g.GameData.BufferHealth[i]
 				}
 			}
 		}
+
+		// Adjust the buffer size
+		if bufferHealth != -1 {
+			if bufferHealth > g.BufferTarget && g.GameData.BufferSize > 0 {
+				g.GameData.BufferSize--
+				g.Logger.Info("reduced buffer size", "bufferSize", g.GameData.BufferSize)
+			} else if bufferHealth < g.BufferTarget {
+				g.GameData.BufferSize++
+				g.Logger.Info("increased buffer size", "bufferSize", g.GameData.BufferSize)
+			}
+		}
+
 		time.Sleep(time.Second * 5)
 	}
 }
@@ -121,7 +131,7 @@ func (g *GameServer) ManagePlayers() {
 			_, ok := g.Registrations[i]
 			if ok {
 				if g.GameData.PlayerAlive[i] {
-					g.Logger.Info("player status", "player", i, "regID", g.Registrations[i].RegID, "bufferSize", g.GameData.BufferSize[i], "bufferHealth", g.GameData.BufferHealth[i], "countLag", g.GameData.CountLag[i], "address", g.GameData.PlayerAddresses[i])
+					g.Logger.Info("player status", "player", i, "regID", g.Registrations[i].RegID, "bufferSize", g.GameData.BufferSize, "bufferHealth", g.GameData.BufferHealth[i], "countLag", g.GameData.CountLag[i], "address", g.GameData.PlayerAddresses[i])
 					playersActive = true
 				} else {
 					g.Logger.Info("play disconnected UDP", "player", i, "regID", g.Registrations[i].RegID, "address", g.GameData.PlayerAddresses[i])
@@ -139,6 +149,7 @@ func (g *GameServer) ManagePlayers() {
 							g.PlayersMutex.Unlock()
 						}
 					}
+					g.GameData.BufferHealth[i] = -1
 				}
 			}
 			g.GameData.PlayerAlive[i] = false

internal/gameServer/tcp.go

@@ -340,7 +340,6 @@ func (g *GameServer) processTCP(conn *net.TCPConn) {
 						g.GameDataMutex.Lock() // any player can modify this, which would be in a different thread
 						g.GameData.PlayerAlive[i] = false
 						g.GameData.Status |= (0x1 << (i + 1))
-						g.GameDataMutex.Unlock()
 
 						g.RegistrationsMutex.Lock() // any player can modify this, which would be in a different thread
 						delete(g.Registrations, i)
@@ -354,6 +353,8 @@ func (g *GameServer) processTCP(conn *net.TCPConn) {
 								g.PlayersMutex.Unlock()
 							}
 						}
+						g.GameData.BufferHealth[i] = -1
+						g.GameDataMutex.Unlock()
 					}
 				}
 			}

internal/gameServer/udp.go

@@ -21,7 +21,7 @@ type InputData struct {
 type GameData struct {
 	SyncValues      map[uint32][]byte
 	PlayerAddresses []*net.UDPAddr
-	BufferSize      []uint32
+	BufferSize      uint32
 	BufferHealth    []int32
 	Inputs          []*lru.Cache[uint32, InputData]
 	PendingInput    []uint32
@@ -86,7 +86,6 @@ func (g *GameServer) sendUDPInput(count uint32, addr *net.UDPAddr, playerNumber
 		countLag = g.GameData.LeadCount - count
 	}
 	if sendingPlayerNumber == NoRegID { // if the incoming packet was KeyInfoClient, the regID isn't included in the packet
-		sendingPlayerNumber = playerNumber
 		buffer[0] = KeyInfoServerGratuitous // client will ignore countLag value in this case
 	} else {
 		buffer[0] = KeyInfoServer
@@ -96,7 +95,7 @@ func (g *GameServer) sendUDPInput(count uint32, addr *net.UDPAddr, playerNumber
 	buffer[3] = uint8(countLag)
 	currentByte := 5
 	start := count
-	end := start + g.GameData.BufferSize[sendingPlayerNumber]
+	end := start + g.GameData.BufferSize
 	_, ok := g.GameData.Inputs[playerNumber].Get(count) // check if input exists for this count
 	for (currentByte < len(buffer)-9) && ((!spectator && countLag == 0 && uintLarger(end, count)) || ok) {
 		binary.BigEndian.PutUint32(buffer[currentByte:], count)
@@ -213,7 +212,7 @@ func (g *GameServer) createUDPServer() error {
 	g.Logger.Info("Created UDP server", "port", g.Port)
 
 	g.GameData.PlayerAddresses = make([]*net.UDPAddr, 4)
-	g.GameData.BufferSize = []uint32{3, 3, 3, 3}
+	g.GameData.BufferSize = 3
 	g.GameData.BufferHealth = []int32{-1, -1, -1, -1}
 	g.GameData.Inputs = make([]*lru.Cache[uint32, InputData], 4)
 	for i := range 4 {