8000 recurrent scheduled functions max delay update by dok-net · Pull Request #8949 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

recurrent scheduled functions max delay update #8949

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.

Sign up for GitHub

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

Draft
wants to merge 29 commits into
base: master
Choose a base branch
from
Draft

recurrent scheduled functions max delay update #8949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2757aa2
Revert `compute_scheduled_recurrent_grain`
dok-net Jul 1, 2023
a81e544
wip
dok-net Jul 1, 2023
588e153
Add function to retrieve the time remaining until the (next) timeout …
dok-net Nov 26, 2019
a435fa5
Rename and reformat according to review.
dok-net Nov 27, 2019
232961e
Revert _current as member change.
dok-net Nov 27, 2019
210c3d4
Fix expiredOneShot to properly stay expired forever unless reset.
dok-net Nov 27, 2019
a6456d0
Fix "reverse notation return statement"
dok-net Nov 27, 2019
9863f71
Reset() was wrecked by resetting _timeout. Reverted.
dok-net Nov 27, 2019
9c83f9a
Expired check ALWAYS executes yield policy BEFORE checking expiration…
dok-net Dec 2, 2019
4cbe06b
Reformat
dok-net Dec 3, 2019
20e6378
Fix comment, remove redundant parentheses
dok-net Dec 4, 2019
b0eb345
expired() is not const qualified in PolledTmeout.
dok-net Mar 15, 2021
a3612dd
expiredOneShot() qualifed as const, despite asymmetry with expired() …
dok-net Mar 16, 2021
c88af7b
Remove alwaysExpired, it is identical to 0 and obfuscates the code.
dok-net Apr 5, 2021
4eab7e4
Somewhat easier on the human reader.
dok-net Apr 5, 2021
b5285c3
Avoid possible unnecessary time conversion.
dok-net Apr 5, 2021
b54576f
Fix one-shot mode in resetToNeverExpires(). Add convenient stop() syn…
dok-net Apr 5, 2021
100d2c4
Due to review and discussion, _oneShotExpired removed again.
dok-net Apr 5, 2021
81b90c9
Revert removal of PolledTimeout::alwaysExpired
dok-net Jul 1, 2023
eaf05e9
Finalize scheduled recurrent function delay logic.
dok-net Jul 1, 2023
a09726d
Fix millis/micros mismatch.
dok-net Jul 1, 2023
4d3655b
ISR safety.
dok-net Jul 1, 2023
55d465a
Returning max delay value that is uint-wrap around safe.
dok-net Jul 2, 2023
c41a2c2
Add pseudo-get delay function for scheduled functions
dok-net Jul 2, 2023
4e654d1
Worked out input from PR review.
dok-net Jul 20, 2023
717f4ad
use single constexpr definition instead of repeated expression.
dok-net Jul 27, 2023
538025a
Simplified roll-over logic
dok-net Jul 30, 2023
861cf02
Add rationale for HALF_MAX_MICROS
dok-net Jul 30, 2023
b3b4aa0
Use CAS to minimize critical sections.
dok-net Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix millis/micros mismatch.
  • Loading branch information
@dok-net
dok-net committed Jan 5, 2024
commit a09726d672a7cfbb0ceb7006c84a884eaa0a03f2
14 changes: 7 additions & 7 deletions cores/esp8266/Schedule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
item->alarm = alarm;

// prevent new item overwriting an already expired rTarget.
const int32_t rRemaining = rTarget - millis();
const int32_t rRemaining = rTarget - micros();
if (!rFirst || (rRemaining > 0 && static_cast<uint32_t>(rRemaining) > item->callNow.remaining()))
{
rTarget = millis() + item->callNow.remaining();
rTarget = micros() + item->callNow.remaining();
}

esp8266::InterruptLock lockAllInterruptsInThisScope;
Expand All @@ -141,11 +141,11 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,
return true;
}

uint32_t get_scheduled_recurrent_delay()
uint32_t get_scheduled_recurrent_delay_us()
{
if (!rFirst) return ~static_cast<uint32_t>(0);
// handle already expired rTarget.
const int32_t rRemaining = rTarget - millis();
const int32_t rRemaining = rTarget - micros();
return (rRemaining > 0) ? static_cast<uint32_t>(rRemaining) : 0;
}

Expand Down Expand Up @@ -209,7 +209,7 @@ void run_scheduled_recurrent_functions()
fence = true;
}

rTarget = millis() + current->callNow.remaining();
rTarget = micros() + current->callNow.remaining();
recurrent_fn_t* prev = nullptr;
// prevent scheduling of new functions during this run
auto stop = rLast;
Expand Down Expand Up @@ -249,10 +249,10 @@ void run_scheduled_recurrent_functions()
prev = current;
current = current->mNext;
// prevent current item overwriting an already expired rTarget.
const int32_t rRemaining = rTarget - millis();
const int32_t rRemaining = rTarget - micros();
if (rRemaining > 0 && static_cast<uint32_t>(rRemaining) > current->callNow.remaining())
{
rTarget = millis() + current->callNow.remaining();
rTarget = micros() + current->callNow.remaining();
}
}

Expand Down
4 changes: 2 additions & 2 deletions cores/esp8266/Schedule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
// scheduled function happen more often: every yield() (vs every loop()),
// and time resolution is microsecond (vs millisecond). Details are below.

// get_scheduled_recurrent_delay() is used by delay() to give a chance to
// get_scheduled_recurrent_delay_us() is used by delay() to give a chance to
// all recurrent functions to run per their timing requirement.

uint32_t get_scheduled_recurrent_delay();
uint32_t get_scheduled_recurrent_delay_us();

// scheduled functions called once:
//
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/core_esp8266_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin
}

// compute greatest delay interval with respect to scheduled recurrent functions
const uint32_t max_delay_ms = std::min(intvl_ms, get_scheduled_recurrent_delay());
const uint32_t max_delay_ms = std::min(intvl_ms, get_scheduled_recurrent_delay_us() / 1000);

// recurrent scheduled functions will be called from esp_delay()->esp_suspend()
esp_delay(std::min((timeout_ms - expired), max_delay_ms));
Expand Down
0