Commit2757aa2

committed

Revertcompute_scheduled_recurrent_grain

1 parentd5eb265 commit2757aa2Copy full SHA for 2757aa2

File tree

3 files changed

-53

lines changed

cores/esp8266

3 files changed

-53

lines changed

`‎cores/esp8266/Schedule.cpp‎`

Lines changed: 0 additions & 35 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include<assert.h>`
`20`		`-#include<numeric>`
`21`	`20`
`22`	`21`	`#include"Schedule.h"`
`23`	`22`	`#include"PolledTimeout.h"`
`@@ -35,7 +34,6 @@ static scheduled_fn_t* sFirst = nullptr;`
`35`	`34`	`staticscheduled_fn_t*sLast =nullptr;`
`36`	`35`	`staticscheduled_fn_t*sUnused =nullptr;`
`37`	`36`	`staticintsCount =0;`
`38`		`-staticuint32_t recurrent_max_grain_mS =0;`
`39`	`37`
`40`	`38`	`typedef std::function<bool(void)>mRecFuncT;`
`41`	`39`	`structrecurrent_fn_t`
`@@ -132,39 +130,9 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,`
`132`	`130`	`}`
`133`	`131`	`rLast = item;`
`134`	`132`
`135`		`-// grain needs to be recomputed`
`136`		`- recurrent_max_grain_mS =0;`
`137`		`-`
`138`	`133`	`returntrue;`
`139`	`134`	`}`
`140`	`135`
`141`		`-uint32_tcompute_scheduled_recurrent_grain ()`
`142`		`-{`
`143`		`-if (recurrent_max_grain_mS ==0)`
`144`		`- {`
`145`		`-if (rFirst)`
`146`		`- {`
`147`		`-uint32_t recurrent_max_grain_uS = rFirst->callNow.getTimeout();`
`148`		`-for (auto it = rFirst->mNext; it; it = it->mNext)`
`149`		`- recurrent_max_grain_uS =std::gcd(recurrent_max_grain_uS, it->callNow.getTimeout());`
`150`		`-if (recurrent_max_grain_uS)`
`151`		`-// round to the upper millis`
`152`		`- recurrent_max_grain_mS = recurrent_max_grain_uS <=1000?1: (recurrent_max_grain_uS +999) /1000;`
`153`		`- }`
`154`		`-`
`155`		`-#ifdef DEBUG_ESP_CORE`
`156`		`-staticuint32_t last_grain =0;`
`157`		`-if (recurrent_max_grain_mS != last_grain)`
`158`		`- {`
`159`		`-::printf(":rsf %u->%u\n", last_grain, recurrent_max_grain_mS);`
`160`		`- last_grain = recurrent_max_grain_mS;`
`161`		`- }`
`162`		`-#endif`
`163`		`- }`
`164`		`-`
`165`		`-return recurrent_max_grain_mS;`
`166`		`-}`
`167`		`-`
`168`	`136`	`voidrun_scheduled_functions()`
`169`	`137`	`{`
`170`	`138`	`// prevent scheduling of new functions during this run`
`@@ -258,9 +226,6 @@ void run_scheduled_recurrent_functions()`
`258`	`226`	`}`
`259`	`227`
`260`	`228`	`delete(to_ditch);`
`261`		`-`
`262`		`-// grain needs to be recomputed`
`263`		`- recurrent_max_grain_mS =0;`
`264`	`229`	`}`
`265`	`230`	`else`
`266`	`231`	`{`

`‎cores/esp8266/Schedule.h‎`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,6 @@`
`39`	`39`	`// scheduled function happen more often: every yield() (vs every loop()),`
`40`	`40`	`// and time resolution is microsecond (vs millisecond). Details are below.`
`41`	`41`
`42`		`-// compute_scheduled_recurrent_grain() is used by delay() to give a chance to`
`43`		`-// all recurrent functions to run per their timing requirement.`
`44`		`-`
`45`		`-uint32_tcompute_scheduled_recurrent_grain ();`
`46`		`-`
`47`	`42`	`// scheduled functions called once:`
`48`	`43`	`//`
`49`	`44`	`// * internal queue is FIFO.`

`‎cores/esp8266/core_esp8266_main.cpp‎`

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@`
`22`	`22`
`23`	`23`	`//This may be used to change user task stack size:`
`24`	`24`	`//#define CONT_STACKSIZE 4096`
`25`		`-`
`26`		`-#include<numeric>`
`27`		`-`
`28`	`25`	`#include<Arduino.h>`
`29`	`26`	`#include"Schedule.h"`
`30`	`27`	`extern"C" {`
`@@ -175,16 +172,8 @@ bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin`
`175`	`172`	`if (expired >= timeout_ms) {`
`176`	`173`	`returntrue;// expired`
`177`	`174`	`}`
`178`		`-`
`179`		`-// compute greatest chunked delay with respect to scheduled recurrent functions`
`180`		`-uint32_t grain_ms =std::gcd(intvl_ms,compute_scheduled_recurrent_grain());`
`181`		`-`
`182`		`-// recurrent scheduled functions will be called from esp_delay()->esp_suspend()`
`183`		`-esp_delay(grain_ms >0 ?`
`184`		`-std::min((timeout_ms - expired), grain_ms):`
`185`		`- (timeout_ms - expired));`
`186`		`-`
`187`		`-returnfalse;// expiration must be checked again`
	`175`	`+esp_delay(std::min((timeout_ms - expired), intvl_ms));`
	`176`	`+returnfalse;`
`188`	`177`	`}`
`189`	`178`
`190`	`179`	`extern"C"void__yield() {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2757aa2

File tree

3 files changed

3 files changed

`‎cores/esp8266/Schedule.cpp‎`

`‎cores/esp8266/Schedule.h‎`

`‎cores/esp8266/core_esp8266_main.cpp‎`

0 commit comments