Skip to content

Dev/v13.x#128

Merged
szmyd merged 2 commits into
eBay:dev/v13.xfrom
szmyd:dev/v13.x
Jun 6, 2026
Merged

Dev/v13.x#128
szmyd merged 2 commits into
eBay:dev/v13.xfrom
szmyd:dev/v13.x

Conversation

@szmyd

@szmyd szmyd commented Jun 6, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

xiaoxichen and others added 2 commits June 5, 2026 01:03
Recurring timer callbacks now receive the timerfd expiration count so
they can decide whether to run once or N times. Add backward-compat
overloads that preserve old loop-N-times behavior for void(void*)
callers.

Add tests for void(void*, uint64_t) thread and global timer callbacks.

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
…v13.x

Brings the recurring-timer fix from stable/v12.x forward to v13. Upstream
572d768 changes timer_callback_t from void(void*) to void(void*, uint64_t):
the reactor hands the timerfd expiration count to the callback once instead
of blindly invoking it N times, and adds SFINAE backward-compat overloads so
existing void(void*) callers keep their loop-N-times behavior.

The literal patch did not apply cleanly because v13's timer subsystem was
refactored; resolved as follows:

- timer_callback_t moved from the (now deleted) iomgr_timer.hpp into iomgr.hpp;
  applied the signature change there. iomgr_timer.hpp stays deleted.
- Dropped the upstream SPDK hunks (timer_spdk / spdk_thread_timer_info) -- SPDK
  was removed in v13.
- Kept conanfile.py at 13.0.0 (ignored the 12.0.3 bump).
- Updated timer_epoll::on_timer_armed declaration for the new exp_count param.
- Updated the v13-only RAII layer's adapt() (timer.cpp) for the 2-arg signature;
  a high-level void() recurring callback fires once per notification (the
  "invoke once" default), not N times.
- Kept both the v13 RAII lifecycle test and the upstream 2-param tests; ported
  the thread-timer test from io_fiber_t/iofiber_self() to the v13
  IOReactor*/this_reactor() API.
@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 66.66667% with 4 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (dev/v13.x@1fc36e7). Learn more about missing BASE report.

Files with missing lines Patch % Lines
src/lib/iomgr_timer.cpp 60.00% 0 Missing and 2 partials ⚠️
src/include/iomgr/iomgr.hpp 83.33% 0 Missing and 1 partial ⚠️
src/lib/timer.cpp 0.00% 0 Missing and 1 partial ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@             Coverage Diff              @@
##             dev/v13.x     #128   +/-   ##
============================================
  Coverage             ?   46.28%           
============================================
  Files                ?       35           
  Lines                ?     1415           
  Branches             ?      632           
============================================
  Hits                 ?      655           
  Misses               ?      325           
  Partials             ?      435           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@szmyd szmyd closed this Jun 6, 2026
@szmyd
szmyd merged commit 61b36c9 into eBay:dev/v13.x Jun 6, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants