Add initial config tournament

Author: RobolabGs2

commands/test.go

@@ -55,9 +55,14 @@ func (d *TestBot) Run(args []string, streams cli.Streams) error {
 		return err
 	}
 	timeout, cancelFunc := context.WithTimeout(context.Background(), d.Timeout)
-	err = battle.Run(timeout)
+	_ = battle.Run(timeout)
 	cancelFunc()
 	output := log.New(streams.Out, "", 0)
+	return analizeTestBattle(output, streams, &battle)
+}
+
+func analizeTestBattle(output *log.Logger, streams cli.Streams, battle *games.Battle) error {
+	err := battle.Err()
 	if err != nil {
 		if conflict := new(games.ConflictScore); errors.As(err, &conflict) {
 			output.Printf(`Либо бот упал с ошибкой, либо он некорректно возвращает результат игры.
@@ -66,15 +71,16 @@ Exit code должен быть: победа - 0, поражение - 3, ни
 `, conflict.Scores[0].String(), conflict.Scores[1].String())
 			return err
 		}
-		if errors.Is(timeout.Err(), context.DeadlineExceeded) {
+		if errors.Is(err, context.DeadlineExceeded) {
 			output.Println("Бот слишком долго играл, возможно, завис")
-			return timeout.Err()
+			return err
 		}
 		_, _ = fmt.Fprintln(streams.Out, "Проблемы с ботом", err)
 		return err
 	}
 	_, _ = fmt.Fprintf(streams.Out, `Тестирование прошло успешно, бот способен играть сам с собой.
+Длительность партии: %s.
 Результат ходившего первым: %s
-`, battle.GameResult(0))
+`, battle.Duration(), battle.GameResult(0))
 	return nil
 }

commands/tournament.go

@@ -2,22 +2,23 @@ package commands
 
 import (
 	"errors"
+	"github.com/RobolabGs2/botctl/cli"
+	"github.com/RobolabGs2/botctl/executil"
+	"github.com/RobolabGs2/botctl/games"
+	"gopkg.in/yaml.v3"
 	"io/fs"
 	"log"
 	"os"
 	"path"
 	"runtime"
 	"sync"
-
-	"github.com/RobolabGs2/botctl/cli"
-	"github.com/RobolabGs2/botctl/executil"
-	"github.com/RobolabGs2/botctl/games"
-	"gopkg.in/yaml.v3"
+	"time"
 )
 
 type Tournament struct {
 	Concurrency int    `name:"c" default:"0" desc:"Количество одновременных соревнований. '0' - количество виртуальных ядер минус 1"`
-	BotsList    string `name:"config" default:"tournament.yaml" desc:"A ботов для турнира"`
+	Config      string `name:"config" default:"tournament.yaml" desc:"Список ботов для турнира"`
+	config      TournamentConfigs
 }
 
 func (t *Tournament) Description() string {
@@ -52,6 +53,11 @@ func (t *Tournament) Run(args []string, streams cli.Streams) error {
 	if err != nil {
 		return err
 	}
+	testBots(bots, streams, t.Concurrency)
+	return runTournament(bots, botsDesc, streams, t.Concurrency)
+}
+
+func runTournament(bots []games.Bot, botsDesc []BotDescription, streams cli.Streams, concurrency int) error {
 	battles := make(chan *games.Battle)
 	go func() {
 		for i, first := range bots {
@@ -65,15 +71,37 @@ func (t *Tournament) Run(args []string, streams cli.Streams) error {
 
 	scores := MakeScoreTable(botsDesc)
 	output := log.New(streams.Out, "", 0)
-	for battle := range RunRunners(t.Concurrency, battles) {
+	for battle := range RunRunners(concurrency, battles) {
 		err := scores.Update(battle)
 		if err != nil {
-			return err
+			output.Printf(
+				"Неудачное сражение между %s vs %s: %s",
+				battle.Players[0].Name, battle.Players[1].Name, err)
+			continue
 		}
-		log.Println(battle.State(),
+		output.Println(scores)
+		output.Println(battle.State(),
 			battle.Players[0].Name, battle.GameResult(0),
 			battle.Players[1].Name, battle.GameResult(1))
-		output.Println(scores)
+		output.Println()
+	}
+	return nil
+}
+
+func testBots(bots []games.Bot, streams cli.Streams, concurrency int) error {
+	battles := make(chan *games.Battle)
+	go func() {
+		for _, bot := range bots {
+			battles <- &games.Battle{Players: [2]games.Bot{bot, bot}}
+		}
+		close(battles)
+	}()
+
+	output := log.New(streams.Out, "", 0)
+	for battle := range RunRunners(concurrency, battles) {
+		output.Println("Результат тестирования бота", battle.Players[0].Name)
+		_ = analizeTestBattle(output, streams, battle)
+		output.Println()
 	}
 	return nil
 }
@@ -90,34 +118,47 @@ func MakeBots(botsDesc []BotDescription, dirName string) ([]games.Bot, error) {
 	return bots, nil
 }
 
+type BotsConfig map[string]BotDescription
+
+func (bots BotsConfig) Slice() []BotDescription {
+	botsDesc := make([]BotDescription, 0, len(bots))
+	for author, bot := range bots {
+		bot.Author = author
+		botsDesc = append(botsDesc, bot)
+	}
+	return botsDesc
+}
+
+type TournamentConfigs struct {
+	Bots    BotsConfig
+	Timeout time.Duration
+	Game    string
+	Rounds  int
+}
+
 func (t *Tournament) readBotDescriptions(dir fs.FS) ([]BotDescription, error) {
-	var botsDesc []BotDescription
-	if executil.CheckFileFs(dir, t.BotsList) == nil {
-		config, err := dir.Open(t.BotsList)
+	if executil.CheckFileFs(dir, t.Config) == nil {
+		config, err := dir.Open(t.Config)
 		if err != nil {
 			return nil, err
 		}
-		bots := map[string]BotDescription{}
-		if err := yaml.NewDecoder(config).Decode(bots); err != nil {
-			return nil, err
-		}
-		for author, bot := range bots {
-			bot.Author = author
-			botsDesc = append(botsDesc, bot)
-		}
-	} else {
-		files, err := fs.ReadDir(dir, ".")
-		if err != nil {
+		if err := yaml.NewDecoder(config).Decode(&t.config); err != nil {
 			return nil, err
 		}
-		for _, file := range files {
-			if executil.Executable(file) {
-				log.Println("Detect bot", file.Name())
-				botsDesc = append(botsDesc, BotDescription{
-					Author: file.Name(),
-					Cmd:    file.Name(),
-				})
-			}
+		return t.config.Bots.Slice(), nil
+	}
+	var botsDesc []BotDescription
+	files, err := fs.ReadDir(dir, ".")
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		if executil.Executable(file) {
+			log.Println("Detect bot", file.Name())
+			botsDesc = append(botsDesc, BotDescription{
+				Author: file.Name(),
+				Cmd:    file.Name(),
+			})
 		}
 	}
 	return botsDesc, nil
@@ -133,7 +174,7 @@ func RunRunners(concurrency int, battles chan *games.Battle) chan *games.Battle
 	runnersGroup.Add(concurrency)
 	finished := make(chan *games.Battle)
 	for i := 0; i < concurrency; i++ {
-		go games.Runner(runnersGroup, battles, finished)
+		go games.RunnerWithTimeout(2*time.Minute, runnersGroup, battles, finished)
 	}
 	go func() {
 		runnersGroup.Wait()

executil/exec_util_windows.go

@@ -1,14 +1,17 @@
+//go:build windows
 // +build windows
 
 package executil
 
 import (
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
 	"os/exec"
 	"strconv"
 	"strings"
+	"syscall"
 )
 
 func MakeCmd(args ...string) *exec.Cmd {
@@ -17,6 +20,9 @@ func MakeCmd(args ...string) *exec.Cmd {
 
 func CheckFile(filename string) error {
 	if _, err := os.Stat(filename); err != nil {
+		if errors.Is(err, syscall.ERROR_FILE_NOT_FOUND) {
+			return fmt.Errorf("файл %q не найден", filename)
+		}
 		return err
 	}
 	return nil

games/battle.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"sync"
+	"time"
 )
 
 type BattleState int
@@ -31,7 +32,13 @@ type Battle struct {
 	scores   [2]GameResult
 	logs     [2]Buffer
 
-	Players [2]Bot
+	Players    [2]Bot
+	StartedAt  time.Time
+	FinishedAt time.Time
+}
+
+func (b *Battle) Duration() time.Duration {
+	return b.FinishedAt.Sub(b.StartedAt)
 }
 
 func (battle *Battle) Logs(player int) string {
@@ -91,7 +98,13 @@ func (b *Buffer) ReadAll() string {
 func (battle *Battle) Run(ctx context.Context) (err error) {
 	battle.stateMut.Lock()
 	battle.state = BattleRunning
+	battle.StartedAt = time.Now()
 	battle.stateMut.Unlock()
+	defer func() {
+		battle.stateMut.Lock()
+		battle.FinishedAt = time.Now()
+		battle.stateMut.Unlock()
+	}()
 	defer func() {
 		if err != nil {
 			battle.stateMut.Lock()

games/runner.go

@@ -3,6 +3,7 @@ package games
 import (
 	"context"
 	"sync"
+	"time"
 )
 
 func Runner(group *sync.WaitGroup, battles <-chan *Battle, finished chan<- *Battle) {
@@ -13,3 +14,14 @@ func Runner(group *sync.WaitGroup, battles <-chan *Battle, finished chan<- *Batt
 		finished <- battle
 	}
 }
+
+func RunnerWithTimeout(timeout time.Duration, group *sync.WaitGroup, battles <-chan *Battle, finished chan<- *Battle) {
+	defer group.Done()
+	for battle := range battles {
+		ctx, cancel := context.WithTimeout(context.TODO(), timeout)
+		// battle contains error, this error should be handled by a receiver of finished chan
+		_ = battle.Run(ctx)
+		cancel()
+		finished <- battle
+	}
+}