gil release

Author: wjblanke

src/python_bindings/fastvdf.cpp

@@ -11,12 +11,15 @@ PYBIND11_MODULE(chiavdf, m) {
     // Creates discriminant.
     m.def("create_discriminant", [] (const py::bytes& challenge_hash, int discriminant_size_bits) {
         std::string challenge_hash_str(challenge_hash);
-        py::gil_scoped_release release;
-        auto challenge_hash_bits = std::vector<uint8_t>(challenge_hash_str.begin(), challenge_hash_str.end());
-        integer D = CreateDiscriminant(
-            challenge_hash_bits,
-            discriminant_size_bits
-        );
+        integer D;
+        {
+            py::gil_scoped_release release;
+            auto challenge_hash_bits = std::vector<uint8_t>(challenge_hash_str.begin(), challenge_hash_str.end());
+            D = CreateDiscriminant(
+                challenge_hash_bits,
+                discriminant_size_bits
+            );
+        }
         return D.to_string();
     });
 
@@ -29,13 +32,14 @@ PYBIND11_MODULE(chiavdf, m) {
         std::string x_s_copy(x_s);
         std::string y_s_copy(y_s);
         std::string proof_s_copy(proof_s);
-        py::gil_scoped_release release;
-        form x = DeserializeForm(D, (const uint8_t *)x_s_copy.data(), x_s_copy.size());
-        form y = DeserializeForm(D, (const uint8_t *)y_s_copy.data(), y_s_copy.size());
-        form proof = DeserializeForm(D, (const uint8_t *)proof_s_copy.data(), proof_s_copy.size());
-
         bool is_valid = false;
-        VerifyWesolowskiProof(D, x, y, proof, num_iterations, is_valid);
+        {
+            py::gil_scoped_release release;
+            form x = DeserializeForm(D, (const uint8_t *)x_s_copy.data(), x_s_copy.size());
+            form y = DeserializeForm(D, (const uint8_t *)y_s_copy.data(), y_s_copy.size());
+            form proof = DeserializeForm(D, (const uint8_t *)proof_s_copy.data(), proof_s_copy.size());
+            VerifyWesolowskiProof(D, x, y, proof, num_iterations, is_valid);
+        }
         return is_valid;
     });
 
@@ -47,17 +51,22 @@ PYBIND11_MODULE(chiavdf, m) {
         std::string discriminant_copy(discriminant);
         std::string x_s_copy(x_s);
         std::string proof_blob_copy(proof_blob);
-        py::gil_scoped_release release;
         uint8_t *proof_blob_ptr = reinterpret_cast<uint8_t *>(proof_blob_copy.data());
         int proof_blob_size = proof_blob_copy.size();
-
-        return CheckProofOfTimeNWesolowski(integer(discriminant_copy), (const uint8_t *)x_s_copy.data(), proof_blob_ptr, proof_blob_size, num_iterations, disc_size_bits, recursion);
+        bool is_valid = false;
+        {
+            py::gil_scoped_release release;
+            is_valid=CheckProofOfTimeNWesolowski(integer(discriminant_copy), (const uint8_t *)x_s_copy.data(), proof_blob_ptr, proof_blob_size, num_iterations, disc_size_bits, recursion);
+        }
+        return is_valid;
     });
 
+
     m.def("prove", [] (const py::bytes& challenge_hash, const string& x_s, int discriminant_size_bits, uint64_t num_iterations, const string& shutdown_file_path) {
         std::string challenge_hash_str(challenge_hash);
         std::string x_s_copy(x_s);
         std::vector<uint8_t> result;
+        std::string shutdown_file_path_copy(shutdown_file_path);
         {
             py::gil_scoped_release release;
             std::vector<uint8_t> challenge_hash_bytes(challenge_hash_str.begin(), challenge_hash_str.end());
@@ -66,7 +75,7 @@ PYBIND11_MODULE(chiavdf, m) {
                     discriminant_size_bits
             );
             form x = DeserializeForm(D, (const uint8_t *) x_s_copy.data(), x_s_copy.size());
-            result = ProveSlow(D, x, num_iterations, shutdown_file_path);
+            result = ProveSlow(D, x, num_iterations, shutdown_file_path_copy);
         }
         py::bytes ret = py::bytes(reinterpret_cast<char*>(result.data()), result.size());
         return ret;
@@ -78,12 +87,12 @@ PYBIND11_MODULE(chiavdf, m) {
                                    const string& x_s,
                                    const string& proof_blob,
                                    const uint64_t num_iterations, const uint64_t recursion) {
+        std::string discriminant_copy(discriminant);
+        std::string B_copy(B);
+        std::string x_s_copy(x_s);
+        std::string proof_blob_copy(proof_blob);
         std::pair<bool, std::vector<uint8_t>> result;
         {
-            std::string discriminant_copy(discriminant);
-            std::string B_copy(B);
-            std::string x_s_copy(x_s);
-            std::string proof_blob_copy(proof_blob);
             py::gil_scoped_release release;
             uint8_t *proof_blob_ptr = reinterpret_cast<uint8_t *>(proof_blob_copy.data());
             int proof_blob_size = proof_blob_copy.size();
@@ -101,10 +110,12 @@ PYBIND11_MODULE(chiavdf, m) {
         std::string discriminant_copy(discriminant);
         std::string x_s_copy(x_s);
         std::string proof_blob_copy(proof_blob);
-        py::gil_scoped_release release;
-        uint8_t *proof_blob_ptr = reinterpret_cast<uint8_t *>(proof_blob_copy.data());
-        int proof_blob_size = proof_blob_copy.size();
-        integer B = GetBFromProof(integer(discriminant_copy), (const uint8_t *)x_s_copy.data(), proof_blob_ptr, proof_blob_size, num_iterations, recursion);
+        {
+            py::gil_scoped_release release;
+            uint8_t *proof_blob_ptr = reinterpret_cast<uint8_t *>(proof_blob_copy.data());
+            int proof_blob_size = proof_blob_copy.size();
+            integer B = GetBFromProof(integer(discriminant_copy), (const uint8_t *)x_s_copy.data(), proof_blob_ptr, proof_blob_size, num_iterations, recursion);
+        }
         return B.to_string();
     });
 }