Skip to content
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

Jump to bottom

umm_malloc manual merge with upstream #7337

Merged
merged 12 commits into from
Jun 8, 2020
Merged

umm_malloc manual merge with upstream #7337

merged 12 commits into from
Jun 8, 2020

Commits on May 29, 2020

  1. umm_malloc manual merge with upstream

    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    3eea82a View commit details
    Browse the repository at this point in the history

  2. Fix divide by zero, case when heap is 100% allocated.

    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    878d7ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into pr-umm_malloc-refresh

    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    5a515f5 View commit details
    Browse the repository at this point in the history

  4. Removed extra line.

    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    364198c View commit details
    Browse the repository at this point in the history

  5. Fixed block count for debug build. This resolves OOM events for debug… 

    … build.

Correct overstepping array when freeing.
    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    71e6e2c View commit details
    Browse the repository at this point in the history

  6. Handle another corner case in example HeapMetric.ino. 

    Comment corrections.
    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    1bad85f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into pr-umm_malloc-refresh

    @mhightower83
    mhightower83 committed May 29, 2020
    Configuration menu
    Copy the full SHA
    52fa8f0 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2020

  1. Revert - ESP.getMaxFreeBlockSize() is back to indicating the size of a 

    contiguous block of memory before the umm_malloc overhead is removed.
    @mhightower83
    mhightower83 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    3cec4dc View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. Stale code cleanup and comment improvements

    @mhightower83
    mhightower83 committed May 31, 2020
    Configuration menu
    Copy the full SHA
    c3a2fa9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into pr-umm_malloc-refresh

    @earlephilhower
    earlephilhower committed May 31, 2020
    Configuration menu
    Copy the full SHA
    cb56e57 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. Merge branch 'master' into pr-umm_malloc-refresh

    @earlephilhower
    earlephilhower committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    e40309e View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge branch 'master' into pr-umm_malloc-refresh

    @earlephilhower
    earlephilhower committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    b21178a View commit details
    Browse the repository at this point in the history