lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-05-04 10:43:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use an iterative implementation for Instance::clone_inner

Browse source
This commit is contained in:
Kenneth Loeffler 2023-05-30 13:38:24 -07:00
parent 933cfa84c0
commit 39ce915157
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/lib-roblox/src/instance/mod.rs
View file

@ -214,9 +214,11 @@ impl Instance {
parent_ref: DomRef, parent_ref: DomRef,
reference_map: &mut HashMap<DomRef, DomRef>, reference_map: &mut HashMap<DomRef, DomRef>,
) -> DomRef { ) -> DomRef {
// NOTE: We create a new scope here to avoid deadlocking since fn do_clone(
// our clone implementation must have exclusive write access dom_ref: DomRef,
let (new_ref, child_refs) = { parent_ref: DomRef,
reference_map: &mut HashMap<DomRef, DomRef>,
) -> (DomRef, Vec<DomRef>) {
let mut dom = INTERNAL_DOM let mut dom = INTERNAL_DOM
.try_write() .try_write()
.expect("Failed to get write access to document"); .expect("Failed to get write access to document");
@ -243,13 +245,25 @@ impl Instance {
reference_map.insert(dom_ref, new_ref); reference_map.insert(dom_ref, new_ref);
(new_ref, child_refs) (new_ref, child_refs)
};
for child_ref in child_refs {
Self::clone_inner(child_ref, new_ref, reference_map);
} }
new_ref let (cloned_parent, uncloned_children) = do_clone(dom_ref, parent_ref, reference_map);
let mut queue = VecDeque::with_capacity(uncloned_children.len());
for uncloned_child in uncloned_children.iter() {
queue.push_back((cloned_parent, *uncloned_child));
}
while let Some((cloned_parent, uncloned_child)) = queue.pop_front() {
let (cloned_parent, uncloned_children) =
do_clone(uncloned_child, cloned_parent, reference_map);
for uncloned_child in uncloned_children.iter() {
queue.push_back((*uncloned_child, cloned_parent))
}
}
cloned_parent
} }
/** /**