remove filterInput from worker

benchkram · Jan 5, 2023 · 5542979 · 5542979
1 parent bfd31de
commit 5542979
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/bob/aggregate.go b/bob/aggregate.go
@@ -224,8 +224,9 @@ func (b *B) Aggregate() (aggregate *bobfile.Bobfile, err error) {
 	err = aggregate.BTasks.IgnoreChildTargets()
 	errz.Fatal(err)
 
-	// err = aggregate.BTasks.FilterInputs()
-	// errz.Fatal(err)
+	// Filter input must run before any work is done.
+	err = aggregate.BTasks.FilterInputs()
+	errz.Fatal(err)
 
 	return aggregate, nil
 }

diff --git a/bob/playbook/build_internal.go b/bob/playbook/build_internal.go
@@ -50,8 +50,8 @@ func (p *Playbook) build(ctx context.Context, task *bobtask.Task) (_ processed.T
 	// Filter inputs populates the task input member by reading and validating
 	// inputs with the filesystem.
 	start := time.Now()
-	err = task.FilterInputs()
-	errz.Fatal(err)
+	// err = task.FilterInputs()
+	// errz.Fatal(err)
 	pt.FilterInputTook = time.Since(start)
 
 	start = time.Now()

diff --git a/bobtask/map.go b/bobtask/map.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
+	"sync"
 
 	"github.com/benchkram/errz"
 
@@ -50,10 +51,16 @@ func (tm Map) Walk(root string, parentLevel string, fn func(taskname string, _ T
 func (tm Map) FilterInputs() (err error) {
 	defer errz.Recover(&err)
 
+	wg := sync.WaitGroup{}
 	for _, task := range tm {
-		err = task.FilterInputs()
-		errz.Fatal(err)
+		wg.Add(1)
+		go func(t Task) {
+			err = t.FilterInputs()
+			errz.Fatal(err)
+			wg.Done()
+		}(task)
 	}
+	wg.Wait()
 
 	return nil
 }