Merge branch 'maintenance' into scores

google · Apr 19, 2024 · 50fa42d · 50fa42d
2 parents 94206cf + 4d3e9e9
commit 50fa42d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/go/dataset/dataset.go b/go/dataset/dataset.go
@@ -532,8 +532,8 @@ func (d *Dataset) Calculate(metrics []MetricRunner, updateProgress func(submitte
 	}
 
 	pool := &worker.Pool[any]{
-		Workers:    maxWorkers,
-		OnComplete: updateProgress,
+		Workers:  maxWorkers,
+		OnChange: updateProgress,
 	}
 
 	for _, loopRef := range d.References {

diff --git a/go/dataset/runner/runner.go b/go/dataset/runner/runner.go
@@ -160,7 +160,7 @@ func (s Setup) getOptimizeComparisons() (map[string]comparisonSlice, error) {
 	defer fmt.Println()
 	pool := &worker.Pool[prepareResult]{
 		Workers: safeInt(s.MaxWorkers),
-		OnComplete: func(submitted, completed int) {
+		OnChange: func(submitted, completed int) {
 			bar.Update(submitted, completed)
 		},
 	}
@@ -255,7 +255,7 @@ func (s Setup) optimize() error {
 			defer fmt.Println()
 			pool := &worker.Pool[compareResult]{
 				Workers: safeInt(s.MaxWorkers),
-				OnComplete: func(submitted, completed int) {
+				OnChange: func(submitted, completed int) {
 					bar.Update(submitted, completed)
 				},
 			}

diff --git a/go/progress/bar.go b/go/progress/bar.go
@@ -19,6 +19,7 @@ import (
 	"bytes"
 	"fmt"
 	"math"
+	"sync"
 	"syscall"
 	"time"
 	"unsafe"
@@ -59,6 +60,7 @@ type Bar struct {
 	total      int
 	emaSpeed   float64
 	lastRender time.Time
+	lock       sync.Mutex
 }
 
 // AddCompleted adds completed tasks to the bar and renders it.
@@ -68,6 +70,9 @@ func (b *Bar) AddCompleted(num int) {
 
 // Update update completed and total tasks to the bar and updates it.
 func (b *Bar) Update(total, completed int) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
 	prefix := fmt.Sprintf("%s, %d/%d ", b.name, completed, total)
 
 	now := time.Now()

diff --git a/go/worker/pool.go b/go/worker/pool.go
@@ -23,8 +23,8 @@ import (
 
 // Pool is a pool of workers.
 type Pool[T any] struct {
-	Workers    int
-	OnComplete func(submitted, completed int)
+	Workers  int
+	OnChange func(submitted, completed int)
 
 	startOnce sync.Once
 
@@ -62,8 +62,8 @@ func (p *Pool[T]) init() {
 					}
 					p.jobsWaitGroup.Done()
 					atomic.AddUint32(&p.completedJobs, 1)
-					if p.OnComplete != nil {
-						p.OnComplete(int(atomic.LoadUint32(&p.submittedJobs)), int(atomic.LoadUint32(&p.completedJobs)))
+					if p.OnChange != nil {
+						p.OnChange(int(atomic.LoadUint32(&p.submittedJobs)), int(atomic.LoadUint32(&p.completedJobs)))
 					}
 				}
 			}()
@@ -77,6 +77,9 @@ func (p *Pool[T]) Submit(job func(func(T)) error) error {
 
 	p.jobsWaitGroup.Add(1)
 	atomic.AddUint32(&p.submittedJobs, 1)
+	if p.OnChange != nil {
+		p.OnChange(int(atomic.LoadUint32(&p.submittedJobs)), int(atomic.LoadUint32(&p.completedJobs)))
+	}
 
 	go func() {
 		p.jobs <- job