From adb25b0dde3909f21f65dbc68ffec72c4ca81819 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 6 Nov 2021 04:33:06 +0100
Subject: [PATCH 1/2] Run the CI in fedora
---
.github/workflows/all.yml | 17 +++++++++++++++++
bench.sh | 2 +-
build-bench-env.sh | 8 ++++----
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index e99d8e4..078c012 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -14,11 +14,28 @@ jobs:
run: |
cd out/bench
../../bench.sh alla allt no-iso
+ build-all-fedora:
+ runs-on: ubuntu-latest
+ container:
+ image: fedora:latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v2
+ - name: Install and build all benchmarks and allocators
+ # rp: https://github.com/mjansson/rpmalloc/issues/263
+ # mi and mesh: error: '__malloc_hook' was not declared in this scope;
+ run: ./build-bench-env.sh all no-lean no-rp no-mi no-mesh no-nomesh
+ - name: Run everything.
+ run: |
+ cd out/bench
+ ../../bench.sh alla allt no-iso
build-all-osx:
runs-on: macos-11
steps:
- name: Check out repository code
uses: actions/checkout@v2
+ - name: Silence some git warnings
+ run: git config --global advice.detachedHead false
- name: Install and build all benchmarks and allocators
run: ./build-bench-env.sh all no-lean
- name: Run everything.
diff --git a/bench.sh b/bench.sh
index 84ddbf1..e1ceb52 100755
--- a/bench.sh
+++ b/bench.sh
@@ -34,7 +34,7 @@ tests_exclude_macos="sh6bench sh8bench redis"
verbose="no"
ldpreload="LD_PRELOAD"
-timecmd=/usr/bin/time
+timecmd="/usr/bin/time" # the shell builtin doesn't support all the options we need
darwin=""
extso=".so"
procs=8
diff --git a/build-bench-env.sh b/build-bench-env.sh
index 5f83a74..d674c4d 100755
--- a/build-bench-env.sh
+++ b/build-bench-env.sh
@@ -277,9 +277,9 @@ function aptinstall {
function dnfinstall {
echo ""
- echo "> sudo dnf install $1"
+ echo "> sudo dnf -y --quiet --nodocs install $1"
echo ""
- sudo dnf install $1
+ sudo dnf -y --quiet --nodocs install $1
}
function brewinstall {
@@ -304,8 +304,8 @@ if test "$setup_packages" = "1"; then
phase "install packages"
if grep -q 'ID=fedora' /etc/os-release 2>/dev/null; then
# no 'apt update' equivalent needed on Fedora
- dnfinstall "gcc-c++ clang lld llvm-dev unzip dos2unix bc gmp-devel wget"
- dnfinstall "cmake python3 ruby ninja-build libtool autoconf"
+ dnfinstall "gcc-c++ clang lld llvm-devel unzip dos2unix bc gmp-devel wget"
+ dnfinstall "cmake python3 ruby ninja-build libtool autoconf git patch time"
elif grep -q -e 'ID=debian' -e 'ID=ubuntu' /etc/os-release 2>/dev/null; then
echo "updating package database... (sudo apt update)"
sudo apt update
From bd1908f0aec265ef104d8a45bde34f57bcdc1b71 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 8 Dec 2021 15:43:34 +0100
Subject: [PATCH 2/2] Enable rpmalloc
---
.github/workflows/all.yml | 3 +--
build-bench-env.sh | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index 078c012..66829fd 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -22,9 +22,8 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v2
- name: Install and build all benchmarks and allocators
- # rp: https://github.com/mjansson/rpmalloc/issues/263
# mi and mesh: error: '__malloc_hook' was not declared in this scope;
- run: ./build-bench-env.sh all no-lean no-rp no-mi no-mesh no-nomesh
+ run: ./build-bench-env.sh all no-lean no-mi no-mesh no-nomesh
- name: Run everything.
run: |
cd out/bench
diff --git a/build-bench-env.sh b/build-bench-env.sh
index d674c4d..eecb7ec 100755
--- a/build-bench-env.sh
+++ b/build-bench-env.sh
@@ -31,7 +31,7 @@ version_mallocng=master
version_mesh=7ef171c7870c8da1c52ff3d78482421f46beb94c
version_mi=v1.7.3
version_nomesh=7ef171c7870c8da1c52ff3d78482421f46beb94c
-version_rp=1.4.3
+version_rp=4c10723
version_sc=v1.0.0
version_scudo=main
version_sm=709663f