Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

refactor(renderer): coalesce continuations by document owner

ldm080bb2e650928
diff --git a/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs b/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs
index a7123a378..4bceb3fb1 100644
--- a/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs
@@ -117,10 +117,9 @@ impl PageVm {
)
}
RendererPageMainDocumentRuntimeAction::ContinueRuntimeScriptWork => {
- let runtime_generation = self.vm().document_runtime.runtime_reset_generation();
let body_effect = self
.vm_mut()
- .continue_main_document_runtime_script_task_body(runtime_generation);
+ .continue_main_document_runtime_script_task_body(owner.document_owner());
PageMainDocumentRuntimeTurnAction::runtime_script_continuation(
owner,
PageRuntimeScriptContinuationTargetEffect::AppliedToCurrentOwner(
@@ -138,9 +137,8 @@ impl PageVm {
)
}
RendererPageMainDocumentRuntimeAction::ContinueRuntimeOwnedModule => {
- let runtime_generation = self.vm().document_runtime.runtime_reset_generation();
self.vm_mut()
- .begin_runtime_owned_module_continuation_turn(runtime_generation);
+ .begin_runtime_owned_module_continuation_turn(owner.document_owner());
let made_progress = self
.run_ready_runtime_owned_module_script_continuation(loader)
.await?;
@@ -155,9 +153,8 @@ impl PageVm {
)
}
RendererPageMainDocumentRuntimeAction::ContinueParserOwnedModule => {
- let runtime_generation = self.vm().document_runtime.runtime_reset_generation();
self.vm_mut()
- .begin_parser_owned_module_continuation_turn(runtime_generation);
+ .begin_parser_owned_module_continuation_turn(owner.document_owner());
let task_effect = self
.run_next_ready_parser_owned_document_script_action(loader)
.await?;
diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rs
index c04bd47d4..8f5fd8f99 100644
--- a/moli-renderer-v8/src/script_vm.rs
+++ b/moli-renderer-v8/src/script_vm.rs
@@ -912,9 +912,12 @@ pub(super) struct ScriptVm {
pub(super) document_runtime: Box<DocumentRuntime>,
post_domcontentloaded_page_task_tx: PageTaskSender,
page_runtime_wake_tx: PageRuntimeWakeSender,
- queued_main_document_runtime_continuation_generation: Option<u64>,
- queued_main_document_module_continuation_generation: Option<u64>,
- queued_main_document_parser_module_continuation_generation: Option<u64>,
+ queued_main_document_runtime_continuation_owner:
+ Option<crate::frame_owner_model::FrameDocumentTaskOwner>,
+ queued_main_document_module_continuation_owner:
+ Option<crate::frame_owner_model::FrameDocumentTaskOwner>,
+ queued_main_document_parser_module_continuation_owner:
+ Option<crate::frame_owner_model::FrameDocumentTaskOwner>,
script_execution_memory: ScriptExecutionMemoryCounters,
runtime_observable_source_queue: RendererRuntimeObservableSourceQueue,
page_context_cancel_tx: RendererPageContextCancelSender,
@@ -2269,9 +2272,9 @@ impl ScriptVmDefaultWorldBootstrap {
page_context_cancel_tx,
post_domcontentloaded_page_task_tx,
page_runtime_wake_tx,
- queued_main_document_runtime_continuation_generation: None,
- queued_main_document_module_continuation_generation: None,
- queued_main_document_parser_module_continuation_generation: None,
+ queued_main_document_runtime_continuation_owner: None,
+ queued_main_document_module_continuation_owner: None,
+ queued_main_document_parser_module_continuation_owner: None,
script_execution_memory: ScriptExecutionMemoryCounters::default(),
runtime_observable_source_queue: RendererRuntimeObservableSourceQueue::default(),
pressed_mouse_buttons: 0,
diff --git a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs
index 240c9fbca..b2721e5de 100644
--- a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs
+++ b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs
@@ -473,15 +473,14 @@ impl ScriptVm {
));
return;
};
- let runtime_generation = self.document_runtime.runtime_reset_generation();
- if self.queued_main_document_runtime_continuation_generation == Some(runtime_generation) {
+ if self.queued_main_document_runtime_continuation_owner == Some(document_owner) {
return;
}
let continuation = self
.page_runtime_wake_tx
.bind_main_document_runtime_continuation(document_owner);
if continuation.send_runtime_script_continuation().is_ok() {
- self.queued_main_document_runtime_continuation_generation = Some(runtime_generation);
+ self.queued_main_document_runtime_continuation_owner = Some(document_owner);
} else {
self.record_runtime_warning(format_args!(
"main-Document runtime route closed before its continuation was accepted"
@@ -496,7 +495,7 @@ impl ScriptVm {
/// token authorizes one action. When a ready tail remains, the body
/// executor may publish its next token before the current selected-task
/// checkpoint; the scheduler cannot select that token until the current
- /// dispatcher returns. The generation guard prevents repeated readiness
+ /// dispatcher returns. The exact-owner guard prevents repeated readiness
/// observations from duplicating the same head.
pub(crate) fn enqueue_parser_owned_module_continuation(&mut self) -> bool {
let Some(document_owner) = self.current_main_document_task_owner() else {
@@ -505,10 +504,7 @@ impl ScriptVm {
));
return false;
};
- let runtime_generation = self.document_runtime.runtime_reset_generation();
- if self.queued_main_document_parser_module_continuation_generation
- == Some(runtime_generation)
- {
+ if self.queued_main_document_parser_module_continuation_owner == Some(document_owner) {
return true;
}
let queued = self
@@ -517,8 +513,7 @@ impl ScriptVm {
.send_parser_owned_module_continuation()
.is_ok();
if queued {
- self.queued_main_document_parser_module_continuation_generation =
- Some(runtime_generation);
+ self.queued_main_document_parser_module_continuation_owner = Some(document_owner);
} else {
self.record_runtime_warning(format_args!(
"main-Document runtime route closed before parser module continuation admission"
@@ -527,11 +522,12 @@ impl ScriptVm {
queued
}
- pub(crate) fn begin_parser_owned_module_continuation_turn(&mut self, runtime_generation: u64) {
- if self.queued_main_document_parser_module_continuation_generation
- == Some(runtime_generation)
- {
- self.queued_main_document_parser_module_continuation_generation = None;
+ pub(crate) fn begin_parser_owned_module_continuation_turn(
+ &mut self,
+ document_owner: crate::frame_owner_model::FrameDocumentTaskOwner,
+ ) {
+ if self.queued_main_document_parser_module_continuation_owner == Some(document_owner) {
+ self.queued_main_document_parser_module_continuation_owner = None;
}
}
diff --git a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs
index 5f9e09d6f..7ac6f1a94 100644
--- a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs
+++ b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs
@@ -458,8 +458,7 @@ impl ScriptVm {
));
return false;
};
- let runtime_generation = self.document_runtime.runtime_reset_generation();
- if self.queued_main_document_module_continuation_generation == Some(runtime_generation) {
+ if self.queued_main_document_module_continuation_owner == Some(document_owner) {
return true;
}
let queued = self
@@ -468,7 +467,7 @@ impl ScriptVm {
.send_runtime_module_continuation()
.is_ok();
if queued {
- self.queued_main_document_module_continuation_generation = Some(runtime_generation);
+ self.queued_main_document_module_continuation_owner = Some(document_owner);
} else {
self.record_runtime_warning(format_args!(
"main-Document runtime route closed before module continuation admission"
@@ -477,9 +476,12 @@ impl ScriptVm {
queued
}
- pub(crate) fn begin_runtime_owned_module_continuation_turn(&mut self, runtime_generation: u64) {
- if self.queued_main_document_module_continuation_generation == Some(runtime_generation) {
- self.queued_main_document_module_continuation_generation = None;
+ pub(crate) fn begin_runtime_owned_module_continuation_turn(
+ &mut self,
+ document_owner: crate::frame_owner_model::FrameDocumentTaskOwner,
+ ) {
+ if self.queued_main_document_module_continuation_owner == Some(document_owner) {
+ self.queued_main_document_module_continuation_owner = None;
}
}
@@ -609,7 +611,7 @@ impl ScriptVm {
return self.prepare_rebuilt_post_parse_round_page_owned_work();
}
let mut work = self.prepare_main_document_lifecycle_page_owned_work(work);
- self.bind_post_parse_page_owned_work_runtime_generation(&mut work);
+ self.bind_post_parse_page_owned_script_handles(&mut work);
work
}
@@ -625,7 +627,7 @@ impl ScriptVm {
// new-owner work before this invalidation is observed.
self.refresh_script_vm_local_document_state();
let mut work = self.prepare_main_document_lifecycle_page_owned_work(Vec::new());
- self.bind_post_parse_page_owned_work_runtime_generation(&mut work);
+ self.bind_post_parse_page_owned_script_handles(&mut work);
work
}
@@ -923,13 +925,13 @@ impl ScriptVm {
}
}
- pub(super) fn bind_post_parse_page_owned_work_runtime_generation(
+ pub(super) fn bind_post_parse_page_owned_script_handles(
&mut self,
work: &mut [PostParsePageOwnedWork],
) {
for item in work {
if let Some(script) = item.as_script_mut() {
- self.bind_prepared_script_if_needed(script, ScriptHandleSource::ParserOwned);
+ self.bind_prepared_script_handle_if_needed(script, ScriptHandleSource::ParserOwned);
}
}
}
@@ -2273,7 +2275,7 @@ impl ScriptVm {
true
}
- pub(crate) fn bind_prepared_script_if_needed(
+ pub(crate) fn bind_prepared_script_handle_if_needed(
&mut self,
script: &mut PreparedScript,
source: ScriptHandleSource,
diff --git a/moli-renderer-v8/src/script_vm/runtime_script_continuation.rs b/moli-renderer-v8/src/script_vm/runtime_script_continuation.rs
index 14cb672d2..8f2b1fd19 100644
--- a/moli-renderer-v8/src/script_vm/runtime_script_continuation.rs
+++ b/moli-renderer-v8/src/script_vm/runtime_script_continuation.rs
@@ -56,21 +56,19 @@ impl ScriptVm {
/// the successor it publishes.
pub(crate) fn continue_main_document_runtime_script_task_body(
&mut self,
- continuation_generation: u64,
+ document_owner: crate::frame_owner_model::FrameDocumentTaskOwner,
) -> RuntimeScriptContinuationBodyEffect {
self.document_runtime
.runtime_script_work_mut()
.dynamic_scripts
.begin_continuation_turn();
- if self.queued_main_document_runtime_continuation_generation
- == Some(continuation_generation)
- {
- self.queued_main_document_runtime_continuation_generation = None;
+ if self.queued_main_document_runtime_continuation_owner == Some(document_owner) {
+ self.queued_main_document_runtime_continuation_owner = None;
}
assert_eq!(
- continuation_generation,
- self.document_runtime.runtime_reset_generation(),
- "an exact-owner-authorized runtime continuation must target the current runtime generation"
+ Some(document_owner),
+ self.current_main_document_task_owner(),
+ "an exact-owner-authorized runtime continuation must target the current Document"
);
self.resume_runtime_script_work_after_deferred_page_tasks();
diff --git a/moli-renderer-v8/src/script_vm/tests/post_parse.rs b/moli-renderer-v8/src/script_vm/tests/post_parse.rs
index a0d4e92a2..32fd6dae6 100644
--- a/moli-renderer-v8/src/script_vm/tests/post_parse.rs
+++ b/moli-renderer-v8/src/script_vm/tests/post_parse.rs
@@ -413,7 +413,7 @@ async fn external_module_prepared_script_hides_root_graph_fetch_in_owner_state()
.expect("script vm bootstrap")
.finish()
.expect("script vm finish");
- vm.bind_prepared_script_if_needed(&mut prepared, ScriptHandleSource::ParserOwned);
+ vm.bind_prepared_script_handle_if_needed(&mut prepared, ScriptHandleSource::ParserOwned);
let task_owner = vm
.current_main_document_task_owner()
@@ -2338,7 +2338,7 @@ async fn pre_domcontentloaded_runtime_source_wait_yields_to_stable_page_continua
let mut script = vm.test_pending_runtime_source_load_script();
script.node_id = script_node;
script.mode = ScriptMode::InOrder;
- vm.bind_prepared_script_if_needed(&mut script, ScriptHandleSource::DocumentWriteOwned);
+ vm.bind_prepared_script_handle_if_needed(&mut script, ScriptHandleSource::DocumentWriteOwned);
let handle = script
.host_script_handle
.as_deref()
@@ -3931,7 +3931,7 @@ fn document_write_owned_inline_normal_defers_already_started_until_execution_wit
.is_some_and(|element| element.script_already_started())
);
- vm.bind_prepared_script_if_needed(&mut prepared, ScriptHandleSource::DocumentWriteOwned);
+ vm.bind_prepared_script_handle_if_needed(&mut prepared, ScriptHandleSource::DocumentWriteOwned);
assert!(
prepared.host_script_handle.is_none(),