From: Dave Watson <davejwatson@fb.com>
Date: Fri, 18 Aug 2017 15:45:44 +0000 (-0700)
Subject: Drop jemalloc specific smartRealloc integration
X-Git-Tag: v2017.08.21.00~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=389f2c456c3919d96a9fba4e1425decf827178b4;p=folly.git

Drop jemalloc specific smartRealloc integration

Summary:
This was added several jemalloc versions ago, and is no longer a win.

From microbenches in folly/test, this codepath is successful less than .5% of the time.

There are a handful of other places directly using this (fbvector, IOBuf, ThreadLocal),
but should probably change them individually.

Reviewed By: interwq

Differential Revision: D5596678

fbshipit-source-id: 354d7204f61df0eace4d98d930d0f6e06a90ffde
---

diff --git a/folly/Malloc.h b/folly/Malloc.h
index 77d6a5be..42faee41 100644
--- a/folly/Malloc.h
+++ b/folly/Malloc.h
@@ -244,12 +244,10 @@ inline void* checkedRealloc(void* ptr, size_t size) {
  * currentSize bytes are used. The problem with using realloc is that
  * if currentSize is relatively small _and_ if realloc decides it
  * needs to move the memory chunk to a new buffer, then realloc ends
- * up copying data that is not used. It's impossible to hook into
- * GNU's malloc to figure whether expansion will occur in-place or as
- * a malloc-copy-free troika. (If an expand_in_place primitive would
- * be available, smartRealloc would use it.) As things stand, this
- * routine just tries to call realloc() (thus benefitting of potential
- * copy-free coalescing) unless there's too much slack memory.
+ * up copying data that is not used. It's generally not a win to try
+ * to hook in to realloc() behavior to avoid copies - at least in
+ * jemalloc, realloc() almost always ends up doing a copy, because
+ * there is little fragmentation / slack space to take advantage of.
  */
 FOLLY_MALLOC_CHECKED_MALLOC FOLLY_MALLOC_NOINLINE inline void* smartRealloc(
     void* p,
@@ -260,28 +258,6 @@ FOLLY_MALLOC_CHECKED_MALLOC FOLLY_MALLOC_NOINLINE inline void* smartRealloc(
   assert(currentSize <= currentCapacity &&
          currentCapacity < newCapacity);
 
-  if (usingJEMalloc()) {
-    // using jemalloc's API. Don't forget that jemalloc can never grow
-    // in place blocks smaller than 4096 bytes.
-    //
-    // NB: newCapacity may not be precisely equal to a jemalloc size class,
-    // i.e. newCapacity is not guaranteed to be the result of a
-    // goodMallocSize() call, therefore xallocx() may return more than
-    // newCapacity bytes of space.  Use >= rather than == to check whether
-    // xallocx() successfully expanded in place.
-    if (currentCapacity >= jemallocMinInPlaceExpandable &&
-        xallocx(p, newCapacity, 0, 0) >= newCapacity) {
-      // Managed to expand in place
-      return p;
-    }
-    // Cannot expand; must move
-    auto const result = checkedMalloc(newCapacity);
-    std::memcpy(result, p, currentSize);
-    free(p);
-    return result;
-  }
-
-  // No jemalloc no honey
   auto const slack = currentCapacity - currentSize;
   if (slack * 2 > currentSize) {
     // Too much slack, malloc-copy-free cycle: