ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7414 from mikaleppanen/nano_heap_stats_conf 

Added json options for nanostack heap statictics
pull/7421/head
Cruz Monrreal 2018-07-05 10:42:58 -05:00 committed by GitHub
parent 4942ec540c 46bcbf2a28
commit cec30ae4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/nanostack/mbed-mesh-api/mbed_lib.json
View File

@ -9,6 +9,14 @@
"help": "Use `malloc()` for reserving the Nanostack's internal heap.", "help": "Use `malloc()` for reserving the Nanostack's internal heap.",
"value": false "value": false
}, },
"heap-stat-info": {
"help": "Pointer to heap statistics `mem_stat_t` storage.",
"value": "NULL"
},
"heap-stat-info-definition": {
"help": "Definition of heap statistics `mem_stat_t` storage.",
"value": null
},
"6lowpan-nd-channel-mask": { "6lowpan-nd-channel-mask": {
"help": "Channel mask, bit-mask of channels to use. [0-0x07fff800]", "help": "Channel mask, bit-mask of channels to use. [0-0x07fff800]",
"value": "0x7fff800" "value": "0x7fff800"

5
features/nanostack/mbed-mesh-api/source/mesh_system.c
View File

@ -36,6 +36,9 @@ static uint8_t app_stack_heap[MBED_CONF_MBED_MESH_API_HEAP_SIZE + 1];
static uint8_t *app_stack_heap; static uint8_t *app_stack_heap;
#endif #endif
static bool mesh_initialized = false; static bool mesh_initialized = false;
#ifdef MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO_DEFINITION
MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO_DEFINITION;
#endif
/* /*
* Heap error handler, called when heap problem is detected. * Heap error handler, called when heap problem is detected.
@ -66,7 +69,7 @@ void mesh_system_init(void)
MBED_ASSERT(app_stack_heap); MBED_ASSERT(app_stack_heap);
#endif #endif
ns_hal_init(app_stack_heap, MBED_CONF_MBED_MESH_API_HEAP_SIZE, ns_hal_init(app_stack_heap, MBED_CONF_MBED_MESH_API_HEAP_SIZE,
mesh_system_heap_error_handler, NULL); mesh_system_heap_error_handler, MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO);
eventOS_scheduler_mutex_wait(); eventOS_scheduler_mutex_wait();
net_init_core(); net_init_core();
eventOS_scheduler_mutex_release(); eventOS_scheduler_mutex_release();