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

Merge branch 'feature/link_heap_to_iram' into 'master'

Browse Source 
Link heap raw malloc/free from flash to iram

See merge request sdk/ESP8266_RTOS_SDK!870
This commit is contained in:
Dong Heng
2019-04-02 11:29:13 +08:00
parent 0460e53434 86df7f879a
commit 288b1c89de
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/heap/src/esp_heap_caps.c
View File

@ -22,12 +22,15 @@
#include "esp_heap_trace.h"
#include "priv/esp_heap_caps_priv.h"
#include "esp_attr.h"
#define LOG_LOCAL_LEVEL ESP_LOG_NONE
#include "esp_log.h"
static const char *TAG = "heap_caps";
extern heap_region_t g_heap_region[HEAP_REGIONS_MAX];
int __g_heap_trace_mode = HEAP_TRACE_NONE;
/**
* @brief Initialize regions of memory to the collection of heaps at runtime.
@ -90,7 +93,7 @@ size_t heap_caps_get_minimum_free_size(uint32_t caps)
/**
* @brief Allocate a chunk of memory which has the given capabilities
*/
void *_heap_caps_malloc(size_t size, uint32_t caps, const char *file, size_t line)
void IRAM_ATTR *_heap_caps_malloc(size_t size, uint32_t caps, const char *file, size_t line)
{
mem_blk_t *mem_blk, *next_mem_blk;
void *ret_mem = NULL;
@ -112,7 +115,7 @@ void *_heap_caps_malloc(size_t size, uint32_t caps, const char *file, size_t lin
_heap_caps_lock(num);
trace = heap_trace_is_on();
trace = __g_heap_trace_mode == HEAP_TRACE_LEAKS;
mem_blk_size = ptr2memblk_size(size, trace);
@ -209,7 +212,7 @@ next_region:
/**
* @brief Free memory previously allocated via heap_caps_(m/c/r/z)alloc().
*/
void _heap_caps_free(void *ptr, const char *file, size_t line)
void IRAM_ATTR _heap_caps_free(void *ptr, const char *file, size_t line)
{
int num;
mem_blk_t *mem_blk;

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

@ -42,8 +42,9 @@
#endif
static const char *TAG = "heap_trace";
static int s_heap_trace_mode = HEAP_TRACE_NONE;
extern heap_region_t g_heap_region[HEAP_REGIONS_MAX];
extern int __g_heap_trace_mode;
/**
* @brief Empty function just for passing compiling some place.
@ -58,7 +59,7 @@ esp_err_t heap_trace_init_standalone(heap_trace_record_t *record_buffer, size_t
*/
int heap_trace_is_on(void)
{
return s_heap_trace_mode == HEAP_TRACE_LEAKS;
return __g_heap_trace_mode == HEAP_TRACE_LEAKS;
}
/**
@ -66,7 +67,7 @@ int heap_trace_is_on(void)
*/
esp_err_t heap_trace_start(heap_trace_mode_t mode)
{
s_heap_trace_mode = mode;
__g_heap_trace_mode = mode;
return ESP_OK;
}
@ -76,7 +77,7 @@ esp_err_t heap_trace_start(heap_trace_mode_t mode)
*/
esp_err_t heap_trace_stop(void)
{
s_heap_trace_mode = HEAP_TRACE_NONE;
__g_heap_trace_mode = HEAP_TRACE_NONE;
return ESP_OK;
}
@ -86,7 +87,7 @@ esp_err_t heap_trace_stop(void)
*/
esp_err_t heap_trace_resume(void)
{
s_heap_trace_mode = HEAP_TRACE_LEAKS;
__g_heap_trace_mode = HEAP_TRACE_LEAKS;
return ESP_OK;
}