Skip to content

Added missing "if (umm_heap == NULL) {..." to umm_free_heap_size_lw #6929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2019
Merged

Added missing "if (umm_heap == NULL) {..." to umm_free_heap_size_lw #6929

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ccf1f8
Added missing "if (umm_heap == NULL) {..." to umm_free_heap_size_lw
mhightower83 Dec 20, 2019
b35e354
Merge branch 'master' into pr-add-umm_init-get_heap_free
earlephilhower Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added missing "if (umm_heap == NULL) {..." to umm_free_heap_size_lw 
also called through xPortGetFreeHeapSize, umm_free_heap_size, ...
  • Loading branch information
@mhightower83
mhightower83 committed Dec 20, 2019
commit 3ccf1f863d10d9385e1d970ab786e8d185cb32d8
6 changes: 4 additions & 2 deletions cores/esp8266/umm_malloc/umm_local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ UMM_STATISTICS ummStats;

// Keep complete call path in IRAM
size_t umm_free_heap_size_lw( void ) {
if (umm_heap == NULL) {
umm_init();
}

return (size_t)ummStats.free_blocks * sizeof(umm_block);
}
#endif
Expand Down Expand Up @@ -211,5 +215,3 @@ int ICACHE_FLASH_ATTR umm_info_safe_printf_P(const char *fmt, ...) {
}

#endif // BUILD_UMM_MALLOC_C


pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy