diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2019-02-28 16:00:39 -0500 |
|---|---|---|
| committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-02-28 16:58:50 -0500 |
| commit | 78d82f7dab0efcf651535665703ae1f80e759605 (patch) | |
| tree | 291f8c41881e56c8764337d46b7b7d037e60637c /src | |
| parent | 9c6828798b304930618e46fa36f39322375f5581 (diff) | |
| download | mongo-78d82f7dab0efcf651535665703ae1f80e759605.tar.gz | |
SERVER-39287 integrate new configure options in gperftools import script
Diffstat (limited to 'src')
| -rw-r--r-- | src/third_party/gperftools-2.7/src/gperftools/tcmalloc.h | 4 | ||||
| -rwxr-xr-x | src/third_party/scripts/gperftools_get_sources.sh | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/third_party/gperftools-2.7/src/gperftools/tcmalloc.h b/src/third_party/gperftools-2.7/src/gperftools/tcmalloc.h index a5515a82148..fe450627076 100644 --- a/src/third_party/gperftools-2.7/src/gperftools/tcmalloc.h +++ b/src/third_party/gperftools-2.7/src/gperftools/tcmalloc.h @@ -48,7 +48,7 @@ #define TC_VERSION_STRING "gperftools 2.7" /* For struct mallinfo, if it's defined. */ -#ifdef HAVE_STRUCT_MALLINFO +#if 0 # include <malloc.h> #endif @@ -104,7 +104,7 @@ extern "C" { PERFTOOLS_DLL_DECL void tc_malloc_stats(void) PERFTOOLS_NOTHROW; PERFTOOLS_DLL_DECL int tc_mallopt(int cmd, int value) PERFTOOLS_NOTHROW; -#ifdef HAVE_STRUCT_MALLINFO +#if 0 PERFTOOLS_DLL_DECL struct mallinfo tc_mallinfo(void) PERFTOOLS_NOTHROW; #endif diff --git a/src/third_party/scripts/gperftools_get_sources.sh b/src/third_party/scripts/gperftools_get_sources.sh index 11f03bf7eaf..462fc1b3ca4 100755 --- a/src/third_party/scripts/gperftools_get_sources.sh +++ b/src/third_party/scripts/gperftools_get_sources.sh @@ -79,9 +79,14 @@ else MAX_SIZE_KB=16 fi +TARGET_TRANSFER_KB=8 + env PATH=/opt/mongodbtoolchain/v3/bin:$PATH \ ./configure \ --enable-tcmalloc-aggressive-merge \ + --enable-tcmalloc-mallinfo=no \ + --enable-tcmalloc-unclamped-transfer-sizes=yes \ + --enable-tcmalloc-target-transfer-kb=$TARGET_TRANSFER_KB \ --with-tcmalloc-pagesize=$PAGE_SIZE_KB \ --with-tcmalloc-maxsize=$MAX_SIZE_KB @@ -96,6 +101,8 @@ if [ ! -d $DEST_DIR ]; then $(set_define TCMALLOC_AGGRESSIVE_MERGE 1) $(set_define TCMALLOC_PAGE_SIZE_SHIFT $(log2floor $((PAGE_SIZE_KB*1024)))) $(set_define TCMALLOC_MAX_SIZE_KB ${MAX_SIZE_KB}) + $(set_define TCMALLOC_TARGET_TRANSFER_KB ${TARGET_TRANSFER_KB}) + $(set_define TCMALLOC_USE_UNCLAMPED_TRANSFER_SIZES 1) " \ < $TEMP_DIR/src/windows/config.h \ > $DEST_CONFIG_DIR/config.h @@ -112,12 +119,6 @@ if [ ! -d $DEST_DIR/src/gperftools/tcmalloc.h ]; then TCMALLOC_H_IN=src/gperftools/tcmalloc.h.in TCMALLOC_H_TMP=tcmalloc.h.bak cp src/gperftools/tcmalloc.h $TCMALLOC_H - - # Change the autotools subsitution into an ifdef instead - for line_number in $(grep -n "@ac_cv_have_struct_mallinfo@" $TCMALLOC_H_IN | cut -d: -f1) ; do - sed "${line_number}s/.*/#ifdef HAVE_STRUCT_MALLINFO/" < $TCMALLOC_H > $TCMALLOC_H_TMP - cp $TCMALLOC_H_TMP $TCMALLOC_H - done fi popd |