Merge branch 'master' into detect_allocators_present_and_functional

Author: derSteFfi

bench.sh

@@ -6,7 +6,7 @@
 # Allocators and tests
 # --------------------------------------------------------------------
 
-readonly alloc_all="sys dh ff fg gd hd hm hml iso je lf lp lt mi mi-dbg mi-sec mi2 mi2-dbg mi2-sec mng mesh nomesh pa rp sc scudo sg sm sn sn-sec tbb tc tcg xmi xsmi xmi-dbg yal"
+readonly alloc_all="sys dh ff fg gd hd hm hml iso je lf lp lt mi mi-sec mi2 mi2-sec mng mesh nomesh pa rp sc scudo sg sm sn sn-sec tbb tc tcg mi-dbg mi2-dbg xmi xsmi xmi-dbg yal rmalloc"
 readonly alloc_secure="dh ff gd hm hml iso mi-sec mi2-sec mng pa scudo sg sn-sec sg"
 alloc_run=""           # allocators to run (expanded by command line options)
 alloc_libs="sys="      # mapping from allocator to its .so as "<allocator>=<sofile> ..."
@@ -28,7 +28,7 @@ readonly tests_exclude_macos="sh6bench sh8bench redis"
 # --------------------------------------------------------------------
 
 readonly version_redis=6.2.7
-readonly version_rocksdb=8.1.1
+readonly version_rocksdb=10.10.1
 readonly version_linux=6.5.1
 
 # --------------------------------------------------------------------
@@ -124,6 +124,7 @@ alloc_lib_add "tbb"    "$lib_tbb"
 alloc_lib_add "tc"     "$localdevdir/tc/.libs/libtcmalloc_minimal$extso"
 alloc_lib_add "tcg"    "$localdevdir/tcg/bazel-bin/tcmalloc/libtcmalloc$extso"
 alloc_lib_add "yal"    "$localdevdir/yal/yalloc$extso"
+alloc_lib_add "rmalloc" "$localdevdir/rmalloc/lib/librmalloc$extso"
 
 alloc_lib_add "mi"     "$localdevdir/mi/out/release/libmimalloc$extso"
 alloc_lib_add "mi-sec" "$localdevdir/mi/out/secure/libmimalloc-secure$extso"

build-bench-env.sh

@@ -59,16 +59,17 @@ readonly version_sc=master   # unmaintained since 2016
 readonly version_scudo=main
 readonly version_sg=master   # ~unmaintained since 2021
 readonly version_sm=master   # ~unmaintained since 2017
-readonly version_sn=0.7.2
+readonly version_sn=0.7.4
 readonly version_tbb=v2021.9.0
-readonly version_tc=gperftools-2.16.90
-readonly version_tcg=98fd24303c7b5ef5e30da625f11fb623a5e038b6 # 2025-07-18
+readonly version_tc=gperftools-2.18
+readonly version_tcg=81f4e44f23f2936303f9404fee7315119b9df623 # 2026-02-23
 readonly version_yal=main
+readonly version_rmalloc=master
 
 # benchmark versions
 readonly version_redis=6.2.7
 readonly version_lean=21d264a66d53b0a910178ae7d9529cb5886a39b6 # build fix for recent compilers
-readonly version_rocksdb=8.1.1
+readonly version_rocksdb=10.10.1
 readonly version_lua=v5.4.7
 readonly version_linux=6.5.1
 
@@ -104,6 +105,7 @@ setup_tbb=0
 setup_tc=0
 setup_tcg=0
 setup_yal=0
+setup_rmalloc=0
 
 # bigger benchmarks
 setup_bench=0
@@ -147,6 +149,7 @@ while : ; do
         setup_tbb=$flag_arg
         setup_tc=$flag_arg
         setup_yal=$flag_arg
+        setup_rmalloc=$flag_arg
         if [ -z "$darwin" ]; then
           setup_tcg=$flag_arg       # lacking 'malloc.h'
           setup_dh=$flag_arg
@@ -176,6 +179,8 @@ while : ; do
         ;;
     bench)
         setup_bench=$flag_arg;;
+    rmalloc)
+        setup_rmalloc=$flag_arg;;
     ff)
         setup_ff=$flag_arg;;
     fg)
@@ -280,6 +285,7 @@ while : ; do
         echo "  tc                           setup tcmalloc ($version_tc)"
         echo "  tcg                          setup Google's tcmalloc ($version_tcg)"
         echo "  yal                          setup yalloc ($version_yal)"
+        echo "  rmalloc                      setup rmalloc($version_rmalloc)"
         echo ""
         echo "  bench                        build all local benchmarks"
         echo "  lean                         setup lean 3 benchmark"
@@ -467,6 +473,13 @@ if test "$setup_packages" = "1"; then
   fi
 fi
 
+if test "$setup_rmalloc" = "1"; then
+  checkout rmalloc $version_rmalloc https://github.com/newell-romario/rmalloc
+  cmake  -DCMAKE_BUILD_TYPE=RELEASE .
+  make
+  popd
+fi
+
 if test "$setup_hm" = "1"; then
   checkout hm $version_hm https://github.com/GrapheneOS/hardened_malloc
   make CONFIG_NATIVE=true CONFIG_WERROR=false VARIANT=light -j $proc
@@ -770,9 +783,6 @@ if test "$setup_rocksdb" = "1"; then
   fi
 
   cd "rocksdb-$version_rocksdb"
-  set +e
-  patch -p1 -N -r- < ../../patches/rocksdb_build.patch > /dev/null
-  set -e
   DISABLE_WARNING_AS_ERROR=1 DISABLE_JEMALLOC=1 ROCKSDB_DISABLE_TCMALLOC=1 make db_bench -j $procs
   [ "$CI" ] && find . -name '*.o' -delete
   popd