Switch to using ring-based TransferCache by default.

PiperOrigin-RevId: 400713544 Change-Id: Icc4e69fe51ab2257d0dc503d05cd16ff53066f2a
jiehuali · Oct 4, 2021 · 45c59cc · 45c59cc
1 parent b2435cb
commit 45c59cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/tcmalloc/testing/get_stats_test.cc b/tcmalloc/testing/get_stats_test.cc
@@ -67,7 +67,7 @@ TEST_F(GetStatsTest, Pbtxt) {
     EXPECT_THAT(buf, HasSubstr("percpu_slab_residence: 0"));
   }
   EXPECT_THAT(buf, ContainsRegex("(cpus_allowed: [1-9][0-9]*)"));
-  EXPECT_THAT(buf, HasSubstr("transfer_cache_implementation: LEGACY"));
+  EXPECT_THAT(buf, HasSubstr("transfer_cache_implementation: RING"));
 
   EXPECT_THAT(buf, HasSubstr("desired_usage_limit_bytes: -1"));
   EXPECT_THAT(buf, HasSubstr("limit_hits: 0"));

diff --git a/tcmalloc/transfer_cache.cc b/tcmalloc/transfer_cache.cc
@@ -132,8 +132,8 @@ TransferCacheImplementation TransferCacheManager::ChooseImplementation() {
     Crash(kCrash, __FILE__, __LINE__, "bad env var", e);
   }
 
-  // Otherwise, default to legacy.
-  return TransferCacheImplementation::Legacy;
+  // Otherwise, default to ring.
+  return TransferCacheImplementation::Ring;
 }
 
 int TransferCacheManager::DetermineSizeClassToEvict() {

diff --git a/tcmalloc/variants.bzl b/tcmalloc/variants.bzl
@@ -126,6 +126,12 @@ variants = [
         "deps": ["//tcmalloc:common"],
         "env": {"BORG_EXPERIMENTS": "TEST_ONLY_TCMALLOC_RING_BUFFER_TRANSFER_CACHE"},
     },
+    {
+        "name": "legacy_transfer_cache",
+        "malloc": "//tcmalloc",
+        "deps": ["//tcmalloc:common"],
+        "env": {"TCMALLOC_INTERNAL_TRANSFERCACHE_CONTROL": "0"},
+    },
     {
         "name": "256k_pages_pow2_with_per_ccx",
         "malloc": "//tcmalloc:tcmalloc_256k_pages",