Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use HIGH priority to wake blocked timers (#11269)

Browse source 
One contributor to some beach-balls was that the main thread was calling
block_with_timeout, but the timeout never fired.

Release Notes:

- Reduced main thread hangs under very high system load
This commit is contained in:
Conrad Irwin 2024-05-01 16:03:27 -06:00 • committed by GitHub
parent 4739797e5d
commit e5b88ac8c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/src/api/events.rs
View file

@ -264,7 +264,7 @@ pub async fn post_hang(
Error::Internal(anyhow!(err)) Error::Internal(anyhow!(err))
})?; })?;
let mut backtrace = "Possible hang detected on main threadL".to_string(); let mut backtrace = "Possible hang detected on main thread:".to_string();
let unknown = "<unknown>".to_string(); let unknown = "<unknown>".to_string();
for frame in report.backtrace.iter() { for frame in report.backtrace.iter() {
backtrace.push_str(&format!("\n{}", frame.symbols.first().unwrap_or(&unknown))); backtrace.push_str(&format!("\n{}", frame.symbols.first().unwrap_or(&unknown)));

1
crates/gpui/build.rs
View file

@ -47,7 +47,6 @@ mod macos {
.header("src/platform/mac/dispatch.h") .header("src/platform/mac/dispatch.h")
.allowlist_var("_dispatch_main_q") .allowlist_var("_dispatch_main_q")
.allowlist_var("_dispatch_source_type_data_add") .allowlist_var("_dispatch_source_type_data_add")
.allowlist_var("DISPATCH_QUEUE_PRIORITY_DEFAULT")
.allowlist_var("DISPATCH_QUEUE_PRIORITY_HIGH") .allowlist_var("DISPATCH_QUEUE_PRIORITY_HIGH")
.allowlist_var("DISPATCH_TIME_NOW") .allowlist_var("DISPATCH_TIME_NOW")
.allowlist_function("dispatch_get_global_queue") .allowlist_function("dispatch_get_global_queue")

2
crates/gpui/src/platform/mac/dispatcher.rs
View file

@ -76,7 +76,7 @@ impl PlatformDispatcher for MacDispatcher {
fn dispatch_after(&self, duration: Duration, runnable: Runnable) { fn dispatch_after(&self, duration: Duration, runnable: Runnable) {
unsafe { unsafe {
let queue = let queue =
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT.try_into().unwrap(), 0); dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH.try_into().unwrap(), 0);
let when = dispatch_time(DISPATCH_TIME_NOW as u64, duration.as_nanos() as i64); let when = dispatch_time(DISPATCH_TIME_NOW as u64, duration.as_nanos() as i64);
dispatch_after_f( dispatch_after_f(
when, when,