Skip to content

umm_malloc manual merge with upstream #7337

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 12 commits into from
Jun 8, 2020
Merged

umm_malloc manual merge with upstream #7337

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3eea82a
umm_malloc manual merge with upstream
mhightower83 May 29, 2020
878d7ac
Fix divide by zero, case when heap is 100% allocated.
mhightower83 May 29, 2020
5a515f5
Merge branch 'master' into pr-umm_malloc-refresh
mhightower83 May 29, 2020
364198c
Removed extra line.
mhightower83 May 29, 2020
71e6e2c
Fixed block count for debug build. This resolves OOM events for debug…
mhightower83 May 29, 2020
1bad85f
Handle another corner case in example HeapMetric.ino.
mhightower83 May 29, 2020
52fa8f0
Merge branch 'master' into pr-umm_malloc-refresh
mhightower83 May 29, 2020
3cec4dc
Revert - ESP.getMaxFreeBlockSize() is back to indicating the size of a
mhightower83 May 30, 2020
c3a2fa9
Stale code cleanup and comment improvements
mhightower83 May 31, 2020
cb56e57
Merge branch 'master' into pr-umm_malloc-refresh
earlephilhower May 31, 2020
e40309e
Merge branch 'master' into pr-umm_malloc-refresh
earlephilhower Jun 7, 2020
b21178a
Merge branch 'master' into pr-umm_malloc-refresh
earlephilhower Jun 8, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix divide by zero, case when heap is 100% allocated.
  • Loading branch information
@mhightower83
mhightower83 committed May 29, 2020
commit 878d7ac7f211b68ed2f0dc55cc79fbe6ce8271f6
7 changes: 6 additions & 1 deletion cores/esp8266/Esp-frag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,13 @@ void EspClass::getHeapStats(uint32_t* hfree, uint16_t* hmax, uint8_t* hfrag)
*hfree = (uint32_t)ummHeapInfo.freeBlocks * umm_block_size();
if (hmax)
*hmax = umm_free_blocks_to_free_space(ummHeapInfo.maxFreeContiguousBlocks);
if (hfrag)
if (hfrag) {
if (ummHeapInfo.freeBlocks) {
*hfrag = 100 - (sqrt32(ummHeapInfo.freeBlocksSquared) * 100) / ummHeapInfo.freeBlocks;
} else {
*hfrag = 0;
}
}

}

Expand Down