apache · bneradt · Jun 26, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 26, 2023
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,6 @@ option(ENABLE_POSIX_CAP
     ON
 )
 option(ENABLE_PROFILER "Use gperftools profiler (default OFF)")
-option(ENABLE_TCMALLOC "Use TCMalloc (default OFF)")
 set(ENABLE_TPROXY
     "AUTO"
     CACHE

diff --git a/build/jemalloc.m4 b/build/jemalloc.m4
@@ -23,9 +23,6 @@ has_jemalloc=no
 AC_ARG_WITH([jemalloc], [AS_HELP_STRING([--with-jemalloc=DIR],[use a specific jemalloc library])],
 [
   if test "$withval" != "no"; then
-    if test "x${has_tcmalloc}" = "xyes"; then
-      AC_MSG_ERROR([Cannot compile with both jemalloc and tcmalloc])
-    fi
     if test "x${has_mimalloc}" = "xyes"; then
       AC_MSG_ERROR([Cannot compile with both jemalloc and mimalloc])
     fi

diff --git a/build/mimalloc.m4 b/build/mimalloc.m4
@@ -23,9 +23,6 @@ has_mimalloc=no
 AC_ARG_WITH([mimalloc], [AS_HELP_STRING([--with-mimalloc=DIR],[use a specific mimalloc library])],
 [
   if test "$withval" != "no"; then
-    if test "x${has_tcmalloc}" = "xyes"; then
-      AC_MSG_ERROR([Cannot compile with both mimalloc and tcmalloc])
-    fi
     if test "x${has_jemalloc}" = "xyes"; then
       AC_MSG_ERROR([Cannot compile with both mimalloc and jemalloc])
     fi

diff --git a/build/tcmalloc.m4 b/build/tcmalloc.m4
diff --git a/cmake/FindTCMalloc.cmake b/cmake/FindTCMalloc.cmake
diff --git a/cmake/FindTSMallocReplacement.cmake b/cmake/FindTSMallocReplacement.cmake
@@ -23,7 +23,6 @@
 #     TS_HAS_MALLOC_REPLACEMENT
 #     TS_HAS_JEMALLOC
 #     TS_HAS_MIMALLOC
-#     TS_HAS_TCMALLOC
 #
 # and the following imported targets
 #
@@ -32,10 +31,6 @@
 
 if(ENABLE_JEMALLOC AND ENABLE_MIMALLOC)
     message(FATAL_ERROR "Cannot build with both jemalloc and mimalloc.")
-elseif(ENABLE_JEMALLOC AND ENABLE_TCMALLOC)
-    message(FATAL_ERROR "Cannot build with both jemalloc and TCMalloc.")
-elseif(ENABLE_MIMALLOC AND ENABLE_TCMALLOC)
-    message(FATAL_ERROR "Cannot build with both mimalloc and TCMalloc.")
 endif()
 
 if(ENABLE_JEMALLOC)
@@ -48,12 +43,7 @@ if(ENABLE_MIMALLOC)
 endif()
 set(TS_HAS_MIMALLOC ${mimalloc_FOUND})
 
-if(ENABLE_TCMALLOC)
-    find_package(TCMalloc REQUIRED)
-endif()
-set(TS_HAS_TCMALLOC ${TCMalloc_FOUND})
-
-if(TS_HAS_JEMALLOC OR TS_HAS_MIMALLOC OR TS_HAS_TCMALLOC)
+if(TS_HAS_JEMALLOC OR TS_HAS_MIMALLOC)
     set(TS_HAS_MALLOC_REPLACEMENT TRUE)
 endif()
 
@@ -62,7 +52,6 @@ mark_as_advanced(
     TS_HAS_MALLOC_REPLACEMENT
     TS_HAS_JEMALLOC
     TS_HAS_MIMALLOC
-    TS_HAS_TCMALLOC
 )
 
 include(FindPackageHandleStandardArgs)
@@ -83,10 +72,5 @@ if(TSMallocReplacement_FOUND AND NOT TARGET ts::TSMallocReplacement)
             INTERFACE
                 mimalloc::mimalloc
     )
-    elseif(TS_HAS_TCMALLOC)
-        target_link_libraries(ts::TSMallocReplacement
-            INTERFACE
-                gperftools::TCMalloc
-        )
     endif()
 endif()
diff --git a/configure.ac b/configure.ac
@@ -1879,8 +1879,7 @@ AM_CONDITIONAL([HAS_WASM], [test "x${has_wasm}" = "x1" ])
 AM_CONDITIONAL([BUILD_HEALTHCHECK_PLUGIN], [ test "$ac_cv_func_inotify_init" = "yes" ])
 
 #
-# Check for tcmalloc, jemalloc and mimalloc
-TS_CHECK_TCMALLOC
+# Check for jemalloc and mimalloc
 TS_CHECK_JEMALLOC
 TS_CHECK_MIMALLOC
 

diff --git a/doc/developer-guide/testing/blackbox-testing.en.rst b/doc/developer-guide/testing/blackbox-testing.en.rst
@@ -237,7 +237,6 @@ Condition Testing
         - TS_HAS_LZMA
         - TS_HAS_PIPE_BUFFER_SIZE_CONFIG
         - TS_HAS_JEMALLOC
-        - TS_HAS_TCMALLOC
         - TS_HAS_MIMALLOC
         - TS_HAS_IN6_IS_ADDR_UNSPECIFIED
         - TS_HAS_BACKTRACE

diff --git a/include/tscore/ink_config.h.cmake.in b/include/tscore/ink_config.h.cmake.in
@@ -118,7 +118,6 @@ const int DEFAULT_STACKSIZE = @DEFAULT_STACK_SIZE@;
 #cmakedefine01 TS_HAS_IN6_IS_ADDR_UNSPECIFIED
 #cmakedefine01 TS_HAS_IP_TOS
 #cmakedefine01 TS_HAS_JEMALLOC
-#cmakedefine01 TS_HAS_TCMALLOC
 #cmakedefine01 TS_HAS_PROFILER
 #cmakedefine01 TS_HAS_QUICHE
 #cmakedefine01 TS_HAS_SO_MARK

diff --git a/include/tscore/ink_config.h.in b/include/tscore/ink_config.h.in
@@ -51,7 +51,6 @@
 
 /* Libraries */
 #define TS_HAS_JEMALLOC @jemalloch@
-#define TS_HAS_TCMALLOC @has_tcmalloc@
 #define TS_HAS_MIMALLOC @mimalloch@
 
 #define TS_USE_MALLOC_ALLOCATOR @enable_malloc_allocator@

diff --git a/src/traffic_layout/info.cc b/src/traffic_layout/info.cc
@@ -93,7 +93,6 @@ produce_features(bool json)
   print_feature("TS_HAS_PIPE_BUFFER_SIZE_CONFIG", 0, json);
 #endif /* F_GETPIPE_SZ */
   print_feature("TS_HAS_JEMALLOC", TS_HAS_JEMALLOC, json);
-  print_feature("TS_HAS_TCMALLOC", TS_HAS_TCMALLOC, json);
   print_feature("TS_HAS_IN6_IS_ADDR_UNSPECIFIED", TS_HAS_IN6_IS_ADDR_UNSPECIFIED, json);
   print_feature("TS_HAS_BACKTRACE", TS_HAS_BACKTRACE, json);
   print_feature("TS_HAS_PROFILER", TS_HAS_PROFILER, json);

diff --git a/tests/README.md b/tests/README.md
@@ -332,7 +332,6 @@ ts.Disk.remap_config.AddLine(
  * TS_HAS_LZMA
  * TS_HAS_PIPE_BUFFER_SIZE_CONFIG
  * TS_HAS_JEMALLOC
- * TS_HAS_TCMALLOC
  * TS_HAS_MIMALLOC
  * TS_HAS_IN6_IS_ADDR_UNSPECIFIED
  * TS_HAS_BACKTRACE
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,6 @@ option(ENABLE_POSIX_CAP @@
         ON
     )
     option(ENABLE_PROFILER "Use gperftools profiler (default OFF)")
-    option(ENABLE_TCMALLOC "Use TCMalloc (default OFF)")
     set(ENABLE_TPROXY
         "AUTO"
         CACHE
@@ Expand Down @@