diff options
| author | Christopher Ferris <cferris@google.com> | 2019-03-18 20:40:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-18 20:40:46 -0700 |
| commit | b4e426ffebd74493d341945490d68f8bbc38e7c5 (patch) | |
| tree | 9f328f5516c84a141bbe2eb407bec8743863350f | |
| parent | 3fa1122d5fbfda63fa1fe3a756bca1771959c9b4 (diff) | |
| parent | cc374363ecc5b8991cac2c9d0e45a95f9a233c74 (diff) | |
| download | platform_external_jemalloc_new-b4e426ffebd74493d341945490d68f8bbc38e7c5.tar.gz platform_external_jemalloc_new-b4e426ffebd74493d341945490d68f8bbc38e7c5.tar.bz2 platform_external_jemalloc_new-b4e426ffebd74493d341945490d68f8bbc38e7c5.zip | |
Remove best fit for extent selection.
am: cc374363ec
Change-Id: Ia44573af27aa921a31bd2e798066b43dc1d72d10
| -rw-r--r-- | src/extent.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/extent.c b/src/extent.c index 09d6d771..da66a8e0 100644 --- a/src/extent.c +++ b/src/extent.c @@ -394,6 +394,12 @@ extents_fit_alignment(extents_t *extents, size_t min_size, size_t max_size, return NULL; } +// ANDROID +// The best-fit selection is reported to possiblity cause a memory leak. +// This code has been completely removed from 5.2.0, so remove it from +// our tree rather than risk a leak. +// See https://github.com/jemalloc/jemalloc/issues/1454 +#if 0 /* Do any-best-fit extent selection, i.e. select any extent that best fits. */ static extent_t * extents_best_fit_locked(tsdn_t *tsdn, arena_t *arena, extents_t *extents, @@ -417,6 +423,7 @@ extents_best_fit_locked(tsdn_t *tsdn, arena_t *arena, extents_t *extents, return NULL; } +#endif /* * Do first-fit extent selection, i.e. select the oldest/lowest extent that is @@ -464,9 +471,18 @@ extents_fit_locked(tsdn_t *tsdn, arena_t *arena, extents_t *extents, return NULL; } +// ANDROID +// The best-fit selection is reported to possiblity cause a memory leak. +// This code has been completely removed from 5.2.0, so remove it from +// our tree rather than risk a leak. +// See https://github.com/jemalloc/jemalloc/issues/1454 +#if 0 extent_t *extent = extents->delay_coalesce ? extents_best_fit_locked(tsdn, arena, extents, max_size) : extents_first_fit_locked(tsdn, arena, extents, max_size); +#endif + extent_t *extent = + extents_first_fit_locked(tsdn, arena, extents, max_size); if (alignment > PAGE && extent == NULL) { /* |