Skip to content

fix: thread safe handle may no longer have an isolate pointer #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2024
Merged

fix: thread safe handle may no longer have an isolate pointer #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions crates/base/src/rt_worker/supervisor/strategy_per_request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,17 @@ pub async fn supervise(args: Arguments, oneshot: bool) -> (ShutdownReason, i64)

Some(reason) => {
is_retired.raise();
thread_safe_handle.request_interrupt(
handle_interrupt,
Box::into_raw(Box::new(IsolateInterruptData {
should_terminate: true,
isolate_memory_usage_tx: Some(isolate_memory_usage_tx),
})) as *mut std::ffi::c_void,
);

let data_ptr_mut = Box::into_raw(Box::new(IsolateInterruptData {
should_terminate: true,
isolate_memory_usage_tx: Some(isolate_memory_usage_tx),
}));

if !thread_safe_handle
.request_interrupt(handle_interrupt, data_ptr_mut as *mut std::ffi::c_void)
{
drop(unsafe { Box::from_raw(data_ptr_mut) });
}

return (reason, cpu_usage_accumulated_ms);
}
Expand Down
13 changes: 7 additions & 6 deletions crates/base/src/rt_worker/supervisor/strategy_per_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,16 @@ pub async fn supervise(args: Arguments) -> (ShutdownReason, i64) {
let interrupt_fn = {
let thread_safe_handle = thread_safe_handle.clone();
move |should_terminate: bool| {
let interrupt_data = IsolateInterruptData {
let data_ptr_mut = Box::into_raw(Box::new(IsolateInterruptData {
should_terminate,
isolate_memory_usage_tx: Some(isolate_memory_usage_tx),
};
}));

thread_safe_handle.request_interrupt(
handle_interrupt,
Box::into_raw(Box::new(interrupt_data)) as *mut std::ffi::c_void,
);
if !thread_safe_handle
.request_interrupt(handle_interrupt, data_ptr_mut as *mut std::ffi::c_void)
{
drop(unsafe { Box::from_raw(data_ptr_mut) });
}
}
};

Expand Down
16 changes: 10 additions & 6 deletions crates/base/src/rt_worker/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,20 @@ impl Worker {
rt::SUPERVISOR_RT
.spawn(async move {
token.inbound.cancelled().await;

is_termination_requested.raise();
thread_safe_handle.request_interrupt(
supervisor::handle_interrupt,

let data_ptr_mut =
Box::into_raw(Box::new(supervisor::IsolateInterruptData {
should_terminate: true,
isolate_memory_usage_tx: None,
}))
as *mut std::ffi::c_void,
);
}));

if !thread_safe_handle.request_interrupt(
supervisor::handle_interrupt,
data_ptr_mut as *mut std::ffi::c_void,
) {
drop(unsafe { Box::from_raw(data_ptr_mut) });
}

while !is_terminated.is_raised() {
waker.wake();
Expand Down