Commita81e544

committed

wip

1 parent2757aa2 commita81e544Copy full SHA for a81e544

File tree

+25

-2

lines changed

+25

-2

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ struct recurrent_fn_t`
`47`	`47`
`48`	`48`	`staticrecurrent_fn_t* rFirst =nullptr;`
`49`	`49`	`staticrecurrent_fn_t* rLast =nullptr;`
	`50`	`+staticuint32_t rScheduleTarget =0;`
`50`	`51`
`51`	`52`	`// Returns a pointer to an unused sched_fn_t,`
`52`	`53`	`// or if none are available allocates a new one,`
`@@ -117,6 +118,10 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,`
`117`	`118`
`118`	`119`	`item->mFunc = fn;`
`119`	`120`	`item->alarm = alarm;`
	`121`	`+// if (!rScheduleTarget \|\| rScheduleTarget > item.callNow.remaining())`
	`122`	`+// {`
	`123`	`+// rScheduleTarget = item.callNow.remaining();`
	`124`	`+// }`
`120`	`125`
`121`	`126`	`esp8266::InterruptLock lockAllInterruptsInThisScope;`
`122`	`127`
`@@ -133,6 +138,11 @@ bool schedule_recurrent_function_us(const std::function<bool(void)>& fn,`
`133`	`138`	`returntrue;`
`134`	`139`	`}`
`135`	`140`
	`141`	`+uint32_tcompute_scheduled_recurrent_grain()`
	`142`	`+{`
	`143`	`+return0;`
	`144`	`+}`
	`145`	`+`
`136`	`146`	`voidrun_scheduled_functions()`
`137`	`147`	`{`
`138`	`148`	`// prevent scheduling of new functions during this run`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,11 @@`
`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`	`+`
`42`	`47`	`// scheduled functions called once:`
`43`	`48`	`//`
`44`	`49`	`// * internal queue is FIFO.`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,16 @@ bool esp_try_delay(const uint32_t start_ms, const uint32_t timeout_ms, const uin`
`172`	`172`	`if (expired >= timeout_ms) {`
`173`	`173`	`returntrue;// expired`
`174`	`174`	`}`
`175`		`-esp_delay(std::min((timeout_ms - expired), intvl_ms));`
`176`		`-returnfalse;`
	`175`	`+`
	`176`	`+// compute greatest delay interval with respect to scheduled recurrent functions`
	`177`	`+uint32_t grain_ms =std::min(intvl_ms,compute_scheduled_recurrent_grain());`
	`178`	`+`
	`179`	`+// recurrent scheduled functions will be called from esp_delay()->esp_suspend()`
	`180`	`+esp_delay(grain_ms >0 ?`
	`181`	`+std::min((timeout_ms - expired), grain_ms) :`
	`182`	`+ (timeout_ms - expired));`
	`183`	`+`
	`184`	`+returnfalse;// expiration must be checked again`
`177`	`185`	`}`
`178`	`186`
`179`	`187`	`extern"C"void__yield() {`

Comments

(0)