[oden-js] Promise completion needs to be more robust
As predicted.
This commit is contained in:
parent
44c39b1740
commit
b77e7eba3e
1 changed files with 33 additions and 26 deletions
|
|
@ -175,13 +175,21 @@ impl Runtime {
|
|||
|
||||
/// Process all pending async jobs. This includes all promise resolutions.
|
||||
fn process_promise_completions(&self) {
|
||||
// TODO: This could be more robust if we buffered all the completed
|
||||
// promise entries and then dropped the borrow of the state, so
|
||||
// that we never invoked user code while borrowing our private
|
||||
// state mutably.
|
||||
let mut promises = vec![];
|
||||
|
||||
// First, gather all the completed promises into a temporary vector
|
||||
// so that we only need to borrow our mutable state for a short
|
||||
// period of time.
|
||||
let mut state = unsafe { PrivateState::from_rt_mut(self.rt) };
|
||||
while let Ok((handle, evt)) = state.promise_recv.try_recv() {
|
||||
if let Some(entry) = state.promise_table.remove(&handle) {
|
||||
promises.push((entry, evt));
|
||||
}
|
||||
}
|
||||
drop(state); // Don't need our internal state anymore.
|
||||
|
||||
// Nowe we can complete all the promises.
|
||||
for (entry, evt) in promises {
|
||||
let ctx = ContextRef::from_raw(entry.context);
|
||||
let (callback, value) = match evt {
|
||||
PromiseEvent::Resolved(v) => (entry.resolve, v),
|
||||
|
|
@ -206,7 +214,6 @@ impl Runtime {
|
|||
.expect("Exception thrown by promise callback");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Process all pending async jobs. This includes all promise resolutions.
|
||||
pub fn process_all_jobs(&self) -> Result<()> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue