language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-30 21:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add exec_new_thread

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-12-14 05:29:47 +09:00
parent fe7ce9d1b3
commit 0e928c758f
6 changed files with 31 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/erg_common/lib.rs
View file

@ -21,6 +21,7 @@ pub mod python_util;
pub mod serialize;
pub mod set;
pub mod shared;
pub mod spawn;
pub mod stdin;
pub mod str;
pub mod style;

22
compiler/erg_common/spawn.rs Normal file
View file

@ -0,0 +1,22 @@
use std::thread;
/// Execute a function in a new thread on Windows, otherwise just run it.
///
/// Windows has a smaller default stack size than other OSs, which may cause a stack overflow, especially in the parsing process.
pub fn exec_new_thread<F, T>(run: F) -> T
where
F: FnOnce() -> T + Send + 'static,
T: Send + 'static,
{
if cfg!(windows) {
const STACK_SIZE: usize = 4 * 1024 * 1024;
let child = thread::Builder::new()
.stack_size(STACK_SIZE)
.spawn(run)
.unwrap();
// Wait for thread to join
child.join().unwrap()
} else {
run()
}
}

16
compiler/erg_compiler/main.rs
View file

@ -3,9 +3,9 @@ extern crate erg_compiler;
extern crate erg_parser;
use std::process;
use std::thread;
use erg_common::config::ErgConfig;
use erg_common::spawn::exec_new_thread;
use erg_common::traits::Runnable;
use erg_compiler::build_hir::HIRBuilder;
@ -49,17 +49,5 @@ fn run() {
}
fn main() {
if cfg!(windows) {
const STACK_SIZE: usize = 4 * 1024 * 1024;
let child = thread::Builder::new()
.stack_size(STACK_SIZE)
.spawn(run)
.unwrap();
// Wait for thread to join
child.join().unwrap();
} else {
run();
}
exec_new_thread(run);
}

16
compiler/erg_parser/main.rs
View file

@ -2,9 +2,9 @@ extern crate erg_common;
extern crate erg_parser;
use std::process;
use std::thread;
use erg_common::config::ErgConfig;
use erg_common::spawn::exec_new_thread;
use erg_common::traits::Runnable;
use erg_parser::build_ast::ASTBuilder;
@ -31,17 +31,5 @@ fn run() {
}
fn main() {
if cfg!(windows) {
const STACK_SIZE: usize = 4 * 1024 * 1024;
let child = thread::Builder::new()
.stack_size(STACK_SIZE)
.spawn(run)
.unwrap();
// Wait for thread to join
child.join().unwrap();
} else {
run();
}
exec_new_thread(run);
}

18
src/main.rs
View file

@ -3,10 +3,9 @@ extern crate erg_compiler;
extern crate erg_parser;
use std::process;
#[cfg(target_os = "windows")]
use std::thread;
use erg_common::config::ErgConfig;
use erg_common::spawn::exec_new_thread;
use erg_common::traits::Runnable;
use erg_parser::build_ast::ASTBuilder;
@ -59,18 +58,5 @@ fn run() {
}
fn main() {
#[cfg(target_os = "windows")]
{
const STACK_SIZE: usize = 4 * 1024 * 1024;
let child = thread::Builder::new()
.stack_size(STACK_SIZE)
.spawn(run)
.unwrap();
// Wait for thread to join
child.join().unwrap();
}
#[cfg(not(target_os = "windows"))]
run();
exec_new_thread(run);
}

16
tests/test.rs
View file

@ -3,6 +3,7 @@ use std::path::PathBuf;
use erg_common::config::ErgConfig;
use erg_common::error::MultiErrorDisplay;
use erg_common::python_util::PythonVersion;
use erg_common::spawn::exec_new_thread;
use erg_common::traits::{Runnable, Stream};
use erg_compiler::error::CompileErrors;
@ -268,19 +269,6 @@ fn _exec_vm(file_path: &'static str) -> Result<i32, CompileErrors> {
vm.exec()
}
#[cfg(target_os = "windows")]
fn exec_vm(file_path: &'static str) -> Result<i32, CompileErrors> {
const STACK_SIZE: usize = 4 * 1024 * 1024;
let child = std::thread::Builder::new()
.stack_size(STACK_SIZE)
.spawn(move || _exec_vm(file_path))
.unwrap();
// Wait for thread to join
child.join().unwrap()
}
#[cfg(not(target_os = "windows"))]
fn exec_vm(file_path: &'static str) -> Result<i32, CompileErrors> {
_exec_vm(file_path)
exec_new_thread(move || _exec_vm(file_path))
}