arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-05 07:24:48 +03:00
Code

Substitute micros() by CPU cycles - faster, but large values for interval_us can overflow - 26s at 160MHz CPU clock.

Browse Source
This commit is contained in:
Dirk O. Kaar 2019-11-19 01:36:59 +01:00
parent d6e603f397
commit 598361f3aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cores/esp8266/core_esp8266_main.cpp
View File

@ -58,7 +58,7 @@ cont_t* g_pcont __attribute__((section(".noinit")));
static os_event_t s_loop_queue[LOOP_QUEUE_SIZE]; static os_event_t s_loop_queue[LOOP_QUEUE_SIZE];
/* Used to implement optimistic_yield */ /* Used to implement optimistic_yield */
static uint32_t s_micros_since_yield_start; static uint32_t s_cycles_since_yield_start;
/* For ets_intr_lock_nest / ets_intr_unlock_nest /* For ets_intr_lock_nest / ets_intr_unlock_nest
* Max nesting seen by SDK so far is 2. * Max nesting seen by SDK so far is 2.
@ -116,7 +116,7 @@ extern "C" void __yield() {
if (can_yield()) { if (can_yield()) {
esp_schedule(); esp_schedule();
esp_yield_within_cont(); esp_yield_within_cont();
s_micros_since_yield_start = system_get_time(); s_cycles_since_yield_start = ESP.getCycleCount();
} }
else { else {
panic(); panic();
@ -126,8 +126,9 @@ extern "C" void __yield() {
extern "C" void yield(void) __attribute__ ((weak, alias("__yield"))); extern "C" void yield(void) __attribute__ ((weak, alias("__yield")));
extern "C" void optimistic_yield(uint32_t interval_us) { extern "C" void optimistic_yield(uint32_t interval_us) {
const uint32_t interval_cycles = interval_us * ESP.getCpuFreqMHz();
if (can_yield() && if (can_yield() &&
(system_get_time() - s_micros_since_yield_start) > interval_us) (ESP.getCycleCount() - s_cycles_since_yield_start) > interval_cycles)
{ {
yield(); yield();
} }
@ -184,7 +185,7 @@ static void loop_wrapper() {
static void loop_task(os_event_t *events) { static void loop_task(os_event_t *events) {
(void) events; (void) events;
s_micros_since_yield_start = system_get_time(); s_cycles_since_yield_start = ESP.getCycleCount();
cont_run(g_pcont, &loop_wrapper); cont_run(g_pcont, &loop_wrapper);
if (cont_check(g_pcont) != 0) { if (cont_check(g_pcont) != 0) {
panic(); panic();
@ -212,7 +213,7 @@ extern void __unhandled_exception(const char *str);
static void __unhandled_exception_cpp() static void __unhandled_exception_cpp()
{ {
#ifndef __EXCEPTIONS #ifndef __EXCEPTIONS
abort(); abort();
#else #else
static bool terminating; static bool terminating;
if (terminating) if (terminating)