nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 23:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #12058 - jonas-schievink:one-thread-with-extra-stack-please, r=jonas-schievink

Browse Source 
fix: Spawn a new thread with a larger stack for the LSP and proc-macro server

This runs the server and proc-macro process in dedicated threads with 8 MB of stack space to paper over OS differences and fix occasional stack overflows.

This hopefully resolves https://github.com/rust-lang/rust-analyzer/issues/11669
This commit is contained in:
bors 2022-04-22 15:46:30 +00:00
commit 1894473b19
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/rust-analyzer/src/bin/main.rs
View File

@ -77,9 +77,13 @@ fn try_main() -> Result<()> {
println!("{}", flags::RustAnalyzer::HELP);
return Ok(());
}
run_server()?
with_extra_thread("rust-analyzer server thread", run_server)?;
}
flags::RustAnalyzerCmd::ProcMacro(flags::ProcMacro) => {
with_extra_thread("rust-analyzer proc-macro expander", || {
proc_macro_srv::cli::run().map_err(Into::into)
})?;
}
flags::RustAnalyzerCmd::ProcMacro(flags::ProcMacro) => proc_macro_srv::cli::run()?,
flags::RustAnalyzerCmd::Parse(cmd) => cmd.run()?,
flags::RustAnalyzerCmd::Symbols(cmd) => cmd.run()?,
flags::RustAnalyzerCmd::Highlight(cmd) => cmd.run()?,
@ -128,6 +132,23 @@ fn setup_logging(log_file: Option<&Path>) -> Result<()> {
Ok(())
}
const STACK_SIZE: usize = 1024 * 1024 * 8;
/// Parts of rust-analyzer can use a lot of stack space, and some operating systems only give us
/// 1 MB by default (eg. Windows), so this spawns a new thread with hopefully sufficient stack
/// space.
fn with_extra_thread(
thread_name: impl Into<String>,
f: impl FnOnce() -> Result<()> + Send + 'static,
) -> Result<()> {
let handle =
std::thread::Builder::new().name(thread_name.into()).stack_size(STACK_SIZE).spawn(f)?;
match handle.join() {
Ok(res) => res,
Err(panic) => std::panic::resume_unwind(panic),
}
}
fn run_server() -> Result<()> {
tracing::info!("server version {} will start", env!("REV"));