sd

Author: winstxnhdw

py-gxhash/src/lib.rs

@@ -1,4 +1,7 @@
+use pyo3::exceptions::PyRuntimeError;
 use pyo3::prelude::*;
+use pyo3_async_runtimes::tokio::future_into_py;
+use tokio::task::spawn_blocking;
 
 #[pyfunction]
 fn gxhash32(input_bytes: &[u8], seed: i64) -> PyResult<u32> {
@@ -14,12 +17,12 @@ fn gxhash32_nogil(py: Python, input_bytes: &[u8], seed: i64) -> PyResult<u32> {
 fn gxhash32_async<'p>(py: Python<'p>, input_bytes: &'p [u8], seed: i64) -> PyResult<Bound<'p, PyAny>> {
     let input_bytes_clone = input_bytes.to_vec();
 
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        let result = tokio::task::spawn_blocking(move || gxhash::gxhash32(&input_bytes_clone, seed)).await;
+    future_into_py(py, async move {
+        let result = Python::with_gil(|py| py.allow_threads(|| spawn_blocking(move || gxhash::gxhash32(&input_bytes_clone, seed)))).await;
 
         match result {
             Ok(result) => Ok(result),
-            Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!("Task failed: {:?}", e))),
+            Err(e) => Err(PyRuntimeError::new_err(format!("Task failed: {:?}", e))),
         }
     })
 }
@@ -38,12 +41,12 @@ fn gxhash64_nogil(py: Python, input_bytes: &[u8], seed: i64) -> PyResult<u64> {
 fn gxhash64_async<'p>(py: Python<'p>, input_bytes: &'p [u8], seed: i64) -> PyResult<Bound<'p, PyAny>> {
     let input_bytes_clone = input_bytes.to_vec();
 
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        let result = tokio::task::spawn_blocking(move || gxhash::gxhash64(&input_bytes_clone, seed)).await;
+    future_into_py(py, async move {
+        let result = spawn_blocking(move || gxhash::gxhash64(&input_bytes_clone, seed)).await;
 
         match result {
             Ok(result) => Ok(result),
-            Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!("Task failed: {:?}", e))),
+            Err(e) => Err(PyRuntimeError::new_err(format!("Task failed: {:?}", e))),
         }
     })
 }
@@ -62,30 +65,16 @@ fn gxhash128_nogil(py: Python, input_bytes: &[u8], seed: i64) -> PyResult<u128>
 fn gxhash128_async<'p>(py: Python<'p>, input_bytes: &'p [u8], seed: i64) -> PyResult<Bound<'p, PyAny>> {
     let input_bytes_clone = input_bytes.to_vec();
 
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        let result = tokio::task::spawn_blocking(move || gxhash::gxhash128(&input_bytes_clone, seed)).await;
+    future_into_py(py, async move {
+        let result = spawn_blocking(move || gxhash::gxhash128(&input_bytes_clone, seed)).await;
 
         match result {
             Ok(result) => Ok(result),
-            Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!("Task failed: {:?}", e))),
+            Err(e) => Err(PyRuntimeError::new_err(format!("Task failed: {:?}", e))),
         }
     })
 }
 
-#[pyfunction]
-fn test_async(py: Python<'_>) -> PyResult<Bound<'_, PyAny>> {
-    pyo3_async_runtimes::tokio::future_into_py(py, async move {
-        let result = tokio::task::spawn_blocking(move || {
-            std::thread::sleep(std::time::Duration::from_secs(1));
-            42
-        })
-        .await
-        .unwrap();
-
-        Ok(result)
-    })
-}
-
 #[pymodule(name = "gxhash")]
 fn pygxhash(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(gxhash32, m)?)?;
@@ -97,6 +86,5 @@ fn pygxhash(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(gxhash128, m)?)?;
     m.add_function(wrap_pyfunction!(gxhash128_nogil, m)?)?;
     m.add_function(wrap_pyfunction!(gxhash128_async, m)?)?;
-    m.add_function(wrap_pyfunction!(test_async, m)?)?;
     Ok(())
 }