diff --git a/tcmalloc/experiment_config.h b/tcmalloc/experiment_config.h index 6af66b2d2..4f8fea203 100644 --- a/tcmalloc/experiment_config.h +++ b/tcmalloc/experiment_config.h @@ -30,7 +30,6 @@ enum class Experiment : int { TCMALLOC_REUSE_SIZE_CLASSES_ABLATION, // TODO: b/524296402 - Complete experiment. TEST_ONLY_L3_AWARE, // TODO: b/239977380 - Complete experiment. TEST_ONLY_MM_VCPU, // TODO: b/245776120 - Complete experiment. - TEST_ONLY_TCMALLOC_ALWAYS_DISCARDING, // TODO: b/328301906 - Complete experiment. TEST_ONLY_TCMALLOC_HEAP_PARTITIONING, // TODO: b/446814339 - Complete experiment. TEST_ONLY_TCMALLOC_POW2_SIZECLASS, TEST_ONLY_TCMALLOC_SHARDED_TRANSFER_CACHE, @@ -57,7 +56,6 @@ inline constexpr ExperimentConfig experiments[] = { {Experiment::TCMALLOC_REUSE_SIZE_CLASSES_ABLATION, "TCMALLOC_REUSE_SIZE_CLASSES_ABLATION"}, {Experiment::TEST_ONLY_L3_AWARE, "TEST_ONLY_L3_AWARE"}, {Experiment::TEST_ONLY_MM_VCPU, "TEST_ONLY_MM_VCPU"}, - {Experiment::TEST_ONLY_TCMALLOC_ALWAYS_DISCARDING, "TEST_ONLY_TCMALLOC_ALWAYS_DISCARDING", /*brittle=*/true}, {Experiment::TEST_ONLY_TCMALLOC_HEAP_PARTITIONING, "TEST_ONLY_TCMALLOC_HEAP_PARTITIONING"}, {Experiment::TEST_ONLY_TCMALLOC_POW2_SIZECLASS, "TEST_ONLY_TCMALLOC_POW2_SIZECLASS", /*brittle=*/true}, {Experiment::TEST_ONLY_TCMALLOC_SHARDED_TRANSFER_CACHE, "TEST_ONLY_TCMALLOC_SHARDED_TRANSFER_CACHE", /*brittle=*/true}, diff --git a/tcmalloc/parameters.cc b/tcmalloc/parameters.cc index 2b1ab13bd..f9cf65f29 100644 --- a/tcmalloc/parameters.cc +++ b/tcmalloc/parameters.cc @@ -114,9 +114,6 @@ static std::atomic& skip_subrelease_short_interval_ns() { #endif absl::base_internal::LowLevelCallOnce(&flag, [&]() { - if (IsExperimentActive(Experiment::TEST_ONLY_TCMALLOC_ALWAYS_DISCARDING)) { - interval = absl::ZeroDuration(); - } // clang-format off v.store(absl::ToInt64Nanoseconds(interval), std::memory_order_relaxed); // clang-format on @@ -135,9 +132,6 @@ static std::atomic& skip_subrelease_long_interval_ns() { #endif absl::base_internal::LowLevelCallOnce(&flag, [&]() { - if (IsExperimentActive(Experiment::TEST_ONLY_TCMALLOC_ALWAYS_DISCARDING)) { - interval = absl::ZeroDuration(); - } // clang-format off v.store(absl::ToInt64Nanoseconds(interval), std::memory_order_relaxed); // clang-format on @@ -180,11 +174,6 @@ std::atomic& background_release_rate_ptr() { 0 }}; absl::base_internal::LowLevelCallOnce(&flag, [&]() { - if (IsExperimentActive(Experiment::TEST_ONLY_TCMALLOC_ALWAYS_DISCARDING)) { - v.store(static_cast( - std::numeric_limits::max()), - std::memory_order_relaxed); - } }); return v; }