mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-22 21:23:07 +03:00
127199ab6d
* Correct critical section with interrupt level preserving and nest support alternative. Replace ets_intr_lock()/ets_intr_unlock() with uint32_t oldValue=xt_rsil(3)/xt_wrs(oldValue). Added UMM_CRITICAL_DECL macro to define storage for current state. Expanded UMM_CRITICAL_... to use unique identifiers. This helpt facilitate gather function specific timing information. Replace printf with something that is ROM or IRAM based so that a printf that occurs during an ISR malloc/new does not cause a crash. To avoid any reentry issue it should also avoid doing malloc lib calls. Refactor realloc to avoid memcpy/memmove while in critical section. This is only effective when realloc is called with interrupts enabled. The copy process alone can take over 10us (when copying more than ~498 bytes with a 80MHz CPU clock). It would be good practice for an ISR to avoid realloc. Note, while doing this might initially sound scary, this appears to be very stable. It ran on my troublesome sketch for over 3 weeks until I got back from vacation and flashed an update. Troublesome sketch - runs ESPAsyncTCP, with modified fauxmo emulation for 10 devices. It receives lost of Network traffic related to uPnP scans, which includes lots of TCP connects disconnects RSTs related to uPnP discovery. I have clocked umm_info critical lock time taking as much as 180us. A common use for the umm_info call is to get the free heap result. It is common to try and closely monitor free heap as a method to detect memory leaks. This may result in frequent calls to umm_info. There has not been a clear test case that shows an issue yet; however, I and others think they are or have had crashes related to this. I have added code that adjusts the running free heap number from _umm_malloc, _umm_realloc, and _umm_free. Removing the need to do a long interrupts disabled calculation via _umm_info. Build optional, min/max time measurements for locks held while in info, malloc, realloc, and free. Also, maintain a count of how many times each is called with INTLEVEL set. * Fixed. travis build complaint. * Changes for https://github.com/esp8266/Arduino/pull/6274#pullrequestreview-259579883 * Added requested comment and missing comment for UMM_CRITICAL_PERIOD_ANALYZE. * Updated comments and update xt_rsil() * Moved xt_rsil&co (pulled in __STRINGIFY) definitions out of Arduino.h, to cores/esp8266/core_esp8266_features.h Added esp_get_cycle_count() to core_esp8266_features.h. Updated umm_malloc and Esp.h to use new defines and location. * Added "#ifndef CORE_MOCK" around conflicted area. * Moved performance measurment and ESP specific definitions to umm_performance.h/cpp. Removed testing asserts. * Commented out umm analyze. Delay CRITICAL_SECTION_EXIT() in umm_realloc() to avoid exposing a transient OOM condition to ISR. * Missed file change. This commit has: Delay CRITICAL_SECTION_EXIT() in umm_realloc() to avoid exposing a transient OOM condition to ISR. * 2nd Path. Removed early release of critical section around memmove to avoid a possible OOM for an ISR. * improved variable name * Resolved ISR OOM concern with `_umm_realloc()` Updated realloc() to do a preliminary free() of unused space, before performing a critical section exit and memmove. This change was applied to the current _umm_realloc(). This change should reduce the risk of an ISR getting an OOM, during a realloc memmove operation. Added additional stats for verifying correct operation. * Resolved ISR OOM concern in _umm_realloc() Updated realloc() to do a preliminary free() of unused space, before performing a critical section exit and memmove. This change was applied to the current _umm_realloc(). This change should reduce the risk of an ISR getting an OOM when interrupting an active realloc memmove operation. Added additional stats for verifying correct operation. Updated: for clarity and Travis-CI fail. * Update to keep access to alternate printf in one file. * Updated to use ISR safe versions of memmove, memcpy, and memset. The library versions of memmove, memcpy, and memset were in flash. Updated to use ROM functions ets_memmove, ets_memcpy, and ets_memset. Additional note, the library version of memmove does not appear to have been optimized. It took almost 10x longer than the ROM version. Renamed printf macro to DBGLOG_FUNCTION and moved to umm_malloc_cfg.h. Changed printf macro usage to use DBGLOG_FUNCTION. * Update umm_malloc.cpp Fix comment