diff --git a/contrib/teamcity/build-configurations.sh b/contrib/teamcity/build-configurations.sh --- a/contrib/teamcity/build-configurations.sh +++ b/contrib/teamcity/build-configurations.sh @@ -59,7 +59,7 @@ case "$ABC_BUILD_NAME" in build-asan) # Build with the address sanitizer, then run unit tests and functional tests. - CONFIGURE_FLAGS="--enable-debug --with-sanitizers=address --disable-ccache" "${CI_SCRIPTS_DIR}"/build_autotools.sh + CONFIGURE_FLAGS="CPPFLAGS=-DARENA_DEBUG --enable-debug --with-sanitizers=address --disable-ccache" "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check # FIXME Remove when wallet_multiwallet works with asan after backporting at least the following PRs from Core and their dependencies: 13161, 12493, 14320, 14552, 14760, 11911. TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --exclude=wallet_multiwallet" diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -28,6 +28,10 @@ #include #include +#ifdef ARENA_DEBUG +#include +#include +#endif LockedPoolManager *LockedPoolManager::_instance = nullptr; std::once_flag LockedPoolManager::init_flag; @@ -143,7 +147,7 @@ } #ifdef ARENA_DEBUG -static void printchunk(char *base, size_t sz, bool used) { +static void printchunk(void *base, size_t sz, bool used) { std::cout << "0x" << std::hex << std::setw(16) << std::setfill('0') << base << " 0x" << std::hex << std::setw(16) << std::setfill('0') << sz << " 0x" << used << std::endl; @@ -153,7 +157,7 @@ printchunk(chunk.first, chunk.second, true); std::cout << std::endl; for (const auto &chunk : chunks_free) - printchunk(chunk.first, chunk.second, false); + printchunk(chunk.first, chunk.second->first, false); std::cout << std::endl; } #endif