espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-08-06 15:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_heap_dump_error' into 'master'

Browse Source 
Fix HEAP dump error

See merge request sdk/ESP8266_RTOS_SDK!495
This commit is contained in:
Dong Heng
2018-09-17 17:30:03 +08:00
parent c8ecf01b56 b1da1ca461
commit b7a4aa9b4c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/heap/port/esp8266/include/esp_heap_port.h
View File

@ -28,7 +28,7 @@
#define _heap_caps_feed_wdt(_num) \ #define _heap_caps_feed_wdt(_num) \
{ \ { \
extern void pp_soft_wdt_feed(void); \ extern void esp_task_wdt_reset(void); \
pp_soft_wdt_feed(); \ esp_task_wdt_reset(); \
} }

2
components/heap/src/esp_heap_trace.c
View File

@ -118,7 +118,7 @@ void heap_trace_dump(void)
if (mem_blk_is_used(p) && mem_blk_is_traced(p)) { if (mem_blk_is_used(p) && mem_blk_is_traced(p)) {
mem2_blk_t *mem2_blk = (mem2_blk_t *)p; mem2_blk_t *mem2_blk = (mem2_blk_t *)p;
if (mem2_blk->line == (size_t)-1) { if (!mem2_blk->line) {
ESP_EARLY_LOGI(TAG, HEAP_INFO " caller func %p", HEAP_INFO_PARAM(p), mem2_blk->file); ESP_EARLY_LOGI(TAG, HEAP_INFO " caller func %p", HEAP_INFO_PARAM(p), mem2_blk->file);
} else { } else {
const char *file = rindex(mem2_blk->file, '/'); const char *file = rindex(mem2_blk->file, '/');