owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #840 from M0Rf30/performance-optimization

Browse Source 
Optimize resource usage and fix leaks
This commit is contained in:
Drew Weymouth
2026-02-02 07:59:41 -08:00
committed by GitHub
parent d647bab218 6ab0258584
commit d955f1ae0d
6 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app.go
+6
View File
@@ -504,6 +504,12 @@ func (a *App) DeleteServerCacheDir(serverID uuid.UUID) error {
return os.RemoveAll(path)
}
// BackgroundContext returns the application's background context
// which is canceled when the application shuts down.
func (a *App) BackgroundContext() context.Context {
return a.bgrndCtx
}
func (a *App) Shutdown() {
if a.logFile != nil {
a.logFile.Close()
backend/config.go
+1 -1
View File
@@ -260,7 +260,7 @@ func DefaultConfig(appVersionTag string) *Config {
Playback: PlaybackConfig{
Autoplay: false,
RepeatMode: "None",
UseWaveformSeekbar: true,
UseWaveformSeekbar: false,
},
LocalPlayback: LocalPlaybackConfig{
// "auto" is the name to pass to MPV for autoselecting the output device
backend/imagecache.go
+33 -18
View File
@@ -51,11 +51,13 @@ func (i *ImageCache) SetWithTTL(key string, val image.Image, ttl time.Duration)
i.mu.Lock()
defer i.mu.Unlock()
now := time.Now().Unix()
if v, ok := i.cache[key]; ok {
v.val = val
v.ttl = ttl
v.expiresAt = time.Now().Add(v.ttl).Unix()
v.lastAccessed = time.Now().Unix()
v.lastAccessed = now
i.cache[key] = v // Update the map with modified struct
return
}
if len(i.cache) == i.MaxSize {
@@ -65,7 +67,7 @@ func (i *ImageCache) SetWithTTL(key string, val image.Image, ttl time.Duration)
val: val,
ttl: ttl,
expiresAt: time.Now().Add(ttl).Unix(),
lastAccessed: time.Now().Unix(),
lastAccessed: now,
}
}
@@ -86,14 +88,15 @@ func (i *ImageCache) Get(key string) (image.Image, error) {
}
func (i *ImageCache) GetResetTTL(key string, resetTTL bool) (image.Image, error) {
i.mu.RLock()
defer i.mu.RUnlock()
i.mu.Lock()
defer i.mu.Unlock()
if v, ok := i.cache[key]; ok {
v.lastAccessed = time.Now().Unix()
if resetTTL {
v.expiresAt = time.Now().Add(v.ttl).Unix()
}
i.cache[key] = v // Update the map with modified struct
return v.val, nil
}
return nil, ErrNotFound
@@ -101,26 +104,29 @@ func (i *ImageCache) GetResetTTL(key string, resetTTL bool) (image.Image, error)
// Gets the image if it exists and extends TTL to time.Now + ttl iff the image would expire before then
func (i *ImageCache) GetExtendTTL(key string, ttl time.Duration) (image.Image, error) {
i.mu.RLock()
defer i.mu.RUnlock()
i.mu.Lock()
defer i.mu.Unlock()
if v, ok := i.cache[key]; ok {
v.lastAccessed = time.Now().Unix()
if v.expiresAt < time.Now().Add(ttl).Unix() {
v.expiresAt = time.Now().Add(ttl).Unix()
newExpiry := time.Now().Add(ttl).Unix()
if v.expiresAt < newExpiry {
v.expiresAt = newExpiry
}
i.cache[key] = v // Update the map with modified struct
return v.val, nil
}
return nil, ErrNotFound
}
func (i *ImageCache) GetWithNewTTL(key string, newTtl time.Duration) (image.Image, error) {
i.mu.RLock()
defer i.mu.RUnlock()
i.mu.Lock()
defer i.mu.Unlock()
if v, ok := i.cache[key]; ok {
v.lastAccessed = time.Now().Unix()
v.expiresAt = time.Now().Add(newTtl).Unix()
v.ttl = newTtl
i.cache[key] = v // Update the map with modified struct
return v.val, nil
}
return nil, ErrNotFound
@@ -137,24 +143,33 @@ func (i *ImageCache) Clear() {
func (i *ImageCache) evictOne() {
now := time.Now().Unix()
var lruKey string
lruTime := now
lruTime := now + 1 // Initialize to future time so any item will be less
var lruExpiredKey string
lruExpiredTime := now
lruExpiredTime := now + 1 // Initialize to future time
hasExpired := false
// Single pass through the cache to find both LRU expired and LRU items
for k, v := range i.cache {
if v.expiresAt < now && v.lastAccessed < lruExpiredTime {
lruExpiredTime = v.lastAccessed
lruExpiredKey = k
if v.expiresAt < now {
// This item is expired
if v.lastAccessed < lruExpiredTime {
lruExpiredTime = v.lastAccessed
lruExpiredKey = k
hasExpired = true
}
}
// Track LRU regardless of expiration
if v.lastAccessed < lruTime {
lruTime = v.lastAccessed
lruKey = k
}
}
if lruExpiredTime < now {
// deleting LRU expired item
if hasExpired {
// Prefer deleting LRU expired item
delete(i.cache, lruExpiredKey)
} else {
// no expired items, delete LRU non-expired item
// No expired items, delete LRU non-expired item
delete(i.cache, lruKey)
}
}
backend/waveformimage.go
+39 -8
View File
@@ -25,6 +25,13 @@ type WaveformImageGenerator struct {
audioCache *AudioCache
}
// Buffer pool for waveform analysis to reduce allocations
var audioBufferPool = sync.Pool{
New: func() any {
return &audio.IntBuffer{Data: make([]int, 4096)}
},
}
type WaveformImage = image.NRGBA
func NewWaveformImage() *WaveformImage {
@@ -192,13 +199,19 @@ func (w *WaveformImageGenerator) StartWaveformGeneration(item *mediaprovider.Tra
}
// Start analyzing the converted wav file
data := &waveformData{}
data := &waveformData{notify: make(chan struct{}, 1)}
go func() {
err := analyzeWavFile(ctx, transcodeFile, data, item.Duration.Milliseconds(), func() bool { return wavConvertDone })
if err != nil {
job.setError(err)
}
data.done = true
// Final notification that processing is complete
select {
case data.notify <- struct{}{}:
default:
}
close(data.notify)
}()
// Start generating the waveform image
@@ -216,6 +229,7 @@ type waveformData struct {
progress int // first invalid index for Peak/RMS data
done bool
notify chan struct{} // signals when new data is available
}
func generateWaveformImage(ctx context.Context, data *waveformData, job *WaveformImageJob) {
@@ -227,14 +241,18 @@ func generateWaveformImage(ctx context.Context, data *waveformData, job *Wavefor
translucentColor := color.NRGBA{R: 255, G: 255, B: 255, A: 128}
for x := range 1024 {
for data.progress <= x {
if data.done {
return
}
if ctx.Err() != nil {
// Wait for data to be available instead of polling
for data.progress <= x && !data.done {
select {
case <-ctx.Done():
return // expired
case <-data.notify:
// New data available or processing complete
}
time.Sleep(50 * time.Millisecond)
}
if data.progress <= x {
return // done but data not available for this x
}
rmsPixels := int(data.RMS[x]) * centerY / 255
@@ -282,7 +300,10 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat
return err
}
buf := &audio.IntBuffer{Data: make([]int, 4096)}
// Get buffer from pool to reduce allocations
buf := audioBufferPool.Get().(*audio.IntBuffer)
defer audioBufferPool.Put(buf)
curChunk := 0
chunkSamples := make([]float64, 0, samplesPerChunk)
bytesPerSample := int64(2 * format.NumChannels) // 16-bit = 2 bytes per channel
@@ -353,6 +374,11 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat
}
curChunk++
data.progress = curChunk
// Notify that new data is available (non-blocking)
select {
case data.notify <- struct{}{}:
default:
}
chunkSamples = chunkSamples[:0]
if curChunk >= 1024 {
break
@@ -367,6 +393,11 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat
data.Peak[curChunk] = float64ToByte(peak)
data.RMS[curChunk] = float64ToByte(rms)
data.progress = curChunk + 1
// Notify that final data is available (non-blocking)
select {
case data.notify <- struct{}{}:
default:
}
}
return nil
ui/browsing/router.go
+1 -1
View File
@@ -26,7 +26,7 @@ func NewRouter(app *backend.App, controller *controller.Controller, nav Navigati
App: app,
Controller: controller,
Nav: nav,
widgetPool: util.NewWidgetPool(),
widgetPool: util.NewWidgetPool(app.BackgroundContext()),
}
return r
}
ui/util/widgetpool.go
+10 -3
View File
@@ -1,6 +1,7 @@
package util
import (
"context"
"sync"
"time"
@@ -40,14 +41,20 @@ type pooledWidget struct {
releasedAt int64 // unixMillis
}
func NewWidgetPool() *WidgetPool {
func NewWidgetPool(ctx context.Context) *WidgetPool {
p := &WidgetPool{
pools: make([][]pooledWidget, numWidgetTypes),
}
go func() {
t := time.NewTicker(2 * time.Minute)
for range t.C {
p.cleanUpExpiredItems()
defer t.Stop()
for {
select {
case <-ctx.Done():
return
case <-t.C:
p.cleanUpExpiredItems()
}
}
}()
return p