Remove autoRef metadata, which is now all done by GC

Author: g3force

cmd/ssl-auto-ref-client/main.go

@@ -25,8 +25,6 @@ var clientIdentifier = flag.String("identifier", "test", "The identifier of the
 
 var privateKey *rsa.PrivateKey
 
-var metadata *rcon.GameStateMetadata
-
 type Client struct {
 	conn  net.Conn
 	token string
@@ -36,9 +34,6 @@ func main() {
 	flag.Parse()
 
 	privateKey = client.LoadPrivateKey(*privateKeyLocation)
-	metadata = new(rcon.GameStateMetadata)
-	metadata.TeamYellow = new(rcon.GameStateMetadataTeam)
-	metadata.TeamBlue = new(rcon.GameStateMetadataTeam)
 
 	if *autoDetectAddress {
 		log.Print("Trying to detect host based on incoming referee messages...")
@@ -81,9 +76,6 @@ func main() {
 	commands["doubleTouch"] = func(_ []string) {
 		c.sendDoubleTouch()
 	}
-	commands["ready"] = func(args []string) {
-		c.sendReady(args)
-	}
 
 	reader := bufio.NewReader(os.Stdin)
 	for {
@@ -231,24 +223,6 @@ func (c *Client) sendRequest(request *rcon.AutoRefToController, doLog bool) {
 	}
 }
 
-func (c *Client) sendReady(args []string) {
-	if len(args) > 0 {
-		metadata.ReadyToContinue = new(bool)
-		if args[0] == "true" {
-			*metadata.ReadyToContinue = true
-		} else {
-			*metadata.ReadyToContinue = false
-		}
-	} else {
-		metadata.ReadyToContinue = nil
-	}
-
-	request := rcon.AutoRefToController{
-		GameStateMetadata: metadata,
-	}
-	c.sendRequest(&request, true)
-}
-
 func logIf(doLog bool, v ...interface{}) {
 	if doLog {
 		log.Print(v...)

internal/app/engine/engine.go

@@ -124,6 +124,8 @@ func (e *Engine) CurrentState() (s *state.State) {
 
 // CurrentGcState returns a deep copy of the current GC state
 func (e *Engine) CurrentGcState() (s *GcState) {
+	e.gcStateMutex.Lock()
+	defer e.gcStateMutex.Unlock()
 	s = new(GcState)
 	proto.Merge(s, e.gcState)
 	return

internal/app/engine/process_botremoved.go

@@ -2,4 +2,5 @@ package engine
 
 func (e *Engine) processBotRemoved() {
 	// TODO check that bot limit fulfilled within 10s after a yellow card
+	// check bot number in general as well
 }

internal/app/engine/ssl_gc_engine.pb.go

@@ -14,10 +14,13 @@ func (e *Engine) ProcessTrackerFrame(wrapperFrame *tracker.TrackerWrapperPacket)
 		Ball:       convertBalls(wrapperFrame.TrackedFrame.Balls),
 		Robots:     convertRobots(wrapperFrame.TrackedFrame.Robots),
 	}
-	e.gcState.TrackerState[*wrapperFrame.Uuid] = &state
 
-	// for now, all tracker sources update the GC state
-	e.gcState.TrackerStateGc = &state
+	e.UpdateGcState(func(gcState *GcState) {
+		gcState.TrackerState[*wrapperFrame.Uuid] = &state
+
+		// for now, all tracker sources update the GC state
+		e.gcState.TrackerStateGc = &state
+	})
 }
 
 func convertRobots(robots []*tracker.TrackedRobot) (rs []*Robot) {

internal/app/engine/tracker.go

@@ -2,7 +2,6 @@ package rcon
 
 import (
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/engine"
-	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/state"
 	"github.com/RoboCup-SSL/ssl-game-controller/internal/app/statemachine"
 	"github.com/RoboCup-SSL/ssl-go-tools/pkg/sslconn"
 	"github.com/odeke-em/go-uuid"
@@ -131,9 +130,6 @@ func (s *AutoRefServer) handleClientConnection(conn net.Conn) {
 	log.Printf("Client %v connected", client.id)
 	s.gcEngine.UpdateGcState(func(gcState *engine.GcState) {
 		s := new(engine.GcStateAutoRef)
-		s.TeamState = map[string]*engine.GcStateAutoRefTeam{}
-		s.TeamState[state.Team_YELLOW.String()] = new(engine.GcStateAutoRefTeam)
-		s.TeamState[state.Team_BLUE.String()] = new(engine.GcStateAutoRefTeam)
 		gcState.AutoRefState[client.id] = s
 	})
 
@@ -170,23 +166,6 @@ func (c *AutoRefClient) reply(reply ControllerReply) {
 
 func (s *AutoRefServer) processRequest(id string, request AutoRefToController) error {
 
-	if request.GameStateMetadata != nil {
-		s.gcEngine.UpdateGcState(func(gcState *engine.GcState) {
-			s := gcState.AutoRefState[id]
-			s.ReadyToContinue = request.GameStateMetadata.ReadyToContinue
-			s.BallPlaced = request.GameStateMetadata.BallPlaced
-			s.LastProgress = request.GameStateMetadata.LastProgress
-			if request.GameStateMetadata.TeamBlue != nil {
-				s.TeamState[state.Team_BLUE.String()].NumberOfRobots = request.GameStateMetadata.TeamBlue.NumberOfRobots
-				s.TeamState[state.Team_BLUE.String()].MayChangeKeeper = request.GameStateMetadata.TeamBlue.MayChangeKeeper
-			}
-			if request.GameStateMetadata.TeamYellow != nil {
-				s.TeamState[state.Team_YELLOW.String()].NumberOfRobots = request.GameStateMetadata.TeamYellow.NumberOfRobots
-				s.TeamState[state.Team_YELLOW.String()].MayChangeKeeper = request.GameStateMetadata.TeamYellow.MayChangeKeeper
-			}
-		})
-	}
-
 	if request.GameEvent != nil {
 		s.gcEngine.Enqueue(&statemachine.Change{
 			Origin: &id,