ST / ST_Events-old

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   HelloWorld_CCA01M1 HelloWorld_CCA02M1 CI-data-logger-server HelloWorld_CCA02M1 ... more

This is a fork of the events subdirectory of https://github.com/ARMmbed/mbed-os.

Note, you must import this library with import name: events!!!

hal/common/mbed_alloc_wrappers.cpp@7813:04b3c320bf04, 2016-08-31 (annotated)

Committer:
Neil Thiessen
Date:
Wed Aug 31 11:46:42 2016 -0600
Revision:
7813:04b3c320bf04
Parent:
7606:dbabbb13e5b0
Child:
7814:9b2b2d58d7dd
[HAL] Improve memory tracer



Fixed a bug and compiler warning in the memory tracer implementation.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Bogdan Marinescu 7604:4544d30abb2a 1 /* mbed Microcontroller Library
Bogdan Marinescu 7604:4544d30abb2a 2 * Copyright (c) 2006-2016 ARM Limited
Bogdan Marinescu 7604:4544d30abb2a 3 *
Bogdan Marinescu 7604:4544d30abb2a 4 * Licensed under the Apache License, Version 2.0 (the "License");
Bogdan Marinescu 7604:4544d30abb2a 5 * you may not use this file except in compliance with the License.
Bogdan Marinescu 7604:4544d30abb2a 6 * You may obtain a copy of the License at
Bogdan Marinescu 7604:4544d30abb2a 7 *
Bogdan Marinescu 7604:4544d30abb2a 8 * http://www.apache.org/licenses/LICENSE-2.0
Bogdan Marinescu 7604:4544d30abb2a 9 *
Bogdan Marinescu 7604:4544d30abb2a 10 * Unless required by applicable law or agreed to in writing, software
Bogdan Marinescu 7604:4544d30abb2a 11 * distributed under the License is distributed on an "AS IS" BASIS,
Bogdan Marinescu 7604:4544d30abb2a 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Bogdan Marinescu 7604:4544d30abb2a 13 * See the License for the specific language governing permissions and
Bogdan Marinescu 7604:4544d30abb2a 14 * limitations under the License.
Bogdan Marinescu 7604:4544d30abb2a 15 */
Bogdan Marinescu 7604:4544d30abb2a 16
Bogdan Marinescu 7604:4544d30abb2a 17 #include "mbed_mem_trace.h"
Bogdan Marinescu 7604:4544d30abb2a 18 #include "mbed_stats.h"
Bogdan Marinescu 7604:4544d30abb2a 19 #include "toolchain.h"
Bogdan Marinescu 7604:4544d30abb2a 20 #include "SingletonPtr.h"
Bogdan Marinescu 7604:4544d30abb2a 21 #include "PlatformMutex.h"
Bogdan Marinescu 7604:4544d30abb2a 22 #include <stddef.h>
Bogdan Marinescu 7604:4544d30abb2a 23 #include <stdio.h>
Bogdan Marinescu 7604:4544d30abb2a 24 #include <string.h>
Bogdan Marinescu 7604:4544d30abb2a 25 #include <stdlib.h>
Bogdan Marinescu 7604:4544d30abb2a 26
Bogdan Marinescu 7604:4544d30abb2a 27 /* There are two memory tracers in mbed OS:
Bogdan Marinescu 7604:4544d30abb2a 28
Bogdan Marinescu 7604:4544d30abb2a 29 - the first can be used to detect the maximum heap usage at runtime. It is
Bogdan Marinescu 7604:4544d30abb2a 30 activated by defining the MBED_HEAP_STATS_ENABLED macro.
Bogdan Marinescu 7604:4544d30abb2a 31 - the second can be used to trace each memory call by automatically invoking
Bogdan Marinescu 7604:4544d30abb2a 32 a callback on each memory operation (see hal/api/mbed_mem_trace.h). It is
Bogdan Marinescu 7604:4544d30abb2a 33 activated by defining the MBED_MEM_TRACING_ENABLED macro.
Bogdan Marinescu 7604:4544d30abb2a 34
Bogdan Marinescu 7604:4544d30abb2a 35 Both tracers can be activated and deactivated in any combination. If both tracers
Bogdan Marinescu 7604:4544d30abb2a 36 are active, the second one (MBED_MEM_TRACING_ENABLED) will trace the first one's
Bogdan Marinescu 7604:4544d30abb2a 37 (MBED_HEAP_STATS_ENABLED) memory calls.*/
Bogdan Marinescu 7604:4544d30abb2a 38
Bogdan Marinescu 7604:4544d30abb2a 39 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 40 /* Implementation of the runtime max heap usage checker */
Bogdan Marinescu 7604:4544d30abb2a 41 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 42
Bogdan Marinescu 7604:4544d30abb2a 43 /* Size must be a multiple of 8 to keep alignment */
Bogdan Marinescu 7604:4544d30abb2a 44 typedef struct {
Bogdan Marinescu 7604:4544d30abb2a 45 uint32_t size;
Bogdan Marinescu 7604:4544d30abb2a 46 uint32_t pad;
Bogdan Marinescu 7604:4544d30abb2a 47 } alloc_info_t;
Bogdan Marinescu 7604:4544d30abb2a 48
Neil Thiessen 7813:04b3c320bf04 49 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 50 static SingletonPtr<PlatformMutex> mem_trace_mutex;
Neil Thiessen 7813:04b3c320bf04 51 #endif
Neil Thiessen 7813:04b3c320bf04 52 #ifdef MBED_HEAP_STATS_ENABLED
Neil Thiessen 7813:04b3c320bf04 53 static SingletonPtr<PlatformMutex> malloc_stats_mutex;
Bogdan Marinescu 7604:4544d30abb2a 54 static mbed_stats_heap_t heap_stats = {0, 0, 0, 0, 0};
Neil Thiessen 7813:04b3c320bf04 55 #endif
Bogdan Marinescu 7604:4544d30abb2a 56
Bogdan Marinescu 7604:4544d30abb2a 57 void mbed_stats_heap_get(mbed_stats_heap_t *stats)
Bogdan Marinescu 7604:4544d30abb2a 58 {
Neil Thiessen 7813:04b3c320bf04 59 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 60 malloc_stats_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 61 memcpy(stats, &heap_stats, sizeof(mbed_stats_heap_t));
Bogdan Marinescu 7604:4544d30abb2a 62 malloc_stats_mutex->unlock();
Neil Thiessen 7813:04b3c320bf04 63 #else
Neil Thiessen 7813:04b3c320bf04 64 memset(stats, 0, sizeof(mbed_stats_heap_t));
Neil Thiessen 7813:04b3c320bf04 65 #endif
Bogdan Marinescu 7604:4544d30abb2a 66 }
Bogdan Marinescu 7604:4544d30abb2a 67
Bogdan Marinescu 7604:4544d30abb2a 68 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 69 /* GCC memory allocation wrappers */
Bogdan Marinescu 7604:4544d30abb2a 70 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 71
Bogdan Marinescu 7604:4544d30abb2a 72 #if defined(TOOLCHAIN_GCC)
Bogdan Marinescu 7604:4544d30abb2a 73
Bogdan Marinescu 7604:4544d30abb2a 74 #ifdef FEATURE_UVISOR
Bogdan Marinescu 7604:4544d30abb2a 75 #include "uvisor-lib/uvisor-lib.h"
Bogdan Marinescu 7604:4544d30abb2a 76 #endif/* FEATURE_UVISOR */
Bogdan Marinescu 7604:4544d30abb2a 77
Bogdan Marinescu 7604:4544d30abb2a 78 // TODO: memory tracing doesn't work with uVisor enabled.
Bogdan Marinescu 7604:4544d30abb2a 79 #if !defined(FEATURE_UVISOR)
Bogdan Marinescu 7604:4544d30abb2a 80
Bogdan Marinescu 7604:4544d30abb2a 81 extern "C" {
Bogdan Marinescu 7604:4544d30abb2a 82 void * __real__malloc_r(struct _reent * r, size_t size);
Bogdan Marinescu 7604:4544d30abb2a 83 void * __real__realloc_r(struct _reent * r, void * ptr, size_t size);
Bogdan Marinescu 7604:4544d30abb2a 84 void __real__free_r(struct _reent * r, void * ptr);
Bogdan Marinescu 7604:4544d30abb2a 85 void* __real__calloc_r(struct _reent * r, size_t nmemb, size_t size);
Bogdan Marinescu 7604:4544d30abb2a 86 }
Bogdan Marinescu 7604:4544d30abb2a 87
Bogdan Marinescu 7604:4544d30abb2a 88 extern "C" void * __wrap__malloc_r(struct _reent * r, size_t size) {
Bogdan Marinescu 7604:4544d30abb2a 89 void *ptr = NULL;
Bogdan Marinescu 7604:4544d30abb2a 90 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 91 malloc_stats_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 92 alloc_info_t *alloc_info = (alloc_info_t*)__real__malloc_r(r, size + sizeof(alloc_info_t));
Bogdan Marinescu 7604:4544d30abb2a 93 if (alloc_info != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 94 alloc_info->size = size;
Bogdan Marinescu 7604:4544d30abb2a 95 ptr = (void*)(alloc_info + 1);
Bogdan Marinescu 7604:4544d30abb2a 96 heap_stats.current_size += size;
Bogdan Marinescu 7604:4544d30abb2a 97 heap_stats.total_size += size;
Bogdan Marinescu 7604:4544d30abb2a 98 heap_stats.alloc_cnt += 1;
Bogdan Marinescu 7604:4544d30abb2a 99 if (heap_stats.current_size > heap_stats.max_size) {
Bogdan Marinescu 7604:4544d30abb2a 100 heap_stats.max_size = heap_stats.current_size;
Bogdan Marinescu 7604:4544d30abb2a 101 }
Bogdan Marinescu 7604:4544d30abb2a 102 } else {
Bogdan Marinescu 7604:4544d30abb2a 103 heap_stats.alloc_fail_cnt += 1;
Bogdan Marinescu 7604:4544d30abb2a 104 }
Bogdan Marinescu 7604:4544d30abb2a 105 malloc_stats_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 106 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 107 ptr = __real__malloc_r(r, size);
Bogdan Marinescu 7604:4544d30abb2a 108 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 109 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 110 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 111 mbed_mem_trace_malloc(ptr, size, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 112 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 113 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 114 return ptr;
Bogdan Marinescu 7604:4544d30abb2a 115 }
Bogdan Marinescu 7604:4544d30abb2a 116
Bogdan Marinescu 7604:4544d30abb2a 117 extern "C" void * __wrap__realloc_r(struct _reent * r, void * ptr, size_t size) {
Bogdan Marinescu 7604:4544d30abb2a 118 void *new_ptr = NULL;
Bogdan Marinescu 7604:4544d30abb2a 119 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 120 // Implement realloc_r with malloc and free.
Bogdan Marinescu 7604:4544d30abb2a 121 // The function realloc_r can't be used here directly since
Bogdan Marinescu 7604:4544d30abb2a 122 // it can call into __wrap__malloc_r (returns ptr + 4) or
Bogdan Marinescu 7604:4544d30abb2a 123 // resize memory directly (returns ptr + 0).
Bogdan Marinescu 7604:4544d30abb2a 124
Bogdan Marinescu 7604:4544d30abb2a 125 // Note - no lock needed since malloc and free are thread safe
Bogdan Marinescu 7604:4544d30abb2a 126
Bogdan Marinescu 7604:4544d30abb2a 127 // Get old size
Bogdan Marinescu 7604:4544d30abb2a 128 uint32_t old_size = 0;
Bogdan Marinescu 7604:4544d30abb2a 129 if (ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 130 alloc_info_t *alloc_info = ((alloc_info_t*)ptr) - 1;
Bogdan Marinescu 7604:4544d30abb2a 131 old_size = alloc_info->size;
Bogdan Marinescu 7604:4544d30abb2a 132 }
Bogdan Marinescu 7604:4544d30abb2a 133
Bogdan Marinescu 7604:4544d30abb2a 134 // Allocate space
Bogdan Marinescu 7604:4544d30abb2a 135 if (size != 0) {
Bogdan Marinescu 7604:4544d30abb2a 136 new_ptr = malloc(size);
Bogdan Marinescu 7604:4544d30abb2a 137 }
Bogdan Marinescu 7604:4544d30abb2a 138
Bogdan Marinescu 7604:4544d30abb2a 139 // If the new buffer has been allocated copy the data to it
Bogdan Marinescu 7604:4544d30abb2a 140 // and free the old buffer
Bogdan Marinescu 7604:4544d30abb2a 141 if (new_ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 142 uint32_t copy_size = (old_size < size) ? old_size : size;
Bogdan Marinescu 7604:4544d30abb2a 143 memcpy(new_ptr, (void*)ptr, copy_size);
Bogdan Marinescu 7604:4544d30abb2a 144 free(ptr);
Bogdan Marinescu 7604:4544d30abb2a 145 }
Bogdan Marinescu 7604:4544d30abb2a 146 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 147 new_ptr = __real__realloc_r(r, ptr, size);
Bogdan Marinescu 7604:4544d30abb2a 148 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 149 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 150 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 151 mbed_mem_trace_realloc(new_ptr, ptr, size, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 152 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 153 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 154 return new_ptr;
Bogdan Marinescu 7604:4544d30abb2a 155 }
Bogdan Marinescu 7604:4544d30abb2a 156
Bogdan Marinescu 7604:4544d30abb2a 157 extern "C" void __wrap__free_r(struct _reent * r, void * ptr) {
Bogdan Marinescu 7604:4544d30abb2a 158 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 159 malloc_stats_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 160 alloc_info_t *alloc_info = NULL;
Bogdan Marinescu 7604:4544d30abb2a 161 if (ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 162 alloc_info = ((alloc_info_t*)ptr) - 1;
Bogdan Marinescu 7604:4544d30abb2a 163 heap_stats.current_size -= alloc_info->size;
Bogdan Marinescu 7604:4544d30abb2a 164 heap_stats.alloc_cnt -= 1;
Bogdan Marinescu 7604:4544d30abb2a 165 }
Bogdan Marinescu 7604:4544d30abb2a 166 __real__free_r(r, (void*)alloc_info);
Bogdan Marinescu 7604:4544d30abb2a 167 malloc_stats_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 168 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 169 __real__free_r(r, ptr);
Bogdan Marinescu 7604:4544d30abb2a 170 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 171 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 172 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 173 mbed_mem_trace_free(ptr, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 174 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 175 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 176 }
Bogdan Marinescu 7604:4544d30abb2a 177
Bogdan Marinescu 7604:4544d30abb2a 178 extern "C" void * __wrap__calloc_r(struct _reent * r, size_t nmemb, size_t size) {
Bogdan Marinescu 7604:4544d30abb2a 179 void *ptr = NULL;
Bogdan Marinescu 7604:4544d30abb2a 180 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 181 // Note - no lock needed since malloc is thread safe
Bogdan Marinescu 7604:4544d30abb2a 182
Bogdan Marinescu 7604:4544d30abb2a 183 ptr = malloc(nmemb * size);
Bogdan Marinescu 7604:4544d30abb2a 184 if (ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 185 memset(ptr, 0, nmemb * size);
Bogdan Marinescu 7604:4544d30abb2a 186 }
Bogdan Marinescu 7604:4544d30abb2a 187 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 188 ptr = __real__calloc_r(r, nmemb, size);
Bogdan Marinescu 7604:4544d30abb2a 189 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 190 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 191 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 192 mbed_mem_trace_calloc(ptr, nmemb, size, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 193 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 194 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 195 return ptr;
Bogdan Marinescu 7604:4544d30abb2a 196 }
Bogdan Marinescu 7604:4544d30abb2a 197
Bogdan Marinescu 7604:4544d30abb2a 198 #endif // if !defined(FEATURE_UVISOR)
Bogdan Marinescu 7604:4544d30abb2a 199
Bogdan Marinescu 7604:4544d30abb2a 200 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 201 /* ARMCC memory allocation wrappers */
Bogdan Marinescu 7604:4544d30abb2a 202 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 203
Bogdan Marinescu 7604:4544d30abb2a 204 #elif defined(TOOLCHAIN_ARM) // #if defined(TOOLCHAIN_GCC)
Bogdan Marinescu 7604:4544d30abb2a 205
Bogdan Marinescu 7604:4544d30abb2a 206 /* Enable hooking of memory function only if tracing is also enabled */
Bogdan Marinescu 7604:4544d30abb2a 207 #if defined(MBED_MEM_TRACING_ENABLED) || defined(MBED_HEAP_STATS_ENABLED)
Bogdan Marinescu 7604:4544d30abb2a 208
Bogdan Marinescu 7604:4544d30abb2a 209 extern "C" {
Bogdan Marinescu 7604:4544d30abb2a 210 void *$Super$$malloc(size_t size);
Bogdan Marinescu 7604:4544d30abb2a 211 void *$Super$$realloc(void *ptr, size_t size);
Bogdan Marinescu 7604:4544d30abb2a 212 void *$Super$$calloc(size_t nmemb, size_t size);
Bogdan Marinescu 7604:4544d30abb2a 213 void $Super$$free(void *ptr);
Bogdan Marinescu 7604:4544d30abb2a 214 }
Bogdan Marinescu 7604:4544d30abb2a 215
Bogdan Marinescu 7604:4544d30abb2a 216 extern "C" void* $Sub$$malloc(size_t size) {
Bogdan Marinescu 7604:4544d30abb2a 217 void *ptr = NULL;
Bogdan Marinescu 7604:4544d30abb2a 218 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 219 malloc_stats_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 220 alloc_info_t *alloc_info = (alloc_info_t*)$Super$$malloc(size + sizeof(alloc_info_t));
Bogdan Marinescu 7604:4544d30abb2a 221 if (alloc_info != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 222 alloc_info->size = size;
Bogdan Marinescu 7604:4544d30abb2a 223 ptr = (void*)(alloc_info + 1);
Bogdan Marinescu 7604:4544d30abb2a 224 heap_stats.current_size += size;
Bogdan Marinescu 7604:4544d30abb2a 225 heap_stats.total_size += size;
Bogdan Marinescu 7604:4544d30abb2a 226 heap_stats.alloc_cnt += 1;
Bogdan Marinescu 7604:4544d30abb2a 227 if (heap_stats.current_size > heap_stats.max_size) {
Bogdan Marinescu 7604:4544d30abb2a 228 heap_stats.max_size = heap_stats.current_size;
Bogdan Marinescu 7604:4544d30abb2a 229 }
Bogdan Marinescu 7604:4544d30abb2a 230 } else {
Bogdan Marinescu 7604:4544d30abb2a 231 heap_stats.alloc_fail_cnt += 1;
Bogdan Marinescu 7604:4544d30abb2a 232 }
Bogdan Marinescu 7604:4544d30abb2a 233 malloc_stats_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 234 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 235 ptr = $Super$$malloc(size);
Bogdan Marinescu 7604:4544d30abb2a 236 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 237 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 238 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 239 mbed_mem_trace_malloc(ptr, size, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 240 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 241 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 242 return ptr;
Bogdan Marinescu 7604:4544d30abb2a 243 }
Bogdan Marinescu 7604:4544d30abb2a 244
Bogdan Marinescu 7604:4544d30abb2a 245 extern "C" void* $Sub$$realloc(void *ptr, size_t size) {
Bogdan Marinescu 7604:4544d30abb2a 246 void *new_ptr = NULL;
Bogdan Marinescu 7604:4544d30abb2a 247 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 248 // Note - no lock needed since malloc and free are thread safe
Bogdan Marinescu 7604:4544d30abb2a 249
Bogdan Marinescu 7604:4544d30abb2a 250 // Get old size
Bogdan Marinescu 7604:4544d30abb2a 251 uint32_t old_size = 0;
Bogdan Marinescu 7604:4544d30abb2a 252 if (ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 253 alloc_info_t *alloc_info = ((alloc_info_t*)ptr) - 1;
Bogdan Marinescu 7604:4544d30abb2a 254 old_size = alloc_info->size;
Bogdan Marinescu 7604:4544d30abb2a 255 }
Bogdan Marinescu 7604:4544d30abb2a 256
Bogdan Marinescu 7604:4544d30abb2a 257 // Allocate space
Bogdan Marinescu 7604:4544d30abb2a 258 if (size != 0) {
Bogdan Marinescu 7604:4544d30abb2a 259 new_ptr = malloc(size);
Bogdan Marinescu 7604:4544d30abb2a 260 }
Bogdan Marinescu 7604:4544d30abb2a 261
Bogdan Marinescu 7604:4544d30abb2a 262 // If the new buffer has been allocated copy the data to it
Bogdan Marinescu 7604:4544d30abb2a 263 // and free the old buffer
Bogdan Marinescu 7604:4544d30abb2a 264 if (new_ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 265 uint32_t copy_size = (old_size < size) ? old_size : size;
Bogdan Marinescu 7604:4544d30abb2a 266 memcpy(new_ptr, (void*)ptr, copy_size);
Bogdan Marinescu 7604:4544d30abb2a 267 free(ptr);
Bogdan Marinescu 7604:4544d30abb2a 268 }
Bogdan Marinescu 7604:4544d30abb2a 269 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 270 new_ptr = $Super$$realloc(ptr, size);
Bogdan Marinescu 7604:4544d30abb2a 271 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 272 #ifdef MBED_MEM_TRACING_ENABLED
Neil Thiessen 7813:04b3c320bf04 273 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 274 mbed_mem_trace_realloc(new_ptr, ptr, size, MBED_CALLER_ADDR());
Neil Thiessen 7813:04b3c320bf04 275 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 276 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 277 return new_ptr;
Bogdan Marinescu 7604:4544d30abb2a 278 }
Bogdan Marinescu 7604:4544d30abb2a 279
Bogdan Marinescu 7604:4544d30abb2a 280 extern "C" void *$Sub$$calloc(size_t nmemb, size_t size) {
Bogdan Marinescu 7604:4544d30abb2a 281 void *ptr = NULL;
Bogdan Marinescu 7604:4544d30abb2a 282 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 283 // Note - no lock needed since malloc is thread safe
Bogdan Marinescu 7604:4544d30abb2a 284 ptr = malloc(nmemb * size);
Bogdan Marinescu 7604:4544d30abb2a 285 if (ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 286 memset(ptr, 0, nmemb * size);
Bogdan Marinescu 7604:4544d30abb2a 287 }
Bogdan Marinescu 7604:4544d30abb2a 288 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 289 ptr = $Super$$calloc(nmemb, size);
Bogdan Marinescu 7604:4544d30abb2a 290 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 291 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 292 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 293 mbed_mem_trace_calloc(ptr, nmemb, size, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 294 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 295 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 296 return ptr;
Bogdan Marinescu 7604:4544d30abb2a 297 }
Bogdan Marinescu 7604:4544d30abb2a 298
Bogdan Marinescu 7604:4544d30abb2a 299 extern "C" void $Sub$$free(void *ptr) {
Bogdan Marinescu 7604:4544d30abb2a 300 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 301 malloc_stats_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 302 alloc_info_t *alloc_info = NULL;
Bogdan Marinescu 7604:4544d30abb2a 303 if (ptr != NULL) {
Bogdan Marinescu 7604:4544d30abb2a 304 alloc_info = ((alloc_info_t*)ptr) - 1;
Bogdan Marinescu 7604:4544d30abb2a 305 heap_stats.current_size -= alloc_info->size;
Bogdan Marinescu 7604:4544d30abb2a 306 heap_stats.alloc_cnt -= 1;
Bogdan Marinescu 7604:4544d30abb2a 307 }
Bogdan Marinescu 7604:4544d30abb2a 308 $Super$$free((void*)alloc_info);
Bogdan Marinescu 7604:4544d30abb2a 309 malloc_stats_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 310 #else // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 311 $Super$$free(ptr);
Bogdan Marinescu 7604:4544d30abb2a 312 #endif // #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 313 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7606:dbabbb13e5b0 314 mem_trace_mutex->lock();
Bogdan Marinescu 7604:4544d30abb2a 315 mbed_mem_trace_free(ptr, MBED_CALLER_ADDR());
Bogdan Marinescu 7606:dbabbb13e5b0 316 mem_trace_mutex->unlock();
Bogdan Marinescu 7604:4544d30abb2a 317 #endif // #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 318 }
Bogdan Marinescu 7604:4544d30abb2a 319
Bogdan Marinescu 7604:4544d30abb2a 320 #endif // #if defined(MBED_MEM_TRACING_ENABLED) || defined(MBED_HEAP_STATS_ENABLED)
Bogdan Marinescu 7604:4544d30abb2a 321
Bogdan Marinescu 7604:4544d30abb2a 322 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 323 /* Allocation wrappers for other toolchains are not supported yet */
Bogdan Marinescu 7604:4544d30abb2a 324 /******************************************************************************/
Bogdan Marinescu 7604:4544d30abb2a 325
Bogdan Marinescu 7604:4544d30abb2a 326 #else // #if defined(TOOLCHAIN_GCC)
Bogdan Marinescu 7604:4544d30abb2a 327
Bogdan Marinescu 7604:4544d30abb2a 328 #ifdef MBED_MEM_TRACING_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 329 #warning Memory tracing is not supported with the current toolchain.
Bogdan Marinescu 7604:4544d30abb2a 330 #endif
Bogdan Marinescu 7604:4544d30abb2a 331
Bogdan Marinescu 7604:4544d30abb2a 332 #ifdef MBED_HEAP_STATS_ENABLED
Bogdan Marinescu 7604:4544d30abb2a 333 #warning Heap statistics are not supported with the current toolchain.
Bogdan Marinescu 7604:4544d30abb2a 334 #endif
Bogdan Marinescu 7604:4544d30abb2a 335
Bogdan Marinescu 7604:4544d30abb2a 336 #endif // #if defined(TOOLCHAIN_GCC)
Bogdan Marinescu 7604:4544d30abb2a 337