kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-20 10:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Consume a context when sourcing ebuild in parallel"

Browse Source 
This reverts commit 1ee2551325.
This commit is contained in:
Ettore Di Giacinto
2019-11-03 13:25:03 +01:00
parent 0923e91527
commit 847f93b8b7
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/tree/builder/gentoo/gentoo.go
View File

@@ -19,13 +19,11 @@ package gentoo
// https://gist.github.com/adnaan/6ca68c7985c6f851def3 // https://gist.github.com/adnaan/6ca68c7985c6f851def3
import ( import (
"context"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"time"
. "github.com/mudler/luet/pkg/logger" . "github.com/mudler/luet/pkg/logger"
tree "github.com/mudler/luet/pkg/tree" tree "github.com/mudler/luet/pkg/tree"
@@ -76,25 +74,17 @@ func (gb *GentooBuilder) scanEbuild(path string, t pkg.Tree) error {
return nil return nil
} }
func (gb *GentooBuilder) worker(ctx context.Context, i int, wg *sync.WaitGroup, s <-chan string, t pkg.Tree) { func (gb *GentooBuilder) worker(i int, wg *sync.WaitGroup, s <-chan string, t pkg.Tree) {
defer wg.Done() defer wg.Done()
for {
select { for path := range s {
case <-ctx.Done():
Info("Worker is done!")
return
case path, ok := <-s:
if !ok {
// Channel closed
return
}
Info("#"+strconv.Itoa(i), "parsing", path) Info("#"+strconv.Itoa(i), "parsing", path)
err := gb.scanEbuild(path, t) err := gb.scanEbuild(path, t)
if err != nil { if err != nil {
Error(path, ":", err.Error()) Error(path, ":", err.Error())
} }
} }
}
} }
func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) { func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
@@ -106,8 +96,6 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
Spinner(27) Spinner(27)
defer SpinnerStop() defer SpinnerStop()
tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}} tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}}
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
//tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}} //tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}}
Debug("Concurrency", gb.Concurrency) Debug("Concurrency", gb.Concurrency)
@@ -115,7 +103,7 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
var wg = new(sync.WaitGroup) var wg = new(sync.WaitGroup)
for i := 0; i < gb.Concurrency; i++ { for i := 0; i < gb.Concurrency; i++ {
wg.Add(1) wg.Add(1)
go gb.worker(ctx, i, wg, toScan, tree) go gb.worker(i, wg, toScan, tree)
} }
// TODO: Handle cleaning after? Cleanup implemented in GetPackageSet().Clean() // TODO: Handle cleaning after? Cleanup implemented in GetPackageSet().Clean()
@@ -133,11 +121,9 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
return nil return nil
}) })
Debug("Waiting for goroutines to finish")
close(toScan) close(toScan)
Debug("Waiting for goroutines to finish")
wg.Wait() // FIXME: With BoltDB as backend goroutines timeouts and deadlocks wg.Wait() // FIXME: With BoltDB as backend goroutines timeouts and deadlocks
if err != nil { if err != nil {
return tree, err return tree, err
} }