fix: isolate split idle scheduler

commit: b0266fa617d83e77f16c638aace473ecb90bfc92
author: brice · 3mo ago · 2026-07-15 08:15 UTC
parent: 7137fd1
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +34 -20

M internal/ui/layout/split.go +4 -8


@@ -21,7 +21,7 @@ type SplitView struct {
21	21		logger zerolog.Logger
22	22
23	23		onRatioChanged func(ratio float64)
24		-	pendingNotifyRatio float64
	24	+	idleAdd func(*glib.SourceFunc, uintptr) uint
25	25		notifyDebounceTimer *time.Timer
26	26		notifyGeneration uint64
27	27		tickCallbackID uint

@@ -41,9 +41,6 @@ const notifyPositionDebounceDelay = 100 * time.Millisecond
41	41		const notifyPositionSuppressAfterApplyDelay = 50 * time.Millisecond
42	42		const splitAllocationSettledTolerance = 2
43	43
44		-	// idleAdd is a seam for scheduling work on GLib's main loop.
45		-	var idleAdd = glib.IdleAdd
46		-
47	44		func childAllocation(widget Widget) (int, int) {
48	45		if widget == nil {
49	46		return 0, 0

@@ -115,6 +112,7 @@ func NewSplitView(
115	112		endChild: endChild,
116	113		ratio: clampRatio(ratio),
117	114		logger: log.With().Str("component", "split-view").Logger(),
	115	+	idleAdd: glib.IdleAdd,
118	116		}
119	117
120	118		// Set children

@@ -162,7 +160,6 @@ func NewSplitView(
162	160		return
163	161		}
164	162		sv.ratio = ratio
165		-	sv.pendingNotifyRatio = ratio
166	163		sv.notifyGeneration++
167	164		generation := sv.notifyGeneration
168	165

@@ -184,15 +181,14 @@ func NewSplitView(
184	181		return false
185	182		}
186	183		onRatioChanged := sv.onRatioChanged
187		-	pending := sv.pendingNotifyRatio
188	184		sv.mu.RUnlock()
189	185
190	186		if onRatioChanged != nil {
191		-	onRatioChanged(pending)
	187	+	onRatioChanged(ratio)
192	188		}
193	189		return false
194	190		})
195		-	idleAdd(&cb, 0)
	191	+	sv.idleAdd(&cb, 0)
196	192		})
197	193
198	194		sv.mu.Unlock()

 	logger      zerolog.Logger
 	onRatioChanged      func(ratio float64)
-	pendingNotifyRatio  float64
+	idleAdd             func(*glib.SourceFunc, uintptr) uint
 	notifyDebounceTimer *time.Timer
 	notifyGeneration    uint64
 	tickCallbackID      uint
 const notifyPositionSuppressAfterApplyDelay = 50 * time.Millisecond
 const splitAllocationSettledTolerance = 2
-// idleAdd is a seam for scheduling work on GLib's main loop.
-var idleAdd = glib.IdleAdd
 func childAllocation(widget Widget) (int, int) {
 	if widget == nil {
 		return 0, 0
 		endChild:    endChild,
 		ratio:       clampRatio(ratio),
 		logger:      log.With().Str("component", "split-view").Logger(),
+		idleAdd:     glib.IdleAdd,
 	}
 	// Set children
 			return
 		}
 		sv.ratio = ratio
-		sv.pendingNotifyRatio = ratio
 		sv.notifyGeneration++
 		generation := sv.notifyGeneration
 					return false
 				}
 				onRatioChanged := sv.onRatioChanged
-				pending := sv.pendingNotifyRatio
 				sv.mu.RUnlock()
 				if onRatioChanged != nil {
-					onRatioChanged(pending)
+					onRatioChanged(ratio)
 				}
 				return false
 			})
-			idleAdd(&cb, 0)
+			sv.idleAdd(&cb, 0)
 		})
 		sv.mu.Unlock()

M internal/ui/layout/split_notify_cleanup_test.go +30 -12


@@ -60,16 +60,17 @@ func receiveQueuedIdle(t testing.T, queued <-chan glib.SourceFunc) *glib.Sourc
60	60		}
61	61		}
62	62
63		-	func TestSplitViewQueuedRatioCallbackDoesNotRunAfterCleanup(t *testing.T) {
64		-	queued := make(chan *glib.SourceFunc, 1)
65		-	previousIdleAdd := idleAdd
66		-	idleAdd = func(source *glib.SourceFunc, _ uintptr) uint {
	63	+	func setIdleScheduler(sv SplitView, queued chan<- glib.SourceFunc) {
	64	+	sv.idleAdd = func(source *glib.SourceFunc, _ uintptr) uint {
67	65		queued <- source
68	66		return 1
69	67		}
70		-	t.Cleanup(func() { idleAdd = previousIdleAdd })
	68	+	}
71	69
	70	+	func TestSplitViewQueuedRatioCallbackDoesNotRunAfterCleanup(t *testing.T) {
	71	+	queued := make(chan *glib.SourceFunc, 1)
72	72		sv, notify := newNotifyingSplitView(t)
	73	+	setIdleScheduler(sv, queued)
73	74		var calls atomic.Int32
74	75		sv.SetOnRatioChanged(func(float64) { calls.Add(1) })
75	76

@@ -83,14 +84,8 @@ func TestSplitViewQueuedRatioCallbackDoesNotRunAfterCleanup(t *testing.T) {
83	84
84	85		func TestSplitViewSupersededRatioCallbackDeliversOnlyLatestValueOnce(t *testing.T) {
85	86		queued := make(chan *glib.SourceFunc, 2)
86		-	previousIdleAdd := idleAdd
87		-	idleAdd = func(source *glib.SourceFunc, _ uintptr) uint {
88		-	queued <- source
89		-	return 1
90		-	}
91		-	t.Cleanup(func() { idleAdd = previousIdleAdd })
92		-
93	87		sv, notify := newNotifyingSplitView(t)
	88	+	setIdleScheduler(sv, queued)
94	89		var ratios []float64
95	90		sv.SetOnRatioChanged(func(ratio float64) { ratios = append(ratios, ratio) })
96	91

@@ -103,3 +98,26 @@ func TestSplitViewSupersededRatioCallbackDeliversOnlyLatestValueOnce(t *testing.
103	98
104	99		require.Equal(t, []float64{0.8}, ratios)
105	100		}
	101	+
	102	+	func TestSplitViewIdleSchedulersAreInstanceScoped(t *testing.T) {
	103	+	firstQueued := make(chan *glib.SourceFunc, 1)
	104	+	secondQueued := make(chan *glib.SourceFunc, 1)
	105	+	first, firstNotify := newNotifyingSplitView(t)
	106	+	second, secondNotify := newNotifyingSplitView(t)
	107	+	setIdleScheduler(first, firstQueued)
	108	+	setIdleScheduler(second, secondQueued)
	109	+
	110	+	firstNotify(20)
	111	+	secondNotify(80)
	112	+
	113	+	firstSource := receiveQueuedIdle(t, firstQueued)
	114	+	secondSource := receiveQueuedIdle(t, secondQueued)
	115	+	var firstCalls, secondCalls atomic.Int32
	116	+	first.SetOnRatioChanged(func(float64) { firstCalls.Add(1) })
	117	+	second.SetOnRatioChanged(func(float64) { secondCalls.Add(1) })
	118	+	(*firstSource)(0)
	119	+	(*secondSource)(0)
	120	+
	121	+	require.Equal(t, int32(1), firstCalls.Load())
	122	+	require.Equal(t, int32(1), secondCalls.Load())
	123	+	}

 	}
 }
-func TestSplitViewQueuedRatioCallbackDoesNotRunAfterCleanup(t *testing.T) {
+func setIdleScheduler(sv *SplitView, queued chan<- *glib.SourceFunc) {
-	queued := make(chan *glib.SourceFunc, 1)
+	sv.idleAdd = func(source *glib.SourceFunc, _ uintptr) uint {
-	previousIdleAdd := idleAdd
-	idleAdd = func(source *glib.SourceFunc, _ uintptr) uint {
 		queued <- source
 		return 1
 	}
-	t.Cleanup(func() { idleAdd = previousIdleAdd })
+}
+func TestSplitViewQueuedRatioCallbackDoesNotRunAfterCleanup(t *testing.T) {
+	queued := make(chan *glib.SourceFunc, 1)
 	sv, notify := newNotifyingSplitView(t)
+	setIdleScheduler(sv, queued)
 	var calls atomic.Int32
 	sv.SetOnRatioChanged(func(float64) { calls.Add(1) })
 func TestSplitViewSupersededRatioCallbackDeliversOnlyLatestValueOnce(t *testing.T) {
 	queued := make(chan *glib.SourceFunc, 2)
-	previousIdleAdd := idleAdd
-	idleAdd = func(source *glib.SourceFunc, _ uintptr) uint {
-		queued <- source
-		return 1
-	}
-	t.Cleanup(func() { idleAdd = previousIdleAdd })
 	sv, notify := newNotifyingSplitView(t)
+	setIdleScheduler(sv, queued)
 	var ratios []float64
 	sv.SetOnRatioChanged(func(ratio float64) { ratios = append(ratios, ratio) })
 	require.Equal(t, []float64{0.8}, ratios)
 }
+func TestSplitViewIdleSchedulersAreInstanceScoped(t *testing.T) {
+	firstQueued := make(chan *glib.SourceFunc, 1)
+	secondQueued := make(chan *glib.SourceFunc, 1)
+	first, firstNotify := newNotifyingSplitView(t)
+	second, secondNotify := newNotifyingSplitView(t)
+	setIdleScheduler(first, firstQueued)
+	setIdleScheduler(second, secondQueued)
+	firstNotify(20)
+	secondNotify(80)
+	firstSource := receiveQueuedIdle(t, firstQueued)
+	secondSource := receiveQueuedIdle(t, secondQueued)
+	var firstCalls, secondCalls atomic.Int32
+	first.SetOnRatioChanged(func(float64) { firstCalls.Add(1) })
+	second.SetOnRatioChanged(func(float64) { secondCalls.Add(1) })
+	(*firstSource)(0)
+	(*secondSource)(0)
+	require.Equal(t, int32(1), firstCalls.Load())
+	require.Equal(t, int32(1), secondCalls.Load())
+}