diff options
| author | Christopher Ferris <cferris@google.com> | 2019-03-18 20:48:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-18 20:48:53 -0700 |
| commit | 58d94c547230b0074b7af73dfd040ea4b92216d5 (patch) | |
| tree | 9f328f5516c84a141bbe2eb407bec8743863350f | |
| parent | 5671f09f1d3e5fc9135b3493328e1b6cf84f6d1c (diff) | |
| parent | 27c2c8bead7fa46e24b71fff072dbfec560dcc6d (diff) | |
| download | platform_external_jemalloc_new-58d94c547230b0074b7af73dfd040ea4b92216d5.tar.gz platform_external_jemalloc_new-58d94c547230b0074b7af73dfd040ea4b92216d5.tar.bz2 platform_external_jemalloc_new-58d94c547230b0074b7af73dfd040ea4b92216d5.zip | |
Remove best fit for extent selection. am: cc374363ec am: b4e426ffeb
am: 27c2c8bead
Change-Id: I421cf23cfc8d2bb0280546c2217861ecc6d93f14
| -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) { /* |