refactor(wayland): reset the fired frame queue after the loop

sendFrames resets the queue after sending instead of in a defer, and the queue test drops a frame-owner check the old code already passed.

commit: 5d1d4d1e64aac5e24dd3b278c8616e0cc31c3f55
author: brice · 6d ago · 2026-10-16 14:08 UTC
parent: 7898c05
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +4 -9

M internal/adapters/wayland/alloc_hotpath_test.go +0 -3


@@ -151,9 +151,6 @@ func TestFrameQueueKeepsBackingArray(t *testing.T) {
151	151		return
152	152		}
153	153		first, head = queue[:1][0], &queue[:1][0]
154		-	if len(s.frameOwners) != 0 {
155		-	t.Errorf("fired queue keeps %d frame owners", len(s.frameOwners))
156		-	}
157	154		})
158	155		if first != nil {
159	156		t.Fatal("fired queue pins a callback")


@@ -151,9 +151,6 @@ func TestFrameQueueKeepsBackingArray(t *testing.T) {
151		return	151	return
152		}	152	}
153		first, head = queue[:1][0], &queue[:1][0]	153	first, head = queue[:1][0], &queue[:1][0]
154	-	if len(s.frameOwners) != 0 {
155	-	t.Errorf("fired queue keeps %d frame owners", len(s.frameOwners))
156	-	}
157		})	154	})
158		if first != nil {	155	if first != nil {
159		t.Fatal("fired queue pins a callback")	156	t.Fatal("fired queue pins a callback")

M internal/adapters/wayland/frames.go +4 -6


@@ -350,12 +350,6 @@ func (s *Server) sendFrames(name string, flipped bool) {
350	350		if len(callbacks) == 0 {
351	351		return
352	352		}
353		-	// The queue keeps its backing array for the next frame (an empty queue
354		-	// reads like an absent one). Nothing below queues a callback.
355		-	defer func() {
356		-	clear(callbacks)
357		-	s.awaiting[name] = callbacks[:0]
358		-	}()
359	353		// done carries the flip's time when the output flips (the frame the
360	354		// client drew for is on screen), else now.
361	355		ms := uint32(time.Since(s.started).Milliseconds())

@@ -371,6 +365,10 @@ func (s *Server) sendFrames(name string, flipped bool) {
371	365		cb.Destroy()
372	366		s.frames++
373	367		}
	368	+	// The queue keeps its backing array for the next frame (an empty queue
	369	+	// reads like an absent one). Nothing above queues a callback.
	370	+	clear(callbacks)
	371	+	s.awaiting[name] = callbacks[:0]
374	372		}
375	373
376	374		// framePeriod is one refresh at refreshMilli mHz, 60 Hz when unknown.

 	if len(callbacks) == 0 {
 		return
 	}
-	// The queue keeps its backing array for the next frame (an empty queue
-	// reads like an absent one). Nothing below queues a callback.
-	defer func() {
-		clear(callbacks)
-		s.awaiting[name] = callbacks[:0]
-	}()
 	// done carries the flip's time when the output flips (the frame the
 	// client drew for is on screen), else now.
 	ms := uint32(time.Since(s.started).Milliseconds())
 		cb.Destroy()
 		s.frames++
 	}
+	// The queue keeps its backing array for the next frame (an empty queue
+	// reads like an absent one). Nothing above queues a callback.
+	clear(callbacks)
+	s.awaiting[name] = callbacks[:0]
 }
 // framePeriod is one refresh at refreshMilli mHz, 60 Hz when unknown.