Skip to content

drop PyErr in do_init while still holding the GIL #157

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
Jun 23, 2025
Merged

drop PyErr in do_init while still holding the GIL #157

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
12 changes: 7 additions & 5 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ fn componentize_py_module(_py: Python<'_>, module: &Bound<PyModule>) -> PyResult
module.add_function(pyo3::wrap_pyfunction!(drop_resource, module)?)
}

fn do_init(app_name: String, symbols: Symbols, stub_wasi: bool) -> Result<()> {
fn do_init(app_name: String, symbols: Symbols, stub_wasi: bool) -> Result<(), String> {
pyo3::append_to_inittab!(componentize_py_module);

pyo3::prepare_freethreaded_python();

Python::with_gil(|py| {
let init = |py: Python| {
let app = match py.import(app_name.as_str()) {
Ok(app) => app,
Err(e) => {
Expand Down Expand Up @@ -390,15 +390,17 @@ fn do_init(app_name: String, symbols: Symbols, stub_wasi: bool) -> Result<()> {

ARGV.set(argv.into()).unwrap();

Ok(())
})
Ok::<_, Error>(())
};

Python::with_gil(|py| init(py).map_err(|e| format!("{e:?}")))
}

struct MyExports;

impl Guest for MyExports {
fn init(app_name: String, symbols: Symbols, stub_wasi: bool) -> Result<(), String> {
let result = do_init(app_name, symbols, stub_wasi).map_err(|e| format!("{e:?}"));
let result = do_init(app_name, symbols, stub_wasi);

// This tells the WASI Preview 1 component adapter to reset its state. In particular, we want it to forget
// about any open handles and re-request the stdio handles at runtime since we'll be running under a brand
Expand Down
Loading