Added check for non-Ruby threads

ankane · Oct 6, 2024 · b19773c · b19773c
1 parent dfc2cac
commit b19773c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/ext/or-tools/constraint.cpp b/ext/or-tools/constraint.cpp
@@ -421,12 +421,13 @@ void init_constraint(Rice::Module& m) {
 
           m.Add(NewFeasibleSolutionObserver(
             [&callback](const CpSolverResponse& r) {
-              // ensure Ruby thread
-              if (ruby_native_thread_p()) {
-                // TODO find a better way to do this
-                callback.call("response=", r);
-                callback.call("on_solution_callback");
+              if (!ruby_native_thread_p()) {
+                throw std::runtime_error("Non-Ruby thread");
               }
+
+              // TODO find a better way to do this
+              callback.call("response=", r);
+              callback.call("on_solution_callback");
             })
           );
         }

diff --git a/ext/or-tools/routing.cpp b/ext/or-tools/routing.cpp
@@ -304,8 +304,13 @@ void init_routing(Rice::Module& m) {
     .define_method(
       "register_unary_transit_callback",
       [](RoutingModel& self, Object callback) {
+        // TODO guard callback?
         return self.RegisterUnaryTransitCallback(
           [callback](int64_t from_index) -> int64_t {
+            if (!ruby_native_thread_p()) {
+              throw std::runtime_error("Non-Ruby thread");
+            }
+
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index));
           }
         );
@@ -314,8 +319,13 @@ void init_routing(Rice::Module& m) {
     .define_method(
       "register_transit_callback",
       [](RoutingModel& self, Object callback) {
+        // TODO guard callback?
         return self.RegisterTransitCallback(
           [callback](int64_t from_index, int64_t to_index) -> int64_t {
+            if (!ruby_native_thread_p()) {
+              throw std::runtime_error("Non-Ruby thread");
+            }
+
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index, to_index));
           }
         );