-
Notifications
You must be signed in to change notification settings - Fork 6
fix: the timer should not be running early. #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tzssangglass
wants to merge
4
commits into
main
Choose a base branch
from
timer_to_jump_the_gun
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| local math_floor = math.floor | ||
|
|
||
|
Comment on lines
+1
to
+2
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Forgot to remove?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes |
||
| local utils = require("resty.timerng.utils") | ||
| local wheel = require("resty.timerng.wheel") | ||
| local array = require("resty.timerng.array") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
|
|
||
| local timer_module = require("resty.timerng") | ||
| local helper = require("helper") | ||
|
|
||
| local sleep = ngx.sleep | ||
| local update_time = ngx.update_time | ||
| local now = ngx.now | ||
| local timer_running_count = ngx.timer.running_count | ||
| local string_format = string.format | ||
|
|
||
|
|
||
| local function callback_func(premature, create_time, delay) | ||
| if premature then | ||
| return | ||
| end | ||
|
|
||
| update_time() | ||
| local now = now() | ||
| local dict = ngx.shared["timer_jump_the_gun"] | ||
| if not dict then | ||
| error("not found shared dict: timer_jump_the_gun") | ||
| return | ||
| end | ||
|
|
||
| dict:set("not_jump_the_gun", now - delay > create_time) | ||
| end | ||
|
|
||
|
|
||
| local function every_func() | ||
| update_time() | ||
| end | ||
|
|
||
| local rand_intervals = { | ||
| 0.111, | ||
| 0.222, | ||
| 0.333, | ||
| 0.444, | ||
| 0.555, | ||
| 0.666, | ||
| 0.777, | ||
| 0.888, | ||
| 0.999, | ||
| } | ||
|
|
||
| for rand_interval in pairs(rand_intervals) do | ||
| insulate("timer jump the gun", function () | ||
| local timer = { } | ||
|
|
||
| randomize() | ||
|
|
||
| lazy_setup(function () | ||
| timer = timer_module.new({ | ||
| min_threads = 16, | ||
| max_threads = 32, | ||
| }) | ||
|
|
||
| assert(timer:start()) | ||
|
|
||
| end) | ||
|
|
||
| lazy_teardown(function () | ||
| timer:freeze() | ||
| timer:destroy() | ||
|
|
||
| helper.wait_until(function () | ||
| assert.same(1, timer_running_count()) | ||
| return true | ||
| end) | ||
|
|
||
| end) | ||
|
|
||
| after_each(function () | ||
| assert.has_no.errors(function () | ||
| timer:cancel(helper.TIMER_NAME_ONCE) | ||
| end) | ||
| end) | ||
|
|
||
| it("test", function () | ||
| local delay = 30 * helper.RESOLUTION | ||
| local interval = 10 * helper.RESOLUTION | ||
| update_time() | ||
|
|
||
| assert.has_no.errors(function () | ||
| assert( | ||
| timer:every(interval, every_func) | ||
| ) | ||
| end) | ||
|
|
||
| sleep(rand_interval) | ||
|
|
||
| update_time() | ||
| assert.has_no.errors(function () | ||
| local create_time = now() | ||
| assert( | ||
| timer:named_at("foo", delay, callback_func, create_time, delay) | ||
| ) | ||
| end) | ||
|
|
||
| sleep(4) | ||
|
|
||
| local dict = ngx.shared["timer_jump_the_gun"] | ||
| if not dict then | ||
| error("not found shared dict: timer_jump_the_gun") | ||
| return | ||
| end | ||
|
|
||
| local jump_the_gun = dict:get("not_jump_the_gun") | ||
| assert.is_not_nil(jump_the_gun) | ||
| assert.is_true(jump_the_gun) | ||
| end) | ||
| end) | ||
| end | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason we don't do this for recurrent timers?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we do this to recurrent timers, they will loop and add +1 step each time they are recreated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I don't understand. The
stepis assigned byjob.new(...)and will never be changed anymore, I think it should not+1 stepfor each recreation.Please let me know if I'm wrong, I haven't touched this codebase for a long time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, you are right, I also think it should not
+1 stepfor each recreation, but I found if apply+1 stepfor recurrent timers, the trigger time maybe+1 stepeach time:reproduce
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for recurrent timers, if
+1 stepis added here, such as changing from 10 to 11, then the steps of this recurrent timer will always be 11, and 11 will be obtained each time the pointer is calculated.