stable-25-3-1: Fix broken TCMalloc options. (#26365)

ydbot · web-flow · commit ffa4be73f1eb · 2025-10-05T21:03:00.000+02:00
diff --git a/contrib/libs/tcmalloc/.yandex_meta/build.ym b/contrib/libs/tcmalloc/.yandex_meta/build.ym
@@ -35,7 +35,7 @@ SRCS(
 INCLUDE(common.inc)
 
 CFLAGS(
-    -DTCMALLOC_256K_PAGES
+    -DTCMALLOC_INTERNAL_256K_PAGES
 )
 {% endblock %}
 
diff --git a/contrib/libs/tcmalloc/no_percpu_cache/ya.make b/contrib/libs/tcmalloc/no_percpu_cache/ya.make
@@ -24,7 +24,7 @@ SRCS(
 )
 
 CFLAGS(
-    -DTCMALLOC_256K_PAGES
+    -DTCMALLOC_INTERNAL_256K_PAGES
     -DTCMALLOC_DEPRECATED_PERTHREAD
 )
 
diff --git a/contrib/libs/tcmalloc/numa_256k/ya.make b/contrib/libs/tcmalloc/numa_256k/ya.make
@@ -20,8 +20,8 @@ GLOBAL_SRCS(
 )
 
 CFLAGS(
-    -DTCMALLOC_256K_PAGES
-    -DTCMALLOC_NUMA_AWARE
+    -DTCMALLOC_INTERNAL_256K_PAGES
+    -DTCMALLOC_INTERNAL_NUMA_AWARE
 )
 
 END()
diff --git a/contrib/libs/tcmalloc/numa_large_pages/ya.make b/contrib/libs/tcmalloc/numa_large_pages/ya.make
@@ -20,8 +20,8 @@ GLOBAL_SRCS(
 )
 
 CFLAGS(
-    -DTCMALLOC_LARGE_PAGES
-    -DTCMALLOC_NUMA_AWARE
+    -DTCMALLOC_INTERNAL_32K_PAGES
+    -DTCMALLOC_INTERNAL_NUMA_AWARE
 )
 
 END()
diff --git a/contrib/libs/tcmalloc/patches/010-fork.patch b/contrib/libs/tcmalloc/patches/010-fork.patch
@@ -369,7 +369,7 @@ index 2b94ac7..8ae5e76 100644
    // We inherit rather than include the list as a data structure to reduce
    // compiler padding.  Without inheritance, the compiler pads the list
 diff --git a/tcmalloc/transfer_cache.h b/tcmalloc/transfer_cache.h
-index b2b29d5..5af6dc8 100644
+index b2b29d5..8bc9eee 100644
 --- a/tcmalloc/transfer_cache.h
 +++ b/tcmalloc/transfer_cache.h
 @@ -415,6 +415,18 @@ class TransferCacheManager : public StaticForwarder {
@@ -391,6 +391,25 @@ index b2b29d5..5af6dc8 100644
    void InsertRange(int size_class, absl::Span<void *> batch) {
      cache_[size_class].tc.InsertRange(size_class, batch);
    }
+@@ -549,6 +561,18 @@ class TransferCacheManager {
+     }
+   }
+ 
++  void AcquireInternalLocks() {
++    for (int i = 0; i < kNumClasses; ++i) {
++      freelist_[i].AcquireInternalLocks();
++    }
++  }
++
++  void ReleaseInternalLocks() {
++    for (int i = 0; i < kNumClasses; ++i) {
++      freelist_[i].ReleaseInternalLocks();
++    }
++  }
++
+   void InsertRange(int size_class, absl::Span<void*> batch) {
+     freelist_[size_class].InsertRange(batch);
+   }
 diff --git a/tcmalloc/transfer_cache_internals.h b/tcmalloc/transfer_cache_internals.h
 index 2a3bd4c..d8f1031 100644
 --- a/tcmalloc/transfer_cache_internals.h
diff --git a/contrib/libs/tcmalloc/small_but_slow/ya.make b/contrib/libs/tcmalloc/small_but_slow/ya.make
@@ -15,7 +15,7 @@ SRCDIR(contrib/libs/tcmalloc)
 INCLUDE(../common.inc)
 
 CFLAGS(
-    -DTCMALLOC_SMALL_BUT_SLOW
+    -DTCMALLOC_INTERNAL_SMALL_BUT_SLOW
 )
 
 END()
diff --git a/contrib/libs/tcmalloc/tcmalloc/transfer_cache.h b/contrib/libs/tcmalloc/tcmalloc/transfer_cache.h
@@ -562,6 +562,18 @@ class TransferCacheManager {
     }
   }
 
+  void AcquireInternalLocks() {
+    for (int i = 0; i < kNumClasses; ++i) {
+      freelist_[i].AcquireInternalLocks();
+    }
+  }
+
+  void ReleaseInternalLocks() {
+    for (int i = 0; i < kNumClasses; ++i) {
+      freelist_[i].ReleaseInternalLocks();
+    }
+  }
+
   void InsertRange(int size_class, absl::Span<void*> batch) {
     freelist_[size_class].InsertRange(batch);
   }
diff --git a/contrib/libs/tcmalloc/ya.make b/contrib/libs/tcmalloc/ya.make
@@ -20,7 +20,7 @@ SRCS(
 INCLUDE(common.inc)
 
 CFLAGS(
-    -DTCMALLOC_256K_PAGES
+    -DTCMALLOC_INTERNAL_256K_PAGES
 )
 
 END()

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ SRCS(`
`35`	`35`	`INCLUDE(common.inc)`
`36`	`36`
`37`	`37`	`CFLAGS(`
`38`		`- -DTCMALLOC_256K_PAGES`
	`38`	`+ -DTCMALLOC_INTERNAL_256K_PAGES`
`39`	`39`	`)`
`40`	`40`	`{% endblock %}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ SRCS(`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`CFLAGS(`
`27`		`- -DTCMALLOC_256K_PAGES`
	`27`	`+ -DTCMALLOC_INTERNAL_256K_PAGES`
`28`	`28`	`-DTCMALLOC_DEPRECATED_PERTHREAD`
`29`	`29`	`)`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ GLOBAL_SRCS(`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`CFLAGS(`
`23`		`- -DTCMALLOC_256K_PAGES`
`24`		`- -DTCMALLOC_NUMA_AWARE`
	`23`	`+ -DTCMALLOC_INTERNAL_256K_PAGES`
	`24`	`+ -DTCMALLOC_INTERNAL_NUMA_AWARE`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`END()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ SRCDIR(contrib/libs/tcmalloc)`
`15`	`15`	`INCLUDE(../common.inc)`
`16`	`16`
`17`	`17`	`CFLAGS(`
`18`		`- -DTCMALLOC_SMALL_BUT_SLOW`
	`18`	`+ -DTCMALLOC_INTERNAL_SMALL_BUT_SLOW`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`END()`
Original file line number	Diff line number	Diff line change
`@@ -562,6 +562,18 @@ class TransferCacheManager {`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`
	`565`	`+ void AcquireInternalLocks() {`
	`566`	`+ for (int i = 0; i < kNumClasses; ++i) {`
	`567`	`+ freelist_[i].AcquireInternalLocks();`
	`568`	`+ }`
	`569`	`+ }`
	`570`	`+`
	`571`	`+ void ReleaseInternalLocks() {`
	`572`	`+ for (int i = 0; i < kNumClasses; ++i) {`
	`573`	`+ freelist_[i].ReleaseInternalLocks();`
	`574`	`+ }`
	`575`	`+ }`
	`576`	`+`
`565`	`577`	`void InsertRange(int size_class, absl::Span<void*> batch) {`
`566`	`578`	`freelist_[size_class].InsertRange(batch);`
`567`	`579`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ SRCS(`
`20`	`20`	`INCLUDE(common.inc)`
`21`	`21`
`22`	`22`	`CFLAGS(`
`23`		`- -DTCMALLOC_256K_PAGES`
	`23`	`+ -DTCMALLOC_INTERNAL_256K_PAGES`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`END()`