17185843058

Committed 24 Aug 2025 07:27AM UTC coverage: 62.326% (+0.02%) from 62.309%

Build # 17185843058

Build Type

Pull #5912

github

Committed by

Jacalz

Commit Message

Make dedup cleanup a bit safer without migrations

Pull Request Pull Request #5912: Simplify freeing of dirty textures

Coverage Stats

56 of 78 new or added lines in 2 files covered. (71.79%)

3 existing lines in 1 file now uncovered.

25427 of 40797 relevant lines covered (62.33%)

711.81 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.85

/internal/driver/common/structures.go

package common

import (
        "fyne.io/fyne/v2"
        "fyne.io/fyne/v2/internal"
        "fyne.io/fyne/v2/internal/async"
        "fyne.io/fyne/v2/internal/build"
)

type deduplicatedObjectQueue struct {
        queue *async.CanvasObjectQueue
        dedup async.Map[fyne.CanvasObject, struct{}]
}

// In adds an object to the queue if it is not already present.
func (q *deduplicatedObjectQueue) In(obj fyne.CanvasObject) {
        _, exists := q.dedup.Load(obj)
        if exists {
                return
        }

        q.queue.In(obj)
        q.dedup.Store(obj, struct{}{})
}

// Out removes and returns the next object from the queue.
// It assumes that the whole queue is drained and defers clearing
// the deduplication map until it is empty.
func (q *deduplicatedObjectQueue) Out() fyne.CanvasObject {
        if q.queue.Len() == 0 {
                q.dedup.Clear()
                return nil
        }

        out := q.queue.Out()
        if !build.DisableThreadChecks {
                q.dedup.Delete(out)
        }
        return out
}

// Len returns the number of elements in the queue.
func (q *deduplicatedObjectQueue) Len() uint64 {
        return q.queue.Len()
}

type renderCacheTree struct {
        root *RenderCacheNode
}

// RenderCacheNode represents a node in a render cache tree.
type RenderCacheNode struct {
        // structural data
        firstChild  *RenderCacheNode
        nextSibling *RenderCacheNode
        obj         fyne.CanvasObject
        parent      *RenderCacheNode
        // cache data
        minSize fyne.Size
}

// Obj returns the node object.
func (r *RenderCacheNode) Obj() fyne.CanvasObject {
        return r.obj
}

type overlayStack struct {
        internal.OverlayStack

        renderCaches []*renderCacheTree
}

func (o *overlayStack) Add(overlay fyne.CanvasObject) {
        if overlay == nil {
                return
        }
        o.add(overlay)
}

func (o *overlayStack) Remove(overlay fyne.CanvasObject) {
        if overlay == nil || len(o.List()) == 0 {
                return
        }
        o.remove(overlay)
}

func (o *overlayStack) add(overlay fyne.CanvasObject) {
        o.renderCaches = append(o.renderCaches, &renderCacheTree{root: &RenderCacheNode{obj: overlay}})
        o.OverlayStack.Add(overlay)
}

func (o *overlayStack) remove(overlay fyne.CanvasObject) {
        o.OverlayStack.Remove(overlay)
        overlayCount := len(o.List())

        // it is possible that overlays are removed implicitly and render caches already cleared out
        if overlayCount >= len(o.renderCaches) {
                return
        }

        o.renderCaches[overlayCount] = nil // release memory reference to removed element
        o.renderCaches = o.renderCaches[:overlayCount]
}

1	package common
2
3	import (
4	"fyne.io/fyne/v2"
5	"fyne.io/fyne/v2/internal"
6	"fyne.io/fyne/v2/internal/async"
7	"fyne.io/fyne/v2/internal/build"
8	)
9
10	type deduplicatedObjectQueue struct {
11	queue *async.CanvasObjectQueue
12	dedup async.Map[fyne.CanvasObject, struct{}]
13	}
14
15	// In adds an object to the queue if it is not already present.
16	func (q *deduplicatedObjectQueue) In(obj fyne.CanvasObject) {	1,005✔
17	_, exists := q.dedup.Load(obj)	1,005✔
18	if exists {	1,007✔
19	return	2✔
20	}	2✔
21
22	q.queue.In(obj)	1,003✔
23	q.dedup.Store(obj, struct{}{})	1,003✔
24	}
25
26	// Out removes and returns the next object from the queue.
27	// It assumes that the whole queue is drained and defers clearing
28	// the deduplication map until it is empty.
29	func (q *deduplicatedObjectQueue) Out() fyne.CanvasObject {	1,005✔
30	if q.queue.Len() == 0 {	1,008✔
31	q.dedup.Clear()	3✔
32	return nil	3✔
33	}	3✔
34
35	out := q.queue.Out()	1,002✔
36	if !build.DisableThreadChecks {	2,004✔
37	q.dedup.Delete(out)	1,002✔
38	}	1,002✔
39	return out	1,002✔
40	}
41
42	// Len returns the number of elements in the queue.
43	func (q *deduplicatedObjectQueue) Len() uint64 {	8✔
44	return q.queue.Len()	8✔
45	}	8✔
46
47	type renderCacheTree struct {
48	root *RenderCacheNode
49	}
50
51	// RenderCacheNode represents a node in a render cache tree.
52	type RenderCacheNode struct {
53	// structural data
54	firstChild *RenderCacheNode
55	nextSibling *RenderCacheNode
56	obj fyne.CanvasObject
57	parent *RenderCacheNode
58	// cache data
59	minSize fyne.Size
60	}
61
62	// Obj returns the node object.
NEW 63	func (r *RenderCacheNode) Obj() fyne.CanvasObject {	×
NEW 64	return r.obj	×
NEW 65	}	×
66
67	type overlayStack struct {
68	internal.OverlayStack
69
70	renderCaches []*renderCacheTree
71	}
72
73	func (o *overlayStack) Add(overlay fyne.CanvasObject) {	3✔
74	if overlay == nil {	3✔
NEW 75	return	×
NEW 76	}	×
77	o.add(overlay)	3✔
78	}
79
80	func (o *overlayStack) Remove(overlay fyne.CanvasObject) {	2✔
81	if overlay == nil \|\| len(o.List()) == 0 {	2✔
NEW 82	return	×
NEW 83	}	×
84	o.remove(overlay)	2✔
85	}
86
87	func (o *overlayStack) add(overlay fyne.CanvasObject) {	3✔
88	o.renderCaches = append(o.renderCaches, &renderCacheTree{root: &RenderCacheNode{obj: overlay}})	3✔
89	o.OverlayStack.Add(overlay)	3✔
90	}	3✔
91
92	func (o *overlayStack) remove(overlay fyne.CanvasObject) {	2✔
93	o.OverlayStack.Remove(overlay)	2✔
94	overlayCount := len(o.List())	2✔
95		2✔
96	// it is possible that overlays are removed implicitly and render caches already cleared out	2✔
97	if overlayCount >= len(o.renderCaches) {	2✔
NEW 98	return	×
NEW 99	}	×
100
101	o.renderCaches[overlayCount] = nil // release memory reference to removed element	2✔
102	o.renderCaches = o.renderCaches[:overlayCount]	2✔
103	}

fyne-io / fyne / 17185843058

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous