diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index 36cf57f..097e4db 100644 --- a/.github/workflows/test-sync.yml +++ b/.github/workflows/test-sync.yml @@ -41,7 +41,7 @@ jobs: - name: Archive p2pool.log uses: actions/upload-artifact@v3 with: - name: p2pool_ubuntu_data + name: p2pool_ubuntu_data_tsan path: | build/*.log build/data/ @@ -61,18 +61,48 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 17 + sudo ./llvm.sh 16 - name: Checkout repository uses: actions/checkout@v3 with: submodules: true + - name: Install libcxx_msan + run: | + mkdir /tmp/libcxx_msan + cp tests/src/libcxx_msan.tar.xz /tmp/libcxx_msan + cd /tmp/libcxx_msan + tar xvf libcxx_msan.tar.xz + + - name: Build libcurl + run: | + cd external/src/curl + cmake . -DCMAKE_C_COMPILER=clang-16 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DCURL_ZLIB=OFF -DCURL_DISABLE_ALTSVC=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_CRYPTO_AUTH=ON -DCURL_DISABLE_DOH=ON -DCURL_DISABLE_GETOPTIONS=ON -DCURL_DISABLE_HSTS=ON -DCURL_DISABLE_LIBCURL_OPTION=ON -DCURL_DISABLE_MIME=ON -DCURL_DISABLE_NETRC=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_PARSEDATE=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_DISABLE_SHUFFLE_DNS=ON -DCURL_DISABLE_SOCKETPAIR=ON -DCURL_DISABLE_VERBOSE_STRINGS=ON -DHTTP_ONLY=ON -DCURL_ENABLE_SSL=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DCURL_USE_LIBSSH2=OFF -DENABLE_UNIX_SOCKETS=OFF + make -j$(nproc) + cd lib && mkdir .libs && cp libcurl.a .libs + + - name: Build libuv + run: | + cd external/src/libuv + mkdir build + cd build + cmake .. -DCMAKE_C_COMPILER=clang-16 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DBUILD_TESTING=OFF + make -j$(nproc) + + - name: Build libzmq + run: | + cd external/src/libzmq + mkdir build + cd build + cmake .. -DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -Os -fno-omit-frame-pointer -g -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument' -DWITH_TLS=OFF -DWITH_LIBSODIUM=OFF -DWITH_LIBBSD=OFF -DBUILD_TESTS=OFF -DWITH_DOCS=OFF -DENABLE_DRAFTS=OFF -DWITH_PERF_TOOL=OFF + make -j$(nproc) + - name: Build p2pool run: | mkdir build cd build - cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 + cmake .. -DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16 -DCMAKE_C_FLAGS='-fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -fno-omit-frame-pointer -g' -DCMAKE_CXX_FLAGS='-nostdinc++ -nostdlib++ -fsanitize=memory -fsanitize-recover -fsanitize-memory-track-origins -isystem /tmp/libcxx_msan/include/c++/v1 -L/tmp/libcxx_msan/lib -Wl,-rpath /tmp/libcxx_msan/lib -lc++ -lc++abi -Wno-unused-command-line-argument -fuse-ld=lld-16 -fno-omit-frame-pointer -g' -DDEV_TEST_SYNC=ON -DDEV_WITH_MSAN=ON -DSTATIC_LIBS=ON make -j$(nproc) - name: Run p2pool @@ -83,13 +113,13 @@ jobs: python ../tests/src/stratum_dummy.py stratum_dummy1.log & python ../tests/src/stratum_dummy.py stratum_dummy2.log & python ../tests/src/stratum_dummy.py stratum_dummy3.log & - TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --data-api data --local-api --loglevel 6 + MSAN_OPTIONS="halt_on_error=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --data-api data --local-api --loglevel 6 grep 'Synchronization finished successfully' p2pool.log - name: Archive p2pool.log uses: actions/upload-artifact@v3 with: - name: p2pool_ubuntu_data + name: p2pool_ubuntu_data_msan path: | build/*.log build/data/ @@ -169,7 +199,7 @@ jobs: - name: Archive p2pool.log uses: actions/upload-artifact@v3 with: - name: p2pool_windows_data + name: p2pool_windows_data_debug_asan path: | build/Debug/*.log build/Debug/data/ diff --git a/CMakeLists.txt b/CMakeLists.txt index a7afa30..71b9f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,10 +288,12 @@ endif() add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES}) if (STATIC_BINARY OR STATIC_LIBS) - if (WIN32) - add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} "${CMAKE_PROJECT_NAME}.exe") - else() - add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} ${CMAKE_PROJECT_NAME}) + if (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN)) + if (WIN32) + add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} "${CMAKE_PROJECT_NAME}.exe") + else() + add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} ${CMAKE_PROJECT_NAME}) + endif() endif() if (WITH_RANDOMX) diff --git a/cmake/flags.cmake b/cmake/flags.cmake index ab3796d..4d7607d 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -10,13 +10,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) if (DEV_WITH_TSAN) set(GENERAL_FLAGS "${GENERAL_FLAGS} -fno-omit-frame-pointer -fsanitize=thread") - elseif (DEV_WITH_MSAN) - set(GENERAL_FLAGS "${GENERAL_FLAGS} -fno-omit-frame-pointer -fsanitize=memory") endif() set(WARNING_FLAGS "-Wall -Wextra -Wcast-align -Wcast-qual -Wlogical-op -Wstrict-overflow=2 -Wundef -Wformat=2 -Wpointer-arith -Werror") - if (DEV_WITH_TSAN OR DEV_WITH_MSAN) + if (DEV_WITH_TSAN) set(OPTIMIZATION_FLAGS "-O2 -g") else() set(OPTIMIZATION_FLAGS "-Ofast -s") @@ -64,7 +62,10 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC) elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) set(GENERAL_FLAGS "-pthread") set(WARNING_FLAGS "-Wall -Wextra -Wno-undefined-internal -Wunreachable-code-aggressive -Wmissing-prototypes -Wmissing-variable-declarations -Werror") - set(OPTIMIZATION_FLAGS "-Ofast -funroll-loops -fmerge-all-constants") + + if (NOT DEV_WITH_MSAN) + set(OPTIMIZATION_FLAGS "-Ofast -funroll-loops -fmerge-all-constants") + endif() if (WITH_LTO) set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -flto") diff --git a/external/src/RandomX b/external/src/RandomX index df7ee03..aff9cd9 160000 --- a/external/src/RandomX +++ b/external/src/RandomX @@ -1 +1 @@ -Subproject commit df7ee038c4cd2127d59afbe0953c89b61b445d93 +Subproject commit aff9cd988f19e8471558c767487959fa38020cba diff --git a/src/util.cpp b/src/util.cpp index 18a286e..71e7d81 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -503,19 +503,19 @@ bool get_dns_txt_records_base(const std::string& host, Callback static_cast(sizeof(answer)))) { return false; } - ns_msg handle; + ns_msg handle{}; if (ns_initparse(answer, anslen, &handle) != 0) { return false; } for (int rrnum = 0, n = ns_msg_count(handle, ns_s_an); rrnum < n; ++rrnum) { - ns_rr rr; + ns_rr rr{}; if ((ns_parserr(&handle, ns_s_an, rrnum, &rr) == 0) && (ns_rr_type(rr) == ns_t_txt)) { for (const uint8_t* data = ns_rr_rdata(rr), *e = data + ns_rr_rdlen(rr); data < e;) { const size_t k = *(data++); diff --git a/tests/src/libcxx_msan.tar.xz b/tests/src/libcxx_msan.tar.xz new file mode 100644 index 0000000..38bd699 Binary files /dev/null and b/tests/src/libcxx_msan.tar.xz differ