From fca8ec777761d133587b991e77eec0066e24561c Mon Sep 17 00:00:00 2001 From: Harihara Kadayam Date: Sun, 24 Mar 2024 10:36:57 -0700 Subject: [PATCH] Use sisl v12 --- conanfile.py | 4 ++-- src/include/iomgr/iomgr_flip.hpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index b1b8e356..ca8d79e8 100644 --- 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 index 5b2d3a6e..279f135e 100644 --- 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)); }