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

Parametrize concurrency

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-01 12:41:31 +01:00
parent f61b79692c
commit 624e991688
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/convert.go
View File

@@ -33,6 +33,7 @@ var convertCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
t := viper.GetString("type") t := viper.GetString("type")
c := viper.GetInt("concurrency")
if len(args) != 2 { if len(args) != 2 {
log.Fatalln("Incorrect number of arguments") log.Fatalln("Incorrect number of arguments")
@@ -45,9 +46,9 @@ var convertCmd = &cobra.Command{
var builder tree.Parser var builder tree.Parser
switch t { switch t {
case "gentoo": case "gentoo":
builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}) builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, c)
default: // dup default: // dup
builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}) builder = gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, c)
} }
packageTree, err := builder.Generate(input) packageTree, err := builder.Generate(input)
@@ -74,6 +75,7 @@ var convertCmd = &cobra.Command{
func init() { func init() {
convertCmd.Flags().String("type", "gentoo", "source type") convertCmd.Flags().String("type", "gentoo", "source type")
viper.BindPFlag("type", convertCmd.Flags().Lookup("type")) viper.BindPFlag("type", convertCmd.Flags().Lookup("type"))
convertCmd.Flags().Int("concurrency", 30, "Concurrenct")
viper.BindPFlag("concurrency", convertCmd.Flags().Lookup("concurrency"))
RootCmd.AddCommand(convertCmd) RootCmd.AddCommand(convertCmd)
} }

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

@@ -31,11 +31,14 @@ import (
pkg "github.com/mudler/luet/pkg/package" pkg "github.com/mudler/luet/pkg/package"
) )
func NewGentooBuilder(e EbuildParser) tree.Parser { func NewGentooBuilder(e EbuildParser, concurrency int) tree.Parser {
return &GentooBuilder{EbuildParser: e} return &GentooBuilder{EbuildParser: e, Concurrency: concurrency}
} }
type GentooBuilder struct{ EbuildParser EbuildParser } type GentooBuilder struct {
EbuildParser EbuildParser
Concurrency int
}
type GentooTree struct { type GentooTree struct {
*tree.DefaultTree *tree.DefaultTree
@@ -87,13 +90,12 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
var numWorkers = 10
var toScan = make(chan string) var toScan = make(chan string)
tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}} tree := &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}}
// the waitgroup will allow us to wait for all the goroutines to finish at the end // the waitgroup will allow us to wait for all the goroutines to finish at the end
var wg = new(sync.WaitGroup) var wg = new(sync.WaitGroup)
for i := 0; i < numWorkers; i++ { for i := 0; i < gb.Concurrency; i++ {
wg.Add(1) wg.Add(1)
go gb.worker(i, wg, toScan, tree) go gb.worker(i, wg, toScan, tree)
} }

2
pkg/tree/builder/gentoo/gentoo_test.go
View File

@@ -34,7 +34,7 @@ var _ = Describe("GentooBuilder", func() {
Context("Simple test", func() { Context("Simple test", func() {
It("parses correctly deps", func() { It("parses correctly deps", func() {
gb := NewGentooBuilder(&FakeParser{}) gb := NewGentooBuilder(&FakeParser{}, 20)
tree, err := gb.Generate("../../../../tests/fixtures/overlay") tree, err := gb.Generate("../../../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(len(tree.GetPackageSet().GetPackages())).To(Equal(10)) Expect(len(tree.GetPackageSet().GetPackages())).To(Equal(10))

2
pkg/tree/builder/gentoo/simpleparser_test.go
View File

@@ -26,7 +26,7 @@ var _ = Describe("GentooBuilder", func() {
Context("Simple test", func() { Context("Simple test", func() {
It("parses correctly deps", func() { It("parses correctly deps", func() {
gb := NewGentooBuilder(&SimpleEbuildParser{}) gb := NewGentooBuilder(&SimpleEbuildParser{}, 20)
tree, err := gb.Generate("../../../../tests/fixtures/overlay") tree, err := gb.Generate("../../../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer func() { defer func() {

6
pkg/tree/recipes_test.go
View File

@@ -29,7 +29,7 @@ var _ = Describe("Recipe", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up defer os.RemoveAll(tmpdir) // clean up
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}) gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20)
tree, err := gb.Generate("../../tests/fixtures/overlay") tree, err := gb.Generate("../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer func() { defer func() {
@@ -51,7 +51,7 @@ var _ = Describe("Recipe", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up defer os.RemoveAll(tmpdir) // clean up
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}) gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20)
tree, err := gb.Generate("../../tests/fixtures/overlay") tree, err := gb.Generate("../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer func() { defer func() {
@@ -88,7 +88,7 @@ var _ = Describe("Recipe", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up defer os.RemoveAll(tmpdir) // clean up
gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}) gb := gentoo.NewGentooBuilder(&gentoo.SimpleEbuildParser{}, 20)
tree, err := gb.Generate("../../tests/fixtures/overlay") tree, err := gb.Generate("../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer func() { defer func() {