mirror of
https://github.com/ollama/ollama.git
synced 2026-09-21 13:55:04 +00:00
43983edf18
* progress: fix data races on ticker, states, spinner, and bar state NewProgress spawned start() which wrote p.ticker while stop() read and cleared it with no synchronization; stop() and StopAndClear() also read p.states and p.pos outside p.mu, Spinner's start() goroutine raced Stop() and String() on s.value/s.stopped/s.ticker, and Bar.Set raced Bar.String on currentValue/stopped/buckets (callback goroutine vs the render goroutine). Detected by go test -race across cmd and cmd/launch (~20 warnings; the Bar race is latent — never flagged because tests don't interleave it, but real in production pull/push progress). Create tickers before spawning the render goroutines and pass the channel in, guard Progress internals with p.mu throughout stop() (via a renderLocked core), and give Spinner and Bar their own mutexes. * use a more idiomatic channel based done signal
99 lines
1.6 KiB
Go
99 lines
1.6 KiB
Go
package progress
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
)
|
|
|
|
type Spinner struct {
|
|
message atomic.Value
|
|
|
|
mu sync.Mutex
|
|
messageWidth int
|
|
|
|
parts []string
|
|
|
|
value int
|
|
|
|
started time.Time
|
|
stopped time.Time
|
|
|
|
stopOnce sync.Once
|
|
// done is closed to tell the animation loop to exit.
|
|
done chan struct{}
|
|
}
|
|
|
|
func NewSpinner(message string) *Spinner {
|
|
s := &Spinner{
|
|
parts: []string{
|
|
"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏",
|
|
},
|
|
started: time.Now(),
|
|
done: make(chan struct{}),
|
|
}
|
|
s.SetMessage(message)
|
|
go s.start()
|
|
return s
|
|
}
|
|
|
|
func (s *Spinner) SetMessage(message string) {
|
|
s.message.Store(message)
|
|
}
|
|
|
|
func (s *Spinner) String() string {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
|
|
var sb strings.Builder
|
|
|
|
if message, ok := s.message.Load().(string); ok && len(message) > 0 {
|
|
message := strings.TrimSpace(message)
|
|
if s.messageWidth > 0 && len(message) > s.messageWidth {
|
|
message = message[:s.messageWidth]
|
|
}
|
|
|
|
fmt.Fprintf(&sb, "%s", message)
|
|
if padding := s.messageWidth - sb.Len(); padding > 0 {
|
|
sb.WriteString(strings.Repeat(" ", padding))
|
|
}
|
|
|
|
sb.WriteString(" ")
|
|
}
|
|
|
|
if s.stopped.IsZero() {
|
|
spinner := s.parts[s.value]
|
|
sb.WriteString(spinner)
|
|
sb.WriteString(" ")
|
|
}
|
|
|
|
return sb.String()
|
|
}
|
|
|
|
func (s *Spinner) start() {
|
|
ticker := time.NewTicker(100 * time.Millisecond)
|
|
defer ticker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-s.done:
|
|
return
|
|
case <-ticker.C:
|
|
s.mu.Lock()
|
|
s.value = (s.value + 1) % len(s.parts)
|
|
s.mu.Unlock()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (s *Spinner) Stop() {
|
|
s.mu.Lock()
|
|
if s.stopped.IsZero() {
|
|
s.stopped = time.Now()
|
|
}
|
|
s.mu.Unlock()
|
|
|
|
s.stopOnce.Do(func() { close(s.done) })
|
|
}
|