Move yield start time set to esp_yield_within_cont

dok-net · dok-net · commit 3d7423bddea6 · 2020-02-05T14:31:42.000+01:00
diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -97,6 +97,7 @@ extern "C" bool can_yield() {
 static inline void esp_yield_within_cont() __attribute__((always_inline));
 static void esp_yield_within_cont() {
         cont_yield(g_pcont);
+        s_cycles_since_yield_start = ESP.getCycleCount();
         run_scheduled_recurrent_functions();
 }
 
@@ -116,7 +117,6 @@ extern "C" void __yield() {
     if (can_yield()) {
         esp_schedule();
         esp_yield_within_cont();
-        s_cycles_since_yield_start = ESP.getCycleCount();
     }
     else {
         panic();
@@ -134,7 +134,6 @@ extern "C" void optimistic_yield(uint32_t interval_us) {
     }
 }
 
-
 // Replace ets_intr_(un)lock with nestable versions
 extern "C" void IRAM_ATTR ets_intr_lock() {
   if (ets_intr_lock_stack_ptr < ETS_INTR_LOCK_NEST_MAX)

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ extern "C" bool can_yield() {`
`97`	`97`	`static inline void esp_yield_within_cont() __attribute__((always_inline));`
`98`	`98`	`static void esp_yield_within_cont() {`
`99`	`99`	`cont_yield(g_pcont);`
	`100`	`+ s_cycles_since_yield_start = ESP.getCycleCount();`
`100`	`101`	`run_scheduled_recurrent_functions();`
`101`	`102`	`}`
`102`	`103`
`@@ -116,7 +117,6 @@ extern "C" void __yield() {`
`116`	`117`	`if (can_yield()) {`
`117`	`118`	`esp_schedule();`
`118`	`119`	`esp_yield_within_cont();`
`119`		`- s_cycles_since_yield_start = ESP.getCycleCount();`
`120`	`120`	`}`
`121`	`121`	`else {`
`122`	`122`	`panic();`
`@@ -134,7 +134,6 @@ extern "C" void optimistic_yield(uint32_t interval_us) {`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`-`
`138`	`137`	`// Replace ets_intr_(un)lock with nestable versions`
`139`	`138`	`extern "C" void IRAM_ATTR ets_intr_lock() {`
`140`	`139`	`if (ets_intr_lock_stack_ptr < ETS_INTR_LOCK_NEST_MAX)`