diff options
| author | JF <jf@codingfield.com> | 2020-07-11 18:50:40 (GMT) |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 18:50:40 (GMT) |
| commit | 09adb78b551ef7659fd7e8e71c337e7de81023d2 (patch) | |
| tree | 7b7585ca2df9b7686d1890953d8f5517c7eeee02 | |
| parent | 71842667a0bce3543c2a649c0e753c59353bd975 (diff) | |
Fix/Workaround a memory leak each time a device connects to BLE.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be73dbf..ff2e181 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ set(SDK_SOURCE_FILES # FreeRTOS ${NRF5_SDK_PATH}/external/freertos/source/croutine.c ${NRF5_SDK_PATH}/external/freertos/source/event_groups.c - ${NRF5_SDK_PATH}/external/freertos/source/portable/MemMang/heap_1.c + ${NRF5_SDK_PATH}/external/freertos/source/portable/MemMang/heap_4.c ${NRF5_SDK_PATH}/external/freertos/source/list.c ${NRF5_SDK_PATH}/external/freertos/source/queue.c ${NRF5_SDK_PATH}/external/freertos/source/stream_buffer.c diff --git a/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c b/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c index 87936bd..eb3b4c9 100644 --- a/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c +++ b/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c @@ -268,10 +268,16 @@ void npl_freertos_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq, ble_npl_event_fn *ev_cb, void *ev_arg) { + // I added this 'if' because nimble seems to never delete the timers. I assume it wants to recycle them. + // This condition ensure that a new timer is created only if 'co' points to an uninitialized structure. + // If the struct contains an existing timer, no new timer is created, which prevent a significant memory leak. + // TODO Ensure that this workaround is valid and does not generate bad side-effect. + if(co->handle == NULL) { memset(co, 0, sizeof(*co)); co->handle = xTimerCreate("co", 1, pdFALSE, co, os_callout_timer_cb); co->evq = evq; ble_npl_event_init(&co->ev, ev_cb, ev_arg); + } } ble_npl_error_t |