Use sisl v12

szmyd · Mar 24, 2024 · fca8ec7 · fca8ec7
1 parent 972239e
commit fca8ec7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class IOMgrConan(ConanFile):
     name = "iomgr"
-    version = "11.1.1"
+    version = "11.2.1"
 
     homepage = "https://github.com/eBay/IOManager"
     description = "Asynchronous event manager"
@@ -54,7 +54,7 @@ def build_requirements(self):
         self.build_requires("cpr/1.10.4")
 
     def requirements(self):
-        self.requires("sisl/[~=11, include_prerelease=True]@oss/master")
+        self.requires("sisl/[~=12, include_prerelease=True]@oss/master")
         if self.options.grpc_support:
             self.requires("grpc/[>=1.50]")
             self.requires("grpc_internal/1.48.0")

diff --git a/src/include/iomgr/iomgr_flip.hpp b/src/include/iomgr/iomgr_flip.hpp
@@ -40,8 +40,14 @@ class FlipTimerIOMgr : public flip::FlipTimerBase {
         };
 
         std::unique_lock< std::mutex > lk(m_mutex);
-        *thdl = IOManager::instance().schedule_thread_timer(delay_us.total_nanoseconds(), false /* recurring */,
-                                                            nullptr /* cookie */, cb);
+        if (IOManager::instance().am_i_io_reactor()) {
+            *thdl = IOManager::instance().schedule_thread_timer(delay_us.total_nanoseconds(), false /* recurring */,
+                                                                nullptr /* cookie */, cb);
+        } else {
+            *thdl =
+                IOManager::instance().schedule_global_timer(delay_us.total_nanoseconds(), false /* recurring */,
+                                                            nullptr /* cookie */, iomgr::reactor_regex::all_worker, cb);
+        }
         m_timer_instances.insert(std::make_pair(timer_name, thdl));
     }