GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 020c2b7609 into merged_master (Bitcoin PR bitcoin/bitcoin#22923)

Browse source
This commit is contained in:
James Dorfman 2023-04-21 05:08:04 +00:00
commit fbabb1c4e8
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -236,7 +236,7 @@ task:
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
task:
name: '[multiprocess, DEBUG] [focal]'
name: '[multiprocess, i686, DEBUG] [focal]'
# Disable for Elements for now; Multiprocess build is not supported or tested and fails CI.
only_if: false
<< : *GLOBAL_TASK_TEMPLATE
@ -247,7 +247,7 @@ task:
env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
MAKEJOBS: "-j8"
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
task:
name: '[no wallet] [bionic]'

7
ci/test/00_setup_env_native_multiprocess.sh → ci/test/00_setup_env_i686_multiprocess.sh
View file

@ -6,11 +6,12 @@
export LC_ALL=C.UTF-8
export CONTAINER_NAME=ci_native_multiprocess
export HOST=i686-pc-linux-gnu
export CONTAINER_NAME=ci_i686_multiprocess
export DOCKER_NAME_TAG=ubuntu:20.04
export PACKAGES="cmake python3 python3-pip llvm clang"
export PACKAGES="cmake python3 python3-pip llvm clang g++-multilib"
export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"
export GOAL="install"
export BITCOIN_CONFIG="--enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM
export BITCOIN_CONFIG="--enable-debug CC='clang -m32' CXX='clang++ -m32' LDFLAGS='--rtlib=compiler-rt -lgcc_s'"
export TEST_RUNNER_ENV="BITCOIND=elements-node"
export PIP_PACKAGES="lief"

4
src/bench/addrman.cpp
View file

@ -5,6 +5,7 @@
#include <addrman.h>
#include <bench/bench.h>
#include <random.h>
#include <util/check.h>
#include <util/time.h>
#include <optional>
@ -110,7 +111,8 @@ static void AddrManGood(benchmark::Bench& bench)
* we want to do the same amount of work in every loop iteration. */
bench.epochs(5).epochIterations(1);
const size_t addrman_count{bench.epochs() * bench.epochIterations()};
const uint64_t addrman_count{bench.epochs() * bench.epochIterations()};
Assert(addrman_count == 5U);
std::vector<std::unique_ptr<CAddrMan>> addrmans(addrman_count);
for (size_t i{0}; i < addrman_count; ++i) {