espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-12-16 19:47:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(heap): Link heap raw malloc/free from flash to iram

Browse Source 
Remove raw malloc internal calling function.
This commit is contained in:
dongheng
2019-04-02 10:53:52 +08:00
parent 0460e53434
commit 86df7f879a
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;