mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify by making command streams pointer lists like in proto

Browse source
This commit is contained in:
Marc Di Luzio 2020-07-21 23:52:14 +01:00
parent f78efd1223
commit 8667f55143
6 changed files with 143 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/rove/command_test.go
View file

@ -38,7 +38,7 @@ func TestCommand_Turn(t *testing.T) {
a, err := w.SpawnRover()
assert.NoError(t, err)
w.Enqueue(a, &roveapi.Command{Command: roveapi.CommandType_turn, Data: &roveapi.Command_Turn{Turn: roveapi.Bearing_NorthWest}})
w.Enqueue(a, &roveapi.Command{Command: roveapi.CommandType_turn, Turn: roveapi.Bearing_NorthWest})
w.EnqueueAllIncoming()
w.ExecuteCommandQueues()

19
pkg/rove/world.go
View file

@ -11,7 +11,7 @@ import (
)
// CommandStream is a list of commands to execute in order
type CommandStream []roveapi.Command
type CommandStream []*roveapi.Command
// World describes a self contained universe and everything in it
type World struct {
@ -406,7 +406,7 @@ func (w *World) RadarFromRover(rover string) (radar []roveapi.Tile, objs []rovea
}
// RoverCommands returns current commands for the given rover
func (w *World) RoverCommands(rover string) (incoming []roveapi.Command, queued []roveapi.Command) {
func (w *World) RoverCommands(rover string) (incoming CommandStream, queued CommandStream) {
if c, ok := w.CommandIncoming[rover]; ok {
incoming = c
}
@ -448,18 +448,7 @@ func (w *World) Enqueue(rover string, commands ...*roveapi.Command) error {
w.cmdMutex.Lock()
defer w.cmdMutex.Unlock()
// Override the incoming command set
var cmds []roveapi.Command
for _, c := range commands {
// Copy the command and data but none of the locks or internals
cmds = append(cmds,
roveapi.Command{
Command: c.Command,
Data: c.Data,
})
}
w.CommandIncoming[rover] = cmds
w.CommandIncoming[rover] = commands
return nil
}
@ -485,7 +474,7 @@ func (w *World) ExecuteCommandQueues() {
if len(cmds) != 0 {
// Execute the command
if err := w.ExecuteCommand(&cmds[0], rover); err != nil {
if err := w.ExecuteCommand(cmds[0], rover); err != nil {
log.Println(err)
// TODO: Report this error somehow
}