Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions crates/base/src/rt_worker/supervisor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use tokio::sync::{
oneshot,
};
use tokio_util::sync::CancellationToken;
use tracing::{debug, instrument};
use uuid::Uuid;

use crate::{
Expand Down Expand Up @@ -182,3 +183,9 @@ extern "C" fn v8_handle_wall_clock_beforeunload(
);
}
}

#[instrument(level = "debug", skip_all)]
extern "C" fn v8_handle_early_retire(isolate: &mut v8::Isolate, _data: *mut std::ffi::c_void) {
isolate.low_memory_notification();
debug!("sent low mem notification");
}
9 changes: 7 additions & 2 deletions crates/base/src/rt_worker/supervisor/strategy_per_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ use sb_workers::context::{Timing, TimingStatus, UserWorkerMsgs};
use tokio::time::Instant;

use crate::rt_worker::supervisor::{
create_wall_clock_beforeunload_alert, v8_handle_termination, v8_handle_wall_clock_beforeunload,
wait_cpu_alarm, CPUUsage, CPUUsageMetrics, Tokens, V8HandleTerminationData,
create_wall_clock_beforeunload_alert, v8_handle_early_retire, v8_handle_termination,
v8_handle_wall_clock_beforeunload, wait_cpu_alarm, CPUUsage, CPUUsageMetrics, Tokens,
V8HandleTerminationData,
};

use super::Arguments;
Expand Down Expand Up @@ -46,6 +47,10 @@ pub async fn supervise(args: Arguments, oneshot: bool) -> (ShutdownReason, i64)
let (_, hard_limit_ms) = cpu_timer_param.limits();

let _guard = scopeguard::guard(is_retired, |v| {
if thread_safe_handle.request_interrupt(v8_handle_early_retire, std::ptr::null_mut()) {
waker.wake();
}

v.raise();
});

Expand Down
8 changes: 6 additions & 2 deletions crates/base/src/rt_worker/supervisor/strategy_per_worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use log::error;
use sb_workers::context::{Timing, TimingStatus, UserWorkerMsgs};

use crate::rt_worker::supervisor::{
create_wall_clock_beforeunload_alert, v8_handle_wall_clock_beforeunload, wait_cpu_alarm,
CPUUsage, Tokens,
create_wall_clock_beforeunload_alert, v8_handle_early_retire,
v8_handle_wall_clock_beforeunload, wait_cpu_alarm, CPUUsage, Tokens,
};

use super::{v8_handle_termination, Arguments, CPUUsageMetrics, V8HandleTerminationData};
Expand Down Expand Up @@ -85,6 +85,10 @@ pub async fn supervise(args: Arguments) -> (ShutdownReason, i64) {
);

let early_retire_fn = || {
if thread_safe_handle.request_interrupt(v8_handle_early_retire, std::ptr::null_mut()) {
waker.wake();
}

// we should raise a retire signal because subsequent incoming requests are unlikely to get
// enough wall clock time or cpu time
guard.raise();
Expand Down