remove agri@ commits part 2
@@ -650,7 +650,7 @@ module LINK_UNIT: BASE_UNIT {
}
when (($MUSL != "yes" && $WITH_VALGRIND == "yes") || $SANITIZER_DEFINED == "yes") {
- when ($ALLOCATOR in [ "GOOGLE", "J", "LF", "LF_YT", "LF_DBG", "B", "BS", "C" ]) {
+ when ($ALLOCATOR in [ "GOOGLE", "J", "LF", "LF_YT", "LF_DBG", "B", "BM", "BS", "C" ]) {
PEERDIR+=library/malloc/system
}
}
@@ -679,6 +679,9 @@ module LINK_UNIT: BASE_UNIT {
"B" ? {
PEERDIR+=library/balloc
}
+ "BM" ? {
+ PEERDIR+=library/balloc_market
+ }
"BS" ? {
PEERDIR+=library/balloc/sanitize
}
@@ -2001,7 +2004,7 @@ macro USE_PERL_LIB() {
### @usage ALLOCATOR(Alloc) # Default: LF
### Set allocator implementation for a program
### This may only be specified for programs. Use inside LIBRARY ALLOCATOR() END() leads to errors and stop the build.
-### Available allocators are: "LF", "LF_YT", "LF_DBG", "J", "B", "BS", "C", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE"
+### Available allocators are: "LF", "LF_YT", "LF_DBG", "J", "B", "BS", "BM", "C", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE"
### LF - lfalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/lfalloc)
### LF_YT - Allocator selection for YT (https://a.yandex-team.ru/arc/trunk/arcadia/library/lfalloc/yt/ya.make)
### LF_DBG - Debug allocator selection(https://a.yandex-team.ru/arc/trunk/arcadia/library/lfalloc/dbg/ya.make)
@@ -2010,6 +2013,7 @@ macro USE_PERL_LIB() {
### Discussion: https://ironpeter.at.yandex-team.ru/replies.xml?item_no=126
### Code: https://a.yandex-team.ru/arc/trunk/arcadia/library/balloc
### BS - The balloc allocator with leak sanitizer (https://a.yandex-team.ru/arc/trunk/arcadia/library/balloc/sanitize)
+### BM - The balloc for market (agri@ commits from july 2018 till november 2018 saved)
### C - Like B, but can be disabled for each thread to LF or SYSTEM one (B can be disabled only to SYSTEM)
### GOOGLE - Google TCMalloc (https://a.yandex-team.ru/arc/trunk/arcadia/library/malloc/galloc)
### LOCKLESS - Allocator based upon lockless queues (https://a.yandex-team.ru/arc/trunk/arcadia/library/malloc/lockless)
@@ -2019,7 +2023,7 @@ macro USE_PERL_LIB() {
macro ALLOCATOR(Alloc) {
SET(ALLOCATOR $Alloc)
- when ($ALLOCATOR in [ "LF", "LF_YT", "LF_DBG", "J", "B", "BS", "C", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE" ]) {
+ when ($ALLOCATOR in [ "LF", "LF_YT", "LF_DBG", "J", "B", "BS", "BM", "C", "GOOGLE", "LOCKLESS", "SYSTEM", "FAKE" ]) {
}
otherwise {
PEERDIR+=___configure_error___unknown_allocator_type___$ALLOCATOR
