mbed library sources. Supersedes mbed-src.

Dependents:   Nucleo_Hello_Encoder BLE_iBeaconScan AM1805_DEMO DISCO-F429ZI_ExportTemplate1 ... more

Committer:
AnnaBridge
Date:
Thu Sep 06 13:40:20 2018 +0100
Revision:
187:0387e8f68319
Parent:
181:57724642e740
Child:
188:bcfe06ba3d64
mbed-dev library. Release version 163

Who changed what in which revision?

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