backend: multithread generation
This commit is contained in:
parent
3bcac39f5f
commit
2b75287d16
7 changed files with 115 additions and 71 deletions
|
|
@ -8,12 +8,92 @@ import (
|
|||
"log"
|
||||
"os"
|
||||
"path"
|
||||
"runtime"
|
||||
"sync"
|
||||
|
||||
"srs.epita.fr/fic-server/libfic"
|
||||
)
|
||||
|
||||
type GenerateType int
|
||||
|
||||
const (
|
||||
GenPublic GenerateType = iota
|
||||
GenEvents
|
||||
GenTeams
|
||||
GenThemes
|
||||
)
|
||||
|
||||
type genStruct struct {
|
||||
Id string
|
||||
Type GenerateType
|
||||
}
|
||||
|
||||
var genTeamQueue chan *fic.Team
|
||||
var genQueue chan genStruct
|
||||
var inQueueMutex sync.RWMutex
|
||||
var inGenQueue map[GenerateType]bool
|
||||
|
||||
func init() {
|
||||
genTeamQueue = make(chan *fic.Team)
|
||||
genQueue = make(chan genStruct)
|
||||
inGenQueue = map[GenerateType]bool{}
|
||||
|
||||
for i := runtime.NumCPU(); i > 0; i-- {
|
||||
go consumer()
|
||||
}
|
||||
}
|
||||
|
||||
func appendGenQueue(gs genStruct) {
|
||||
inQueueMutex.RLock()
|
||||
if v, ok := inGenQueue[gs.Type]; !ok || !v {
|
||||
inQueueMutex.RUnlock()
|
||||
|
||||
inQueueMutex.Lock()
|
||||
inGenQueue[gs.Type] = true
|
||||
inQueueMutex.Unlock()
|
||||
|
||||
genQueue <- gs
|
||||
} else {
|
||||
inQueueMutex.RUnlock()
|
||||
}
|
||||
}
|
||||
|
||||
func consumer() {
|
||||
for {
|
||||
var id string
|
||||
var err error
|
||||
|
||||
select {
|
||||
case gt := <-genTeamQueue:
|
||||
err = genTeamMyFile(gt)
|
||||
|
||||
case gs := <-genQueue:
|
||||
id = gs.Id
|
||||
|
||||
inQueueMutex.Lock()
|
||||
inGenQueue[gs.Type] = false
|
||||
inQueueMutex.Unlock()
|
||||
|
||||
switch gs.Type {
|
||||
case GenPublic:
|
||||
err = genMyPublicFile()
|
||||
case GenEvents:
|
||||
err = genEventsFile()
|
||||
case GenTeams:
|
||||
err = genTeamsFile()
|
||||
case GenThemes:
|
||||
err = genThemesFile()
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
log.Println(id, "[ERR] Unable to generate:", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Generate my.json and wait.json for a given team
|
||||
func genTeamMyFile(team fic.Team) error {
|
||||
func genTeamMyFile(team *fic.Team) error {
|
||||
dirPath := path.Join(TeamsDir, fmt.Sprintf("%d", team.Id))
|
||||
|
||||
if s, err := os.Stat(dirPath); os.IsNotExist(err) {
|
||||
|
|
@ -22,7 +102,7 @@ func genTeamMyFile(team fic.Team) error {
|
|||
return errors.New(fmt.Sprintf("%s is not a directory", dirPath))
|
||||
}
|
||||
|
||||
if my, err := fic.MyJSONTeam(&team, true); err != nil {
|
||||
if my, err := fic.MyJSONTeam(team, true); err != nil {
|
||||
return err
|
||||
} else if j, err := json.Marshal(my); err != nil {
|
||||
return err
|
||||
|
|
@ -32,7 +112,7 @@ func genTeamMyFile(team fic.Team) error {
|
|||
|
||||
// Speed up generation when challenge is started
|
||||
if !ChStarted {
|
||||
if my, err := fic.MyJSONTeam(&team, false); err != nil {
|
||||
if my, err := fic.MyJSONTeam(team, false); err != nil {
|
||||
return err
|
||||
} else if j, err := json.Marshal(my); err != nil {
|
||||
return err
|
||||
|
|
@ -106,32 +186,17 @@ func genThemesFile() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func genTeamAll(team fic.Team) {
|
||||
if err := genThemesFile(); err != nil {
|
||||
log.Println("themes.json generation error: ", err)
|
||||
} else if err = genTeamsFile(); err != nil {
|
||||
log.Println("teams.json generation error: ", err)
|
||||
} else if err = genTeamMyFile(team); err != nil {
|
||||
log.Println("my.json(", team.Id, ") generation error: ", err)
|
||||
}
|
||||
}
|
||||
|
||||
func genAll() {
|
||||
if err := genThemesFile(); err != nil {
|
||||
log.Println("themes.json generation error: ", err)
|
||||
} else if err = genTeamsFile(); err != nil {
|
||||
log.Println("teams.json generation error: ", err)
|
||||
} else if err = genEventsFile(); err != nil {
|
||||
log.Println("events.json generation error: ", err)
|
||||
} else if err = genMyPublicFile(); err != nil {
|
||||
log.Println("MyPublic generation error: ", err)
|
||||
} else if teams, err := fic.GetActiveTeams(); err != nil {
|
||||
appendGenQueue(genStruct{Type: GenThemes})
|
||||
appendGenQueue(genStruct{Type: GenTeams})
|
||||
appendGenQueue(genStruct{Type: GenEvents})
|
||||
appendGenQueue(genStruct{Type: GenPublic})
|
||||
|
||||
if teams, err := fic.GetActiveTeams(); err != nil {
|
||||
log.Println("Team retrieval error: ", err)
|
||||
} else {
|
||||
for _, team := range(teams) {
|
||||
if err = genTeamMyFile(team); err != nil {
|
||||
log.Println("Team generation error: ", err)
|
||||
}
|
||||
for _, team := range teams {
|
||||
genTeamQueue <- &team
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue