use slice for bufferHealth (#146)

Author: loganmc10

internal/gameServer/server.go

@@ -94,15 +94,14 @@ func (g *GameServer) isConnClosed(err error) bool {
 }
 
 func (g *GameServer) averageBufferHealth(playerNumber int) (float32, error) {
-	defer g.gameData.bufferHealth[playerNumber].Purge()
+	defer func() { g.gameData.bufferHealth[playerNumber] = g.gameData.bufferHealth[playerNumber][:0] }()
 
-	if g.gameData.bufferHealth[playerNumber].Len() > 0 {
+	if len(g.gameData.bufferHealth[playerNumber]) > 0 {
 		var total float32
-		for _, k := range g.gameData.bufferHealth[playerNumber].Keys() {
-			value, _ := g.gameData.bufferHealth[playerNumber].Peek(k)
+		for _, value := range g.gameData.bufferHealth[playerNumber] {
 			total += float32(value)
 		}
-		return total / float32(g.gameData.bufferHealth[playerNumber].Len()), nil
+		return total / float32(len(g.gameData.bufferHealth[playerNumber])), nil
 	} else {
 		return 0, fmt.Errorf("no buffer health data for player %d", playerNumber)
 	}
@@ -174,7 +173,7 @@ func (g *GameServer) ManagePlayers() {
 							g.PlayersMutex.Unlock()
 						}
 					}
-					g.gameData.bufferHealth[i].Purge()
+					g.gameData.bufferHealth[i] = g.gameData.bufferHealth[i][:0]
 				}
 			}
 			g.gameData.playerAlive[i] = false

internal/gameServer/tcp.go

@@ -353,7 +353,7 @@ func (g *GameServer) processTCP(conn *net.TCPConn) {
 								g.PlayersMutex.Unlock()
 							}
 						}
-						g.gameData.bufferHealth[i].Purge()
+						g.gameData.bufferHealth[i] = g.gameData.bufferHealth[i][:0]
 						g.gameDataMutex.Unlock()
 					}
 				}

internal/gameServer/udp.go

@@ -23,7 +23,7 @@ type GameData struct {
 	playerAddresses     [4]*net.UDPAddr
 	bufferSize          uint32
 	averageBufferHealth [4]float32
-	bufferHealth        [4]*lru.Cache[uint32, byte]
+	bufferHealth        [4][]byte
 	inputs              [4]*lru.Cache[uint32, InputData]
 	pendingInput        [4]InputData
 	countLag            [4]uint32
@@ -151,7 +151,7 @@ func (g *GameServer) processUDP(addr *net.UDPAddr) {
 		}
 		g.gameData.countLag[sendingPlayerNumber] = g.sendUDPInput(count, addr, playerNumber, spectator != 0, sendingPlayerNumber)
 		g.gameDataMutex.Lock() // PlayerAlive and BufferHealth can be modified in different threads
-		g.gameData.bufferHealth[sendingPlayerNumber].Add(count, g.gameData.recvBuffer[11])
+		g.gameData.bufferHealth[sendingPlayerNumber] = append(g.gameData.bufferHealth[sendingPlayerNumber], g.gameData.recvBuffer[11])
 		g.gameData.playerAlive[sendingPlayerNumber] = true
 		g.gameDataMutex.Unlock()
 	case CP0Info:
@@ -213,7 +213,7 @@ func (g *GameServer) createUDPServer() error {
 	g.gameData.bufferSize = 3
 	for i := range 4 {
 		g.gameData.inputs[i], _ = lru.New[uint32, InputData](InputDataMax)
-		g.gameData.bufferHealth[i], _ = lru.New[uint32, byte](InputDataMax)
+		g.gameData.bufferHealth[i] = make([]byte, 0, InputDataMax)
 	}
 	g.gameData.syncValues, _ = lru.New[uint32, []byte](100) // Store up to 100 sync values
 	g.gameData.sendBuffer = make([]byte, 508)