From 613d7c22ff888f10dac3cd96869932e8a14e8d2b Mon Sep 17 00:00:00 2001 From: ldm0 Date: Thu, 12 Nov 2026 02:00:18 +0800 Subject: [PATCH] refactor(cdp): clarify response settlement and deferred completion --- moli-protocol-server/src/cdp_scheduler.rs | 2 +- .../src/cdp_scheduler/actor.rs | 42 ++++++++++--------- moli-protocol/src/conn.rs | 4 +- .../src/conn/renderer_command_turn.rs | 2 +- .../state_access/navigation_completion.rs | 2 +- moli-protocol/src/conn/tests/mod.rs | 10 ++--- moli-protocol/src/testing.rs | 2 +- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/moli-protocol-server/src/cdp_scheduler.rs b/moli-protocol-server/src/cdp_scheduler.rs index cd29cb1fb80..506842dedc9 100644 --- a/moli-protocol-server/src/cdp_scheduler.rs +++ b/moli-protocol-server/src/cdp_scheduler.rs @@ -2709,7 +2709,7 @@ impl CdpScheduler { for work in publications { if let Some(output) = work.command_output_dependency() { let ready = self.state.scheduler_events_ready(); - output.defer_until_response_flush(move || ready.notify_one()); + output.defer_until_response_settled(move || ready.notify_one()); } // An already-admitted owner continuation declares its own turn. // Neither command output handling nor the adapter infers this from diff --git a/moli-protocol-server/src/cdp_scheduler/actor.rs b/moli-protocol-server/src/cdp_scheduler/actor.rs index 2e70ab61252..dc19888a1c6 100644 --- a/moli-protocol-server/src/cdp_scheduler/actor.rs +++ b/moli-protocol-server/src/cdp_scheduler/actor.rs @@ -928,11 +928,9 @@ async fn flush_background_completion_input( enum RuntimeDeferredReplyFlushItem { Protocol(ProtocolOutputSequence), - FinishCommand(RuntimeDeferredReplyCompletedCommand), -} - -struct RuntimeDeferredReplyCompletedCommand { - output_release_permit: Option, + FinishCommand { + output_release_permit: Option, + }, } struct RuntimeDeferredReplyCompletion { @@ -988,7 +986,7 @@ impl RuntimeDeferredReplyCompletion { ) -> ( ProtocolOutputSequence, Vec, - RuntimeDeferredReplyCompletedCommand, + Option, ) { let ( completion_output, @@ -1009,9 +1007,7 @@ impl RuntimeDeferredReplyCompletion { ( completion_output, post_response_events, - RuntimeDeferredReplyCompletedCommand { - output_release_permit, - }, + output_release_permit, ) } } @@ -1137,9 +1133,14 @@ async fn flush_protocol_output_with_runtime_deferred_reply_routing( } } }, - RuntimeDeferredReplyFlushItem::FinishCommand(completed) => { - let followup_output = - finish_runtime_deferred_reply_completed_command(scheduler, completed).await; + RuntimeDeferredReplyFlushItem::FinishCommand { + output_release_permit, + } => { + let followup_output = finish_runtime_deferred_reply_completed_command( + scheduler, + output_release_permit, + ) + .await; if !followup_output.is_empty() { pending_flush .push_front(RuntimeDeferredReplyFlushItem::Protocol(followup_output)); @@ -1155,11 +1156,13 @@ fn enqueue_runtime_deferred_reply_completion_flush( completion: RuntimeDeferredReplyCompletion, remaining_output: ProtocolOutputSequence, ) { - let (completion_output, post_response_events, completed) = completion.into_parts(); + let (completion_output, post_response_events, output_release_permit) = completion.into_parts(); if !remaining_output.is_empty() { pending_flush.push_front(RuntimeDeferredReplyFlushItem::Protocol(remaining_output)); } - pending_flush.push_front(RuntimeDeferredReplyFlushItem::FinishCommand(completed)); + pending_flush.push_front(RuntimeDeferredReplyFlushItem::FinishCommand { + output_release_permit, + }); if !post_response_events.is_empty() { pending_flush.push_front(RuntimeDeferredReplyFlushItem::Protocol( ProtocolOutputSequence::from_background_events(post_response_events), @@ -1170,10 +1173,9 @@ fn enqueue_runtime_deferred_reply_completion_flush( async fn finish_runtime_deferred_reply_completed_command( scheduler: &mut CdpScheduler, - completed: RuntimeDeferredReplyCompletedCommand, + output_release_permit: Option, ) -> ProtocolOutputSequence { - let mut followup_output = - scheduler.finish_command_dispatch_output_flush(completed.output_release_permit); + let mut followup_output = scheduler.finish_command_dispatch_output_flush(output_release_permit); followup_output.append(scheduler.complete_ready_protocol_residences_after_command()); followup_output } @@ -1285,7 +1287,8 @@ async fn flush_runtime_deferred_reply_advance( let completion = (*completion) .settle_exact_outputs_before_response(scheduler) .await; - let (completion_output, post_response_events, completed) = completion.into_parts(); + let (completion_output, post_response_events, output_release_permit) = + completion.into_parts(); frontend_router.enqueue_protocol_output_sequence(completion_output); if !post_response_events.is_empty() && !flush_protocol_output_with_runtime_deferred_reply_routing( @@ -1299,7 +1302,8 @@ async fn flush_runtime_deferred_reply_advance( return false; } let followup_output = - finish_runtime_deferred_reply_completed_command(scheduler, completed).await; + finish_runtime_deferred_reply_completed_command(scheduler, output_release_permit) + .await; if !followup_output.is_empty() { flush_protocol_output_with_runtime_deferred_reply_routing( frontend_router, diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs index f7628fff9cd..c3372af4234 100644 --- a/moli-protocol/src/conn.rs +++ b/moli-protocol/src/conn.rs @@ -442,10 +442,10 @@ impl CommandResponseFlushContext { self.receiver.clone() } - /// Releases owner work when the boundary finishes or is abandoned. + /// Releases owner work when the response boundary is flushed or cancelled. /// This is also suitable for waking readiness observers. It is not a /// success notification; use `state()` to distinguish flush and cancel. - pub fn defer_until_response_flush(&self, release: impl FnOnce() + Send + 'static) { + pub fn defer_until_response_settled(&self, release: impl FnOnce() + Send + 'static) { let release = CommandResponseFlushRelease::new(release); let immediate = match &self.deferred_releases { Some(deferred_releases) => { diff --git a/moli-protocol/src/conn/renderer_command_turn.rs b/moli-protocol/src/conn/renderer_command_turn.rs index 5f37dcefd10..29f41bffd1d 100644 --- a/moli-protocol/src/conn/renderer_command_turn.rs +++ b/moli-protocol/src/conn/renderer_command_turn.rs @@ -55,7 +55,7 @@ impl CommandDispatchContext { } if let Some(continuation) = completion.take_post_response_continuation() { self.response_flush() - .defer_until_response_flush(move || continuation.release()); + .defer_until_response_settled(move || continuation.release()); } completion } diff --git a/moli-protocol/src/conn/state_access/navigation_completion.rs b/moli-protocol/src/conn/state_access/navigation_completion.rs index a1ebd8d239e..0b628b0d331 100644 --- a/moli-protocol/src/conn/state_access/navigation_completion.rs +++ b/moli-protocol/src/conn/state_access/navigation_completion.rs @@ -76,7 +76,7 @@ impl ProtocolWorkflowState<'_> { if let Some(continuation) = continuation { context .response_flush() - .defer_until_response_flush(move || continuation.release()); + .defer_until_response_settled(move || continuation.release()); } if binding.as_ref().is_some_and(SessionDisposalWait::is_closed) || !conn.accepts_pending_document_navigation_for_owner(&owner, &token) diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rs index 638711620b0..dcf7b109c53 100644 --- a/moli-protocol/src/conn/tests/mod.rs +++ b/moli-protocol/src/conn/tests/mod.rs @@ -489,7 +489,7 @@ fn command_response_flush_permit_runs_deferred_release_exactly_once() { let (permit, context) = conn.begin_command_response_flush_permit(); let releases = Arc::new(AtomicUsize::new(0)); let release_counter = releases.clone(); - context.defer_until_response_flush(move || { + context.defer_until_response_settled(move || { release_counter.fetch_add(1, Ordering::SeqCst); }); @@ -508,7 +508,7 @@ fn abandoned_command_response_flush_permit_releases_fail_open() { let (permit, context) = conn.begin_command_response_flush_permit(); let releases = Arc::new(AtomicUsize::new(0)); let release_counter = releases.clone(); - context.defer_until_response_flush(move || { + context.defer_until_response_settled(move || { release_counter.fetch_add(1, Ordering::SeqCst); }); @@ -531,7 +531,7 @@ fn missing_command_response_flush_context_releases_immediately() { ); let releases = Arc::new(AtomicUsize::new(0)); let release_counter = releases.clone(); - context.defer_until_response_flush(move || { + context.defer_until_response_settled(move || { release_counter.fetch_add(1, Ordering::SeqCst); }); @@ -545,7 +545,7 @@ fn command_output_release_callbacks_already_observe_the_terminal_state() { let (permit, context) = conn.begin_command_response_flush_permit(); let observed = context.clone(); let (sender, receiver) = std::sync::mpsc::channel(); - context.defer_until_response_flush(move || sender.send(observed.state()).unwrap()); + context.defer_until_response_settled(move || sender.send(observed.state()).unwrap()); std::thread::spawn(move || { if flush { permit.finish(); @@ -563,7 +563,7 @@ fn command_output_release_callbacks_already_observe_the_terminal_state() { assert_eq!(receiver.recv().unwrap(), expected); // Observers registered after release see the same settled boundary. let observed = context.clone(); - context.defer_until_response_flush(move || assert_eq!(observed.state(), expected)); + context.defer_until_response_settled(move || assert_eq!(observed.state(), expected)); } } diff --git a/moli-protocol/src/testing.rs b/moli-protocol/src/testing.rs index 05a071261fa..d3851337dbf 100644 --- a/moli-protocol/src/testing.rs +++ b/moli-protocol/src/testing.rs @@ -2389,7 +2389,7 @@ impl TestContext { for publication in &publications { if let Some(output) = publication.command_output_dependency() { let ready = self.state.scheduler_events_ready(); - output.defer_until_response_flush(move || ready.notify_one()); + output.defer_until_response_settled(move || ready.notify_one()); } } self.pending_protocol_scheduler_work.extend(publications);