fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-16 06:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the arena unwind safe and the slot locks poison tolerant

Browse Source
This commit is contained in:
Dennis Kobert
2026-07-27 11:40:16 +00:00
parent 9e83632647
commit 3d17fa0f0c
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
node-graph/node-macro/src/gcodegen.rs
View File

@@ -316,7 +316,7 @@ pub(crate) fn generate_gnode_code(crate_ident: &CrateIdent, parsed: &ParsedNodeF
let slot_check = quote! {
let __key = #core_types::wire::cache_key(__input);
{
let __entries = self.slot.lock().unwrap();
let __entries = self.slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
if let Some(__state) = __entries.get(&__key) {
return match __state {
Some(value) => __cell.merge(value.clone()),
@@ -347,13 +347,13 @@ pub(crate) fn generate_gnode_code(crate_ident: &CrateIdent, parsed: &ParsedNodeF
let completion = future_completion(&parsed.output_type);
quote! {
#slot_check
self.slot.lock().unwrap().insert(__key, None);
self.slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).insert(__key, None);
let __slot = std::sync::Arc::clone(&self.slot);
#(#snapshot_binding)*
let __future = self::#fn_name(#(#future_args),*);
_runtime.0.spawn(_source, Box::pin(async move {
let __value = #completion;
__slot.lock().unwrap().insert(__key, Some(__value));
__slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).insert(__key, Some(__value));
}));
#inflight
}
@@ -384,11 +384,11 @@ pub(crate) fn generate_gnode_code(crate_ident: &CrateIdent, parsed: &ParsedNodeF
#slot_check
#placeholder_binding
#acquire
self.slot.lock().unwrap().insert(__key, None);
self.slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).insert(__key, None);
let __slot = std::sync::Arc::clone(&self.slot);
_runtime.0.spawn(_source, Box::pin(async move {
let __value = #completion;
__slot.lock().unwrap().insert(__key, Some(__value));
__slot.lock().unwrap_or_else(std::sync::PoisonError::into_inner).insert(__key, Some(__value));
}));
#spawn_return
}