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

Make also deps recalculation concurrent

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-01 16:26:03 +01:00
parent eef03f8909
commit ef1d0e5573
5 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/tree/tree.go
View File

@@ -7,7 +7,9 @@ package tree
import (
"errors"
"fmt"
"sync"
. "github.com/mudler/luet/pkg/logger"
pkg "github.com/mudler/luet/pkg/package"
)
@@ -62,20 +64,16 @@ func (gt *DefaultTree) FindPackage(pack pkg.Package) (pkg.Package, error) {
return nil, errors.New("No package found")
}
// Search for deps/conflicts in db and replaces it with packages in the db
func (t *DefaultTree) ResolveDeps() error {
for _, pid := range t.GetPackageSet().GetPackages() {
p, err := t.GetPackageSet().GetPackage(pid)
if err != nil {
return err
}
func (gb *DefaultTree) depsWorker(i int, wg *sync.WaitGroup, c chan pkg.Package) error {
defer wg.Done()
for p := range c {
SpinnerText(" "+p.GetName(), "Deps ")
for _, r := range p.GetRequires() {
foundPackage, err := t.GetPackageSet().FindPackage(r)
foundPackage, err := gb.GetPackageSet().FindPackage(r)
if err != nil {
fmt.Println("Warning: Unmatched dependency - no package found in the database for this requirement clause")
Warning("Unmatched dependency - no package found in the database for this requirement clause")
continue
//return err
}
@@ -88,7 +86,7 @@ func (t *DefaultTree) ResolveDeps() error {
for _, r := range p.GetConflicts() {
foundPackage, err := t.GetPackageSet().FindPackage(r)
foundPackage, err := gb.GetPackageSet().FindPackage(r)
if err != nil {
continue
//return err
@@ -100,10 +98,29 @@ func (t *DefaultTree) ResolveDeps() error {
r = found
}
if err = t.GetPackageSet().UpdatePackage(p); err != nil {
if err := gb.GetPackageSet().UpdatePackage(p); err != nil {
return err
}
}
return nil
}
// Search for deps/conflicts in db and replaces it with packages in the db
func (t *DefaultTree) ResolveDeps(concurrency int) error {
all := make(chan pkg.Package)
var wg = new(sync.WaitGroup)
for i := 0; i < concurrency; i++ {
wg.Add(1)
go t.depsWorker(i, wg, all)
}
if err := t.GetPackageSet().GetAllPackages(all); err != nil {
return err
}
close(all)
wg.Wait()
return nil
}