luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored to prevent re-acquiring the gil

This commit is contained in:
R2D2 2021-08-01 22:38:34 +02:00
parent 3cfc76ae93
commit 5b8efdd6e2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pyo3-macros-backend/src/from_pyobject.rs
View File

@ -61,8 +61,7 @@ impl<'a> Enum<'a> {
match maybe_ret { match maybe_ret {
ok @ Ok(_) => return ok, ok @ Ok(_) => return ok,
Err(inner) => { Err(inner) => {
let gil = Python::acquire_gil(); let py = unsafe { Python::assume_gil_acquired() };
let py = gil.python();
err_reasons.push_str(&format!("{}\n", inner.instance(py).str().unwrap())); err_reasons.push_str(&format!("{}\n", inner.instance(py).str().unwrap()));
} }
} }
@ -212,8 +211,7 @@ impl<'a> Container<'a> {
); );
quote!( quote!(
Ok(#self_ty{#ident: obj.extract().map_err(|inner| { Ok(#self_ty{#ident: obj.extract().map_err(|inner| {
let gil = Python::acquire_gil(); let py = unsafe {Python::assume_gil_acquired() };
let py = gil.python();
let new_err = pyo3::exceptions::PyTypeError::new_err(#error_msg); let new_err = pyo3::exceptions::PyTypeError::new_err(#error_msg);
new_err.set_cause(py, Some(inner)); new_err.set_cause(py, Some(inner));
new_err new_err
@ -228,8 +226,7 @@ impl<'a> Container<'a> {
}; };
quote!( quote!(
Ok(#self_ty(obj.extract().map_err(|inner| { Ok(#self_ty(obj.extract().map_err(|inner| {
let gil = Python::acquire_gil(); let py = unsafe { Python::assume_gil_acquired() };
let py = gil.python();
let err_msg = format!("{}: {}", let err_msg = format!("{}: {}",
#error_msg, #error_msg,
inner.instance(py).str().unwrap()); inner.instance(py).str().unwrap());
@ -246,8 +243,7 @@ impl<'a> Container<'a> {
let error_msg = format!("failed to extract field {}.{}", quote!(#self_ty), i); let error_msg = format!("failed to extract field {}.{}", quote!(#self_ty), i);
fields.push(quote!( fields.push(quote!(
s.get_item(#i).extract().map_err(|inner| { s.get_item(#i).extract().map_err(|inner| {
let gil = Python::acquire_gil(); let py = unsafe { Python::assume_gil_acquired() };
let py = gil.python();
let new_err = pyo3::exceptions::PyTypeError::new_err(#error_msg); let new_err = pyo3::exceptions::PyTypeError::new_err(#error_msg);
new_err.set_cause(py, Some(inner)); new_err.set_cause(py, Some(inner));
new_err new_err
@ -287,16 +283,14 @@ impl<'a> Container<'a> {
let extractor = match &attrs.from_py_with { let extractor = match &attrs.from_py_with {
None => quote!( None => quote!(
#get_field.extract().map_err(|inner| { #get_field.extract().map_err(|inner| {
let gil = Python::acquire_gil(); let py = unsafe{ Python::assume_gil_acquired() };
let py = gil.python();
let new_err = pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg); let new_err = pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
new_err.set_cause(py, Some(inner)); new_err.set_cause(py, Some(inner));
new_err new_err
})?), })?),
Some(FromPyWithAttribute(expr_path)) => quote! ( Some(FromPyWithAttribute(expr_path)) => quote! (
#expr_path(#get_field).map_err(|inner| { #expr_path(#get_field).map_err(|inner| {
let gil = Python::acquire_gil(); let py = unsafe{ Python::assume_gil_acquired() };
let py = gil.python();
let new_err = pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg); let new_err = pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
new_err.set_cause(py, Some(inner)); new_err.set_cause(py, Some(inner));
new_err new_err