diff --git a/.gitignore b/.gitignore
index 9265eadc..6145c899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
-/test/CMakeFiles
-/test/*/CMakeFiles
/build
/CMakeLists.txt.user
/.idea
-/CMakeFiles
/src/3rdparty
/cmake-build-*
CMakeCache.txt
@@ -14,3 +11,6 @@ src/crypto/asm/*.inc
src/crypto/asm/win/*.inc
src/3rdparty/
test/
+*CMakeFiles*
+*.a
+*.cbp
diff --git a/.travis.yml b/.travis.yml
index fa5e813d..5ac4fae1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,7 @@ before_install:
script:
- brew install gcc libuv libmicrohttpd
- - brew upgrade boost
- - cmake . -DUV_LIBRARY=/usr/local/lib/libuv.a -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_SSL_LIBRARY=/usr/local/opt/openssl/lib/libssl.a -DOPENSSL_CRYPTO_LIBRARY=/usr/local/opt/openssl/lib/libcrypto.a -DBOOST_ROOT=/usr/local/lib
+ - cmake . -DUV_LIBRARY=/usr/local/lib/libuv.a -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_SSL_LIBRARY=/usr/local/opt/openssl/lib/libssl.a -DOPENSSL_CRYPTO_LIBRARY=/usr/local/opt/openssl/lib/libcrypto.a
- make
- cp ./src/config.json .
- ./xmrigDaemon --version
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80760706..6046eeb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 2.0.0
+**Thx to @xmrig and @SChernykh awesome work!**
+* Full Rebase on XMRig 3.1.1
+ * randomX/wow/XL
+ * NUMA support
+ * flexible multi algorithm configuration
+ * unlimited switching between incompatible algorithms at runtime
+* Argon2, UPX2 (Nice hashrate improvement) and CN-Conceal support integrated like in previous version
+* 5-10% Hashrate improvement on ARMv8 CPUs when mining CN based algos compared to stock xmrig
+* Fully compatible to XMRigCCServer 1.9.5 no server upgrade needed!
+**New XMRigCCServer will be released soon with new features**
# 1.9.5
- Integrated CN-Conceal algo (algo: "cryptonight", variant: "conceal" or variant: "ccx") #259
- Integrated Argon2-512 algo "chukwa" for upcoming trtl fork (algo: "argon2-512", variant: "auto" or "chukwa") #258
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72d4065e..8803e0eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,112 +1,160 @@
cmake_minimum_required(VERSION 2.8)
project(xmrig)
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
-endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+#set(CMAKE_BUILD_TYPE "Debug")
-option(WITH_LIBCPUID "Use Libcpuid" ON)
-option(WITH_HTTPD "HTTP REST API" OFF)
-option(WITH_CC_CLIENT "CC Client" ON)
-option(WITH_CC_SERVER "CC Server" ON)
-option(WITH_TLS "TLS support" ON)
-option(WITH_ASM "ASM optimizations" ON)
-option(BUILD_STATIC "Build static binary" OFF)
-set(Boost_USE_STATIC_RUNTIME ON)
-set(Boost_USE_STATIC_LIBS ON)
+find_program(CCACHE_PROGRAM ccache)
+if(CCACHE_PROGRAM)
+ message(STATUS "-- XMRigCC: Found ccache package... Activating...")
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
+option(WITH_LIBCPUID "Enable libcpuid support" ON)
+option(WITH_HWLOC "Enable hwloc support" ON)
+option(WITH_CN_LITE "Enable CryptoNight-Lite algorithms family" ON)
+option(WITH_CN_HEAVY "Enable CryptoNight-Heavy algorithms family" ON)
+option(WITH_CN_PICO "Enable CryptoNight-Pico algorithm" ON)
+option(WITH_CN_GPU "Enable CryptoNight-GPU algorithm" OFF)
+option(WITH_RANDOMX "Enable RandomX algorithms family" ON)
+option(WITH_ARGON2 "Enable Argon2 algorithms family" ON)
+option(WITH_HTTP "Enable HTTP protocol support (client/server)" ON)
+option(WITH_CN_EXTREMELITE "CryptoNight-Extremelite support" ON)
+option(WITH_DEBUG_LOG "Enable debug log output" OFF)
+option(WITH_TLS "Enable OpenSSL support" ON)
+option(WITH_ASM "Enable ASM PoW implementations" ON)
+option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
+option(WITH_CC_CLIENT "CC Client" ON)
+option(WITH_CC_SERVER "CC Server" OFF)
+
+option(BUILD_STATIC "Build static binary" OFF)
+option(ARM_TARGET "Force use specific ARM target 8 or 7" 0)
+option(HWLOC_DEBUG "Enable hwloc debug helpers and log" OFF)
+
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
if(NOT MINER_EXECUTABLE_NAME)
-set(MINER_EXECUTABLE_NAME "xmrigMiner" CACHE STRING "Miner executable file name")
+ set(MINER_EXECUTABLE_NAME "xmrigMiner" CACHE STRING "Miner executable file name")
endif(NOT MINER_EXECUTABLE_NAME)
if(NOT DAEMON_EXECUTABLE_NAME)
-set(DAEMON_EXECUTABLE_NAME "xmrigDaemon" CACHE STRING "Daemon executable file name")
+ set(DAEMON_EXECUTABLE_NAME "xmrigDaemon" CACHE STRING "Daemon executable file name")
endif(NOT DAEMON_EXECUTABLE_NAME)
include (CheckIncludeFile)
include (cmake/cpu.cmake)
+include (src/base/base.cmake)
+include (src/backend/backend.cmake)
+
+
+set(HEADERS
+ "${HEADERS_BASE}"
+ "${HEADERS_BASE_HTTP}"
+ "${HEADERS_BACKEND}"
+ src/App.h
+ src/core/config/Config_default.h
+ src/core/config/Config_platform.h
+ src/core/config/Config.h
+ src/core/config/ConfigTransform.h
+ src/core/config/usage.h
+ src/core/Controller.h
+ src/core/Miner.h
+ src/net/interfaces/IJobResultListener.h
+ src/net/JobResult.h
+ src/net/JobResults.h
+ src/net/Network.h
+ src/net/NetworkState.h
+ src/net/strategies/DonateStrategy.h
+ src/Summary.h
+ src/version.h
+ )
+
+set(HEADERS_CRYPTO
+ src/crypto/cn/asm/CryptonightR_template.h
+ src/crypto/cn/c_blake256.h
+ src/crypto/cn/c_groestl.h
+ src/crypto/cn/c_jh.h
+ src/crypto/cn/c_skein.h
+ src/crypto/cn/CnAlgo.h
+ src/crypto/cn/CnCtx.h
+ src/crypto/cn/CnHash.h
+ src/crypto/cn/CryptoNight_monero.h
+ src/crypto/cn/CryptoNight_test.h
+ src/crypto/cn/CryptoNight.h
+ src/crypto/cn/groestl_tables.h
+ src/crypto/cn/hash.h
+ src/crypto/cn/skein_port.h
+ src/crypto/cn/soft_aes.h
+ src/crypto/common/Algorithm.h
+ src/crypto/common/keccak.h
+ src/crypto/common/Nonce.h
+ src/crypto/common/portable/mm_malloc.h
+ src/crypto/common/VirtualMemory.h
+ )
+
+if (XMRIG_ARM)
+ set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_arm.h)
+else()
+ set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_x86.h)
+endif()
set(SOURCES
- src/api/NetworkState.cpp
+ "${SOURCES_BASE}"
+ "${SOURCES_BASE_HTTP}"
+ "${SOURCES_BACKEND}"
src/App.cpp
- src/net/BoostTcpConnection.cpp
- src/net/Client.cpp
- src/net/Connection.cpp
- src/net/Job.cpp
+ src/core/config/Config.cpp
+ src/core/config/ConfigTransform.cpp
+ src/core/Controller.cpp
+ src/core/Miner.cpp
+ src/net/JobResults.cpp
src/net/Network.cpp
+ src/net/NetworkState.cpp
src/net/strategies/DonateStrategy.cpp
- src/net/strategies/FailoverStrategy.cpp
- src/net/strategies/SinglePoolStrategy.cpp
- src/net/SubmitResult.cpp
src/Summary.cpp
- src/workers/MultiWorker.cpp
- src/workers/Handle.cpp
- src/workers/Hashrate.cpp
- src/workers/Worker.cpp
- src/workers/Workers.cpp
src/xmrig.cpp
)
set(SOURCES_CRYPTO
- src/crypto/c_keccak.c
- src/crypto/c_groestl.c
- src/crypto/c_blake256.c
- src/crypto/c_jh.c
- src/crypto/c_skein.c
- src/crypto/HashSelector.cpp
- src/crypto/CryptoNightR_gen.cpp
- )
-
-set(SOURCES_COMMON
- src/Console.cpp
- src/Mem.cpp
- src/net/Url.cpp
- src/Options.cpp
- src/log/ConsoleLog.cpp
- src/log/FileLog.cpp
- src/log/RemoteLog.cpp
- src/log/Log.cpp
- src/Platform.cpp
- src/Cpu.cpp
-
+ src/crypto/cn/c_blake256.c
+ src/crypto/cn/c_groestl.c
+ src/crypto/cn/c_jh.c
+ src/crypto/cn/c_skein.c
+ src/crypto/cn/CnCtx.cpp
+ src/crypto/cn/CnHash.cpp
+ src/crypto/common/Algorithm.cpp
+ src/crypto/common/keccak.cpp
+ src/crypto/common/Nonce.cpp
+ src/crypto/common/VirtualMemory.cpp
)
if (WIN32)
set(SOURCES_OS
+ "${SOURCES_OS}"
res/app.rc
- src/api/Api.cpp
- src/api/ApiState.cpp
src/App_win.cpp
- src/Cpu_win.cpp
- src/Mem_win.cpp
- src/Platform_win.cpp
+ src/crypto/common/VirtualMemory_win.cpp
)
add_definitions(/DWIN32)
- set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv crypt32)
+ set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
elseif (APPLE)
set(SOURCES_OS
+ "${SOURCES_OS}"
src/App_unix.cpp
- src/Cpu_mac.cpp
- src/Mem_unix.cpp
- src/Platform_mac.cpp
+ src/crypto/common/VirtualMemory_unix.cpp
)
else()
set(SOURCES_OS
- src/api/Api.cpp
- src/api/ApiState.cpp
+ "${SOURCES_OS}"
src/App_unix.cpp
- src/Cpu_unix.cpp
- src/Mem_unix.cpp
- src/Platform_unix.cpp
+ src/crypto/common/VirtualMemory_unix.cpp
)
- set(EXTRA_LIBS pthread rt)
-
if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
- set(EXTRA_LIBS ${EXTRA_LIBS} kvm)
+ set(EXTRA_LIBS kvm pthread)
else()
- set(EXTRA_LIBS ${EXTRA_LIBS} dl)
+ set(EXTRA_LIBS pthread rt dl)
endif()
endif()
@@ -120,76 +168,41 @@ endif()
add_definitions(/D__STDC_FORMAT_MACROS)
add_definitions(/DUNICODE)
add_definitions(/DMINER_EXECUTABLE_NAME=${MINER_EXECUTABLE_NAME})
-#add_definitions(/DAPP_DEBUG)
-
-add_compile_options(-fexceptions)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
find_package(UV REQUIRED)
-if (WIN32)
- add_definitions(-DBOOST_ALL_NO_LIB)
-endif(WIN32)
-
-find_package(Boost 1.62.0 COMPONENTS system REQUIRED)
-
include(cmake/flags.cmake)
+include(cmake/randomx.cmake)
+include(cmake/argon2.cmake)
+include(cmake/OpenSSL.cmake)
+include(cmake/asm.cmake)
+include(cmake/cn-gpu.cmake)
-if (WITH_TLS)
- find_package(OpenSSL)
-
- add_definitions(/DCPPHTTPLIB_OPENSSL_SUPPORT)
-
- if (OPENSSL_FOUND)
- include_directories(${OPENSSL_INCLUDE_DIR})
- set(SOURCES_SSL_TLS src/net/BoostTlsConnection.cpp)
- else()
- message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
- endif(OPENSSL_FOUND)
-else()
- add_definitions(/DXMRIG_NO_TLS)
-endif(WITH_TLS)
-
-if (WITH_LIBCPUID)
- add_subdirectory(src/3rdparty/libcpuid)
-
- include_directories(src/3rdparty/libcpuid)
- set(CPUID_LIB cpuid)
- set(SOURCES_CPUID src/Cpu_cpuid.cpp)
-else()
- add_definitions(/DXMRIG_NO_LIBCPUID)
-
- if (XMRIG_ARM)
- set(SOURCES_CPUID src/Cpu_arm.cpp)
- else()
- set(SOURCES_CPUID src/Cpu_stub.cpp)
- endif(XMRIG_ARM)
-endif(WITH_LIBCPUID)
-
-CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H)
-if (HAVE_SYSLOG_H)
- add_definitions(/DHAVE_SYSLOG_H)
- set(SOURCES_SYSLOG src/log/SysLog.h src/log/SysLog.cpp)
+if (WITH_CN_LITE)
+ add_definitions(/DXMRIG_ALGO_CN_LITE)
endif()
-if (WITH_HTTPD)
- find_package(MHD)
+if (WITH_CN_HEAVY)
+ add_definitions(/DXMRIG_ALGO_CN_HEAVY)
+endif()
- if (MHD_FOUND)
- include_directories(${MHD_INCLUDE_DIRS})
- set(HTTPD_SOURCES src/api/Httpd.h src/api/Httpd.cpp)
- else()
- message(FATAL_ERROR "microhttpd NOT found: use `-DWITH_HTTPD=OFF` to build without http deamon support")
- endif(MHD_FOUND)
-else()
- add_definitions(/DXMRIG_NO_HTTPD)
- add_definitions(/DXMRIG_NO_API)
-endif(WITH_HTTPD)
+if (WITH_CN_PICO)
+ add_definitions(/DXMRIG_ALGO_CN_PICO)
+endif()
+
+if (WITH_CN_EXTREMELITE)
+ add_definitions(/DXMRIG_ALGO_CN_EXTREMELITE)
+endif()
+
+if (WITH_ARGON2)
+ add_definitions(/DXMRIG_ALGO_ARGON2)
+endif()
+
+if (WITH_EMBEDDED_CONFIG)
+ add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG)
+endif()
if (WITH_CC_SERVER)
- find_package(MHD)
-
if (MHD_FOUND)
include_directories(${MHD_INCLUDE_DIRS})
else()
@@ -203,86 +216,44 @@ if (WITH_CC_SERVER)
src/cc/Httpd.cpp
src/cc/XMRigCC.cpp
)
-endif(WITH_CC_SERVER)
+ add_definitions("/DXMRIG_FEATURE_CC_SERVER")
+endif()
if (WITH_CC_CLIENT)
set(SOURCES_CC_CLIENT
+ src/cc/CCClientConfig.cpp
src/cc/CCClient.cpp)
-endif(WITH_CC_CLIENT)
+ add_definitions("/DXMRIG_FEATURE_CC_CLIENT")
+
+ if (WITH_TLS)
+ add_definitions(/DCPPHTTPLIB_OPENSSL_SUPPORT)
+ endif()
+
+endif()
if (WITH_CC_SERVER OR WITH_CC_CLIENT)
set(SOURCES_CC_COMMON
src/cc/ControlCommand.cpp
src/cc/ClientStatus.cpp
src/cc/GPUInfo.cpp)
-else()
- add_definitions(/DXMRIG_NO_CC)
-endif(WITH_CC_SERVER OR WITH_CC_CLIENT)
-
-if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
- include(cmake/asm.cmake)
-else()
- add_definitions(/DXMRIG_NO_ASM)
-endif(WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-add_subdirectory(src/3rdparty/argon2)
-set(ARGON2_LIBRARY argon2)
-
-if (BUILD_STATIC)
- set(CMAKE_EXE_LINKER_FLAGS " -static")
-endif(BUILD_STATIC)
+endif()
include_directories(src)
include_directories(src/3rdparty)
include_directories(${UV_INCLUDE_DIR})
-include_directories(${Boost_INCLUDE_DIRS})
-add_library(xmrig_common STATIC ${SOURCES_COMMON})
-add_library(xmrig_os_dependencies STATIC ${SOURCES_OS} ${SOURCES_SYSLOG})
-add_library(xmrig_cpuid STATIC ${SOURCES_CPUID})
+if (BUILD_STATIC)
+ set(CMAKE_EXE_LINKER_FLAGS " -static")
+endif()
-if (WITH_TLS)
- add_library(xmrig_tls STATIC ${SOURCES_SSL_TLS})
-endif (WITH_TLS)
+if (WITH_DEBUG_LOG)
+ add_definitions(/DAPP_DEBUG)
+endif()
-if (WITH_CC_SERVER OR WITH_CC_CLIENT)
- add_library(xmrig_cc_common STATIC ${SOURCES_CC_COMMON})
-endif (WITH_CC_SERVER OR WITH_CC_CLIENT)
-
-add_executable(xmrigMiner ${SOURCES} ${SOURCES_CRYPTO} ${HTTPD_SOURCES} ${SOURCES_CC_CLIENT} res/app.rc)
-set_target_properties(xmrigMiner PROPERTIES OUTPUT_NAME ${MINER_EXECUTABLE_NAME})
-
-target_link_libraries(xmrigMiner xmrig_common xmrig_os_dependencies xmrig_cpuid ${Boost_LIBRARIES}
- ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB} argon2)
-
-if (WITH_CC_CLIENT)
- target_link_libraries(xmrigMiner xmrig_cc_common)
-endif(WITH_CC_CLIENT)
-
-if (WITH_TLS)
- target_link_libraries(xmrigMiner xmrig_tls ${OPENSSL_LIBRARIES} ${EXTRA_LIBS})
-endif(WITH_TLS)
-
-if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
- target_link_libraries(xmrigMiner xmrig_asm)
-endif(WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES} ${SOURCES_CC_CLIENT} ${SOURCES_CC_COMMON})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY})
add_executable(xmrigDaemon src/cc/XMRigd.cpp res/app.rc)
+
set_target_properties(xmrigDaemon PROPERTIES OUTPUT_NAME ${DAEMON_EXECUTABLE_NAME})
-
-if (WITH_CC_SERVER AND MHD_FOUND)
- add_library(xmrig_common_cc STATIC ${SOURCES_COMMON})
- add_executable(xmrigCCServer ${SOURCES_CC_SERVER} res/app.rc)
- target_link_libraries(xmrigCCServer
- xmrig_common_cc xmrig_os_dependencies xmrig_cpuid xmrig_cc_common
- ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
-
- if (WITH_TLS)
- target_link_libraries(xmrigCCServer xmrig_tls ${OPENSSL_LIBRARIES} ${EXTRA_LIBS})
- endif (WITH_TLS)
-
- set_target_properties(xmrig_common_cc PROPERTIES COMPILE_FLAGS "-DXMRIG_CC_SERVER ${SHARED_FLAGS}")
- set_target_properties(xmrigCCServer PROPERTIES COMPILE_FLAGS "-DXMRIG_CC_SERVER ${SHARED_FLAGS}")
-endif(WITH_CC_SERVER AND MHD_FOUND)
-
-add_subdirectory(test EXCLUDE_FROM_ALL)
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${MINER_EXECUTABLE_NAME})
diff --git a/Dockerfile b/Dockerfile
index 59ceab4f..92385e0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,13 @@
FROM ubuntu:latest
RUN apt-get update && \
- apt install git build-essential libbz2-dev cmake libuv1-dev libssl-dev wget gcc g++ -y && \
+ apt install git build-essential libbz2-dev cmake libuv1-dev libssl-dev libhwloc-dev wget gcc g++ -y && \
apt clean && \
rm -rf /var/lib/apt/lists/*
-RUN wget https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz \
- && tar xfz boost_1_66_0.tar.gz \
- && cd boost_1_66_0 \
- && ./bootstrap.sh --with-libraries=system \
- && ./b2 link=static runtime-link=static install \
- && cd .. && rm -rf boost_1_66_0 && rm boost_1_66_0.tar.gz && ldconfig
-
RUN git clone https://github.com/Bendr0id/xmrigCC.git && \
cd xmrigCC && \
- cmake . -DWITH_CC_SERVER=OFF -DWITH_HTTPD=OFF && \
+ cmake . -DWITH_CC_SERVER=OFF && \
make
COPY Dockerfile /Dockerfile
diff --git a/README.md b/README.md
index f58bf59f..e0b221ae 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
# XMRigCC
+XMRig is a high performance RandomX, CryptoNight and Argon2 CPU miner, with official support for Windows.
+
:bulb: **This is the CPU variant of XMRigCC, if you're looking for the AMD GPU (OpenCL) variant [click here](https://github.com/Bendr0id/xmrigCC-amd/).**
-:warning: **Confused by all the forks? Check the [Coin Configuration](https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations) guide.**
-
-
[](https://ci.appveyor.com/project/Bendr0id/xmrigcc)
[](https://hub.docker.com/r/bendr0id/xmrigcc/)
[](https://github.com/bendr0id/xmrigCC/releases)
@@ -16,164 +15,83 @@
### About XMRigCC
-XMRigCC is a fork of [XMRig](https://github.com/xmrig/xmrig) which adds the ability to remote control your XMRig instances via a Webfrontend and REST api.
-This fork is based on XMRig and adds a "Command and Control" (C&C) server, a daemon to reload XMRigCCMiner on config changes and modifications in XMRig to send the current status to the C&C Server.
-The modified version can also handle commands like "update config", "start/stop mining" or "restart/shutdown" which can be send from the C&C-Server.
-
-**AND MANY MORE**
+XMRigCC is a [XMRig](https://github.com/xmrig/xmrig) fork which adds remote control and monitoring functions to XMRigCC miners. It lets you control your miners via a Dashboard or the REST api.
+XMRigCC has a "Command and Control" (C&C) server part, a daemon to keep the XMRigCC miner alive and modifications to send the current status to the C&C Server.
+The modified version can handle commands like "update config", "start/stop mining" or "restart/shutdown/reboot" which can be send from the C&C-Server Dashboard.
+Assign config templates to multiple miners with a single click and let them switch configs without connecting to each of them.
+Watch your miners logs with the simple remote Log viewer and monitor you miners. When the hashrate drops or one of your miners went offline you can get a notification via
+PushOver or Telegram automatically so that you dont need to watch your miners all day.
Full Windows/Linux compatible, and you can mix Linux and Windows miner on one XMRigCCServer.
## Additional features of XMRigCC (on top of XMRig)
Check the [Coin Configuration](https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations) guide
-* **NEW Support of Argon2-512 chukwa (TRTL) variant (algo: "argon2-512", variant "auto" or "chukwa")**
-* **NEW Support of Argon2-256 wrkz variant (algo: "argon2-256", variant "auto" or "wrkz")**
-* **NEW Support of Crytptonight Conceal variant (algo: "cryptonight", variant "conceal" or "ccx")**
-* **NEW Support of Crytptonight-Extremelite (UPX 2) variant (algo: "cryptonight-extremelite", variant "auto" (autodetect) or "upx2")**
-* **Support of Crytptonight R (XMR) variant (algo: "cryptonight", variant "auto" (autodetect) or "r")**
-* **Support of Crytptonight WOW (Wownero) variant (algo: "cryptonight", variant "wow")**
-* **Support of Crytptonight Reverse Waltz (Graft) variant (algo: "cryptonight", variant "rwz" (autodetect) or variant "graft")**
-* **Support of Crytptonight Double/Heavyx (XCash) variant (algo: "cryptonight", variant "double")**
-* **Support of Crytptonight Zelerius variant (algo: "cryptonight", variant "zls")**
-* **Support of Crytptonight RTO/HOSP variant (algo: "cryptonight", variant "rto" or variant "hosp")**
-* **Support of Crytptonight-Ultralite TRTL/Turtle variant (algo: "cryptonight-ultralite", variant "auto")**
-* **Support of Crytptonight-Lite UPX/uPlexa variant (algo: "cryptonight-lite", variant "upx")**
-* **Support of Crytptonight XTL v5/v9 PoW changes aka CN-FastV2 (algo: "cryptonight", variant: "xtl" (autodetect), "xtlv9" (force v9))**
-* **Support of Crytptonight XFH/SWAP variant aka CN-Heavy-Fast**
-* **Support of Crytptonight v8 PoW changes aka CNV2 (XMR fork on Block 1685555)**
-* **Support of Crytptonight-Heavy BitTube (TUBE) v4 variant (fork on Block 110000)**
-* **Support of Crytptonight Masari (MSR) v7 variant (use variant "msr" to be ready for the fork, with autodetect)**
-* **Support of Crytptonight-Heavy Haven Protocol (XHV) v3 variant (use variant "xhv")**
-* **Support of Crytptonight Stellite (XTL) v4 variant**
-* **Support of Crytptonight Alloy (XAO) variant**
-* **Support of Crytptonight-Lite IPBC/TUBE variant**
-* **Support of Crytptonight-Heavy (Loki, Ryo, ...)**
-* **Support of Crytptonight v7 PoW changes aka CNV1**
-* **Support of Crytptonight-Lite v7 PoW changes aka CN-LiteV1**
-* Full SSL/TLS support for the whole communication: [Howto](https://github.com/Bendr0id/xmrigCC/wiki/tls)
- - XMRigCCServer Dashboard <-> Browser
- - XMRigCCServer <-> XMRigMiner
- - XMRigMiner <-> Pool
+* **Support of UPX2 variant (algo: "cn-extremelite/upx2")**
+* **Support of CN-Conceal variant (algo: "cn/conceal")**
+* **Better performance for ARMv8 CPUs**
+* Full SSL/TLS support
+* NUMA support
* Command and control server
* CC Dashboard with:
* statistics of all connected miners
* remote control miners (start/stop/restart/shutdown)
* remote configuration changes of miners
- * simple config editor for miner / mass editor for multiple miners
- * monitoring / offline notification
-* Daemon around the miner to restart and apply config changes
-* High optimized mining code ([Benchmarks](#benchmarks))
-* Working CPU affinity for NUMA Cores or CPU's with lots of cores
-* Multihash support (Double, Triple, Quadruple, Quituple)
-* Configuration of multihash per thread
-* Smarter automatic CPU configuration
-* It's still open source software :D
+ * simple config editor for miner / config templates
+ * monitoring / offline notification push notifications via Pushover and Telegram
+* Daemon to restart the miner
-**[Find Help/Howto](https://github.com/Bendr0id/xmrigCC/wiki/)**
+**XMRigCC Miner**
-
-**XMRigCC Daemon(miner)**
-
-
+
**XMRigCC Server**
-
+
**XMRigCC Dashboard**
-
+
#### Table of contents
* [Download](#download)
-* [Wiki/Building/Howto](https://github.com/Bendr0id/xmrigCC/wiki/)
* [Usage](#usage)
-* [Multihash factor](#multihash-multihash-factor)
-* [Multihash thread Mask](#multihash-thread-mask-only-for-multihash-factor--1)
+* [Wiki/Building/Howto](https://github.com/Bendr0id/xmrigCC/wiki/)
* [Common Issues](#common-issues)
-* [Optimizations](#cpu-mining-performance)
-* [Benchmarks](#benchmarks)
* [Donations](#donations)
* [Contacts](#contact)
## Download
* Binary releases: https://github.com/Bendr0id/xmrigCC/releases
* Git tree: https://github.com/Bendr0id/xmrigCC.git
- * Clone with `git clone https://github.com/Bendr0id/xmrigCC.git` :hammer: [Build instructions](https://github.com/Bendr0id/xmrigCC/wiki/Build-Debian%5CUbuntu).
+ * Clone with `git clone https://github.com/Bendr0id/xmrigCC.git` :hammer: [Build instructions](https://github.com/xmrig/xmrig/wiki/Build.
## Usage
-### Basic example xmrigCCServer
+### Basic example XMRigCCServer
```
xmrigCCServer --cc-port=3344 --cc-user=admin --cc-pass=pass --cc-access-token=SECRET_TOKEN_TO_ACCESS_CC_SERVER
```
-### Options xmrigCCServer
+### Options XMRigCCServer
```
- --cc-user=USERNAME CC Server admin user
- --cc-pass=PASSWORD CC Server admin pass
- --cc-access-token=T CC Server access token for CC Client
- --cc-port=N CC Server
- --cc-use-tls enable tls encryption for CC communication
- --cc-cert-file=FILE when tls is turned on, use this to point to the right cert file (default: server.pem)
- --cc-key-file=FILE when tls is turned on, use this to point to the right key file (default: server.key)
- --cc-client-config-folder=FOLDER Folder contains the client config files
- --cc-custom-dashboard=FILE loads a custom dashboard and serve it to '/'
- --cc-client-log-lines-history=N maximum lines of log history kept per miner (default: 100)
- --no-color disable colored output
- -S, --syslog use system log for output messages
- -B, --background run the miner in the background
- -c, --config=FILE load a JSON-format configuration file
- -l, --log-file=FILE log all output to a file
- -h, --help display this help and exit
- -V, --version output version information and exit
-```
-
-Also you can use configuration via config file, default **[config_cc.json](https://github.com/Bendr0id/xmrigCC/wiki/Config-XMRigCCServer)**. You can load multiple config files and combine it with command line options.
-
-
-### Basic example xmrigDaemon
-```
-xmrigDaemon -o pool.minemonero.pro:5555 -u YOUR_WALLET -p x -k --cc-url=IP_OF_CC_SERVER:PORT --cc-access-token=SECRET_TOKEN_TO_ACCESS_CC_SERVER --cc-worker-id=OPTIONAL_WORKER_NAME
-```
-
-### Options xmrigDaemon
-```
- -a, --algo=ALGO cryptonight (default), cryptonight-lite or cryptonight-heavy
- -o, --url=URL URL of mining server
- -O, --userpass=U:P username:password pair for mining server
- -u, --user=USERNAME username for mining server
- -p, --pass=PASSWORD password for mining server
- -t, --threads=N number of miner threads
- -A, --aesni=N selection of AES-NI mode (0 auto, 1 on, 2 off)
- -k, --keepalive send keepalived for prevent timeout (need pool support)
- -r, --retries=N number of times to retry before switch to backup server (default: 5)
- -R, --retry-pause=N time to pause between retries (default: 5)
- --pow-variant=V specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), tube (ipbc), alloy, xtl (including autodetect for v5), msr, xhv, rto
- for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations
- --multihash-factor=N number of hash blocks to process at a time (don't set or 0 enables automatic selection of optimal number of hash blocks)
- --multihash-thread-mask=MASK limits multihash to given threads (mask), (default: all threads)
- --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1
- --cpu-priority set process priority (0 idle, 2 normal to 5 highest)
- --no-huge-pages disable huge pages support
- --donate-level=N donate level, default 5% (5 minutes in 100 minutes)
- --user-agent set custom user-agent string for pool
- --max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75)
- --safe safe adjust threads and av settings for current CPU
- --nicehash enable nicehash/xmrig-proxy support
- --use-tls enable tls on pool communication
- --print-time=N print hashrate report every N seconds
- --api-port=N port for the miner API
- --api-access-token=T access token for API
- --api-worker-id=ID custom worker-id for API
- --cc-url=URL url of the CC Server
+ --cc-user=USERNAME CC Server admin user
+ --cc-pass=PASSWORD CC Server admin pass
+ --cc-access-token=T CC Server access token for CC Client
+ --cc-port=N CC Server port
--cc-use-tls enable tls encryption for CC communication
- --cc-access-token=T access token for CC Server
- --cc-worker-id=ID custom worker-id for CC Server
- --cc-update-interval-s=N status update interval in seconds (default: 10 min: 1)
- --cc-use-remote-logging enable remote logging on CC Server
- --cc-upload-config-on-startup upload current miner config to CC Server on startup
+ --cc-cert-file=FILE when tls is turned on, use this to point to the right cert file (default: server.pem)
+ --cc-key-file=FILE when tls is turned on, use this to point to the right key file (default: server.key)
+ --cc-client-log-lines-history=N maximum lines of log history kept per miner (default: 100)
+ --cc-client-config-folder=FOLDER Folder contains the client config files
+ --cc-pushover-user-key your user key for pushover notifications
+ --cc-pushover-api-token api token/keytoken of the application for pushover notifications
+ --cc-telegram-bot-token your bot token for telegram notifications
+ --cc-telegram-chat-id your chat-id for telegram notifications
+ --cc-push-miner-offline-info push notification for offline miners and recover push
+ --cc-push-miner-zero-hash-info push notification when miner reports 0 hashrate and recover push
+ --cc-push-periodic-mining-status push periodic status notification (every hour)
+ --cc-custom-dashboard=FILE loads a custom dashboard and serve it to '/'
--no-color disable colored output
-S, --syslog use system log for output messages
-B, --background run the miner in the background
@@ -183,46 +101,73 @@ xmrigDaemon -o pool.minemonero.pro:5555 -u YOUR_WALLET -p x -k --cc-url=IP_OF_CC
-V, --version output version information and exit
```
-Also you can use configuration via config file, default **[config.json](https://github.com/Bendr0id/xmrigCC/wiki/Config-XMRigDaemon)**. You can load multiple config files and combine it with command line options.
-
-## Multihash (multihash-factor)
-With this option it is possible to increase the number of hashblocks calculated by a single thread in each round.
-Selecting multihash-factors greater than 1 increases the L3 cache demands relative to the multihash-factor.
-E.g. at multihash-factor 2, each Cryptonight thread requires 4MB and each Cryptonight-lite thread requires 2 MB of L3 cache.
-With multihash-factor 3, they need 6MB or 3MB respectively.
-
-Setting multihash-factor to 0 will allow automatic detection of the optimal value.
-Xmrig will then try to utilize as much of the L3 cache as possible for the selected number of threads.
-If the threads parameter has been set to auto, Xmrig will detect the optimal number of threads first.
-After that it finds the greatest possible multihash-factor.
-
-### Multihash for low power operation
-Depending the CPU and its L3 caches, it can make sense to replace multiple single hash threads with single multi-hash counterparts.
-This change might come at the price of a minor drop in effective hash-rate, yet it will also reduce heat production and power consumption of the used CPU.
-
-### Multihash for optimal CPU exploitation
-In certain environments (e.g. vServer) the system running xmrig can have access to relatively large amounts of L3 cache, but may has access to only a few CPU cores.
-In such cases, running xmrig with higher multihash-factors can lead to improvements.
-
-
-## Multihash thread Mask (only for multihash-factor > 1)
-With this option you can limit multihash to the given threads (mask).
-This can significantly improve your hashrate by using unused l3 cache.
-The default is to run the configured multihash-factor on all threads.
-
+### Basic example xmrigDaemon
+```
+xmrigDaemon -o pool.minemonero.pro:5555 -u YOUR_WALLET -p x -k --cc-url=IP_OF_CC_SERVER:PORT --cc-access-token=SECRET_TOKEN_TO_ACCESS_CC_SERVER --cc-worker-id=OPTIONAL_WORKER_NAME
```
-{
-...
-"multihash-factor":2,
-"multihash-thread-mask":"0x5", // in binary -> 0101
-"threads": 4,
-
-...
-}
-```
-This will limit multihash mode (multihash-factor = 2) to thread 0 and thread 2, thread 1 and thread 3 will run in single hashmode.
+### Options xmrigDaemon
+```
+ -a, --algo=ALGO specify the algorithm to use
+ cn/r, cn/2, cn/1, cn/0, cn/double, cn/half, cn/fast,
+ cn/rwz, cn/zls, cn/xao, cn/rto, cn/conceal,
+ cn-lite/1,
+ cn-heavy/xhv, cn-heavy/tube, cn-heavy/0,
+ cn-pico
+ cn-extremelite
+ argon2/chukwa, argon2/wrkz
+ rx/wow, rx/loki
+ -o, --url=URL URL of mining server
+ -O, --userpass=U:P username:password pair for mining server
+ -u, --user=USERNAME username for mining server
+ -p, --pass=PASSWORD password for mining server
+ --rig-id=ID rig identifier for pool-side statistics (needs pool support)
+ -t, --threads=N number of miner threads
+ -v, --av=N algorithm variation, 0 auto select
+ -k, --keepalive send keepalived packet for prevent timeout (needs pool support)
+ --nicehash enable nicehash.com support
+ --tls enable SSL/TLS support (needs pool support)
+ --tls-fingerprint=F pool TLS certificate fingerprint, if set enable strict certificate pinning
+ --daemon use daemon RPC instead of pool for solo mining
+ --daemon-poll-interval=N daemon poll interval in milliseconds (default: 1000)
+ -r, --retries=N number of times to retry before switch to backup server (default: 5)
+ -R, --retry-pause=N time to pause between retries (default: 5)
+ --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1
+ --cpu-priority set process priority (0 idle, 2 normal to 5 highest)
+ --no-huge-pages disable huge pages support
+ --no-color disable colored output
+ --donate-level=N donate level, default 5% (5 minutes in 100 minutes)
+ --user-agent set custom user-agent string for pool
+ -B, --background run the miner in the background
+ -c, --config=FILE load a JSON-format configuration file
+ -l, --log-file=FILE log all output to a file
+ -S, --syslog use system log for output messages
+ --asm=ASM ASM optimizations, possible values: auto, none, intel, ryzen, bulldozer.
+ --print-time=N print hashrate report every N seconds
+ --api-worker-id=ID custom worker-id for API
+ --api-id=ID custom instance ID for API
+ --http-enabled enable HTTP API
+ --http-host=HOST bind host for HTTP API (default: 127.0.0.1)
+ --http-port=N bind port for HTTP API
+ --http-access-token=T access token for HTTP API
+ --http-no-restricted enable full remote access to HTTP API (only if access token set)
+ --randomx-init=N threads count to initialize RandomX dataset
+ --randomx-no-numa disable NUMA support for RandomX
+ --export-topology export hwloc topology to a XML file and exit
+ --cc-disabled disable CC Client feature
+ --cc-url=URL url of the CC Server
+ --cc-access-token=T access token for CC Server
+ --cc-worker-id=ID custom worker-id for CC Server
+ --cc-update-interval-s=N status update interval in seconds (default: 10 min: 1)
+ --cc-use-tls enable tls encryption for CC communication
+ --cc-use-remote-logging enable remote logging on CC Server
+ --cc-upload-config-on-start upload current miner config to CC Server on startup
+ --cc-reboot-cmd=CMD command/bat to execute to Reboot miner machine
+ --dry-run test configuration and exit
+ -h, --help display this help and exit
+ -V, --version output version information and exit
+```
## Common Issues
@@ -239,62 +184,19 @@ This will limit multihash mode (multihash-factor = 2) to thread 0 and thread 2,
### HUGE PAGES unavailable (Windows)
-* Run XMRig as Administrator.
-* Since version 0.8.0 XMRig automatically enables SeLockMemoryPrivilege for current user, but reboot or sign out still required. [Manual instruction](https://msdn.microsoft.com/en-gb/library/ms190730.aspx).
+* Run XMRigDaemon as Administrator.
+* On Windows it automatically enables SeLockMemoryPrivilege for current user, but reboot or sign out still required. [Manual instruction](https://msdn.microsoft.com/en-gb/library/ms190730.aspx).
### HUGE PAGES unavailable (Linux)
* Before starting XMRigDaemon set huge pages
`sudo sysctl -w vm.nr_hugepages=128`
-
-## Other information
-* No HTTP support, only stratum protocol support.
-
-
-### CPU mining performance
-Please note performance is highly dependent on system load.
-The numbers above are obtained on an idle system.
-Tasks heavily using a processor cache, such as video playback, can greatly degrade hashrate.
-Optimal number of threads depends on the size of the L3 cache of a processor, 1 thread requires 4 MB (Cryptonight-Heavy), 2 MB (Cryptonight) or 1MB (Cryptonigh-Lite) of cache.
-
-### Maximum performance checklist
-* Idle operating system.
-* Do not exceed optimal thread count.
-* Use modern CPUs with AES-NI instruction set.
-* Try setup optimal cpu affinity.
-* Try decreasing number of threads while increasing multihash-factor.
- Allocate unused cores and L3 cache with the help of multihash-thread-mask.
-* Enable fast memory (Large/Huge pages).
-
-## Benchmarks
-
-Here are some result reported by users. Feel free to share your results, i'll add them.
-
-### XMRigCC with max optimizations:
-
- * AMD Ryzen 1950x
-
- AEON: ~5300 h/s (XMRig Stock: ~4900 h/s)
- XMR: ~1320 h/s (XMRig Stock: ~1200 h/s)
-
- * AMD Ryzen 1600
-
- AEON: ~2065 h/s (XMRig Stock: ~1800 h/s)
- XMR: ~565 h/s (XMRig Stock: ~460 h/s)
-
- * 4x Intel XEON e7-4820
-
- AEON: ~2500 h/s (XMRig Stock ~2200h/s)
-
- * 2x Intel XEON 2x e5-2670
-
- AEON: ~3300 h/s (XMRig Stock ~2500h/s)
## Donations
* Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via command line option `--donate-level`.
-##### BenDroid (xmrigCC):
+##### BenDroid (XMRigCC):
XMR: `4BEn3sSa2SsHBcwa9dNdKnGvvbyHPABr2JzoY7omn7DA2hPv84pVFvwDrcwMCWgz3dQVcrkw3gE9aTC9Mi5HxzkfF9ev1eH`
AEON: `Wmtm4S2cQ8uEBBAVjvbiaVAPv2d6gA1mAUmBmjna4VF7VixLxLRUYag5cvsym3WnuzdJ9zvhQ3Xwa8gWxPDPRfcQ3AUkYra3W`
diff --git a/appveyor.yml b/appveyor.yml
index 107144fa..b8b98ad6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@ build_script:
- mkdir build
- cd build
- set CMAKE_PREFIX_PATH=c:\xmrigCC-deps\msvc2017\libuv\x64\;c:\xmrigCC-deps\msvc2017\libmicrohttpd\x64\;c:\xmrigCC-deps\msvc2017\openssl\x64\
- - cmake -G "Visual Studio 15 2017 Win64" -T v141,host=x64 .. -DBOOST_ROOT=C:\Libraries\boost_1_66_0
+ - cmake -G "Visual Studio 15 2017 Win64" -T v141,host=x64 ..
- msbuild xmrig.sln /p:Configuration=Release
after_build:
diff --git a/cmake/FindHWLOC.cmake b/cmake/FindHWLOC.cmake
new file mode 100644
index 00000000..55309d3e
--- /dev/null
+++ b/cmake/FindHWLOC.cmake
@@ -0,0 +1,25 @@
+find_path(
+ HWLOC_INCLUDE_DIR
+ NAMES hwloc.h
+ PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
+ PATH_SUFFIXES "include"
+ NO_DEFAULT_PATH
+)
+
+find_path(HWLOC_INCLUDE_DIR NAMES hwloc.h)
+
+find_library(
+ HWLOC_LIBRARY
+ NAMES hwloc.a hwloc libhwloc
+ PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
+ PATH_SUFFIXES "lib"
+ NO_DEFAULT_PATH
+)
+
+find_library(HWLOC_LIBRARY NAMES hwloc.a hwloc libhwloc)
+
+set(HWLOC_LIBRARIES ${HWLOC_LIBRARY})
+set(HWLOC_INCLUDE_DIRS ${HWLOC_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(HWLOC DEFAULT_MSG HWLOC_LIBRARY HWLOC_INCLUDE_DIR)
diff --git a/cmake/FindMHD.cmake b/cmake/FindMHD.cmake
deleted file mode 100644
index f6665892..00000000
--- a/cmake/FindMHD.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# - Try to find MHD
-# Once done this will define
-#
-# MHD_FOUND - system has MHD
-# MHD_INCLUDE_DIRS - the MHD include directory
-# MHD_LIBRARY - Link these to use MHD
-
-find_path(
- MHD_INCLUDE_DIR
- NAMES microhttpd.h
- DOC "microhttpd include dir"
-)
-
-find_library(
- MHD_LIBRARY
- NAMES microhttpd microhttpd-10 libmicrohttpd libmicrohttpd-dll
- DOC "microhttpd library"
-)
-
-set(MHD_INCLUDE_DIRS ${MHD_INCLUDE_DIR})
-set(MHD_LIBRARIES ${MHD_LIBRARY})
-
-# debug library on windows
-# same naming convention as in qt (appending debug library with d)
-# boost is using the same "hack" as us with "optimized" and "debug"
-# official MHD project actually uses _d suffix
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL MSVC)
- find_library(
- MHD_LIBRARY_DEBUG
- NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d
- DOC "mhd debug library"
- )
- set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(mhd DEFAULT_MSG MHD_INCLUDE_DIR MHD_LIBRARY)
-mark_as_advanced(MHD_INCLUDE_DIR MHD_LIBRARY)
-
diff --git a/cmake/FindUV.cmake b/cmake/FindUV.cmake
index e3c22d28..ba59d1d3 100644
--- a/cmake/FindUV.cmake
+++ b/cmake/FindUV.cmake
@@ -1,5 +1,22 @@
+find_path(
+ UV_INCLUDE_DIR
+ NAMES uv.h
+ PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
+ PATH_SUFFIXES "include"
+ NO_DEFAULT_PATH
+)
+
find_path(UV_INCLUDE_DIR NAMES uv.h)
-find_library(UV_LIBRARY NAMES uv libuv)
+
+find_library(
+ UV_LIBRARY
+ NAMES libuv.a uv libuv
+ PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
+ PATH_SUFFIXES "lib"
+ NO_DEFAULT_PATH
+)
+
+find_library(UV_LIBRARY NAMES libuv.a uv libuv)
set(UV_LIBRARIES ${UV_LIBRARY})
set(UV_INCLUDE_DIRS ${UV_INCLUDE_DIR})
diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake
new file mode 100644
index 00000000..ea46081c
--- /dev/null
+++ b/cmake/OpenSSL.cmake
@@ -0,0 +1,31 @@
+if (WITH_TLS)
+ set(OPENSSL_ROOT_DIR ${XMRIG_DEPS})
+
+ if (WIN32)
+ set(OPENSSL_USE_STATIC_LIBS TRUE)
+ set(OPENSSL_MSVC_STATIC_RT TRUE)
+
+ set(EXTRA_LIBS ${EXTRA_LIBS} Crypt32)
+ endif()
+
+ find_package(OpenSSL)
+
+ if (OPENSSL_FOUND)
+ set(TLS_SOURCES src/base/net/stratum/Tls.h src/base/net/stratum/Tls.cpp)
+ include_directories(${OPENSSL_INCLUDE_DIR})
+
+ if (WITH_HTTP)
+ set(TLS_SOURCES ${TLS_SOURCES} src/base/net/http/HttpsClient.h src/base/net/http/HttpsClient.cpp)
+ endif()
+ else()
+ message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
+ endif()
+
+ add_definitions(/DXMRIG_FEATURE_TLS)
+else()
+ set(TLS_SOURCES "")
+ set(OPENSSL_LIBRARIES "")
+ remove_definitions(/DXMRIG_FEATURE_TLS)
+
+ set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
+endif()
diff --git a/cmake/argon2.cmake b/cmake/argon2.cmake
new file mode 100644
index 00000000..e82cd389
--- /dev/null
+++ b/cmake/argon2.cmake
@@ -0,0 +1,18 @@
+if (WITH_ARGON2)
+ add_definitions(/DXMRIG_ALGO_ARGON2)
+
+ list(APPEND HEADERS_CRYPTO
+ src/crypto/argon2/Hash.h
+ src/crypto/argon2/Impl.h
+ )
+
+ list(APPEND SOURCES_CRYPTO
+ src/crypto/argon2/Impl.cpp
+ )
+
+ add_subdirectory(src/3rdparty/argon2)
+ set(ARGON2_LIBRARY argon2)
+else()
+ remove_definitions(/DXMRIG_ALGO_ARGON2)
+ set(ARGON2_LIBRARY "")
+endif()
diff --git a/cmake/asm.cmake b/cmake/asm.cmake
index 8b11e2ee..e445defd 100644
--- a/cmake/asm.cmake
+++ b/cmake/asm.cmake
@@ -1,179 +1,52 @@
-message("Generating ASM files")
+if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(XMRIG_ASM_LIBRARY "xmrig-asm")
-# CN v1 original
-set(ALGO "original")
-set(ITERATIONS "524288") #0x80000
-set(MASK "2097136") #0x1FFFF0
+ if (CMAKE_C_COMPILER_ID MATCHES MSVC)
+ enable_language(ASM_MASM)
-configure_file("src/crypto/asm/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_sandybridge.inc")
-configure_file("src/crypto/asm/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_soft_aes_sandybridge.inc")
+ if (MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
+ set(XMRIG_ASM_FILES
+ "src/crypto/cn/asm/cn_main_loop.asm"
+ "src/crypto/cn/asm/CryptonightR_template.asm"
+ )
+ else()
+ set(XMRIG_ASM_FILES
+ "src/crypto/cn/asm/win64/cn_main_loop.asm"
+ "src/crypto/cn/asm/win64/CryptonightR_template.asm"
+ )
+ endif()
-configure_file("src/crypto/asm/win/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_soft_aes_sandybridge.inc")
-
-# CN v2 ORIGINAL
-set(ALGO "originalv2")
-set(ITERATIONS "524288") #0x80000
-set(MASK "2097136") #0x1FFFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/cnv2_main_loop_ivybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/cnv2_main_loop_bulldozer.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/cnv2_main_loop_ryzen.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv2_double_main_loop_sandybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv2_main_loop_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_ivybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/win/cnv2_main_loop_bulldozer.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/win/cnv2_main_loop_ryzen.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_soft_aes_sandybridge.inc")
-
-# CN v1 FAST
-set(ALGO "fast")
-set(ITERATIONS "262144") #0x40000
-set(MASK "2097136") #0x1FFFF0
-
-configure_file("src/crypto/asm/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_fast_sandybridge.inc")
-configure_file("src/crypto/asm/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_fast_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_fast_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_fast_soft_aes_sandybridge.inc")
-
-# CN v2 FAST
-set(ALGO "fastv2")
-set(ITERATIONS "262144") #0x40000
-set(MASK "2097136") #0x1FFFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/cnv2_main_loop_fastv2_ivybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/cnv2_main_loop_fastv2_bulldozer.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/cnv2_main_loop_fastv2_ryzen.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv2_double_main_loop_fastv2_sandybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv2_main_loop_fastv2_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_fastv2_ivybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/win/cnv2_main_loop_fastv2_bulldozer.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/win/cnv2_main_loop_fastv2_ryzen.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_fastv2_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_fastv2_soft_aes_sandybridge.inc")
-
-# CN XCASH
-set(ALGO "xcash")
-set(ITERATIONS "1048576") #0x100000
-set(MASK "2097136") #0x1FFFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/cnv2_main_loop_xcash_ivybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/cnv2_main_loop_xcash_bulldozer.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/cnv2_main_loop_xcash_ryzen.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv2_double_main_loop_xcash_sandybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv2_main_loop_xcash_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_xcash_ivybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/win/cnv2_main_loop_xcash_bulldozer.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/win/cnv2_main_loop_xcash_ryzen.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_xcash_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_xcash_soft_aes_sandybridge.inc")
-
-# CN ZELERIUS
-set(ALGO "zelerius")
-set(ITERATIONS "393216") #0x60000
-set(MASK "2097136") #0x1FFFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/cnv2_main_loop_zelerius_ivybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/cnv2_main_loop_zelerius_bulldozer.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/cnv2_main_loop_zelerius_ryzen.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv2_double_main_loop_zelerius_sandybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv2_main_loop_zelerius_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_zelerius_ivybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/win/cnv2_main_loop_zelerius_bulldozer.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/win/cnv2_main_loop_zelerius_ryzen.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_zelerius_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_zelerius_soft_aes_sandybridge.inc")
-
-# CN LITE
-
-set(ALGO "lite")
-set(ITERATIONS "262144") #0x40000
-set(MASK "1048560") #0xFFFF0
-
-configure_file("src/crypto/asm/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_lite_sandybridge.inc")
-configure_file("src/crypto/asm/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_lite_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_lite_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_lite_soft_aes_sandybridge.inc")
-
-# CN UPX
-
-set(ALGO "upx")
-set(ITERATIONS "131072") #0x20000
-set(MASK "1048560") #0xFFFF0
-
-configure_file("src/crypto/asm/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_upx_sandybridge.inc")
-configure_file("src/crypto/asm/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv1_main_loop_upx_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv1_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_upx_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv1_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv1_main_loop_upx_soft_aes_sandybridge.inc")
-
-# CN V2 ULTRALITE
-set(ALGO "ultralite")
-set(ITERATIONS "65536") #0x10000
-set(MASK "131056") #0x1FFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/cnv2_main_loop_ultralite_ivybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/cnv2_main_loop_ultralite_bulldozer.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/cnv2_main_loop_ultralite_ryzen.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/cnv2_double_main_loop_ultralite_sandybridge.inc")
-configure_file("src/crypto/asm/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/cnv2_main_loop_ultralite_soft_aes_sandybridge.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_ivybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_ultralite_ivybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_bulldozer.inc.in" "src/crypto/asm/win/cnv2_main_loop_ultralite_bulldozer.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_ryzen.inc.in" "src/crypto/asm/win/cnv2_main_loop_ultralite_ryzen.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_sandybridge.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_ultralite_sandybridge.inc")
-configure_file("src/crypto/asm/win/cnv2_main_loop_soft_aes_sandybridge.inc.in" "src/crypto/asm/win/cnv2_main_loop_ultralite_soft_aes_sandybridge.inc")
-
-# CN V2 RWZ
-set(ALGO "original")
-set(ITERATIONS "393216") #0x60000
-set(MASK "2097136") #0x1FFFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_rwz_all.inc.in" "src/crypto/asm/cnv2_main_loop_rwz_original_all.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_rwz_all.inc.in" "src/crypto/asm/cnv2_double_main_loop_rwz_original_all.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_rwz_all.inc.in" "src/crypto/asm/win/cnv2_main_loop_rwz_original_all.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_rwz_all.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_rwz_original_all.inc")
-
-
-# CN V2 UPX2
-set(ALGO "upx2")
-set(ITERATIONS "16384") #0x4000
-set(MASK "131056") #0x1FFF0
-
-configure_file("src/crypto/asm/cnv2_main_loop_rwz_all.inc.in" "src/crypto/asm/cnv2_main_loop_rwz_upx2_all.inc")
-configure_file("src/crypto/asm/cnv2_double_main_loop_rwz_all.inc.in" "src/crypto/asm/cnv2_double_main_loop_rwz_upx2_all.inc")
-
-configure_file("src/crypto/asm/win/cnv2_main_loop_rwz_all.inc.in" "src/crypto/asm/win/cnv2_main_loop_rwz_upx2_all.inc")
-configure_file("src/crypto/asm/win/cnv2_double_main_loop_rwz_all.inc.in" "src/crypto/asm/win/cnv2_double_main_loop_rwz_upx2_all.inc")
-
-if (CMAKE_C_COMPILER_ID MATCHES MSVC)
- enable_language(ASM_MASM)
- set(XMRIG_ASM_FILE "src/crypto/asm/win/cn_main_loop.asm"
- "src/crypto/asm/win/CryptonightR_template.asm")
- set_property(SOURCE ${XMRIG_ASM_FILE} PROPERTY ASM_MASM)
- include_directories(${CMAKE_BINARY_DIR}/src/crypto/asm/win)
-else()
- enable_language(ASM)
-
- if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU)
- set(XMRIG_ASM_FILE "src/crypto/asm/win/cn_main_loop_win_gcc.S"
- "src/crypto/asm/win/CryptonightR_template.S")
+ set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY ASM_MASM)
else()
- set(XMRIG_ASM_FILE "src/crypto/asm/cn_main_loop.S"
- "src/crypto/asm/CryptonightR_template.S")
+ enable_language(ASM)
+
+ if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU)
+ set(XMRIG_ASM_FILES
+ "src/crypto/cn/asm/win64/cn_main_loop.S"
+ "src/crypto/cn/asm/CryptonightR_template.S"
+ )
+ else()
+ set(XMRIG_ASM_FILES
+ "src/crypto/cn/asm/cn_main_loop.S"
+ "src/crypto/cn/asm/CryptonightR_template.S"
+ )
+ endif()
+
+ set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY C)
endif()
- set_property(SOURCE ${XMRIG_ASM_FILE} PROPERTY C)
- include_directories(${CMAKE_BINARY_DIR}/src/crypto/asm/)
-endif()
+ add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES})
+ set(XMRIG_ASM_SOURCES
+ src/crypto/common/Assembly.h
+ src/crypto/common/Assembly.cpp
+ src/crypto/cn/r/CryptonightR_gen.cpp
+ )
+ set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C)
-add_library(xmrig_asm STATIC ${XMRIG_ASM_FILE})
-set_property(TARGET xmrig_asm PROPERTY LINKER_LANGUAGE C)
\ No newline at end of file
+ add_definitions(/DXMRIG_FEATURE_ASM)
+else()
+ set(XMRIG_ASM_SOURCES "")
+ set(XMRIG_ASM_LIBRARY "")
+
+ remove_definitions(/DXMRIG_FEATURE_ASM)
+endif()
diff --git a/cmake/cn-gpu.cmake b/cmake/cn-gpu.cmake
new file mode 100644
index 00000000..7aa489e6
--- /dev/null
+++ b/cmake/cn-gpu.cmake
@@ -0,0 +1,25 @@
+if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+ if (XMRIG_ARM)
+ set(CN_GPU_SOURCES src/crypto/cn/gpu/cn_gpu_arm.cpp)
+
+ if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
+ set_source_files_properties(src/crypto/cn/gpu/cn_gpu_arm.cpp PROPERTIES COMPILE_FLAGS "-O3")
+ endif()
+ else()
+ set(CN_GPU_SOURCES src/crypto/cn/gpu/cn_gpu_avx.cpp src/crypto/cn/gpu/cn_gpu_ssse3.cpp)
+
+ if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
+ set_source_files_properties(src/crypto/cn/gpu/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2")
+ set_source_files_properties(src/crypto/cn/gpu/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3")
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+ set_source_files_properties(src/crypto/cn/gpu/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX")
+ endif()
+ endif()
+
+ add_definitions(/DXMRIG_ALGO_CN_GPU)
+else()
+ set(CN_GPU_SOURCES "")
+
+ remove_definitions(/DXMRIG_ALGO_CN_GPU)
+endif()
diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
index 96e61e2b..2fdebad8 100644
--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@@ -7,19 +7,37 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
add_definitions(/DRAPIDJSON_SSE2)
endif()
-
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64)$")
- set(XMRIG_ARM ON)
- set(XMRIG_ARMv8 ON)
- set(WITH_LIBCPUID OFF)
-
- add_definitions(/DXMRIG_ARM)
- add_definitions(/DXMRIG_ARMv8)
-elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
- set(XMRIG_ARM ON)
- set(XMRIG_ARMv7 ON)
- set(WITH_LIBCPUID OFF)
-
- add_definitions(/DXMRIG_ARM)
- add_definitions(/DXMRIG_ARMv7)
+if (NOT ARM_TARGET)
+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
+ set(ARM_TARGET 8)
+ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
+ set(ARM_TARGET 7)
+ endif()
+endif()
+
+if (ARM_TARGET AND ARM_TARGET GREATER 6)
+ set(XMRIG_ARM ON)
+ set(WITH_LIBCPUID OFF)
+ add_definitions(/DXMRIG_ARM)
+
+ message(STATUS "Use ARM_TARGET=${ARM_TARGET} (${CMAKE_SYSTEM_PROCESSOR})")
+
+ include(CheckCXXCompilerFlag)
+
+ if (ARM_TARGET EQUAL 8)
+ set(XMRIG_ARMv8 ON)
+ add_definitions(/DXMRIG_ARMv8)
+
+ CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto XMRIG_ARM_CRYPTO)
+
+ if (XMRIG_ARM_CRYPTO)
+ add_definitions(/DXMRIG_ARM_CRYPTO)
+ set(ARM8_CXX_FLAGS "-march=armv8-a+crypto")
+ else()
+ set(ARM8_CXX_FLAGS "-march=armv8-a")
+ endif()
+ elseif (ARM_TARGET EQUAL 7)
+ set(XMRIG_ARMv7 ON)
+ add_definitions(/DXMRIG_ARMv7)
+ endif()
endif()
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
index ceabcdc6..bc441dd0 100644
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -6,6 +6,10 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE Release)
endif()
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+ add_definitions(/DNDEBUG)
+endif()
+
include(CheckSymbolExists)
if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
@@ -13,23 +17,28 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-strict-aliasing")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti -Wno-class-memaccess")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-class-memaccess")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s")
if (XMRIG_ARMv8)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto -flax-vector-conversions")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions")
elseif (XMRIG_ARMv7)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+
add_definitions(/DHAVE_ROTR)
endif()
if (WIN32)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+ else()
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -Wl,--large-address-aware")
+ endif()
else()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
endif()
@@ -56,12 +65,12 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti -Wno-missing-braces")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-missing-braces")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
if (XMRIG_ARMv8)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS}")
elseif (XMRIG_ARMv7)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
@@ -76,3 +85,10 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
endif()
endif()
+
+if (NOT WIN32)
+ check_symbol_exists("__builtin___clear_cache" "stdlib.h" HAVE_BUILTIN_CLEAR_CACHE)
+ if (HAVE_BUILTIN_CLEAR_CACHE)
+ add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
+ endif()
+endif()
diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake
new file mode 100644
index 00000000..23f66b29
--- /dev/null
+++ b/cmake/randomx.cmake
@@ -0,0 +1,57 @@
+if (WITH_RANDOMX)
+ add_definitions(/DXMRIG_ALGO_RANDOMX)
+
+ list(APPEND HEADERS_CRYPTO
+ src/crypto/rx/Rx.h
+ src/crypto/rx/RxAlgo.h
+ src/crypto/rx/RxCache.h
+ src/crypto/rx/RxConfig.h
+ src/crypto/rx/RxDataset.h
+ src/crypto/rx/RxVm.h
+ )
+
+ list(APPEND SOURCES_CRYPTO
+ src/crypto/randomx/aes_hash.cpp
+ src/crypto/randomx/allocator.cpp
+ src/crypto/randomx/argon2_core.c
+ src/crypto/randomx/argon2_ref.c
+ src/crypto/randomx/blake2_generator.cpp
+ src/crypto/randomx/blake2/blake2b.c
+ src/crypto/randomx/bytecode_machine.cpp
+ src/crypto/randomx/dataset.cpp
+ src/crypto/randomx/instructions_portable.cpp
+ src/crypto/randomx/randomx.cpp
+ src/crypto/randomx/reciprocal.c
+ src/crypto/randomx/soft_aes.cpp
+ src/crypto/randomx/superscalar.cpp
+ src/crypto/randomx/virtual_machine.cpp
+ src/crypto/randomx/virtual_memory.cpp
+ src/crypto/randomx/vm_compiled_light.cpp
+ src/crypto/randomx/vm_compiled.cpp
+ src/crypto/randomx/vm_interpreted_light.cpp
+ src/crypto/randomx/vm_interpreted.cpp
+ src/crypto/rx/Rx.cpp
+ src/crypto/rx/RxAlgo.cpp
+ src/crypto/rx/RxCache.cpp
+ src/crypto/rx/RxConfig.cpp
+ src/crypto/rx/RxDataset.cpp
+ src/crypto/rx/RxVm.cpp
+ )
+
+ if (CMAKE_C_COMPILER_ID MATCHES MSVC)
+ enable_language(ASM_MASM)
+ list(APPEND SOURCES_CRYPTO
+ src/crypto/randomx/jit_compiler_x86_static.asm
+ src/crypto/randomx/jit_compiler_x86.cpp
+ )
+ elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+ list(APPEND SOURCES_CRYPTO
+ src/crypto/randomx/jit_compiler_x86_static.S
+ src/crypto/randomx/jit_compiler_x86.cpp
+ )
+ # cheat because cmake and ccache hate each other
+ set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
+ endif()
+else()
+ remove_definitions(/DXMRIG_ALGO_RANDOMX)
+endif()
diff --git a/config.json b/config.json
deleted file mode 100644
index 035bc4a3..00000000
--- a/config.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "algo": "cryptonight", // cryptonight (default), cryptonight-lite, cryptonight-ultralite, cryptonight-extremelite or cryptonight-heavy
- "aesni": 0, // selection of AES-NI mode (0 auto, 1 on, 2 off)
- "threads": 0, // number of miner threads (not set or 0 enables automatic selection of optimal thread count)
- "multihash-factor": 0, // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks)
- "multihash-thread-mask" : null, // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads)
- "pow-variant" : "auto", // specificy the PoW variat to use: -> auto (default), '0', '1', '2', 'ipbc', 'xao', 'xtl', 'rto', 'xfh', 'upx', 'turtle', 'hosp', 'r', 'wow', 'double (xcash)', 'zls' (zelerius), 'rwz' (graft), 'upx2'
- // for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations
- "asm-optimization" : "auto", // specificy the ASM optimization to use: -> auto (default), intel, ryzen, bulldozer, off
- "background": false, // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead)
- "colors": true, // false to disable colored output
- "cpu-affinity": null, // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1
- "cpu-priority": null, // set process priority (0 idle, 2 normal to 5 highest)
- "donate-level": 5, // donate level, mininum 1%
- "log-file": null, // log all output to a file, example: "c:/some/path/xmrig.log"
- "max-cpu-usage": 100, // maximum CPU usage for automatic mode, usually limiting factor is CPU cache not this option.
- "print-time": 60, // print hashrate report every N seconds
- "retries": 5, // number of times to retry before switch to backup server
- "retry-pause": 5, // time to pause between retries
- "safe": false, // true to safe adjust threads and av settings for current CPU
- "syslog": false, // use system log for output messages
- "reboot-cmd" : "", // command to execute to reboot the OS
- "force-pow-variant" : false, // force pow variant, dont parse pow/variant from pool job
- "skip-self-check" : false, // skip the self check on startup
- "pools": [
- {
- "url": "donate2.graef.in:80", // URL of mining server
- "user": "YOUR_WALLET_ID", // username for mining server
- "pass": "x", // password for mining server
- "use-tls" : false, // enable tls for pool communication (need pool support)
- "keepalive": true, // send keepalived for prevent timeout (need pool support)
- "nicehash": false // enable nicehash/xmrig-proxy support
- }
- ],
- "cc-client": {
- "url": "localhost:3344", // url of the CC Server (ip:port)
- "use-tls" : false, // enable tls for CC communication (needs to be enabled on CC Server too)
- "access-token": "mySecret", // access token for CC Server (has to be the same in config_cc.json)
- "worker-id": null, // custom worker-id for CC Server (otherwise hostname is used)
- "update-interval-s": 10, // status update interval in seconds (default: 10 min: 1)
- "use-remote-logging" : true, // enable remote logging on CC Server
- "upload-config-on-startup" : true // upload current miner config to CC Server on startup
- }
-}
diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md
new file mode 100644
index 00000000..005342ce
--- /dev/null
+++ b/doc/ALGORITHMS.md
@@ -0,0 +1,53 @@
+# Algorithms
+
+Since version 2 mining [algorithm](#algorithm-names) should specified for each pool separately (`algo` option), earlier versions was use one global `algo` option and per pool `variant/powVariant` option (this option was removed in v2). If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) you may not specify this option at all.
+
+#### Example
+```json
+{
+ "pools": [
+ {
+ "url": "...",
+ "algo": "cn/r",
+ ...
+ }
+ ],
+ ...
+}
+```
+
+#### Pools with mining algorithm negotiation support.
+
+ * [www.hashvault.pro](https://www.hashvault.pro/)
+ * [moneroocean.stream](https://moneroocean.stream)
+
+ ## Algorithm names
+
+| Name | Memory | Version | Notes |
+|------|--------|---------|-------|
+| `rx/test` | 2 MB | 2.0.0+ | RandomX (reference configuration). |
+| `rx/0` | 2 MB | 2.0.0+ | RandomX (reference configuration), reserved for future use. |
+| `rx/wow` | 1 MB | 2.0.0+ | RandomWOW. |
+| `rx/loki` | 2 MB | 2.0.0+ | RandomXL. |
+| `cn/conceal` | 2 MB | 1.9.5+ | CryptoNight variant 1 (modified). |
+| `argon2/chukwa` | 512 KB | 1.9.5+ | Argon2id (Chukwa). |
+| `argon2/wrkz` | 256 KB | 1.9.5+ | Argon2id (WRKZ). |
+| `cn-extremelite/upx2` | 128 KB | <1.9.5 | CryptoNight-Extremelite variant UPX2 with reversed shuffle. |
+| `cn/fast` | 2 MB | <1.9.5+ | CryptoNight variant 1 with half iterations. |
+| `cn/rwz` | 2 MB | <1.9.5+ | CryptoNight variant 2 with 3/4 iterations and reversed shuffle operation. |
+| `cn/zls` | 2 MB | <1.9.5+ | CryptoNight variant 2 with 3/4 iterations. |
+| `cn/double` | 2 MB | <1.9.5+ | CryptoNight variant 2 with double iterations. |
+| `cn/r` | 2 MB | <1.9.5+ | CryptoNightR (Monero's variant 4). |
+| `cn/wow` | 2 MB | <1.9.5+ | CryptoNightR (Wownero). |
+| `cn-pico` | 256 KB | <1.9.5+ | CryptoNight-Pico. (Turtle) |
+| `cn/half` | 2 MB | <1.9.5+ | CryptoNight variant 2 with half iterations. |
+| `cn/2` | 2 MB | <1.9.5+ | CryptoNight variant 2. |
+| `cn/xao` | 2 MB | <1.9.5+ | CryptoNight variant 0 (modified). |
+| `cn/rto` | 2 MB | <1.9.5+ | CryptoNight variant 1 (modified). |
+| `cn-heavy/tube` | 4 MB | <1.9.5+ | CryptoNight-Heavy (modified). |
+| `cn-heavy/xhv` | 4 MB | <1.9.5+ | CryptoNight-Heavy (modified). |
+| `cn-heavy/0` | 4 MB | <1.9.5+ | CryptoNight-Heavy. |
+| `cn/1` | 2 MB | <1.9.5+ | CryptoNight variant 1. |
+| `cn-lite/1` | 1 MB | <1.9.5+ | CryptoNight-Lite variant 1. |
+| `cn-lite/0` | 1 MB | <1.9.5+ | CryptoNight-Lite variant 0. |
+| `cn/0` | 2 MB | <1.9.5+ | CryptoNight (original). |
diff --git a/doc/API.md b/doc/API.md
new file mode 100644
index 00000000..2cd0fbbe
--- /dev/null
+++ b/doc/API.md
@@ -0,0 +1,66 @@
+# HTTP API
+
+If you want use HTTP API you need enable it (`"enabled": true,`) then choice `port` and optionaly `host`. API not available if miner built without HTTP support (`-DWITH_HTTP=OFF`).
+
+Offical HTTP client for API: http://workers.xmrig.info/
+
+Example configuration:
+
+```json
+"api": {
+ "id": null,
+ "worker-id": null,
+},
+"http": {
+ "enabled": false,
+ "host": "127.0.0.1",
+ "port": 0,
+ "access-token": null,
+ "restricted": true
+}
+```
+
+#### Global API options
+* **id** Miner ID, if not set created automatically.
+* **worker-id** Optional worker name, if not set will be detected automatically.
+
+#### HTTP API options,
+* **enabled** Enable (`true`) or disable (`false`) HTTP API.
+* **host** Host for incoming connections `http://:`, to allow connections from all interfaces use `0.0.0.0` (IPv4) or `::` (IPv4+IPv6).
+* **port** Port for incoming connections `http://:`, zero port is valid option and means random port.
+* **access-token** [Bearer](https://gist.github.com/xmrig/c75fdd1f8e0f3bac05500be2ab718f8e#file-api-html-L54) access token to secure access to API. Miner support this token only via `Authorization` header.
+* **restricted** Use `false` to allow remote configuration.
+
+If you prefer use command line options instead of config file, you can use options: `--api-id`, `--api-worker-id`, `--http-enabled`, `--http-host`, `--http-access-token`, `--http-port`, `--http-no-restricted`.
+
+Versions before 2.15 was use another options for API https://github.com/xmrig/xmrig/issues/1007
+
+## Endpoints
+
+### GET /1/summary
+
+Get miner summary information. [Example](api/1/summary.json).
+
+### GET /1/threads
+
+Get detailed information about miner threads. [Example](api/1/threads.json).
+
+
+## Restricted endpoints
+
+All API endpoints below allow access to sensitive information and remote configure miner. You should set `access-token` and allow unrestricted access (`"restricted": false`).
+
+### GET /1/config
+
+Get current miner configuration. [Example](api/1/config.json).
+
+
+### PUT /1/config
+
+Update current miner configuration. Common use case, get current configuration, make changes, and upload it to miner.
+
+Curl example:
+
+```
+curl -v --data-binary @config.json -X PUT -H "Content-Type: application/json" -H "Authorization: Bearer SECRET" http://127.0.0.1:44444/1/config
+```
diff --git a/doc/CPU.md b/doc/CPU.md
new file mode 100644
index 00000000..4d1f0858
--- /dev/null
+++ b/doc/CPU.md
@@ -0,0 +1,96 @@
+# CPU backend
+
+All CPU related settings contains in one `cpu` object in config file, CPU backend allow specify multiple profiles and allow switch between them without restrictions by pool request or config change. Default auto-configuration create reasonable minimum of profiles which cover all supported algorithms.
+
+### Example
+
+Example below demonstrate all primary ideas of flexible profiles configuration:
+
+* `"rx/wow"` Exact match to algorithm `rx/wow`, defined 4 threads without CPU affinity.
+* `"cn"` Default failback profile for all `cn/*` algorithms, defined 2 threads with CPU affinity, another failback profiles is `cn-lite`, `cn-heavy` and `rx`.
+* `"cn-lite"` Default failback profile for all `cn-lite/*` algorithms, defined 2 double threads with CPU affinity.
+* `"cn-pico"` Alternative short object format.
+* `"custom-profile"` Custom user defined profile.
+* `"*"` Failback profile for all unhandled by other profiles algorithms.
+* `"cn/r"` Exact match, alias to profile `custom-profile`.
+* `"cn/0"` Exact match, disabled algorithm.
+
+```json
+{
+ "cpu": {
+ "enabled": true,
+ "huge-pages": true,
+ "hw-aes": null,
+ "priority": null,
+ "asm": true,
+ "rx/wow": [-1, -1, -1, -1],
+ "cn": [
+ [1, 0],
+ [1, 2]
+ ],
+ "cn-lite": [
+ [2, 0],
+ [2, 2]
+ ],
+ "cn-pico": {
+ "intensity": 2,
+ "threads": 8,
+ "affinity": -1
+ },
+ "custom-profile": [0, 2],
+ "*": [-1],
+ "cn/r": "custom-profile",
+ "cn/0": false
+ }
+}
+```
+
+## Threads definition
+Threads can be defined in 3 formats.
+
+#### Array format
+```json
+[
+ [1, 0],
+ [1, 2],
+ [1, -1],
+ [2, -1]
+]
+```
+Each line represent one thread, first element is intensity, this option was known as `low_power_mode`, possible values is range from 1 to 5, second element is CPU affinity, special value `-1` means no affinity.
+
+#### Short array format
+```json
+[-1, -1, -1, -1]
+```
+Each number represent one thread and means CPU affinity, this is default format for algorithm with maximum intensity 1, currently it all RandomX variants and cryptonight-gpu.
+
+#### Short object format
+```json
+{
+ "intensity": 2,
+ "threads": 8,
+ "affinity": -1
+}
+```
+Internal format, but can be user defined.
+
+## Shared options
+
+#### `enabled`
+Enable (`true`) or disable (`false`) CPU backend, by default `true`.
+
+#### `huge-pages`
+Enable (`true`) or disable (`false`) huge pages support, by default `true`.
+
+#### `hw-aes`
+Force enable (`true`) or disable (`false`) hardware AES support. Default value `null` means miner autodetect this feature. Usually don't need change this option, this option useful for some rare cases when miner can't detect hardware AES, but it available. If you force enable this option, but your hardware not support it, miner will crash.
+
+#### `priority`
+Mining threads priority, value from `1` (lowest priority) to `5` (highest possible priority). Default value `null` means miner don't change threads priority at all.
+
+#### `asm`
+Enable/configure or disable ASM optimizations. Possible values: `true`, `false`, `"intel"`, `"ryzen"`, `"bulldozer"`.
+
+#### `argon2-impl` (since v3.1.0)
+Allow override automatically detected Argon2 implementation, this option added mostly for debug purposes, default value `null` means autodetect. Other possible values: `"x86_64"`, `"SSE2"`, `"SSSE3"`, `"XOP"`, `"AVX2"`, `"AVX-512F"`. Manual selection has no safe guards, if you CPU not support required instuctions, miner will crash.
diff --git a/doc/api/1/config.json b/doc/api/1/config.json
new file mode 100644
index 00000000..2c74cfba
--- /dev/null
+++ b/doc/api/1/config.json
@@ -0,0 +1,63 @@
+{
+ "algo": "cryptonight",
+ "api": {
+ "port": 44444,
+ "access-token": "TOKEN",
+ "worker-id": null,
+ "ipv6": false,
+ "restricted": false
+ },
+ "av": 1,
+ "background": false,
+ "colors": true,
+ "cpu-affinity": null,
+ "cpu-priority": null,
+ "donate-level": 5,
+ "huge-pages": true,
+ "hw-aes": null,
+ "log-file": null,
+ "max-cpu-usage": 75,
+ "pools": [
+ {
+ "url": "pool.monero.hashvault.pro:3333",
+ "user": "48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD",
+ "pass": "x",
+ "keepalive": false,
+ "nicehash": false,
+ "variant": -1
+ },
+ {
+ "url": "pool.supportxmr.com:3333",
+ "user": "48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD",
+ "pass": "x",
+ "keepalive": false,
+ "nicehash": false,
+ "variant": -1
+ }
+ ],
+ "print-time": 60,
+ "retries": 5,
+ "retry-pause": 5,
+ "safe": false,
+ "threads": [
+ {
+ "low_power_mode": 1,
+ "affine_to_cpu": 0
+ },
+ {
+ "low_power_mode": 1,
+ "affine_to_cpu": 1
+ },
+ {
+ "low_power_mode": 1,
+ "affine_to_cpu": 2
+ },
+ {
+ "low_power_mode": 1,
+ "affine_to_cpu": 3
+ }
+ ],
+ "user-agent": null,
+ "syslog": false,
+ "watch": false
+}
\ No newline at end of file
diff --git a/doc/api/1/summary.json b/doc/api/1/summary.json
new file mode 100644
index 00000000..ed3cd128
--- /dev/null
+++ b/doc/api/1/summary.json
@@ -0,0 +1,73 @@
+{
+ "id": "92f3104f9a2ee78c",
+ "worker_id": "Ubuntu-1604-xenial-64-minimal",
+ "version": "2.6.0-beta3",
+ "kind": "cpu",
+ "ua": "XMRig/2.6.0-beta3 (Linux x86_64) libuv/1.8.0 gcc/5.4.0",
+ "cpu": {
+ "brand": "Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz",
+ "aes": true,
+ "x64": true,
+ "sockets": 1
+ },
+ "algo": "cryptonight",
+ "hugepages": true,
+ "donate_level": 5,
+ "hashrate": {
+ "total": [
+ 296.24,
+ 296.23,
+ 295.97
+ ],
+ "highest": 296.5,
+ "threads": [
+ [
+ 73.39,
+ 73.39,
+ 73.28
+ ],
+ [
+ 74.72,
+ 74.72,
+ 74.71
+ ],
+ [
+ 74.72,
+ 74.72,
+ 74.71
+ ],
+ [
+ 73.39,
+ 73.39,
+ 73.27
+ ]
+ ]
+ },
+ "results": {
+ "diff_current": 9990,
+ "shares_good": 30,
+ "shares_total": 30,
+ "avg_time": 31,
+ "hashes_total": 311833,
+ "best": [
+ 278199,
+ 181923,
+ 103717,
+ 96632,
+ 56154,
+ 51580,
+ 45667,
+ 33159,
+ 29581,
+ 29514
+ ],
+ "error_log": []
+ },
+ "connection": {
+ "pool": "pool.monero.hashvault.pro:3333",
+ "uptime": 953,
+ "ping": 35,
+ "failures": 0,
+ "error_log": []
+ }
+}
\ No newline at end of file
diff --git a/doc/api/1/threads.json b/doc/api/1/threads.json
new file mode 100644
index 00000000..e536883d
--- /dev/null
+++ b/doc/api/1/threads.json
@@ -0,0 +1,65 @@
+{
+ "hugepages": [
+ 4,
+ 4
+ ],
+ "memory": 8388608,
+ "threads": [
+ {
+ "type": "cpu",
+ "algo": "cryptonight",
+ "av": 1,
+ "low_power_mode": 1,
+ "affine_to_cpu": 0,
+ "priority": -1,
+ "soft_aes": false,
+ "hashrate": [
+ 73.39,
+ 73.4,
+ 73.28
+ ]
+ },
+ {
+ "type": "cpu",
+ "algo": "cryptonight",
+ "av": 1,
+ "low_power_mode": 1,
+ "affine_to_cpu": 1,
+ "priority": -1,
+ "soft_aes": false,
+ "hashrate": [
+ 74.72,
+ 74.72,
+ 74.7
+ ]
+ },
+ {
+ "type": "cpu",
+ "algo": "cryptonight",
+ "av": 1,
+ "low_power_mode": 1,
+ "affine_to_cpu": 2,
+ "priority": -1,
+ "soft_aes": false,
+ "hashrate": [
+ 74.71,
+ 74.72,
+ 74.7
+ ]
+ },
+ {
+ "type": "cpu",
+ "algo": "cryptonight",
+ "av": 1,
+ "low_power_mode": 1,
+ "affine_to_cpu": 3,
+ "priority": -1,
+ "soft_aes": false,
+ "hashrate": [
+ 73.39,
+ 73.4,
+ 73.28
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/doc/screenshot.png b/doc/screenshot.png
new file mode 100644
index 00000000..be1ebcf6
Binary files /dev/null and b/doc/screenshot.png differ
diff --git a/doc/screenshot_dashboard.png b/doc/screenshot_dashboard.png
new file mode 100644
index 00000000..e883e9d8
Binary files /dev/null and b/doc/screenshot_dashboard.png differ
diff --git a/doc/screenshot_server.png b/doc/screenshot_server.png
new file mode 100644
index 00000000..90718d97
Binary files /dev/null and b/doc/screenshot_server.png differ
diff --git a/doc/topology/AMD_FX_8320_windows_2_0_4.xml b/doc/topology/AMD_FX_8320_windows_2_0_4.xml
new file mode 100644
index 00000000..55fe6b5d
--- /dev/null
+++ b/doc/topology/AMD_FX_8320_windows_2_0_4.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
diff --git a/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml b/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml
new file mode 100644
index 00000000..39576bb4
--- /dev/null
+++ b/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0 1 2 3 4 5 6 7
+ 10 16 16 22 16 22 16 22 16 10
+ 22 16 22 16 22 16 16 22 10 16
+ 16 22 16 22 22 16 16 10 22 16
+ 22 16 16 22 16 22 10 16 16 22
+ 22 16 22 16 16 10 22 16 16 22
+ 16 22 16 22 10 16 22 16 22 16
+ 22 16 16 10
+
+
\ No newline at end of file
diff --git a/doc/topology/AMD_Opteron_6278_x2_UMA_windows_2_0_4.xml b/doc/topology/AMD_Opteron_6278_x2_UMA_windows_2_0_4.xml
new file mode 100644
index 00000000..b59f773c
--- /dev/null
+++ b/doc/topology/AMD_Opteron_6278_x2_UMA_windows_2_0_4.xml
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml b/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml
new file mode 100644
index 00000000..2d889819
--- /dev/null
+++ b/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml
@@ -0,0 +1,550 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/AMD_Opteron_6380_x4_N8_linux_1_11_5.xml b/doc/topology/AMD_Opteron_6380_x4_N8_linux_1_11_5.xml
new file mode 100644
index 00000000..2ecbe3cb
--- /dev/null
+++ b/doc/topology/AMD_Opteron_6380_x4_N8_linux_1_11_5.xml
@@ -0,0 +1,670 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml b/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml
new file mode 100644
index 00000000..e3ecb6fd
--- /dev/null
+++ b/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/AMD_Ryzen_7_3700X_windows_2_0_4.xml b/doc/topology/AMD_Ryzen_7_3700X_windows_2_0_4.xml
new file mode 100644
index 00000000..1f2d0ee4
--- /dev/null
+++ b/doc/topology/AMD_Ryzen_7_3700X_windows_2_0_4.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml b/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml
new file mode 100644
index 00000000..c168e2a0
--- /dev/null
+++ b/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0 1
+ 10 16 16 10
+
+
diff --git a/doc/topology/AMD_Ryzen_Threadripper_2950X_UMA_linux_1_11_9.xml b/doc/topology/AMD_Ryzen_Threadripper_2950X_UMA_linux_1_11_9.xml
new file mode 100644
index 00000000..ed3776c0
--- /dev/null
+++ b/doc/topology/AMD_Ryzen_Threadripper_2950X_UMA_linux_1_11_9.xml
@@ -0,0 +1,328 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml b/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml
new file mode 100644
index 00000000..18c80210
--- /dev/null
+++ b/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml b/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml
new file mode 100644
index 00000000..c80c7403
--- /dev/null
+++ b/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Core_i7-6700_windows_2_0_4.xml b/doc/topology/Intel_Core_i7-6700_windows_2_0_4.xml
new file mode 100644
index 00000000..dd3c201c
--- /dev/null
+++ b/doc/topology/Intel_Core_i7-6700_windows_2_0_4.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Core_i7-7660U_windows_2_0_4.xml b/doc/topology/Intel_Core_i7-7660U_windows_2_0_4.xml
new file mode 100644
index 00000000..01a29e86
--- /dev/null
+++ b/doc/topology/Intel_Core_i7-7660U_windows_2_0_4.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Xeon_E5-4650_0_x4_N4_windows_2_0_4.xml b/doc/topology/Intel_Xeon_E5-4650_0_x4_N4_windows_2_0_4.xml
new file mode 100644
index 00000000..7811a49f
--- /dev/null
+++ b/doc/topology/Intel_Xeon_E5-4650_0_x4_N4_windows_2_0_4.xml
@@ -0,0 +1,477 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Xeon_E5620_x2_UMA_windows_2_0_4.xml b/doc/topology/Intel_Xeon_E5620_x2_UMA_windows_2_0_4.xml
new file mode 100644
index 00000000..9dad397a
--- /dev/null
+++ b/doc/topology/Intel_Xeon_E5620_x2_UMA_windows_2_0_4.xml
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Xeon_E7-4870_x4_N4_windows_2_0_4.xml b/doc/topology/Intel_Xeon_E7-4870_x4_N4_windows_2_0_4.xml
new file mode 100644
index 00000000..3d0a6736
--- /dev/null
+++ b/doc/topology/Intel_Xeon_E7-4870_x4_N4_windows_2_0_4.xml
@@ -0,0 +1,541 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Xeon_Gold_6146_x2_UMA_linux_2_0_4.xml b/doc/topology/Intel_Xeon_Gold_6146_x2_UMA_linux_2_0_4.xml
new file mode 100644
index 00000000..fe94194c
--- /dev/null
+++ b/doc/topology/Intel_Xeon_Gold_6146_x2_UMA_linux_2_0_4.xml
@@ -0,0 +1,246 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_1_11_9.xml b/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_1_11_9.xml
new file mode 100644
index 00000000..0dadfed2
--- /dev/null
+++ b/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_1_11_9.xml
@@ -0,0 +1,403 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml b/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml
new file mode 100644
index 00000000..fd56a10c
--- /dev/null
+++ b/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml
@@ -0,0 +1,263 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0 1
+ 10 21 21 10
+
+
diff --git a/res/app.rc b/res/app.rc
index 800ce2dd..75f16796 100644
--- a/res/app.rc
+++ b/res/app.rc
@@ -1,37 +1,36 @@
#include
#include "../src/version.h"
-IDI_ICON1 ICON DISCARDABLE "app.ico"
+101 ICON "app.ico"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_BUILD,APP_VER_REV
- PRODUCTVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_BUILD,APP_VER_REV
- FILEFLAGSMASK 0x3fL
+FILEVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_PATCH,0
+PRODUCTVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_PATCH,0
+FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
+FILEFLAGS VS_FF_DEBUG
#else
- FILEFLAGS 0x0L
+FILEFLAGS 0x0L
#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
- BEGIN
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE 0x0L
+BEGIN
BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "CompanyName", APP_SITE
- VALUE "FileDescription", APP_DESC
- VALUE "FileVersion", APP_VERSION
- VALUE "LegalCopyright", APP_COPYRIGHT
- VALUE "OriginalFilename", "xmrig.exe"
- VALUE "ProductName", APP_NAME
- VALUE "ProductVersion", APP_VERSION
- END
+BEGIN
+ BLOCK "000004b0"
+BEGIN
+ VALUE "CompanyName", APP_SITE
+VALUE "FileDescription", APP_DESC
+VALUE "FileVersion", APP_VERSION
+VALUE "LegalCopyright", APP_COPYRIGHT
+VALUE "OriginalFilename", "xmrigMiner.exe"
+VALUE "ProductName", APP_NAME
+VALUE "ProductVersion", APP_VERSION
+END
END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
+BLOCK "VarFileInfo"
+BEGIN
+ VALUE "Translation", 0x0, 1200
+END
END
- END
-
diff --git a/src/interfaces/IWorker.h b/src/3rdparty/argon2.h
similarity index 71%
rename from src/interfaces/IWorker.h
rename to src/3rdparty/argon2.h
index b9b6eb0a..6d5f2e69 100644
--- a/src/interfaces/IWorker.h
+++ b/src/3rdparty/argon2.h
@@ -4,8 +4,9 @@
* Copyright 2014 Lucas Jones
* Copyright 2014-2016 Wolf9466
* Copyright 2016 Jay D Dee
- * Copyright 2016-2017 XMRig
- *
+ * Copyright 2017-2018 XMR-Stak ,
+ * Copyright 2018-2019 SChernykh
+ * Copyright 2016-2019 XMRig ,
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,22 +22,12 @@
* along with this program. If not, see .
*/
-#ifndef __IWORKER_H__
-#define __IWORKER_H__
+
+#ifndef XMRIG_3RDPARTY_ARGON2_H
+#define XMRIG_3RDPARTY_ARGON2_H
-#include
+#include "3rdparty/argon2/include/argon2.h"
-class IWorker
-{
-public:
- virtual ~IWorker() {}
-
- virtual uint64_t hashCount() const = 0;
- virtual uint64_t timestamp() const = 0;
- virtual void start() = 0;
-};
-
-
-#endif // __IWORKER_H__
+#endif /* XMRIG_3RDPARTY_ARGON2_H */
diff --git a/src/3rdparty/argon2/.gitattributes b/src/3rdparty/argon2/.gitattributes
deleted file mode 100644
index 69755b35..00000000
--- a/src/3rdparty/argon2/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-*.h linguist-language=C
-*.pro linguist-language=QMake
diff --git a/src/3rdparty/argon2/.gitignore b/src/3rdparty/argon2/.gitignore
deleted file mode 100644
index 5bff3d06..00000000
--- a/src/3rdparty/argon2/.gitignore
+++ /dev/null
@@ -1,70 +0,0 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Autotools + Libtool
-/aclocal.m4
-/config.status
-/config
-/install-sh
-**/Makefile
-**/Makefile.in
-/autom4te.cache/
-/compile
-/config.guess
-/config.log
-/config.sub
-/configure
-/depcomp
-/libtool
-/ltmain.sh
-/m4/libtool.m4
-/m4/lt*.m4
-/missing
-/test-driver
-**/.deps/
-**/.dirstamp
-**/.libs/
-
-# Qt Creator
-**/*.user
-**/*.user.*
-**/build-*/
-
-# KDE
-**/.directory
-
-# Vim
-*.swp
-
-# CMake
-CMakeFiles/
-*.cmake
-CMakeCache.txt
-Makefile
-
diff --git a/src/3rdparty/argon2/.travis.yml b/src/3rdparty/argon2/.travis.yml
deleted file mode 100644
index 0298ff65..00000000
--- a/src/3rdparty/argon2/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: c
-
-dist: trusty
-sudo: false
-
-compiler:
- - clang
- - gcc
-
-env:
- - BUILD=cmake BUILD_TYPE=Debug
- - BUILD=cmake BUILD_TYPE=Release
- - BUILD=autotools
-
-script: |
- case $BUILD in
- cmake)
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test
- ;;
- autotools)
- autoreconf -i && ./configure && make && make check
- ;;
- esac
diff --git a/src/3rdparty/argon2/CMakeLists.txt b/src/3rdparty/argon2/CMakeLists.txt
index a8be1bed..30900b0b 100644
--- a/src/3rdparty/argon2/CMakeLists.txt
+++ b/src/3rdparty/argon2/CMakeLists.txt
@@ -1,203 +1,83 @@
cmake_minimum_required(VERSION 2.6)
-find_program(CCACHE_PROGRAM ccache)
-if(CCACHE_PROGRAM)
- message(STATUS "-- Argon2: Found ccache package... Activating...")
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-endif()
-
project(Argon2 C)
set(ARGON2_VERSION 1.0)
-set(CMAKE_C_STANDARD 90)
+set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON)
include(CheckCSourceCompiles)
-find_package(Threads REQUIRED)
-add_library(argon2-interface INTERFACE)
-target_include_directories(argon2-interface INTERFACE
- $
- $
+add_library(argon2 STATIC
+ lib/argon2.c
+ lib/core.c
+ lib/encoding.c
+ lib/genkat.c
+ lib/impl-select.c
+ lib/blake2/blake2.c
)
-add_library(argon2-internal INTERFACE)
-target_include_directories(argon2-internal INTERFACE lib lib/blake2)
-target_link_libraries(argon2-internal INTERFACE argon2-interface)
+target_include_directories(argon2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-set(ARGON2_SRC
- lib/argon2.c
- lib/core.c
- lib/encoding.c
- lib/genkat.c
- lib/impl-select.c
- lib/thread.c
- lib/blake2/blake2.c
-)
+if (CMAKE_C_COMPILER_ID MATCHES MSVC)
+ function(add_feature_impl FEATURE MSVC_FLAG DEF)
+ add_library(argon2-${FEATURE} STATIC arch/x86_64/lib/argon2-${FEATURE}.c)
+ target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+ target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+ set_target_properties(argon2-${FEATURE} PROPERTIES POSITION_INDEPENDENT_CODE True)
-message("-- Argon2: Processor: ${CMAKE_SYSTEM_PROCESSOR}")
-message("-- Argon2: Build Type: ${ARCH}")
+ target_compile_options(argon2-${FEATURE} PRIVATE ${MSVC_FLAG})
+ target_compile_definitions(argon2-${FEATURE} PRIVATE ${DEF})
+ target_link_libraries(argon2 PUBLIC argon2-${FEATURE})
+ endfunction()
-if((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") AND NOT "${ARCH}" STREQUAL "default")
- include(CheckCXXSourceRuns)
+ add_feature_impl(sse2 "" HAVE_SSE2)
+ add_feature_impl(ssse3 "/arch:SSSE3" HAVE_SSSE3)
+ add_feature_impl(xop "" HAVE_XOP)
+ add_feature_impl(avx2 "/arch:AVX2" HAVE_AVX2)
+ add_feature_impl(avx512f "/arch:AVX512F" HAVE_AVX512F)
- # Check for AVX2
- check_cxx_source_runs("
- #include
- int main()
- {
- __m256i a, b, c;
- const int src[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
- int dst[8];
- a = _mm256_loadu_si256( (__m256i*)src );
- b = _mm256_loadu_si256( (__m256i*)src );
- c = _mm256_add_epi32( a, b );
- _mm256_storeu_si256( (__m256i*)dst, c );
- for( int i = 0; i < 8; i++ ){
- if( ( src[i] + src[i] ) != dst[i] ){
- return -1;
- }
- }
- return 0;
- }"
- HAVE_AVX2_EXTENSIONS)
+ target_sources(argon2 PRIVATE arch/x86_64/lib/argon2-arch.c arch/x86_64/lib/cpu-flags.c)
+elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+ function(add_feature_impl FEATURE GCC_FLAG DEF)
+ add_library(argon2-${FEATURE} STATIC arch/x86_64/lib/argon2-${FEATURE}.c)
+ target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+ target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+ set_target_properties(argon2-${FEATURE} PROPERTIES POSITION_INDEPENDENT_CODE True)
- if(HAVE_AVX2_EXTENSIONS)
- message("-- Argon2: AVX2 Extensions - Enabled")
- add_definitions(-DHAVE_AVX2)
- if(MSVC)
- add_definitions(/arch:AVX2)
- endif()
- else()
- message("-- Argon2: AVX2 Extensions - Disabled")
- endif()
+ message("-- argon2: detecting feature '${FEATURE}'...")
+ file(READ arch/x86_64/src/test-feature-${FEATURE}.c SOURCE_CODE)
- # Check for AVX512
- check_cxx_source_runs("
- #include
- int main()
- {
- __m512i a, b, c;
- const int src[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
- int dst[8];
- a = _mm512_loadu_si512( (__m512i*)src );
- b = _mm512_loadu_si512( (__m512i*)src );
- c = _mm512_add_epi32( a, b );
- _mm512_storeu_si512( (__m512i*)dst, c );
- for( int i = 0; i < 8; i++ ){
- if( ( src[i] + src[i] ) != dst[i] ){
- return -1;
- }
- }
- return 0;
- }"
- HAVE_AVX512F_EXTENSIONS)
+ # try without flag:
+ check_c_source_compiles("${SOURCE_CODE}" FEATURE_${FEATURE}_NOFLAG)
+ set(HAS_FEATURE ${FEATURE_${FEATURE}_NOFLAG})
+ if (NOT "${HAS_FEATURE}")
+ # try with -m flag:
+ set(CMAKE_REQUIRED_FLAGS ${GCC_FLAG})
+ check_c_source_compiles("${SOURCE_CODE}" FEATURE_${FEATURE}_FLAG)
+ set(CMAKE_REQUIRED_FLAGS "")
- if(HAVE_AVX512F_EXTENSIONS)
- message("-- Argon2: AVX512 Extensions - Enabled")
- add_definitions(-DHAVE_AVX512F)
- else()
- message("-- Argon2: AVX512 Extensions - Disabled")
- endif()
+ set(HAS_FEATURE ${FEATURE_${FEATURE}_FLAG})
+ if (${HAS_FEATURE})
+ target_compile_options(argon2-${FEATURE} PRIVATE ${GCC_FLAG})
+ endif()
+ endif()
- # Check for SSE2
- check_cxx_source_runs("
- #include
- int main()
- {
- __m128d a, b;
- double vals[2] = {0};
- a = _mm_loadu_pd(vals);
- b = _mm_add_pd(a,a);
- _mm_storeu_pd(vals,b);
- return 0;
- }"
- HAVE_SSE2_EXTENSIONS)
+ if (${HAS_FEATURE})
+ message("-- argon2: feature '${FEATURE}' detected!")
+ target_compile_definitions(argon2-${FEATURE} PRIVATE ${DEF})
+ endif()
- if(HAVE_SSE2_EXTENSIONS)
- message("-- Argon2: SSE2 Extensions - Enabled")
- add_definitions(-DHAVE_SSE2)
- if(MSVC)
- add_definitions(/arch:SSE2)
- endif()
- else()
- message("-- Argon2: SSE2 Extensions - Disabled")
- endif()
+ target_link_libraries(argon2 PUBLIC argon2-${FEATURE})
+ endfunction()
- # Check for SSE3
- check_cxx_source_runs("
- #include
- int main()
- {
- __m128d a, b;
- double vals[2] = {0};
- a = _mm_loadu_pd(vals);
- b = _mm_hadd_pd(a,a);
- _mm_storeu_pd(vals, b);
- return 0;
- }"
- HAVE_SSE3_EXTENSIONS)
+ add_feature_impl(sse2 -msse2 HAVE_SSE2)
+ add_feature_impl(ssse3 -mssse3 HAVE_SSSE3)
+ add_feature_impl(xop -mxop HAVE_XOP)
+ add_feature_impl(avx2 -mavx2 HAVE_AVX2)
+ add_feature_impl(avx512f -mavx512f HAVE_AVX512F)
- if(HAVE_SSE3_EXTENSIONS)
- message("-- Argon2: SSE3 Extensions - Enabled")
- add_definitions(-DHAVE_SSE3)
- if(MSVC)
- add_definitions(/arch:SSE3)
- endif()
- else()
- message("-- Argon2: SSE3 Extensions - Disabled")
- endif()
-
- # Check for XOP
- check_cxx_source_runs("
- #include
- int main()
- {
- __m128i a, b, c;
- const int src[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
- a = _mm_load_si128( (__m128i*)src );
- b = _mm_load_si128( (__m128i*)src );
- c = _mm_roti_epi64(*a, b);
- return 0;
- }"
- HAVE_XOP_EXTENSIONS)
-
- if(HAVE_XOP_EXTENSIONS)
- message("-- Argon2: XOP Extensions - Enabled")
- add_definitions(-DHAVE_XOP)
- else()
- message("-- Argon2: XOP Extensions - Disabled")
- endif()
-
- list(APPEND ARGON2_SRC
- arch/x86_64/lib/argon2-sse2.c
- arch/x86_64/lib/argon2-ssse3.c
- arch/x86_64/lib/argon2-xop.c
- arch/x86_64/lib/argon2-avx2.c
- arch/x86_64/lib/argon2-avx512f.c
- arch/x86_64/lib/argon2-arch.c
- )
+ target_sources(argon2 PRIVATE arch/x86_64/lib/argon2-arch.c arch/x86_64/lib/cpu-flags.c)
else()
- list(APPEND ARGON2_SRC
- arch/generic/lib/argon2-arch.c
- )
+ target_sources(argon2 PRIVATE arch/generic/lib/argon2-arch.c)
endif()
-
-add_library(argon2 STATIC ${ARGON2_SRC})
-
-target_compile_definitions(argon2
- PUBLIC "A2_VISCTL"
-)
-
-target_link_libraries(argon2
- PUBLIC argon2-interface ${CMAKE_THREAD_LIBS_INIT}
- PRIVATE argon2-internal
-)
-
-set_property(TARGET argon2 PROPERTY C_STANDARD 90)
-set_property(TARGET argon2 PROPERTY VERSION ${Upstream_VERSION})
-set_property(TARGET argon2 PROPERTY SOVERSION 1)
-set_property(TARGET argon2 PROPERTY INTERFACE_ARGON2_MAJOR_VERSION 1)
-set_property(TARGET argon2 APPEND PROPERTY
- COMPATIBLE_INTERFACE_STRING ARGON2_MAJOR_VERSION
-)
-
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c
index 1d54b657..4486e395 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c
@@ -4,6 +4,7 @@
#include "impl-select.h"
+#include "cpu-flags.h"
#include "argon2-sse2.h"
#include "argon2-ssse3.h"
#include "argon2-xop.h"
@@ -33,6 +34,8 @@ void argon2_get_impl_list(argon2_impl_list *list)
{ "AVX-512F", check_avx512f, fill_segment_avx512f },
};
+ cpu_flags_get();
+
list->count = sizeof(IMPLS) / sizeof(IMPLS[0]);
list->entries = IMPLS;
}
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c
index 5dc41979..09ef421a 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c
@@ -3,7 +3,13 @@
#ifdef HAVE_AVX2
#include
-#include
+#ifdef __GNUC__
+# include
+#else
+# include
+#endif
+
+#include "cpu-flags.h"
#define r16 (_mm256_setr_epi8( \
2, 3, 4, 5, 6, 7, 0, 1, \
@@ -323,7 +329,7 @@ void fill_segment_avx2(const argon2_instance_t *instance,
int check_avx2(void)
{
- return 1;
+ return cpu_flags_have_avx2();
}
#else
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c
index f6de135b..79fd2dda 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c
@@ -4,7 +4,13 @@
#include
#include
-#include
+#ifdef __GNUC__
+# include
+#else
+# include
+#endif
+
+#include "cpu-flags.h"
#define ror64(x, n) _mm512_ror_epi64((x), (n))
@@ -308,7 +314,7 @@ void fill_segment_avx512f(const argon2_instance_t *instance,
int check_avx512f(void)
{
- return 1;
+ return cpu_flags_have_avx512f();
}
#else
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c
index 60ffb7bb..5eccdf07 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c
@@ -1,7 +1,13 @@
#include "argon2-sse2.h"
#ifdef HAVE_SSE2
-#include
+#ifdef __GNUC__
+# include
+#else
+# include
+#endif
+
+#include "cpu-flags.h"
#define ror64_16(x) \
_mm_shufflehi_epi16( \
@@ -104,7 +110,7 @@ void fill_segment_sse2(const argon2_instance_t *instance,
int check_sse2(void)
{
- return 1;
+ return cpu_flags_have_sse2();
}
#else
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c
index 7098ab22..86e9b3c9 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c
@@ -3,7 +3,13 @@
#ifdef HAVE_SSSE3
#include
-#include
+#ifdef __GNUC__
+# include
+#else
+# include
+#endif
+
+#include "cpu-flags.h"
#define r16 (_mm_setr_epi8( \
2, 3, 4, 5, 6, 7, 0, 1, \
@@ -116,7 +122,7 @@ void fill_segment_ssse3(const argon2_instance_t *instance,
int check_ssse3(void)
{
- return 1;
+ return cpu_flags_have_ssse3();
}
#else
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h
index 3062ec00..4fb04c1f 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h
@@ -1,6 +1,10 @@
#include
-#include
+#ifdef __GNUC__
+# include
+#else
+# include
+#endif
#include "core.h"
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c
index a7f6e399..0e877bce 100644
--- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c
+++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c
@@ -3,7 +3,13 @@
#ifdef HAVE_XOP
#include
-#include
+#ifdef __GNUC__
+# include
+#else
+# include
+#endif
+
+#include "cpu-flags.h"
#define ror64(x, c) _mm_roti_epi64((x), -(c))
@@ -104,7 +110,7 @@ void fill_segment_xop(const argon2_instance_t *instance,
int check_xop(void)
{
- return 1;
+ return cpu_flags_have_xop();
}
#else
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.c b/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.c
new file mode 100644
index 00000000..cd13cb01
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.c
@@ -0,0 +1,129 @@
+#include
+#include
+
+
+#include "cpu-flags.h"
+
+#include
+
+#ifdef _MSC_VER
+# include
+#else
+# include
+#endif
+
+#ifndef bit_OSXSAVE
+# define bit_OSXSAVE (1 << 27)
+#endif
+
+#ifndef bit_SSE2
+# define bit_SSE2 (1 << 26)
+#endif
+
+#ifndef bit_SSSE3
+# define bit_SSSE3 (1 << 9)
+#endif
+
+#ifndef bit_AVX2
+# define bit_AVX2 (1 << 5)
+#endif
+
+#ifndef bit_AVX512F
+# define bit_AVX512F (1 << 16)
+#endif
+
+#ifndef bit_XOP
+# define bit_XOP (1 << 11)
+#endif
+
+#define PROCESSOR_INFO (1)
+#define EXTENDED_FEATURES (7)
+
+#define EAX_Reg (0)
+#define EBX_Reg (1)
+#define ECX_Reg (2)
+#define EDX_Reg (3)
+
+
+enum {
+ X86_64_FEATURE_SSE2 = (1 << 0),
+ X86_64_FEATURE_SSSE3 = (1 << 1),
+ X86_64_FEATURE_XOP = (1 << 2),
+ X86_64_FEATURE_AVX2 = (1 << 3),
+ X86_64_FEATURE_AVX512F = (1 << 4),
+};
+
+static unsigned int cpu_flags;
+
+
+static inline void cpuid(uint32_t level, int32_t output[4])
+{
+# ifdef _MSC_VER
+ __cpuid(output, (int) level);
+# else
+ __cpuid_count(level, 0, output[0], output[1], output[2], output[3]);
+# endif
+}
+
+
+static bool has_feature(uint32_t level, uint32_t reg, int32_t bit)
+{
+ int32_t cpu_info[4] = { 0 };
+ cpuid(level, cpu_info);
+
+ return (cpu_info[reg] & bit) != 0;
+}
+
+
+void cpu_flags_get(void)
+{
+ if (has_feature(PROCESSOR_INFO, EDX_Reg, bit_SSE2)) {
+ cpu_flags |= X86_64_FEATURE_SSE2;
+ }
+
+ if (has_feature(PROCESSOR_INFO, ECX_Reg, bit_SSSE3)) {
+ cpu_flags |= X86_64_FEATURE_SSSE3;
+ }
+
+ if (!has_feature(PROCESSOR_INFO, ECX_Reg, bit_OSXSAVE)) {
+ return;
+ }
+
+ if (has_feature(EXTENDED_FEATURES, EBX_Reg, bit_AVX2)) {
+ cpu_flags |= X86_64_FEATURE_AVX2;
+ }
+
+ if (has_feature(EXTENDED_FEATURES, EBX_Reg, bit_AVX512F)) {
+ cpu_flags |= X86_64_FEATURE_AVX512F;
+ }
+
+ if (has_feature(0x80000001, ECX_Reg, bit_XOP)) {
+ cpu_flags |= X86_64_FEATURE_XOP;
+ }
+}
+
+int cpu_flags_have_sse2(void)
+{
+ return cpu_flags & X86_64_FEATURE_SSE2;
+}
+
+int cpu_flags_have_ssse3(void)
+{
+ return cpu_flags & X86_64_FEATURE_SSSE3;
+}
+
+int cpu_flags_have_xop(void)
+{
+ return cpu_flags & X86_64_FEATURE_XOP;
+}
+
+int cpu_flags_have_avx2(void)
+{
+ return cpu_flags & X86_64_FEATURE_AVX2;
+}
+
+int cpu_flags_have_avx512f(void)
+{
+ return cpu_flags & X86_64_FEATURE_AVX512F;
+}
+
diff --git a/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.h b/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.h
new file mode 100644
index 00000000..b546a8ba
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/lib/cpu-flags.h
@@ -0,0 +1,12 @@
+#ifndef ARGON2_CPU_FLAGS_H
+#define ARGON2_CPU_FLAGS_H
+
+void cpu_flags_get(void);
+
+int cpu_flags_have_sse2(void);
+int cpu_flags_have_ssse3(void);
+int cpu_flags_have_xop(void);
+int cpu_flags_have_avx2(void);
+int cpu_flags_have_avx512f(void);
+
+#endif // ARGON2_CPU_FLAGS_H
diff --git a/src/3rdparty/argon2/arch/x86_64/src/test-feature-avx2.c b/src/3rdparty/argon2/arch/x86_64/src/test-feature-avx2.c
new file mode 100644
index 00000000..01e5b156
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/src/test-feature-avx2.c
@@ -0,0 +1,8 @@
+#include
+
+void function_avx2(__m256i *dst, const __m256i *a, const __m256i *b)
+{
+ *dst = _mm256_xor_si256(*a, *b);
+}
+
+int main(void) { return 0; }
diff --git a/src/3rdparty/argon2/arch/x86_64/src/test-feature-avx512f.c b/src/3rdparty/argon2/arch/x86_64/src/test-feature-avx512f.c
new file mode 100644
index 00000000..372eb256
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/src/test-feature-avx512f.c
@@ -0,0 +1,8 @@
+#include
+
+void function_avx512f(__m512i *dst, const __m512i *a)
+{
+ *dst = _mm512_ror_epi64(*a, 57);
+}
+
+int main(void) { return 0; }
diff --git a/src/3rdparty/argon2/arch/x86_64/src/test-feature-sse2.c b/src/3rdparty/argon2/arch/x86_64/src/test-feature-sse2.c
new file mode 100644
index 00000000..4a3b70fd
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/src/test-feature-sse2.c
@@ -0,0 +1,8 @@
+#include
+
+void function_sse2(__m128i *dst, const __m128i *a, const __m128i *b)
+{
+ *dst = _mm_xor_si128(*a, *b);
+}
+
+int main(void) { return 0; }
diff --git a/src/3rdparty/argon2/arch/x86_64/src/test-feature-ssse3.c b/src/3rdparty/argon2/arch/x86_64/src/test-feature-ssse3.c
new file mode 100644
index 00000000..db2b3551
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/src/test-feature-ssse3.c
@@ -0,0 +1,8 @@
+#include
+
+void function_ssse3(__m128i *dst, const __m128i *a, const __m128i *b)
+{
+ *dst = _mm_shuffle_epi8(*a, *b);
+}
+
+int main(void) { return 0; }
diff --git a/src/3rdparty/argon2/arch/x86_64/src/test-feature-xop.c b/src/3rdparty/argon2/arch/x86_64/src/test-feature-xop.c
new file mode 100644
index 00000000..5897fe14
--- /dev/null
+++ b/src/3rdparty/argon2/arch/x86_64/src/test-feature-xop.c
@@ -0,0 +1,8 @@
+#include
+
+void function_xop(__m128i *dst, const __m128i *a, int b)
+{
+ *dst = _mm_roti_epi64(*a, b);
+}
+
+int main(void) { return 0; }
diff --git a/src/3rdparty/argon2/configure.ac b/src/3rdparty/argon2/configure.ac
deleted file mode 100644
index 81607a97..00000000
--- a/src/3rdparty/argon2/configure.ac
+++ /dev/null
@@ -1,108 +0,0 @@
-dnl ---------------------------------------------------------------------
-dnl Copyright (C) 2015, Ondrej Mosnacek
-dnl
-dnl This program is free software: you can redistribute it and/or
-dnl modify it under the terms of the GNU General Public License
-dnl as published by the Free Software Foundation: either version 2
-dnl of the License, or (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program. If not, see .
-dnl ---------------------------------------------------------------------
-
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_INIT([argon2], [0.1], [])
-LT_INIT
-AM_INIT_AUTOMAKE([foreign subdir-objects])
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC
-AC_PROG_CC_C89
-AM_PROG_AS
-AX_PTHREAD
-
-AC_CANONICAL_HOST
-
-AS_CASE([$host_cpu],
- dnl [i?86], [ARCH=i386],
- [x86_64], [ARCH=x86_64],
- [ARCH=generic
- AC_MSG_WARN("No code for architecture $host_cpu; using generic implementation")]
-)
-AC_SUBST([ARCH])
-
-AM_CONDITIONAL([ARCH_X86_64], [test "$ARCH" = 'x86_64'])
-AM_CONDITIONAL([ARCH_GENERIC], [test "$ARCH" = 'generic'])
-
-# AX_CHECK_COMPILER_FEATURE(NAME, FLAG, TEST_SOURCE)
-# --------------------------
-AC_DEFUN([AX_CHECK_COMPILER_FEATURE], [{
- AX_CHECK_COMPILE_FLAG([-m$2], [HAVE_FLAG=1], [HAVE_FLAG=0])
- HAVE_FEATURE=0
- AS_IF([test "$HAVE_FLAG" = '1'], [{
- AC_MSG_CHECKING("whether C compiler supports $1 with -m$2...")
-
- CFLAGS_BACKUP="$CFLAGS"
- CFLAGS="-m$2"
-
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], [HAVE_FEATURE=1])
-
- CFLAGS="$CFLAGS_BACKUP"
- AS_IF([test "$HAVE_FEATURE" = '1'], [RESULT='yes'], [RESULT='no'])
- AC_MSG_RESULT([$RESULT])
-
- }])
- HAVE_$1=HAVE_FEATURE
- AM_CONDITIONAL([HAVE_$1], [test "$HAVE_FEATURE" = '1'])
-}])
-
-AX_CHECK_COMPILER_FEATURE([SSE2], [sse2], [[
-#include
-
-void function_sse2(__m128i *dst, const __m128i *a, const __m128i *b)
-{
- *dst = _mm_xor_si128(*a, *b);
-}
-]])
-AX_CHECK_COMPILER_FEATURE([SSSE3], [ssse3], [[
-#include
-
-void function_ssse3(__m128i *dst, const __m128i *a, const __m128i *b)
-{
- *dst = _mm_shuffle_epi8(*a, *b);
-}
-]])
-AX_CHECK_COMPILER_FEATURE([XOP], [xop], [[
-#include
-
-void function_xop(__m128i *dst, const __m128i *a, int b)
-{
- *dst = _mm_roti_epi64(*a, b);
-}
-]])
-AX_CHECK_COMPILER_FEATURE([AVX2], [avx2], [[
-#include
-
-void function_avx2(__m256i *dst, const __m256i *a, const __m256i *b)
-{
- *dst = _mm256_xor_si256(*a, *b);
-}
-]])
-AX_CHECK_COMPILER_FEATURE([AVX512F], [avx512f], [[
-#include
-
-void function_avx512f(__m512i *dst, const __m512i *a)
-{
- *dst = _mm512_ror_epi64(*a, 57);
-}
-]])
-
-AC_CONFIG_FILES([Makefile])
-
-AC_OUTPUT
diff --git a/src/3rdparty/argon2/include/argon2.h b/src/3rdparty/argon2/include/argon2.h
index d3bf8458..7759a885 100644
--- a/src/3rdparty/argon2/include/argon2.h
+++ b/src/3rdparty/argon2/include/argon2.h
@@ -19,30 +19,7 @@
#include
/* Symbols visibility control */
-#if defined(_WIN32) || defined(__CYGWIN__)
- #if defined(A2_VISCTL)
- #if defined(_MSC_VER)
- #define ARGON2_PUBLIC __declspec(dllexport)
- #else
- #define ARGON2_PUBLIC __attribute__ ((dllexport))
- #endif
- #else
- #if defined(_MSC_VER)
- #define ARGON2_PUBLIC __declspec(dllimport)
- #else
- #define ARGON2_PUBLIC /*__attribute__ ((dllimport))*/
- #endif
- #endif
- #define ARGON2_LOCAL
-#else
- #if defined(A2_VISCTL)
- #define ARGON2_PUBLIC __attribute__ ((visibility ("default")))
- #define ARGON2_LOCAL __attribute__ ((visibility ("hidden")))
- #else
- #define ARGON2_PUBLIC
- #define ARGON2_LOCAL
- #endif
-#endif
+#define ARGON2_PUBLIC
#if defined(__cplusplus)
extern "C" {
@@ -255,7 +232,7 @@ ARGON2_PUBLIC const char *argon2_type2string(argon2_type type, int uppercase);
* @param context Pointer to the Argon2 internal structure
* @return Error code if smth is wrong, ARGON2_OK otherwise
*/
-ARGON2_PUBLIC int argon2_ctx(argon2_context *context, argon2_type type, void *memory, size_t memory_size);
+ARGON2_PUBLIC int argon2_ctx(argon2_context *context, argon2_type type);
/**
* Hashes a password with Argon2i, producing an encoded hash
@@ -278,8 +255,7 @@ ARGON2_PUBLIC int argon2i_hash_encoded(const uint32_t t_cost,
const void *pwd, const size_t pwdlen,
const void *salt, const size_t saltlen,
const size_t hashlen, char *encoded,
- const size_t encodedlen, void *memory,
- size_t memory_size);
+ const size_t encodedlen);
/**
* Hashes a password with Argon2i, producing a raw hash by allocating memory at
@@ -300,8 +276,7 @@ ARGON2_PUBLIC int argon2i_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
const size_t saltlen, void *hash,
- const size_t hashlen, void *memory,
- size_t memory_size);
+ const size_t hashlen);
ARGON2_PUBLIC int argon2d_hash_encoded(const uint32_t t_cost,
const uint32_t m_cost,
@@ -309,16 +284,14 @@ ARGON2_PUBLIC int argon2d_hash_encoded(const uint32_t t_cost,
const void *pwd, const size_t pwdlen,
const void *salt, const size_t saltlen,
const size_t hashlen, char *encoded,
- const size_t encodedlen, void *memory,
- size_t memory_size);
+ const size_t encodedlen);
ARGON2_PUBLIC int argon2d_hash_raw(const uint32_t t_cost,
const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
const size_t saltlen, void *hash,
- const size_t hashlen, void *memory,
- size_t memory_size);
+ const size_t hashlen);
ARGON2_PUBLIC int argon2id_hash_encoded(const uint32_t t_cost,
const uint32_t m_cost,
@@ -326,16 +299,22 @@ ARGON2_PUBLIC int argon2id_hash_encoded(const uint32_t t_cost,
const void *pwd, const size_t pwdlen,
const void *salt, const size_t saltlen,
const size_t hashlen, char *encoded,
- const size_t encodedlen, void *memory,
- size_t memory_size);
+ const size_t encodedlen);
ARGON2_PUBLIC int argon2id_hash_raw(const uint32_t t_cost,
const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
const size_t saltlen, void *hash,
- const size_t hashlen, void *memory,
- size_t memory_size);
+ const size_t hashlen);
+
+ARGON2_PUBLIC int argon2id_hash_raw_ex(const uint32_t t_cost,
+ const uint32_t m_cost,
+ const uint32_t parallelism, const void *pwd,
+ const size_t pwdlen, const void *salt,
+ const size_t saltlen, void *hash,
+ const size_t hashlen,
+ void *memory);
/* generic function underlying the above ones */
ARGON2_PUBLIC int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
@@ -344,8 +323,7 @@ ARGON2_PUBLIC int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
const size_t saltlen, void *hash,
const size_t hashlen, char *encoded,
const size_t encodedlen, argon2_type type,
- const uint32_t version, void *memory,
- size_t memory_size);
+ const uint32_t version);
/**
* Verifies a password against an encoded string
@@ -460,7 +438,9 @@ ARGON2_PUBLIC size_t argon2_encodedlen(uint32_t t_cost, uint32_t m_cost,
* @param prefix What to print before each line; NULL is equivalent to empty
* string
*/
-ARGON2_PUBLIC void argon2_select_impl(FILE *out, const char *prefix);
+ARGON2_PUBLIC void argon2_select_impl();
+ARGON2_PUBLIC const char *argon2_get_impl_name();
+ARGON2_PUBLIC int argon2_select_impl_by_name(const char *name);
/* signals support for passing preallocated memory: */
#define ARGON2_PREALLOCATED_MEMORY
diff --git a/src/3rdparty/argon2/lib/argon2.c b/src/3rdparty/argon2/lib/argon2.c
index 4027690e..d4d038a9 100644
--- a/src/3rdparty/argon2/lib/argon2.c
+++ b/src/3rdparty/argon2/lib/argon2.c
@@ -116,8 +116,8 @@ int argon2_ctx_mem(argon2_context *context, argon2_type type, void *memory,
return ARGON2_OK;
}
-int argon2_ctx(argon2_context *context, argon2_type type, void *memory, size_t memory_size) {
- return argon2_ctx_mem(context, type, memory, memory_size);
+int argon2_ctx(argon2_context *context, argon2_type type) {
+ return argon2_ctx_mem(context, type, NULL, 0);
}
int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
@@ -125,7 +125,7 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
const size_t pwdlen, const void *salt, const size_t saltlen,
void *hash, const size_t hashlen, char *encoded,
const size_t encodedlen, argon2_type type,
- const uint32_t version, void *memory, size_t memory_size){
+ const uint32_t version){
argon2_context context;
int result;
@@ -171,7 +171,7 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
context.flags = ARGON2_DEFAULT_FLAGS;
context.version = version;
- result = argon2_ctx(&context, type, memory, memory_size);
+ result = argon2_ctx(&context, type);
if (result != ARGON2_OK) {
clear_internal_memory(out, hashlen);
@@ -203,66 +203,88 @@ int argon2i_hash_encoded(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
const size_t saltlen, const size_t hashlen,
- char *encoded, const size_t encodedlen,
- void *memory, size_t memory_size) {
+ char *encoded, const size_t encodedlen) {
return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
NULL, hashlen, encoded, encodedlen, Argon2_i,
- ARGON2_VERSION_NUMBER, memory, memory_size);
+ ARGON2_VERSION_NUMBER);
}
int argon2i_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
- const size_t saltlen, void *hash, const size_t hashlen,
- void *memory, size_t memory_size) {
+ const size_t saltlen, void *hash, const size_t hashlen) {
return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
- hash, hashlen, NULL, 0, Argon2_i, ARGON2_VERSION_NUMBER, memory, memory_size);
+ hash, hashlen, NULL, 0, Argon2_i, ARGON2_VERSION_NUMBER);
}
int argon2d_hash_encoded(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
const size_t saltlen, const size_t hashlen,
- char *encoded, const size_t encodedlen,
- void *memory, size_t memory_size) {
+ char *encoded, const size_t encodedlen) {
return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
NULL, hashlen, encoded, encodedlen, Argon2_d,
- ARGON2_VERSION_NUMBER, memory, memory_size);
+ ARGON2_VERSION_NUMBER);
}
int argon2d_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
- const size_t saltlen, void *hash, const size_t hashlen,
- void *memory, size_t memory_size) {
+ const size_t saltlen, void *hash, const size_t hashlen) {
return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
- hash, hashlen, NULL, 0, Argon2_d, ARGON2_VERSION_NUMBER, memory, memory_size);
+ hash, hashlen, NULL, 0, Argon2_d, ARGON2_VERSION_NUMBER);
}
int argon2id_hash_encoded(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
const size_t saltlen, const size_t hashlen,
- char *encoded, const size_t encodedlen,
- void *memory, size_t memory_size) {
+ char *encoded, const size_t encodedlen) {
return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
NULL, hashlen, encoded, encodedlen, Argon2_id,
- ARGON2_VERSION_NUMBER, memory, memory_size);
+ ARGON2_VERSION_NUMBER);
}
int argon2id_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
const uint32_t parallelism, const void *pwd,
const size_t pwdlen, const void *salt,
- const size_t saltlen, void *hash, const size_t hashlen,
- void *memory, size_t memory_size) {
+ const size_t saltlen, void *hash, const size_t hashlen) {
return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
hash, hashlen, NULL, 0, Argon2_id,
- ARGON2_VERSION_NUMBER, memory, memory_size);
+ ARGON2_VERSION_NUMBER);
+}
+
+int argon2id_hash_raw_ex(const uint32_t t_cost, const uint32_t m_cost,
+ const uint32_t parallelism, const void *pwd,
+ const size_t pwdlen, const void *salt,
+ const size_t saltlen, void *hash, const size_t hashlen, void *memory) {
+ argon2_context context;
+
+ context.out = (uint8_t *)hash;
+ context.outlen = (uint32_t)hashlen;
+ context.pwd = CONST_CAST(uint8_t *)pwd;
+ context.pwdlen = (uint32_t)pwdlen;
+ context.salt = CONST_CAST(uint8_t *)salt;
+ context.saltlen = (uint32_t)saltlen;
+ context.secret = NULL;
+ context.secretlen = 0;
+ context.ad = NULL;
+ context.adlen = 0;
+ context.t_cost = t_cost;
+ context.m_cost = m_cost;
+ context.lanes = parallelism;
+ context.threads = parallelism;
+ context.allocate_cbk = NULL;
+ context.free_cbk = NULL;
+ context.flags = ARGON2_DEFAULT_FLAGS;
+ context.version = ARGON2_VERSION_NUMBER;
+
+ return argon2_ctx_mem(&context, Argon2_id, memory, m_cost * 1024);
}
static int argon2_compare(const uint8_t *b1, const uint8_t *b2, size_t len) {
@@ -357,20 +379,20 @@ int argon2id_verify(const char *encoded, const void *pwd, const size_t pwdlen) {
}
int argon2d_ctx(argon2_context *context) {
- return argon2_ctx(context, Argon2_d, NULL, 0);
+ return argon2_ctx(context, Argon2_d);
}
int argon2i_ctx(argon2_context *context) {
- return argon2_ctx(context, Argon2_i, NULL, 0);
+ return argon2_ctx(context, Argon2_i);
}
int argon2id_ctx(argon2_context *context) {
- return argon2_ctx(context, Argon2_id, NULL, 0);
+ return argon2_ctx(context, Argon2_id);
}
int argon2_verify_ctx(argon2_context *context, const char *hash,
argon2_type type) {
- int ret = argon2_ctx(context, type, NULL, 0);
+ int ret = argon2_ctx(context, type);
if (ret != ARGON2_OK) {
return ret;
}
diff --git a/src/3rdparty/argon2/lib/core.c b/src/3rdparty/argon2/lib/core.c
index 3498e37c..5d130c04 100644
--- a/src/3rdparty/argon2/lib/core.c
+++ b/src/3rdparty/argon2/lib/core.c
@@ -27,7 +27,6 @@
#include
#include "core.h"
-#include "thread.h"
#include "blake2/blake2.h"
#include "blake2/blake2-impl.h"
@@ -89,8 +88,6 @@ int allocate_memory(const argon2_context *context,
return ARGON2_OK;
}
- return ARGON2_MEMORY_ALLOCATION_ERROR;
-
/* 1. Check for multiplication overflow */
if (blocks != 0 && memory_size / ARGON2_BLOCK_SIZE != blocks) {
return ARGON2_MEMORY_ALLOCATION_ERROR;
@@ -142,7 +139,7 @@ void NOT_OPTIMIZED secure_wipe_memory(void *v, size_t n) {
}
/* Memory clear flag defaults to true. */
-int FLAG_clear_internal_memory = 1;
+int FLAG_clear_internal_memory = 0;
void clear_internal_memory(void *v, size_t n) {
if (FLAG_clear_internal_memory && v) {
secure_wipe_memory(v, n);
@@ -252,18 +249,6 @@ uint32_t index_alpha(const argon2_instance_t *instance,
return absolute_position;
}
-#ifdef _WIN32
-static unsigned __stdcall fill_segment_thr(void *thread_data)
-#else
-static void *fill_segment_thr(void *thread_data)
-#endif
-{
- argon2_thread_data *my_data = thread_data;
- fill_segment(my_data->instance_ptr, my_data->pos);
- argon2_thread_exit();
- return 0;
-}
-
/* Single-threaded version for p=1 case */
static int fill_memory_blocks_st(argon2_instance_t *instance) {
uint32_t r, s, l;
@@ -283,93 +268,12 @@ static int fill_memory_blocks_st(argon2_instance_t *instance) {
return ARGON2_OK;
}
-/* Multi-threaded version for p > 1 case */
-static int fill_memory_blocks_mt(argon2_instance_t *instance) {
- uint32_t r, s;
- argon2_thread_handle_t *thread = NULL;
- argon2_thread_data *thr_data = NULL;
- int rc = ARGON2_OK;
-
- /* 1. Allocating space for threads */
- thread = calloc(instance->lanes, sizeof(argon2_thread_handle_t));
- if (thread == NULL) {
- rc = ARGON2_MEMORY_ALLOCATION_ERROR;
- goto fail;
- }
-
- thr_data = calloc(instance->lanes, sizeof(argon2_thread_data));
- if (thr_data == NULL) {
- rc = ARGON2_MEMORY_ALLOCATION_ERROR;
- goto fail;
- }
-
- for (r = 0; r < instance->passes; ++r) {
- for (s = 0; s < ARGON2_SYNC_POINTS; ++s) {
- uint32_t l;
-
- /* 2. Calling threads */
- for (l = 0; l < instance->lanes; ++l) {
- argon2_position_t position;
-
- /* 2.1 Join a thread if limit is exceeded */
- if (l >= instance->threads) {
- if (argon2_thread_join(thread[l - instance->threads])) {
- rc = ARGON2_THREAD_FAIL;
- goto fail;
- }
- }
-
- /* 2.2 Create thread */
- position.pass = r;
- position.lane = l;
- position.slice = (uint8_t)s;
- position.index = 0;
- thr_data[l].instance_ptr =
- instance; /* preparing the thread input */
- memcpy(&(thr_data[l].pos), &position,
- sizeof(argon2_position_t));
- if (argon2_thread_create(&thread[l], &fill_segment_thr,
- (void *)&thr_data[l])) {
- rc = ARGON2_THREAD_FAIL;
- goto fail;
- }
-
- /* fill_segment(instance, position); */
- /*Non-thread equivalent of the lines above */
- }
-
- /* 3. Joining remaining threads */
- for (l = instance->lanes - instance->threads; l < instance->lanes;
- ++l) {
- if (argon2_thread_join(thread[l])) {
- rc = ARGON2_THREAD_FAIL;
- goto fail;
- }
- }
- }
-
- if (instance->print_internals) {
- internal_kat(instance, r); /* Print all memory blocks */
- }
- }
-
-fail:
- if (thread != NULL) {
- free(thread);
- }
- if (thr_data != NULL) {
- free(thr_data);
- }
- return rc;
-}
-
int fill_memory_blocks(argon2_instance_t *instance) {
if (instance == NULL || instance->lanes == 0) {
return ARGON2_INCORRECT_PARAMETER;
}
- return instance->threads == 1 ?
- fill_memory_blocks_st(instance) : fill_memory_blocks_mt(instance);
+ return fill_memory_blocks_st(instance);
}
int validate_inputs(const argon2_context *context) {
diff --git a/src/3rdparty/argon2/lib/impl-select.c b/src/3rdparty/argon2/lib/impl-select.c
index 84c62aec..d618010c 100644
--- a/src/3rdparty/argon2/lib/impl-select.c
+++ b/src/3rdparty/argon2/lib/impl-select.c
@@ -5,18 +5,11 @@
#include "argon2.h"
-#define log_maybe(file, ...) \
- do { \
- if (file) { \
- fprintf(file, __VA_ARGS__); \
- } \
- } while((void)0, 0)
-
-#define BENCH_SAMPLES 512
+#define BENCH_SAMPLES 1024
#define BENCH_MEM_BLOCKS 512
static argon2_impl selected_argon_impl = {
- "(default)", NULL, fill_segment_default
+ "default", NULL, fill_segment_default
};
/* the benchmark routine is not thread-safe, so we can use a global var here: */
@@ -60,32 +53,24 @@ static uint64_t benchmark_impl(const argon2_impl *impl) {
return bench;
}
-static void select_impl(FILE *out, const char *prefix)
+void argon2_select_impl()
{
argon2_impl_list impls;
unsigned int i;
const argon2_impl *best_impl = NULL;
uint64_t best_bench = UINT_MAX;
- log_maybe(out, "%sSelecting best fill_segment implementation...\n", prefix);
-
argon2_get_impl_list(&impls);
for (i = 0; i < impls.count; i++) {
const argon2_impl *impl = &impls.entries[i];
uint64_t bench;
- log_maybe(out, "%s%s: Checking availability... ", prefix, impl->name);
if (impl->check != NULL && !impl->check()) {
- log_maybe(out, "FAILED!\n");
continue;
}
- log_maybe(out, "OK!\n");
- log_maybe(out, "%s%s: Benchmarking...\n", prefix, impl->name);
bench = benchmark_impl(impl);
- log_maybe(out, "%s%s: Benchmark result: %llu\n", prefix, impl->name,
- (unsigned long long)bench);
if (bench < best_bench) {
best_bench = bench;
@@ -94,15 +79,7 @@ static void select_impl(FILE *out, const char *prefix)
}
if (best_impl != NULL) {
- log_maybe(out,
- "%sBest implementation: '%s' (bench %llu)\n", prefix,
- best_impl->name, (unsigned long long)best_bench);
-
selected_argon_impl = *best_impl;
- } else {
- log_maybe(out,
- "%sNo optimized implementation available, using default!\n",
- prefix);
}
}
@@ -111,10 +88,28 @@ void fill_segment(const argon2_instance_t *instance, argon2_position_t position)
selected_argon_impl.fill_segment(instance, position);
}
-void argon2_select_impl(FILE *out, const char *prefix)
+const char *argon2_get_impl_name()
{
- if (prefix == NULL) {
- prefix = "";
- }
- select_impl(out, prefix);
+ return selected_argon_impl.name;
+}
+
+
+int argon2_select_impl_by_name(const char *name)
+{
+ argon2_impl_list impls;
+ unsigned int i;
+
+ argon2_get_impl_list(&impls);
+
+ for (i = 0; i < impls.count; i++) {
+ const argon2_impl *impl = &impls.entries[i];
+
+ if (strcmp(impl->name, name) == 0) {
+ selected_argon_impl = *impl;
+
+ return 1;
+ }
+ }
+
+ return 0;
}
diff --git a/src/3rdparty/argon2/lib/thread.c b/src/3rdparty/argon2/lib/thread.c
deleted file mode 100644
index 412261f1..00000000
--- a/src/3rdparty/argon2/lib/thread.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "thread.h"
-#if defined(_WIN32)
-#include
-#endif
-
-int argon2_thread_create(argon2_thread_handle_t *handle,
- argon2_thread_func_t func, void *args) {
- if (NULL == handle || func == NULL) {
- return -1;
- }
-#if defined(_WIN32)
- *handle = _beginthreadex(NULL, 0, func, args, 0, NULL);
- return *handle != 0 ? 0 : -1;
-#else
- return pthread_create(handle, NULL, func, args);
-#endif
-}
-
-int argon2_thread_join(argon2_thread_handle_t handle) {
-#if defined(_WIN32)
- if (WaitForSingleObject((HANDLE)handle, INFINITE) == WAIT_OBJECT_0) {
- return CloseHandle((HANDLE)handle) != 0 ? 0 : -1;
- }
- return -1;
-#else
- return pthread_join(handle, NULL);
-#endif
-}
-
-void argon2_thread_exit(void) {
-#if defined(_WIN32)
- _endthreadex(0);
-#else
- pthread_exit(NULL);
-#endif
-}
diff --git a/src/3rdparty/argon2/lib/thread.h b/src/3rdparty/argon2/lib/thread.h
deleted file mode 100644
index f1ef5191..00000000
--- a/src/3rdparty/argon2/lib/thread.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef ARGON2_THREAD_H
-#define ARGON2_THREAD_H
-/*
- Here we implement an abstraction layer for the simpĺe requirements
- of the Argon2 code. We only require 3 primitives---thread creation,
- joining, and termination---so full emulation of the pthreads API
- is unwarranted. Currently we wrap pthreads and Win32 threads.
-
- The API defines 2 types: the function pointer type,
- argon2_thread_func_t,
- and the type of the thread handle---argon2_thread_handle_t.
-*/
-#if defined(_WIN32)
-#include
-#include
-typedef unsigned(__stdcall *argon2_thread_func_t)(void *);
-typedef uintptr_t argon2_thread_handle_t;
-#else
-#include
-typedef void *(*argon2_thread_func_t)(void *);
-typedef pthread_t argon2_thread_handle_t;
-#endif
-
-/* Creates a thread
- * @param handle pointer to a thread handle, which is the output of this
- * function. Must not be NULL.
- * @param func A function pointer for the thread's entry point. Must not be
- * NULL.
- * @param args Pointer that is passed as an argument to @func. May be NULL.
- * @return 0 if @handle and @func are valid pointers and a thread is successfuly
- * created.
- */
-int argon2_thread_create(argon2_thread_handle_t *handle,
- argon2_thread_func_t func, void *args);
-
-/* Waits for a thread to terminate
- * @param handle Handle to a thread created with argon2_thread_create.
- * @return 0 if @handle is a valid handle, and joining completed successfully.
-*/
-int argon2_thread_join(argon2_thread_handle_t handle);
-
-/* Terminate the current thread. Must be run inside a thread created by
- * argon2_thread_create.
-*/
-void argon2_thread_exit(void);
-
-#endif
diff --git a/src/3rdparty/argon2/m4/ax_check_compile_flag.m4 b/src/3rdparty/argon2/m4/ax_check_compile_flag.m4
deleted file mode 100644
index ca363971..00000000
--- a/src/3rdparty/argon2/m4/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-# Check whether the given FLAG works with the current language's compiler
-# or gives an error. (Warnings, however, are ignored)
-#
-# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-# success/failure.
-#
-# If EXTRA-FLAGS is defined, it is added to the current language's default
-# flags (e.g. CFLAGS) when the check is done. The check is thus made with
-# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
-# force the compiler to issue an error when a bad flag is given.
-#
-# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Guido U. Draheim
-# Copyright (c) 2011 Maarten Bosmans
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
- ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
- _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
- AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
- [AS_VAR_SET(CACHEVAR,[yes])],
- [AS_VAR_SET(CACHEVAR,[no])])
- _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
- [m4_default([$2], :)],
- [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/src/3rdparty/argon2/m4/ax_pthread.m4 b/src/3rdparty/argon2/m4/ax_pthread.m4
deleted file mode 100644
index 4c4051ea..00000000
--- a/src/3rdparty/argon2/m4/ax_pthread.m4
+++ /dev/null
@@ -1,485 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-# This macro figures out how to build C programs using POSIX threads. It
-# sets the PTHREAD_LIBS output variable to the threads library and linker
-# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-# flags that are needed. (The user can also force certain compiler
-# flags/libs to be tested by setting these environment variables.)
-#
-# Also sets PTHREAD_CC to any special C compiler that is needed for
-# multi-threaded programs (defaults to the value of CC otherwise). (This
-# is necessary on AIX to use the special cc_r compiler alias.)
-#
-# NOTE: You are assumed to not only compile your program with these flags,
-# but also to link with them as well. For example, you might link with
-# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-# If you are only building threaded programs, you may wish to use these
-# variables in your default LIBS, CFLAGS, and CC:
-#
-# LIBS="$PTHREAD_LIBS $LIBS"
-# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-# CC="$PTHREAD_CC"
-#
-# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-# PTHREAD_CFLAGS.
-#
-# ACTION-IF-FOUND is a list of shell commands to run if a threads library
-# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-# is not found. If ACTION-IF-FOUND is not specified, the default action
-# will define HAVE_PTHREAD.
-#
-# Please let the authors know if this macro fails on any platform, or if
-# you have any other suggestions or comments. This macro was based on work
-# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-# Alejandro Forero Cuervo to the autoconf macro repository. We are also
-# grateful for the helpful feedback of numerous users.
-#
-# Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-# Copyright (c) 2008 Steven G. Johnson
-# Copyright (c) 2011 Daniel Richard G.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
-
-#serial 23
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
- ax_pthread_save_CC="$CC"
- ax_pthread_save_CFLAGS="$CFLAGS"
- ax_pthread_save_LIBS="$LIBS"
- AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LIBS="$PTHREAD_LIBS $LIBS"
- AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
- AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
- AC_MSG_RESULT([$ax_pthread_ok])
- if test "x$ax_pthread_ok" = "xno"; then
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
- fi
- CC="$ax_pthread_save_CC"
- CFLAGS="$ax_pthread_save_CFLAGS"
- LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try. Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important. Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-# other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-# (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-# doesn't hurt to check since this sometimes defines pthreads and
-# -D_REENTRANT too), HP C (must be checked before -lpthread, which
-# is present but should not be used directly; and before -mthreads,
-# because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
- freebsd*)
-
- # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
- # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
- ax_pthread_flags="-kthread lthread $ax_pthread_flags"
- ;;
-
- hpux*)
-
- # From the cc(1) man page: "[-mt] Sets various -D flags to enable
- # multi-threading and also sets -lpthread."
-
- ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
- ;;
-
- openedition*)
-
- # IBM z/OS requires a feature-test macro to be defined in order to
- # enable POSIX threads at all, so give the user a hint if this is
- # not set. (We don't define these ourselves, as they can affect
- # other portions of the system API in unpredictable ways.)
-
- AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
- [
-# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
- AX_PTHREAD_ZOS_MISSING
-# endif
- ],
- [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
- ;;
-
- solaris*)
-
- # On Solaris (at least, for some versions), libc contains stubbed
- # (non-functional) versions of the pthreads routines, so link-based
- # tests will erroneously succeed. (N.B.: The stubs are missing
- # pthread_cleanup_push, or rather a function called by this macro,
- # so we could check for that, but who knows whether they'll stub
- # that too in a future libc.) So we'll check first for the
- # standard Solaris way of linking pthreads (-mt -lpthread).
-
- ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
- ;;
-esac
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-AS_IF([test "x$GCC" = "xyes"],
- [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
- darwin* | hpux* | linux* | osf* | solaris*)
- ax_pthread_check_macro="_REENTRANT"
- ;;
-
- aix*)
- ax_pthread_check_macro="_THREAD_SAFE"
- ;;
-
- *)
- ax_pthread_check_macro="--"
- ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
- [ax_pthread_check_cond=0],
- [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-# Are we compiling with Clang?
-
-AC_CACHE_CHECK([whether $CC is Clang],
- [ax_cv_PTHREAD_CLANG],
- [ax_cv_PTHREAD_CLANG=no
- # Note that Autoconf sets GCC=yes for Clang as well as GCC
- if test "x$GCC" = "xyes"; then
- AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
- [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-# if defined(__clang__) && defined(__llvm__)
- AX_PTHREAD_CC_IS_CLANG
-# endif
- ],
- [ax_cv_PTHREAD_CLANG=yes])
- fi
- ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-ax_pthread_clang_warning=no
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
- # Clang takes -pthread; it has never supported any other flag
-
- # (Note 1: This will need to be revisited if a system that Clang
- # supports has POSIX threads in a separate library. This tends not
- # to be the way of modern systems, but it's conceivable.)
-
- # (Note 2: On some systems, notably Darwin, -pthread is not needed
- # to get POSIX threads support; the API is always present and
- # active. We could reasonably leave PTHREAD_CFLAGS empty. But
- # -pthread does define _REENTRANT, and while the Darwin headers
- # ignore this macro, third-party headers might not.)
-
- PTHREAD_CFLAGS="-pthread"
- PTHREAD_LIBS=
-
- ax_pthread_ok=yes
-
- # However, older versions of Clang make a point of warning the user
- # that, in an invocation where only linking and no compilation is
- # taking place, the -pthread option has no effect ("argument unused
- # during compilation"). They expect -pthread to be passed in only
- # when source code is being compiled.
- #
- # Problem is, this is at odds with the way Automake and most other
- # C build frameworks function, which is that the same flags used in
- # compilation (CFLAGS) are also used in linking. Many systems
- # supported by AX_PTHREAD require exactly this for POSIX threads
- # support, and in fact it is often not straightforward to specify a
- # flag that is used only in the compilation phase and not in
- # linking. Such a scenario is extremely rare in practice.
- #
- # Even though use of the -pthread flag in linking would only print
- # a warning, this can be a nuisance for well-run software projects
- # that build with -Werror. So if the active version of Clang has
- # this misfeature, we search for an option to squash it.
-
- AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
- [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
- [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
- # Create an alternate version of $ac_link that compiles and
- # links in two steps (.c -> .o, .o -> exe) instead of one
- # (.c -> exe), because the warning occurs only in the second
- # step
- ax_pthread_save_ac_link="$ac_link"
- ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
- ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
- ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
- ax_pthread_save_CFLAGS="$CFLAGS"
- for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
- AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
- CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
- ac_link="$ax_pthread_save_ac_link"
- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
- [ac_link="$ax_pthread_2step_ac_link"
- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
- [break])
- ])
- done
- ac_link="$ax_pthread_save_ac_link"
- CFLAGS="$ax_pthread_save_CFLAGS"
- AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
- ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
- ])
-
- case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
- no | unknown) ;;
- *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
- esac
-
-fi # $ax_pthread_clang = yes
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
- case $ax_pthread_try_flag in
- none)
- AC_MSG_CHECKING([whether pthreads work without any flags])
- ;;
-
- -mt,pthread)
- AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
- PTHREAD_CFLAGS="-mt"
- PTHREAD_LIBS="-lpthread"
- ;;
-
- -*)
- AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
- PTHREAD_CFLAGS="$ax_pthread_try_flag"
- ;;
-
- pthread-config)
- AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
- AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
- PTHREAD_CFLAGS="`pthread-config --cflags`"
- PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
- ;;
-
- *)
- AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
- PTHREAD_LIBS="-l$ax_pthread_try_flag"
- ;;
- esac
-
- ax_pthread_save_CFLAGS="$CFLAGS"
- ax_pthread_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LIBS="$PTHREAD_LIBS $LIBS"
-
- # Check for various functions. We must include pthread.h,
- # since some functions may be macros. (On the Sequent, we
- # need a special flag -Kthread to make this header compile.)
- # We check for pthread_join because it is in -lpthread on IRIX
- # while pthread_create is in libc. We check for pthread_attr_init
- # due to DEC craziness with -lpthreads. We check for
- # pthread_cleanup_push because it is one of the few pthread
- # functions on Solaris that doesn't have a non-functional libc stub.
- # We try pthread_create on general principles.
-
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include
-# if $ax_pthread_check_cond
-# error "$ax_pthread_check_macro must be defined"
-# endif
- static void routine(void *a) { a = 0; }
- static void *start_routine(void *a) { return a; }],
- [pthread_t th; pthread_attr_t attr;
- pthread_create(&th, 0, start_routine, 0);
- pthread_join(th, 0);
- pthread_attr_init(&attr);
- pthread_cleanup_push(routine, 0);
- pthread_cleanup_pop(0) /* ; */])],
- [ax_pthread_ok=yes],
- [])
-
- CFLAGS="$ax_pthread_save_CFLAGS"
- LIBS="$ax_pthread_save_LIBS"
-
- AC_MSG_RESULT([$ax_pthread_ok])
- AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
- ax_pthread_save_CFLAGS="$CFLAGS"
- ax_pthread_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- LIBS="$PTHREAD_LIBS $LIBS"
-
- # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
- AC_CACHE_CHECK([for joinable pthread attribute],
- [ax_cv_PTHREAD_JOINABLE_ATTR],
- [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
- for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],
- [int attr = $ax_pthread_attr; return attr /* ; */])],
- [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
- [])
- done
- ])
- AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
- test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
- test "x$ax_pthread_joinable_attr_defined" != "xyes"],
- [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
- [$ax_cv_PTHREAD_JOINABLE_ATTR],
- [Define to necessary symbol if this constant
- uses a non-standard name on your system.])
- ax_pthread_joinable_attr_defined=yes
- ])
-
- AC_CACHE_CHECK([whether more special flags are required for pthreads],
- [ax_cv_PTHREAD_SPECIAL_FLAGS],
- [ax_cv_PTHREAD_SPECIAL_FLAGS=no
- case $host_os in
- solaris*)
- ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
- ;;
- esac
- ])
- AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
- test "x$ax_pthread_special_flags_added" != "xyes"],
- [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
- ax_pthread_special_flags_added=yes])
-
- AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
- [ax_cv_PTHREAD_PRIO_INHERIT],
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],
- [[int i = PTHREAD_PRIO_INHERIT;]])],
- [ax_cv_PTHREAD_PRIO_INHERIT=yes],
- [ax_cv_PTHREAD_PRIO_INHERIT=no])
- ])
- AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
- test "x$ax_pthread_prio_inherit_defined" != "xyes"],
- [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
- ax_pthread_prio_inherit_defined=yes
- ])
-
- CFLAGS="$ax_pthread_save_CFLAGS"
- LIBS="$ax_pthread_save_LIBS"
-
- # More AIX lossage: compile with *_r variant
- if test "x$GCC" != "xyes"; then
- case $host_os in
- aix*)
- AS_CASE(["x/$CC"],
- [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
- [#handle absolute path differently from PATH based program lookup
- AS_CASE(["x$CC"],
- [x/*],
- [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
- [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
- ;;
- esac
- fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([PTHREAD_CFLAGS])
-AC_SUBST([PTHREAD_CC])
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
- ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
- :
-else
- ax_pthread_ok=no
- $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
diff --git a/src/3rdparty/argon2/qmake/arch/arch.pro b/src/3rdparty/argon2/qmake/arch/arch.pro
deleted file mode 100644
index b1a83150..00000000
--- a/src/3rdparty/argon2/qmake/arch/arch.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += $$ARCH
diff --git a/src/3rdparty/argon2/qmake/arch/generic/generic.pro b/src/3rdparty/argon2/qmake/arch/generic/generic.pro
deleted file mode 100644
index 96710850..00000000
--- a/src/3rdparty/argon2/qmake/arch/generic/generic.pro
+++ /dev/null
@@ -1 +0,0 @@
-TEMPLATE = subdirs
diff --git a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-avx2/libargon2-avx2.pro b/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-avx2/libargon2-avx2.pro
deleted file mode 100644
index 449dc508..00000000
--- a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-avx2/libargon2-avx2.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-QT -= core gui
-
-TARGET = argon2-avx2
-TEMPLATE = lib
-CONFIG += staticlib
-
-ARGON2_ROOT = ../../../..
-
-INCLUDEPATH += \
- $$ARGON2_ROOT/include \
- $$ARGON2_ROOT/lib \
- $$ARGON2_ROOT/arch/$$ARCH/lib
-
-USE_AVX2 {
- DEFINES += HAVE_AVX2
- QMAKE_CFLAGS += -mavx2
-}
-
-SOURCES += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-avx2.c
-
-HEADERS += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-avx2.h
diff --git a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-avx512f/libargon2-avx512f.pro b/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-avx512f/libargon2-avx512f.pro
deleted file mode 100644
index a4a32e06..00000000
--- a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-avx512f/libargon2-avx512f.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-QT -= core gui
-
-TARGET = argon2-avx512f
-TEMPLATE = lib
-CONFIG += staticlib
-
-ARGON2_ROOT = ../../../..
-
-INCLUDEPATH += \
- $$ARGON2_ROOT/include \
- $$ARGON2_ROOT/lib \
- $$ARGON2_ROOT/arch/$$ARCH/lib
-
-USE_AVX512F {
- DEFINES += HAVE_AVX512F
- QMAKE_CFLAGS += -mavx512f
-}
-
-SOURCES += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-avx512f.c
-
-HEADERS += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-avx512f.h
diff --git a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-sse2/libargon2-sse2.pro b/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-sse2/libargon2-sse2.pro
deleted file mode 100644
index 49e7deee..00000000
--- a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-sse2/libargon2-sse2.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-QT -= core gui
-
-TARGET = argon2-sse2
-TEMPLATE = lib
-CONFIG += staticlib
-
-ARGON2_ROOT = ../../../..
-
-INCLUDEPATH += \
- $$ARGON2_ROOT/include \
- $$ARGON2_ROOT/lib \
- $$ARGON2_ROOT/arch/$$ARCH/lib
-
-USE_SSE2 | USE_SSSE3 | USE_XOP | USE_AVX2 {
- DEFINES += HAVE_SSE2
- QMAKE_CFLAGS += -msse2
-}
-
-SOURCES += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-sse2.c
-
-HEADERS += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-sse2.h \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-template-128.h
diff --git a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-ssse3/libargon2-ssse3.pro b/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-ssse3/libargon2-ssse3.pro
deleted file mode 100644
index 53ebe6e5..00000000
--- a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-ssse3/libargon2-ssse3.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-QT -= core gui
-
-TARGET = argon2-ssse3
-TEMPLATE = lib
-CONFIG += staticlib
-
-ARGON2_ROOT = ../../../..
-
-INCLUDEPATH += \
- $$ARGON2_ROOT/include \
- $$ARGON2_ROOT/lib \
- $$ARGON2_ROOT/arch/$$ARCH/lib
-
-USE_SSSE3 | USE_XOP | USE_AVX2 {
- DEFINES += HAVE_SSSE3
- QMAKE_CFLAGS += -mssse3
-}
-
-SOURCES += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-ssse3.c
-
-HEADERS += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-ssse3.h \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-template-128.h
diff --git a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-xop/libargon2-xop.pro b/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-xop/libargon2-xop.pro
deleted file mode 100644
index 85517dce..00000000
--- a/src/3rdparty/argon2/qmake/arch/x86_64/libargon2-xop/libargon2-xop.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-QT -= core gui
-
-TARGET = argon2-xop
-TEMPLATE = lib
-CONFIG += staticlib
-
-ARGON2_ROOT = ../../../..
-
-INCLUDEPATH += \
- $$ARGON2_ROOT/include \
- $$ARGON2_ROOT/lib \
- $$ARGON2_ROOT/arch/$$ARCH/lib
-
-USE_XOP {
- DEFINES += HAVE_XOP
- QMAKE_CFLAGS += -mxop
-}
-
-SOURCES += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-xop.c
-
-HEADERS += \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-xop.h \
- $$ARGON2_ROOT/arch/x86_64/lib/argon2-template-128.h
diff --git a/src/3rdparty/argon2/qmake/arch/x86_64/x86_64.pro b/src/3rdparty/argon2/qmake/arch/x86_64/x86_64.pro
deleted file mode 100644
index b3cfe029..00000000
--- a/src/3rdparty/argon2/qmake/arch/x86_64/x86_64.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
- libargon2-sse2 \
- libargon2-ssse3 \
- libargon2-xop \
- libargon2-avx2 \
- libargon2-avx512f
diff --git a/src/3rdparty/argon2/qmake/argon2-bench2/argon2-bench2.pro b/src/3rdparty/argon2/qmake/argon2-bench2/argon2-bench2.pro
deleted file mode 100644
index 1e858d42..00000000
--- a/src/3rdparty/argon2/qmake/argon2-bench2/argon2-bench2.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-CONFIG += console c++11
-CONFIG -= app_bundle
-CONFIG -= qt
-
-ARGON2_ROOT = ../..
-
-SOURCES += \
- $$ARGON2_ROOT/src/bench2.c
-
-HEADERS += \
- $$ARGON2_ROOT/src/timing.h
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libargon2/release/ -largon2
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libargon2/debug/ -largon2
-else:unix: LIBS += -L$$OUT_PWD/../libargon2/ -largon2
-
-INCLUDEPATH += $$PWD/../../include
-DEPENDPATH += $$PWD/../../include
diff --git a/src/3rdparty/argon2/qmake/argon2-genkat/argon2-genkat.pro b/src/3rdparty/argon2/qmake/argon2-genkat/argon2-genkat.pro
deleted file mode 100644
index c397efec..00000000
--- a/src/3rdparty/argon2/qmake/argon2-genkat/argon2-genkat.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = app
-CONFIG += console c++11
-CONFIG -= app_bundle
-CONFIG -= qt
-
-ARGON2_ROOT = ../..
-
-SOURCES += \
- $$ARGON2_ROOT/src/genkat.c
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libargon2/release/ -largon2
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libargon2/debug/ -largon2
-else:unix: LIBS += -L$$OUT_PWD/../libargon2/ -largon2
-
-INCLUDEPATH += $$PWD/../../include
-DEPENDPATH += $$PWD/../../include
diff --git a/src/3rdparty/argon2/qmake/argon2-test/argon2-test.pro b/src/3rdparty/argon2/qmake/argon2-test/argon2-test.pro
deleted file mode 100644
index e0d23c45..00000000
--- a/src/3rdparty/argon2/qmake/argon2-test/argon2-test.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = app
-CONFIG += console c++11
-CONFIG -= app_bundle
-CONFIG -= qt
-
-ARGON2_ROOT = ../..
-
-SOURCES += \
- $$ARGON2_ROOT/tests/test.c
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libargon2/release/ -largon2
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libargon2/debug/ -largon2
-else:unix: LIBS += -L$$OUT_PWD/../libargon2/ -largon2
-
-INCLUDEPATH += $$PWD/../../include
-DEPENDPATH += $$PWD/../../include
diff --git a/src/3rdparty/argon2/qmake/argon2.pro b/src/3rdparty/argon2/qmake/argon2.pro
deleted file mode 100644
index 0949d39c..00000000
--- a/src/3rdparty/argon2/qmake/argon2.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
- arch \
- libargon2 \
- argon2 \
- argon2-genkat \
- argon2-bench2 \
- argon2-test
diff --git a/src/3rdparty/argon2/qmake/argon2/argon2.pro b/src/3rdparty/argon2/qmake/argon2/argon2.pro
deleted file mode 100644
index ff8c2049..00000000
--- a/src/3rdparty/argon2/qmake/argon2/argon2.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = app
-CONFIG += console c++11
-CONFIG -= app_bundle
-CONFIG -= qt
-
-ARGON2_ROOT = ../..
-
-SOURCES += \
- $$ARGON2_ROOT/src/run.c
-
-win32: DEFINES += argon2_EXPORT
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libargon2/release/ -largon2
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libargon2/debug/ -largon2
-else:unix: LIBS += -L$$OUT_PWD/../libargon2/ -largon2
-
-INCLUDEPATH += $$PWD/../../include $$PWD/../../lib
-DEPENDPATH += $$PWD/../../include $$PWD/../../lib
diff --git a/src/3rdparty/argon2/qmake/libargon2/libargon2.pro b/src/3rdparty/argon2/qmake/libargon2/libargon2.pro
deleted file mode 100644
index 77846168..00000000
--- a/src/3rdparty/argon2/qmake/libargon2/libargon2.pro
+++ /dev/null
@@ -1,119 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-08-08T17:43:00
-#
-#-------------------------------------------------
-
-QT -= core gui
-
-TARGET = argon2
-TEMPLATE = lib
-
-ARGON2_ROOT = ../..
-
-INCLUDEPATH += \
- $$ARGON2_ROOT/include \
- $$ARGON2_ROOT/lib
-
-SOURCES += \
- $$ARGON2_ROOT/lib/argon2.c \
- $$ARGON2_ROOT/lib/core.c \
- $$ARGON2_ROOT/lib/encoding.c \
- $$ARGON2_ROOT/lib/genkat.c \
- $$ARGON2_ROOT/lib/impl-select.c \
- $$ARGON2_ROOT/lib/thread.c \
- $$ARGON2_ROOT/lib/blake2/blake2.c
-
-HEADERS += \
- $$ARGON2_ROOT/include/argon2.h \
- $$ARGON2_ROOT/lib/argon2-template-64.h \
- $$ARGON2_ROOT/lib/core.h \
- $$ARGON2_ROOT/lib/encoding.h \
- $$ARGON2_ROOT/lib/genkat.h \
- $$ARGON2_ROOT/lib/impl-select.h \
- $$ARGON2_ROOT/lib/thread.h \
- $$ARGON2_ROOT/lib/blake2/blake2.h \
- $$ARGON2_ROOT/lib/blake2/blake2-impl.h
-
-equals(ARCH, x86_64) {
- SOURCES += \
- $$ARGON2_ROOT/arch/$$ARCH/lib/cpu-flags.c \
- $$ARGON2_ROOT/arch/$$ARCH/lib/argon2-arch.c
-
- HEADERS += \
- $$ARGON2_ROOT/arch/$$ARCH/lib/cpu-flags.h
-
- # libargon2-sse2.a:
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-sse2/release/ -largon2-sse2
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-sse2/debug/ -largon2-sse2
- else:unix: LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-sse2/ -largon2-sse2
-
- DEPENDPATH += $$PWD/../arch/x86_64/libargon2-sse2
-
- win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-sse2/release/libargon2-sse2.a
- else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-sse2/debug/libargon2-sse2.a
- else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-sse2/release/argon2-sse2.lib
- else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-sse2/debug/argon2-sse2.lib
- else:unix: PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-sse2/libargon2-sse2.a
-
- # libargon2-ssse3.a:
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-ssse3/release/ -largon2-ssse3
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-ssse3/debug/ -largon2-ssse3
- else:unix: LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-ssse3/ -largon2-ssse3
-
- DEPENDPATH += $$PWD/../arch/x86_64/libargon2-ssse3
-
- win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-ssse3/release/libargon2-ssse3.a
- else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-ssse3/debug/libargon2-ssse3.a
- else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-ssse3/release/argon2-ssse3.lib
- else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-ssse3/debug/argon2-ssse3.lib
- else:unix: PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-ssse3/libargon2-ssse3.a
-
- # libargon2-xop.a:
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-xop/release/ -largon2-xop
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-xop/debug/ -largon2-xop
- else:unix: LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-xop/ -largon2-xop
-
- DEPENDPATH += $$PWD/../arch/x86_64/libargon2-xop
-
- win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-xop/release/libargon2-xop.a
- else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-xop/debug/libargon2-xop.a
- else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-xop/release/argon2-xop.lib
- else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-xop/debug/argon2-xop.lib
- else:unix: PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-xop/libargon2-xop.a
-
- # libargon2-avx2.a:
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-avx2/release/ -largon2-avx2
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-avx2/debug/ -largon2-avx2
- else:unix: LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-avx2/ -largon2-avx2
-
- DEPENDPATH += $$PWD/../arch/x86_64/libargon2-avx2
-
- win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx2/release/libargon2-avx2.a
- else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx2/debug/libargon2-avx2.a
- else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx2/release/argon2-avx2.lib
- else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx2/debug/argon2-avx2.lib
- else:unix: PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx2/libargon2-avx2.a
-
- # libargon2-avx512f.a:
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-avx512f/release/ -largon2-avx512f
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-avx512f/debug/ -largon2-avx512f
- else:unix: LIBS += -L$$OUT_PWD/../arch/x86_64/libargon2-avx512f/ -largon2-avx512f
-
- DEPENDPATH += $$PWD/../arch/x86_64/libargon2-avx512f
-
- win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx512f/release/libargon2-avx512f.a
- else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx512f/debug/libargon2-avx512f.a
- else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx512f/release/argon2-avx512f.lib
- else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx512f/debug/argon2-avx512f.lib
- else:unix: PRE_TARGETDEPS += $$OUT_PWD/../arch/x86_64/libargon2-avx512f/libargon2-avx512f.a
-}
-equals(ARCH, generic) {
- SOURCES += \
- $$ARGON2_ROOT/arch/$$ARCH/lib/argon2-arch.c
-}
-
-unix {
- target.path = /usr/lib
- INSTALLS += target
-}
diff --git a/src/3rdparty/argon2/scripts/metacentrum/start-all-benchmarks.sh b/src/3rdparty/argon2/scripts/metacentrum/start-all-benchmarks.sh
deleted file mode 100644
index 47e925c6..00000000
--- a/src/3rdparty/argon2/scripts/metacentrum/start-all-benchmarks.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-dirname="$(dirname "$0")"
-
-cd "$dirname" || exit 1
-
-./start-benchmark.sh luna
-./start-benchmark.sh lex '' '' '' '' '' backfill
-./start-benchmark.sh mandos
-./start-benchmark.sh zubat
-PBS_SERVER=wagap.cerit-sc.cz \
- ./start-benchmark.sh zapat '' '' '' '' '' default@wagap.cerit-sc.cz
diff --git a/src/3rdparty/argon2/scripts/metacentrum/start-benchmark.sh b/src/3rdparty/argon2/scripts/metacentrum/start-benchmark.sh
deleted file mode 100644
index beedf748..00000000
--- a/src/3rdparty/argon2/scripts/metacentrum/start-benchmark.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-
-machine="$1"
-max_t_cost="$2"
-max_m_cost="$3"
-max_lanes="$4"
-branch="$5"
-duration="$6"
-queue="$7"
-run_tests="$8"
-
-if [ -z "$machine" ]; then
- echo "ERROR: Machine must be specified!" 1>&2
- exit 1
-fi
-
-if [ -z "$max_t_cost" ]; then
- max_t_cost=16
-fi
-
-if [ -z "$max_m_cost" ]; then
- max_m_cost=$((8 * 1024 * 1024))
-fi
-
-if [ -z "$max_lanes" ]; then
- max_lanes=16
-fi
-
-if [ -z "$branch" ]; then
- branch='master'
-fi
-
-if [ -z "$duration" ]; then
- duration=2h
-fi
-
-REPO_URL='https://github.com/WOnder93/argon2.git'
-
-dest_dir="$(pwd)"
-
-task_file="$(mktemp)"
-
-cat >$task_file <"$dest_dir/\$PBS_JOBID/benchmark-$machine-$branch.csv"
-EOF
-
-qsub "$task_file"
-
-rm -f "$task_file"
diff --git a/src/3rdparty/argon2/scripts/run-benchmark.sh b/src/3rdparty/argon2/scripts/run-benchmark.sh
deleted file mode 100644
index f023b8e8..00000000
--- a/src/3rdparty/argon2/scripts/run-benchmark.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-max_t_cost="$1"
-max_m_cost="$2"
-max_lanes="$3"
-
-if [ -z "$max_t_cost" ]; then
- echo "ERROR: Maximum time cost must be specified!" 1>&2
- exit 1
-fi
-
-if [ -z "$max_m_cost" ]; then
- echo "ERROR: Maximum memory cost must be specified!" 1>&2
- exit 1
-fi
-
-if [ -z "$max_lanes" ]; then
- echo "ERROR: Maximum number of lanes must be specified!" 1>&2
- exit 1
-fi
-
-dirname="$(dirname "$0")"
-
-cd "$dirname/.." || exit 1
-
-echo "t_cost,m_cost,lanes,ms_i,ms_d,ms_id"
-stdbuf -oL ./argon2-bench2 $max_t_cost $max_m_cost $max_lanes |
-stdbuf -oL tail -n +2 |
-while read line; do
- print_comma=0
- for x in $line; do
- if [ $print_comma -eq 1 ]; then
- echo -n ","
- else
- print_comma=1
- fi
- echo -n "$x"
- done
- echo
-done
diff --git a/src/3rdparty/argon2/src/bench2.c b/src/3rdparty/argon2/src/bench2.c
deleted file mode 100644
index 0d7d7fca..00000000
--- a/src/3rdparty/argon2/src/bench2.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include
-#include
-#include
-#include
-#include
-
-#include "argon2.h"
-
-#include "timing.h"
-
-#define ARGON2_BLOCK_SIZE 1024
-
-#define BENCH_MAX_T_COST 16
-#define BENCH_MAX_M_COST (1024 * 1024)
-#define BENCH_MAX_THREADS 8
-#define BENCH_MIN_PASSES (1024 * 1024)
-#define BENCH_MAX_SAMPLES 128
-
-#define BENCH_OUTLEN 16
-#define BENCH_INLEN 16
-
-static double pick_min(const double *samples, size_t count)
-{
- size_t i;
- double min = INFINITY;
- for (i = 0; i < count; i++) {
- if (samples[i] < min) {
- min = samples[i];
- }
- }
- return min;
-}
-
-static int benchmark(void *memory, size_t memory_size,
- uint32_t t_cost, uint32_t m_cost, uint32_t p)
-{
- static const unsigned char PASSWORD[BENCH_OUTLEN] = { 0 };
- static const unsigned char SALT[BENCH_INLEN] = { 1 };
-
- unsigned char out[BENCH_OUTLEN];
- struct timestamp start, end;
- double ms_d[BENCH_MAX_SAMPLES];
- double ms_i[BENCH_MAX_SAMPLES];
- double ms_id[BENCH_MAX_SAMPLES];
-
- double ms_d_final, ms_i_final, ms_id_final;
- unsigned int i, bench_samples;
- argon2_context ctx;
-
- int res;
-
- ctx.out = out;
- ctx.outlen = sizeof(out);
- ctx.pwd = (uint8_t *)PASSWORD;
- ctx.pwdlen = sizeof(PASSWORD);
- ctx.salt = (uint8_t *)SALT;
- ctx.saltlen = sizeof(SALT);
- ctx.secret = NULL;
- ctx.secretlen = 0;
- ctx.ad = NULL;
- ctx.adlen = 0;
- ctx.t_cost = t_cost;
- ctx.m_cost = m_cost;
- ctx.lanes = ctx.threads = p;
- ctx.version = ARGON2_VERSION_NUMBER;
- ctx.allocate_cbk = NULL;
- ctx.free_cbk = NULL;
- ctx.flags = ARGON2_DEFAULT_FLAGS;
-
- bench_samples = (BENCH_MIN_PASSES * p) / (t_cost * m_cost);
- bench_samples += (BENCH_MIN_PASSES * p) % (t_cost * m_cost) != 0;
-
- if (bench_samples > BENCH_MAX_SAMPLES) {
- bench_samples = BENCH_MAX_SAMPLES;
- }
- for (i = 0; i < bench_samples; i++) {
- timestamp_store(&start);
- res = argon2_ctx_mem(&ctx, Argon2_d, memory, memory_size);
- timestamp_store(&end);
- if (res != ARGON2_OK) {
- return res;
- }
-
- ms_d[i] = timestamp_span_ms(&start, &end);
- }
-
- for (i = 0; i < bench_samples; i++) {
- timestamp_store(&start);
- res = argon2_ctx_mem(&ctx, Argon2_i, memory, memory_size);
- timestamp_store(&end);
- if (res != ARGON2_OK) {
- return res;
- }
-
- ms_i[i] = timestamp_span_ms(&start, &end);
- }
-
- for (i = 0; i < bench_samples; i++) {
- timestamp_store(&start);
- res = argon2_ctx_mem(&ctx, Argon2_id, memory, memory_size);
- timestamp_store(&end);
- if (res != ARGON2_OK) {
- return res;
- }
-
- ms_id[i] = timestamp_span_ms(&start, &end);
- }
-
- ms_d_final = pick_min(ms_d, bench_samples);
- ms_i_final = pick_min(ms_i, bench_samples);
- ms_id_final = pick_min(ms_id, bench_samples);
-
- printf("%8lu%16lu%8lu%16.6lf%16.6lf%16.6lf\n",
- (unsigned long)t_cost, (unsigned long)m_cost, (unsigned long)p,
- ms_d_final, ms_i_final, ms_id_final);
- return 0;
-}
-
-int main(int argc, const char * const *argv)
-{
- uint32_t max_t_cost = BENCH_MAX_T_COST;
- uint32_t max_m_cost = BENCH_MAX_M_COST;
- uint32_t max_p = BENCH_MAX_THREADS;
- uint32_t t_cost, m_cost, p;
- char *end;
- int res;
-
- if (argc >= 2) {
- max_t_cost = strtoul(argv[1], &end, 10);
- if (end == argv[1]) {
- fprintf(stderr, "ERROR: Invalid number format!\n");
- return 1;
- }
- }
-
- if (argc >= 3) {
- max_m_cost = strtoul(argv[2], &end, 10);
- if (end == argv[2]) {
- fprintf(stderr, "ERROR: Invalid number format!\n");
- return 1;
- }
- }
-
- if (argc >= 4) {
- max_p = strtoul(argv[3], &end, 10);
- if (end == argv[3]) {
- fprintf(stderr, "ERROR: Invalid number format!\n");
- return 1;
- }
- }
-
- argon2_select_impl(stderr, "[libargon2] ");
-
- size_t memory_size = (size_t)max_m_cost * (size_t)ARGON2_BLOCK_SIZE;
- void *memory = malloc(memory_size);
- if (memory == NULL) {
- fprintf(stderr, "ERROR: Memory allocation failed!\n");
- return 1;
- }
- /* make sure the whole memory gets mapped to physical pages: */
- memset(memory, 0xAB, memory_size);
-
- printf("%8s%16s%8s%16s%16s%16s\n", "t_cost", "m_cost", "threads",
- "Argon2d (ms)", "Argon2i (ms)", "Argon2id (ms)");
- for (t_cost = 1; t_cost <= max_t_cost; t_cost *= 2) {
- uint32_t min_m_cost = max_p * ARGON2_SYNC_POINTS * 2;
- for (m_cost = min_m_cost; m_cost <= max_m_cost; m_cost *= 2) {
- for (p = 1; p <= max_p; p *= 2) {
- res = benchmark(memory, memory_size, t_cost, m_cost, p);
- if (res != 0) {
- free(memory);
- return res;
- }
- }
- }
- }
- free(memory);
- return 0;
-}
diff --git a/src/3rdparty/argon2/src/genkat.c b/src/3rdparty/argon2/src/genkat.c
deleted file mode 100644
index 7295c985..00000000
--- a/src/3rdparty/argon2/src/genkat.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include
-#include
-#include
-
-#include "argon2.h"
-
-static void fatal(const char *error) {
- fprintf(stderr, "Error: %s\n", error);
- exit(1);
-}
-
-static void generate_testvectors(argon2_type type, const uint32_t version) {
-#define TEST_OUTLEN 32
-#define TEST_PWDLEN 32
-#define TEST_SALTLEN 16
-#define TEST_SECRETLEN 8
-#define TEST_ADLEN 12
- argon2_context context;
-
- unsigned char out[TEST_OUTLEN];
- unsigned char pwd[TEST_PWDLEN];
- unsigned char salt[TEST_SALTLEN];
- unsigned char secret[TEST_SECRETLEN];
- unsigned char ad[TEST_ADLEN];
- const allocate_fptr myown_allocator = NULL;
- const deallocate_fptr myown_deallocator = NULL;
-
- unsigned t_cost = 3;
- unsigned m_cost = 32;
- unsigned lanes = 4;
-
- memset(pwd, 1, TEST_OUTLEN);
- memset(salt, 2, TEST_SALTLEN);
- memset(secret, 3, TEST_SECRETLEN);
- memset(ad, 4, TEST_ADLEN);
-
- context.out = out;
- context.outlen = TEST_OUTLEN;
- context.version = version;
- context.pwd = pwd;
- context.pwdlen = TEST_PWDLEN;
- context.salt = salt;
- context.saltlen = TEST_SALTLEN;
- context.secret = secret;
- context.secretlen = TEST_SECRETLEN;
- context.ad = ad;
- context.adlen = TEST_ADLEN;
- context.t_cost = t_cost;
- context.m_cost = m_cost;
- context.lanes = lanes;
- context.threads = lanes;
- context.allocate_cbk = myown_allocator;
- context.free_cbk = myown_deallocator;
- context.flags = ARGON2_DEFAULT_FLAGS | ARGON2_FLAG_GENKAT;
-
-#undef TEST_OUTLEN
-#undef TEST_PWDLEN
-#undef TEST_SALTLEN
-#undef TEST_SECRETLEN
-#undef TEST_ADLEN
-
- argon2_ctx(&context, type);
-}
-
-int main(int argc, char *argv[]) {
- /* Get and check Argon2 type */
- const char *type_str = (argc > 1) ? argv[1] : "i";
- argon2_type type = Argon2_i;
- uint32_t version = ARGON2_VERSION_NUMBER;
- if (!strcmp(type_str, "d")) {
- type = Argon2_d;
- } else if (!strcmp(type_str, "i")) {
- type = Argon2_i;
- } else if (!strcmp(type_str, "id")) {
- type = Argon2_id;
- } else {
- fatal("wrong Argon2 type");
- }
-
- /* Get and check Argon2 version number */
- if(argc > 2) {
- version = strtoul(argv[2], NULL, 10);
- }
- if (ARGON2_VERSION_10 != version && ARGON2_VERSION_NUMBER != version) {
- fatal("wrong Argon2 version number");
- }
-
- generate_testvectors(type, version);
- return ARGON2_OK;
-}
diff --git a/src/3rdparty/argon2/src/run.c b/src/3rdparty/argon2/src/run.c
deleted file mode 100644
index 9588a632..00000000
--- a/src/3rdparty/argon2/src/run.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Argon2 source code package
- *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
- *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
- *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * .
- */
-
-#define _GNU_SOURCE 1
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "argon2.h"
-#include "core.h"
-
-#define T_COST_DEF 3
-#define LOG_M_COST_DEF 12 /* 2^12 = 4 MiB */
-#define LANES_DEF 1
-#define THREADS_DEF 1
-#define OUTLEN_DEF 32
-#define MAX_PASS_LEN 128
-
-#define UNUSED_PARAMETER(x) (void)(x)
-
-static void usage(const char *cmd) {
- printf("Usage: %s [-h] salt [-i|-d|-id] [-t iterations] [-m memory] "
- "[-p parallelism] [-l hash length] [-e|-r] [-v (10|13)]\n",
- cmd);
- printf("\tPassword is read from stdin\n");
- printf("Parameters:\n");
- printf("\tsalt\t\tThe salt to use, at least 8 characters\n");
- printf("\t-i\t\tUse Argon2i (this is the default)\n");
- printf("\t-d\t\tUse Argon2d instead of Argon2i\n");
- printf("\t-id\t\tUse Argon2id instead of Argon2i\n");
- printf("\t-t N\t\tSets the number of iterations to N (default = %d)\n",
- T_COST_DEF);
- printf("\t-m N\t\tSets the memory usage of 2^N KiB (default %d)\n",
- LOG_M_COST_DEF);
- printf("\t-p N\t\tSets parallelism to N threads (default %d)\n",
- THREADS_DEF);
- printf("\t-l N\t\tSets hash output length to N bytes (default %d)\n",
- OUTLEN_DEF);
- printf("\t-e\t\tOutput only encoded hash\n");
- printf("\t-r\t\tOutput only the raw bytes of the hash\n");
- printf("\t-v (10|13)\tArgon2 version (defaults to the most recent version, "
- "currently %x)\n", ARGON2_VERSION_NUMBER);
- printf("\t-h\t\tPrint %s usage\n", cmd);
-}
-
-static void fatal(const char *error) {
- fprintf(stderr, "Error: %s\n", error);
- exit(1);
-}
-
-static void print_hex(uint8_t *bytes, size_t bytes_len) {
- size_t i;
- for (i = 0; i < bytes_len; ++i) {
- printf("%02x", bytes[i]);
- }
- printf("\n");
-}
-
-/*
-Runs Argon2 with certain inputs and parameters, inputs not cleared. Prints the
-Base64-encoded hash string
-@out output array with at least 32 bytes allocated
-@pwd NULL-terminated string, presumably from argv[]
-@salt salt array
-@t_cost number of iterations
-@m_cost amount of requested memory in KB
-@lanes amount of requested parallelism
-@threads actual parallelism
-@type Argon2 type we want to run
-@encoded_only display only the encoded hash
-@raw_only display only the hexadecimal of the hash
-@version Argon2 version
-*/
-static void run(uint32_t outlen, char *pwd, char *salt, uint32_t t_cost,
- uint32_t m_cost, uint32_t lanes, uint32_t threads,
- argon2_type type, int encoded_only, int raw_only,
- uint32_t version) {
- clock_t start_time, stop_time;
- size_t pwdlen, saltlen, encodedlen;
- int result;
- unsigned char * out = NULL;
- char * encoded = NULL;
-
- start_time = clock();
-
- if (!pwd) {
- fatal("password missing");
- }
-
- if (!salt) {
- clear_internal_memory(pwd, strlen(pwd));
- fatal("salt missing");
- }
-
- pwdlen = strlen(pwd);
- saltlen = strlen(salt);
- if(UINT32_MAX < saltlen) {
- fatal("salt is too long");
- }
-
- UNUSED_PARAMETER(lanes);
-
- out = malloc(outlen + 1);
- if (!out) {
- clear_internal_memory(pwd, strlen(pwd));
- fatal("could not allocate memory for output");
- }
-
- encodedlen = argon2_encodedlen(t_cost, m_cost, lanes, (uint32_t)saltlen, outlen, type);
- encoded = malloc(encodedlen + 1);
- if (!encoded) {
- clear_internal_memory(pwd, strlen(pwd));
- fatal("could not allocate memory for hash");
- }
-
- result = argon2_hash(t_cost, m_cost, threads, pwd, pwdlen, salt, saltlen,
- out, outlen, encoded, encodedlen, type, version);
- if (result != ARGON2_OK)
- fatal(argon2_error_message(result));
-
- stop_time = clock();
-
- if (encoded_only)
- puts(encoded);
-
- if (raw_only)
- print_hex(out, outlen);
-
- if (encoded_only || raw_only) {
- free(out);
- free(encoded);
- return;
- }
-
- printf("Hash:\t\t");
- print_hex(out, outlen);
- free(out);
-
- printf("Encoded:\t%s\n", encoded);
-
- printf("%2.3f seconds\n",
- ((double)stop_time - start_time) / (CLOCKS_PER_SEC));
-
- result = argon2_verify(encoded, pwd, pwdlen, type);
- if (result != ARGON2_OK)
- fatal(argon2_error_message(result));
- printf("Verification ok\n");
- free(encoded);
-}
-
-int main(int argc, char *argv[]) {
- uint32_t outlen = OUTLEN_DEF;
- uint32_t m_cost = 1 << LOG_M_COST_DEF;
- uint32_t t_cost = T_COST_DEF;
- uint32_t lanes = LANES_DEF;
- uint32_t threads = THREADS_DEF;
- argon2_type type = Argon2_i; /* Argon2i is the default type */
- int types_specified = 0;
- int encoded_only = 0;
- int raw_only = 0;
- uint32_t version = ARGON2_VERSION_NUMBER;
- int i;
- size_t n;
- char pwd[MAX_PASS_LEN], *salt;
-
- if (argc < 2) {
- usage(argv[0]);
- return ARGON2_MISSING_ARGS;
- } else if (argc >= 2 && strcmp(argv[1], "-h") == 0) {
- usage(argv[0]);
- return 1;
- }
-
- argon2_select_impl(stderr, "[libargon2] ");
-
- /* get password from stdin */
- n = fread(pwd, 1, sizeof pwd - 1, stdin);
- if(n < 1) {
- fatal("no password read");
- }
- if(n == MAX_PASS_LEN-1) {
- fatal("Provided password longer than supported in command line utility");
- }
-
- pwd[n] = '\0';
- if (pwd[n - 1] == '\n') {
- pwd[n - 1] = '\0';
- }
-
- salt = argv[1];
-
- /* parse options */
- for (i = 2; i < argc; i++) {
- const char *a = argv[i];
- unsigned long input = 0;
- if (!strcmp(a, "-h")) {
- usage(argv[0]);
- return 1;
- } else if (!strcmp(a, "-m")) {
- if (i < argc - 1) {
- i++;
- input = strtoul(argv[i], NULL, 10);
- if (input == 0 || input == ULONG_MAX ||
- input > ARGON2_MAX_MEMORY_BITS) {
- fatal("bad numeric input for -m");
- }
- m_cost = ARGON2_MIN(UINT64_C(1) << input, UINT32_C(0xFFFFFFFF));
- if (m_cost > ARGON2_MAX_MEMORY) {
- fatal("m_cost overflow");
- }
- continue;
- } else {
- fatal("missing -m argument");
- }
- } else if (!strcmp(a, "-t")) {
- if (i < argc - 1) {
- i++;
- input = strtoul(argv[i], NULL, 10);
- if (input == 0 || input == ULONG_MAX ||
- input > ARGON2_MAX_TIME) {
- fatal("bad numeric input for -t");
- }
- t_cost = input;
- continue;
- } else {
- fatal("missing -t argument");
- }
- } else if (!strcmp(a, "-p")) {
- if (i < argc - 1) {
- i++;
- input = strtoul(argv[i], NULL, 10);
- if (input == 0 || input == ULONG_MAX ||
- input > ARGON2_MAX_THREADS || input > ARGON2_MAX_LANES) {
- fatal("bad numeric input for -p");
- }
- threads = input;
- lanes = threads;
- continue;
- } else {
- fatal("missing -p argument");
- }
- } else if (!strcmp(a, "-l")) {
- if (i < argc - 1) {
- i++;
- input = strtoul(argv[i], NULL, 10);
- outlen = input;
- continue;
- } else {
- fatal("missing -l argument");
- }
- } else if (!strcmp(a, "-i")) {
- type = Argon2_i;
- ++types_specified;
- } else if (!strcmp(a, "-d")) {
- type = Argon2_d;
- ++types_specified;
- } else if (!strcmp(a, "-id")) {
- type = Argon2_id;
- ++types_specified;
- } else if (!strcmp(a, "-e")) {
- encoded_only = 1;
- } else if (!strcmp(a, "-r")) {
- raw_only = 1;
- } else if (!strcmp(a, "-v")) {
- if (i < argc - 1) {
- i++;
- if (!strcmp(argv[i], "10")) {
- version = ARGON2_VERSION_10;
- } else if (!strcmp(argv[i], "13")) {
- version = ARGON2_VERSION_13;
- } else {
- fatal("invalid Argon2 version");
- }
- } else {
- fatal("missing -v argument");
- }
- } else {
- fatal("unknown argument");
- }
- }
-
- if (types_specified > 1) {
- fatal("cannot specify multiple Argon2 types");
- }
-
- if(encoded_only && raw_only)
- fatal("cannot provide both -e and -r");
-
- if(!encoded_only && !raw_only) {
- printf("Type:\t\t%s\n", argon2_type2string(type, 1));
- printf("Iterations:\t%" PRIu32 " \n", t_cost);
- printf("Memory:\t\t%" PRIu32 " KiB\n", m_cost);
- printf("Parallelism:\t%" PRIu32 " \n", lanes);
- }
-
- run(outlen, pwd, salt, t_cost, m_cost, lanes, threads, type,
- encoded_only, raw_only, version);
-
- return ARGON2_OK;
-}
-
diff --git a/src/3rdparty/argon2/src/timing.h b/src/3rdparty/argon2/src/timing.h
deleted file mode 100644
index 0e39a1f3..00000000
--- a/src/3rdparty/argon2/src/timing.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#include
-
-#ifdef _POSIX_SOURCE
-#include
-
-struct timestamp {
- struct timespec time;
-};
-
-static inline void timestamp_store(struct timestamp *out)
-{
- clock_gettime(CLOCK_MONOTONIC, &out->time);
-}
-
-static inline double timestamp_span_ms(const struct timestamp *start,
- const struct timestamp *end)
-{
- double res = 0.0;
- res += (end->time.tv_sec - start->time.tv_sec) * 1000.0;
- res += (end->time.tv_nsec - start->time.tv_nsec) / 1000000.0;
- return res;
-}
-#else
-#include
-
-struct timestamp {
- clock_t time;
-};
-
-static inline void timestamp_store(struct timestamp *out)
-{
- out->time = clock();
-}
-
-static inline double timestamp_span_ms(const struct timestamp *start,
- const struct timestamp *end)
-{
- double res = (end->time - start->time) * 1000;
- return res / CLOCKS_PER_SEC;
-}
-#endif
diff --git a/src/3rdparty/argon2/tests/test.c b/src/3rdparty/argon2/tests/test.c
deleted file mode 100644
index 1fe9f0e2..00000000
--- a/src/3rdparty/argon2/tests/test.c
+++ /dev/null
@@ -1,239 +0,0 @@
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "argon2.h"
-
-#define OUT_LEN 32
-#define ENCODED_LEN 108
-
-/* Test harness will assert:
- * argon2_hash() returns ARGON2_OK
- * HEX output matches expected
- * encoded output matches expected
- * argon2_verify() correctly verifies value
- */
-
-void hashtest(uint32_t version, uint32_t t, uint32_t m, uint32_t p, char *pwd,
- char *salt, char *hexref, char *mcfref) {
- unsigned char out[OUT_LEN];
- unsigned char hex_out[OUT_LEN * 2 + 4];
- char encoded[ENCODED_LEN];
- int ret, i;
-
- printf("Hash test: $v=%d t=%d, m=%d, p=%d, pass=%s, salt=%s: ", version,
- t, m, p, pwd, salt);
-
- ret = argon2_hash(t, 1 << m, p, pwd, strlen(pwd), salt, strlen(salt), out,
- OUT_LEN, encoded, ENCODED_LEN, Argon2_i, version);
- assert(ret == ARGON2_OK);
-
- for (i = 0; i < OUT_LEN; ++i)
- sprintf((char *)(hex_out + i * 2), "%02x", out[i]);
-
- assert(memcmp(hex_out, hexref, OUT_LEN * 2) == 0);
-
- if (ARGON2_VERSION_NUMBER == version) {
- assert(memcmp(encoded, mcfref, strlen(mcfref)) == 0);
- }
-
- ret = argon2_verify(encoded, pwd, strlen(pwd), Argon2_i);
- assert(ret == ARGON2_OK);
- ret = argon2_verify(mcfref, pwd, strlen(pwd), Argon2_i);
- assert(ret == ARGON2_OK);
-
- printf("PASS\n");
-}
-
-int main() {
- int ret;
- unsigned char out[OUT_LEN];
- char const *msg;
- int version;
-
- argon2_select_impl(stderr, "[libargon2] ");
-
- version = ARGON2_VERSION_10;
- printf("Test Argon2i version number: %02x\n", version);
-
- /* Multiple test cases for various input values */
- hashtest(version, 2, 16, 1, "password", "somesalt",
- "f6c4db4a54e2a370627aff3db6176b94a2a209a62c8e36152711802f7b30c694",
- "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ");
-#ifdef TEST_LARGE_RAM
- hashtest(version, 2, 20, 1, "password", "somesalt",
- "9690ec55d28d3ed32562f2e73ea62b02b018757643a2ae6e79528459de8106e9",
- "$argon2i$m=1048576,t=2,p=1$c29tZXNhbHQ"
- "$lpDsVdKNPtMlYvLnPqYrArAYdXZDoq5ueVKEWd6BBuk");
-#endif
- hashtest(version, 2, 18, 1, "password", "somesalt",
- "3e689aaa3d28a77cf2bc72a51ac53166761751182f1ee292e3f677a7da4c2467",
- "$argon2i$m=262144,t=2,p=1$c29tZXNhbHQ"
- "$Pmiaqj0op3zyvHKlGsUxZnYXURgvHuKS4/Z3p9pMJGc");
- hashtest(version, 2, 8, 1, "password", "somesalt",
- "fd4dd83d762c49bdeaf57c47bdcd0c2f1babf863fdeb490df63ede9975fccf06",
- "$argon2i$m=256,t=2,p=1$c29tZXNhbHQ"
- "$/U3YPXYsSb3q9XxHvc0MLxur+GP960kN9j7emXX8zwY");
- hashtest(version, 2, 8, 2, "password", "somesalt",
- "b6c11560a6a9d61eac706b79a2f97d68b4463aa3ad87e00c07e2b01e90c564fb",
- "$argon2i$m=256,t=2,p=2$c29tZXNhbHQ"
- "$tsEVYKap1h6scGt5ovl9aLRGOqOth+AMB+KwHpDFZPs");
- hashtest(version, 1, 16, 1, "password", "somesalt",
- "81630552b8f3b1f48cdb1992c4c678643d490b2b5eb4ff6c4b3438b5621724b2",
- "$argon2i$m=65536,t=1,p=1$c29tZXNhbHQ"
- "$gWMFUrjzsfSM2xmSxMZ4ZD1JCytetP9sSzQ4tWIXJLI");
- hashtest(version, 4, 16, 1, "password", "somesalt",
- "f212f01615e6eb5d74734dc3ef40ade2d51d052468d8c69440a3a1f2c1c2847b",
- "$argon2i$m=65536,t=4,p=1$c29tZXNhbHQ"
- "$8hLwFhXm6110c03D70Ct4tUdBSRo2MaUQKOh8sHChHs");
- hashtest(version, 2, 16, 1, "differentpassword", "somesalt",
- "e9c902074b6754531a3a0be519e5baf404b30ce69b3f01ac3bf21229960109a3",
- "$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$6ckCB0tnVFMaOgvlGeW69ASzDOabPwGsO/ISKZYBCaM");
- hashtest(version, 2, 16, 1, "password", "diffsalt",
- "79a103b90fe8aef8570cb31fc8b22259778916f8336b7bdac3892569d4f1c497",
- "$argon2i$m=65536,t=2,p=1$ZGlmZnNhbHQ"
- "$eaEDuQ/orvhXDLMfyLIiWXeJFvgza3vaw4kladTxxJc");
-
- /* Error state tests */
-
- /* Handle an invalid encoding correctly (it is missing a $) */
- ret = argon2_verify("$argon2i$m=65536,t=2,p=1c29tZXNhbHQ"
- "$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_DECODING_FAIL);
- printf("Recognise an invalid encoding: PASS\n");
-
- /* Handle an invalid encoding correctly (it is missing a $) */
- ret = argon2_verify("$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
- "9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_DECODING_FAIL);
- printf("Recognise an invalid encoding: PASS\n");
-
- /* Handle an invalid encoding correctly (salt is too short) */
- ret = argon2_verify("$argon2i$m=65536,t=2,p=1$"
- "$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_SALT_TOO_SHORT);
- printf("Recognise an invalid salt in encoding: PASS\n");
-
- /* Handle an mismatching hash (the encoded password is "passwore") */
- ret = argon2_verify("$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$b2G3seW+uPzerwQQC+/E1K50CLLO7YXy0JRcaTuswRo",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_VERIFY_MISMATCH);
- printf("Verify with mismatched password: PASS\n");
-
- msg = argon2_error_message(ARGON2_DECODING_FAIL);
- assert(strcmp(msg, "Decoding failed") == 0);
- printf("Decode an error message: PASS\n");
-
- printf("\n");
-
- version = ARGON2_VERSION_NUMBER;
- printf("Test Argon2i version number: %02x\n", version);
-
- /* Multiple test cases for various input values */
- hashtest(version, 2, 16, 1, "password", "somesalt",
- "c1628832147d9720c5bd1cfd61367078729f6dfb6f8fea9ff98158e0d7816ed0",
- "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA");
-#ifdef TEST_LARGE_RAM
- hashtest(version, 2, 20, 1, "password", "somesalt",
- "d1587aca0922c3b5d6a83edab31bee3c4ebaef342ed6127a55d19b2351ad1f41",
- "$argon2i$v=19$m=1048576,t=2,p=1$c29tZXNhbHQ"
- "$0Vh6ygkiw7XWqD7asxvuPE667zQu1hJ6VdGbI1GtH0E");
-#endif
- hashtest(version, 2, 18, 1, "password", "somesalt",
- "296dbae80b807cdceaad44ae741b506f14db0959267b183b118f9b24229bc7cb",
- "$argon2i$v=19$m=262144,t=2,p=1$c29tZXNhbHQ"
- "$KW266AuAfNzqrUSudBtQbxTbCVkmexg7EY+bJCKbx8s");
- hashtest(version, 2, 8, 1, "password", "somesalt",
- "89e9029f4637b295beb027056a7336c414fadd43f6b208645281cb214a56452f",
- "$argon2i$v=19$m=256,t=2,p=1$c29tZXNhbHQ"
- "$iekCn0Y3spW+sCcFanM2xBT63UP2sghkUoHLIUpWRS8");
- hashtest(version, 2, 8, 2, "password", "somesalt",
- "4ff5ce2769a1d7f4c8a491df09d41a9fbe90e5eb02155a13e4c01e20cd4eab61",
- "$argon2i$v=19$m=256,t=2,p=2$c29tZXNhbHQ"
- "$T/XOJ2mh1/TIpJHfCdQan76Q5esCFVoT5MAeIM1Oq2E");
- hashtest(version, 1, 16, 1, "password", "somesalt",
- "d168075c4d985e13ebeae560cf8b94c3b5d8a16c51916b6f4ac2da3ac11bbecf",
- "$argon2i$v=19$m=65536,t=1,p=1$c29tZXNhbHQ"
- "$0WgHXE2YXhPr6uVgz4uUw7XYoWxRkWtvSsLaOsEbvs8");
- hashtest(version, 4, 16, 1, "password", "somesalt",
- "aaa953d58af3706ce3df1aefd4a64a84e31d7f54175231f1285259f88174ce5b",
- "$argon2i$v=19$m=65536,t=4,p=1$c29tZXNhbHQ"
- "$qqlT1YrzcGzj3xrv1KZKhOMdf1QXUjHxKFJZ+IF0zls");
- hashtest(version, 2, 16, 1, "differentpassword", "somesalt",
- "14ae8da01afea8700c2358dcef7c5358d9021282bd88663a4562f59fb74d22ee",
- "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$FK6NoBr+qHAMI1jc73xTWNkCEoK9iGY6RWL1n7dNIu4");
- hashtest(version, 2, 16, 1, "password", "diffsalt",
- "b0357cccfbef91f3860b0dba447b2348cbefecadaf990abfe9cc40726c521271",
- "$argon2i$v=19$m=65536,t=2,p=1$ZGlmZnNhbHQ"
- "$sDV8zPvvkfOGCw26RHsjSMvv7K2vmQq/6cxAcmxSEnE");
-
- /* Error state tests */
-
- /* Handle an invalid encoding correctly (it is missing a $) */
- ret = argon2_verify("$argon2i$v=19$m=65536,t=2,p=1c29tZXNhbHQ"
- "$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_DECODING_FAIL);
- printf("Recognise an invalid encoding: PASS\n");
-
- /* Handle an invalid encoding correctly (it is missing a $) */
- ret = argon2_verify("$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
- "wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_DECODING_FAIL);
- printf("Recognise an invalid encoding: PASS\n");
-
- /* Handle an invalid encoding correctly (salt is too short) */
- ret = argon2_verify("$argon2i$v=19$m=65536,t=2,p=1$"
- "$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_SALT_TOO_SHORT);
- printf("Recognise an invalid salt in encoding: PASS\n");
-
- /* Handle an mismatching hash (the encoded password is "passwore") */
- ret = argon2_verify("$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$8iIuixkI73Js3G1uMbezQXD0b8LG4SXGsOwoQkdAQIM",
- "password", strlen("password"), Argon2_i);
- assert(ret == ARGON2_VERIFY_MISMATCH);
- printf("Verify with mismatched password: PASS\n");
-
- msg = argon2_error_message(ARGON2_DECODING_FAIL);
- assert(strcmp(msg, "Decoding failed") == 0);
- printf("Decode an error message: PASS\n");
-
- /* Common error state tests */
-
- printf("\n");
- printf("Common error state tests\n");
-
- ret = argon2_hash(2, 1, 1, "password", strlen("password"),
- "diffsalt", strlen("diffsalt"),
- out, OUT_LEN, NULL, 0, Argon2_i, version);
- assert(ret == ARGON2_MEMORY_TOO_LITTLE);
- printf("Fail on invalid memory: PASS\n");
-
- ret = argon2_hash(2, 1 << 12, 1, NULL, strlen("password"),
- "diffsalt", strlen("diffsalt"),
- out, OUT_LEN, NULL, 0, Argon2_i, version);
- assert(ret == ARGON2_PWD_PTR_MISMATCH);
- printf("Fail on invalid null pointer: PASS\n");
-
- ret = argon2_hash(2, 1 << 12, 1, "password", strlen("password"), "s", 1,
- out, OUT_LEN, NULL, 0, Argon2_i, version);
- assert(ret == ARGON2_SALT_TOO_SHORT);
- printf("Fail on salt too short: PASS\n");
-
- return 0;
-}
diff --git a/src/3rdparty/cpp-httplib/example/Makefile b/src/3rdparty/cpp-httplib/example/Makefile
deleted file mode 100644
index 575e0fae..00000000
--- a/src/3rdparty/cpp-httplib/example/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-
-CC = clang++
-CFLAGS = -std=c++14 -I..
-#OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto
-
-all: server client hello simplesvr benchmark
-
-server : server.cc ../httplib.h Makefile
- $(CC) -o server $(CFLAGS) server.cc $(OPENSSL_SUPPORT)
-
-client : client.cc ../httplib.h Makefile
- $(CC) -o client $(CFLAGS) client.cc $(OPENSSL_SUPPORT)
-
-hello : hello.cc ../httplib.h Makefile
- $(CC) -o hello $(CFLAGS) hello.cc $(OPENSSL_SUPPORT)
-
-simplesvr : simplesvr.cc ../httplib.h Makefile
- $(CC) -o simplesvr $(CFLAGS) simplesvr.cc $(OPENSSL_SUPPORT)
-
-benchmark : benchmark.cc ../httplib.h Makefile
- $(CC) -o benchmark $(CFLAGS) benchmark.cc $(OPENSSL_SUPPORT)
-
-pem:
- openssl genrsa 2048 > key.pem
- openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
-
-clean:
- rm server client hello simplesvr *.pem
diff --git a/src/3rdparty/cpp-httplib/example/benchmark.cc b/src/3rdparty/cpp-httplib/example/benchmark.cc
deleted file mode 100644
index 7e3c3dd7..00000000
--- a/src/3rdparty/cpp-httplib/example/benchmark.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-#include
-#include
-#include
-
-using namespace std;
-
-struct StopWatch {
- StopWatch(const string& label) : label_(label) {
- start_ = chrono::system_clock::now();
- }
- ~StopWatch() {
- auto end = chrono::system_clock::now();
- auto diff = end - start_;
- auto count = chrono::duration_cast(diff).count();
- cout << label_ << ": " << count << " millisec." << endl;
- }
- string label_;
- chrono::system_clock::time_point start_;
-};
-
-int main(int argc, char* argv[]) {
- string body(1024 * 5, 'a');
-
- httplib::Client cli("httpbin.org", 80);
-
- for (int i = 0; i < 3; i++) {
- StopWatch sw(to_string(i).c_str());
- auto res = cli.post("/post", body, "application/octet-stream");
- assert(res->status == 200);
- }
-
- return 0;
-}
diff --git a/src/3rdparty/cpp-httplib/example/client.cc b/src/3rdparty/cpp-httplib/example/client.cc
deleted file mode 100644
index 3bd1641c..00000000
--- a/src/3rdparty/cpp-httplib/example/client.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// client.cc
-//
-// Copyright (c) 2012 Yuji Hirose. All rights reserved.
-// The Boost Software License 1.0
-//
-
-#include
-#include
-
-using namespace std;
-
-int main(void)
-{
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
- httplib::SSLClient cli("localhost", 8080);
-#else
- httplib::Client cli("localhost", 8080);
-#endif
-
- auto res = cli.get("/hi");
- if (res) {
- cout << res->status << endl;
- cout << res->get_header_value("Content-Type") << endl;
- cout << res->body << endl;
- }
-
- return 0;
-}
-
-// vim: et ts=4 sw=4 cin cino={1s ff=unix
diff --git a/src/3rdparty/cpp-httplib/example/client.vcxproj b/src/3rdparty/cpp-httplib/example/client.vcxproj
deleted file mode 100644
index 51d06c1c..00000000
--- a/src/3rdparty/cpp-httplib/example/client.vcxproj
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- {6DB1FC63-B153-4279-92B7-D8A11AF285D6}
- Win32Proj
- client
-
-
-
- Application
- true
- Unicode
- v140
-
-
- Application
- false
- true
- Unicode
- v140
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- false
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- ..
-
-
- Console
- true
- Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- ..
-
-
- Console
- true
- true
- true
- Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/3rdparty/cpp-httplib/example/example.sln b/src/3rdparty/cpp-httplib/example/example.sln
deleted file mode 100644
index e11aa85e..00000000
--- a/src/3rdparty/cpp-httplib/example/example.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{864CD288-050A-4C8B-9BEF-3048BD876C5B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcxproj", "{6DB1FC63-B153-4279-92B7-D8A11AF285D6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{280E605F-0CB8-4336-8D9F-CE50A9472AE2}"
- ProjectSection(SolutionItems) = preProject
- ..\README.md = ..\README.md
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.ActiveCfg = Debug|Win32
- {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.Build.0 = Debug|Win32
- {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.ActiveCfg = Release|Win32
- {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.Build.0 = Release|Win32
- {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.ActiveCfg = Debug|Win32
- {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.Build.0 = Debug|Win32
- {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.ActiveCfg = Release|Win32
- {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/src/3rdparty/cpp-httplib/example/hello.cc b/src/3rdparty/cpp-httplib/example/hello.cc
deleted file mode 100644
index de6f4fbf..00000000
--- a/src/3rdparty/cpp-httplib/example/hello.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// hello.cc
-//
-// Copyright (c) 2012 Yuji Hirose. All rights reserved.
-// The Boost Software License 1.0
-//
-
-#include
-using namespace httplib;
-
-int main(void)
-{
- Server svr;
-
- svr.get("/hi", [](const auto& req, auto& res) {
- res.set_content("Hello World!", "text/plain");
- });
-
- svr.listen("localhost", 1234);
-}
-
-// vim: et ts=4 sw=4 cin cino={1s ff=unix
diff --git a/src/3rdparty/cpp-httplib/example/server.vcxproj b/src/3rdparty/cpp-httplib/example/server.vcxproj
deleted file mode 100644
index f4e71812..00000000
--- a/src/3rdparty/cpp-httplib/example/server.vcxproj
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- {864CD288-050A-4C8B-9BEF-3048BD876C5B}
- Win32Proj
- sample
-
-
-
- Application
- true
- Unicode
- v140
-
-
- Application
- false
- true
- Unicode
- v140
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- false
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- ..
-
-
- Console
- true
- Ws2_32.lib;%(AdditionalDependencies)
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- ..
-
-
- Console
- true
- true
- true
- Ws2_32.lib;%(AdditionalDependencies)
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/3rdparty/cpp-httplib/example/simplesvr.cc b/src/3rdparty/cpp-httplib/example/simplesvr.cc
deleted file mode 100644
index 1c9d5a2f..00000000
--- a/src/3rdparty/cpp-httplib/example/simplesvr.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// simplesvr.cc
-//
-// Copyright (c) 2013 Yuji Hirose. All rights reserved.
-// The Boost Software License 1.0
-//
-
-#include
-#include
-#include
-
-#define SERVER_CERT_FILE "./cert.pem"
-#define SERVER_PRIVATE_KEY_FILE "./key.pem"
-
-using namespace httplib;
-using namespace std;
-
-string dump_headers(const MultiMap& headers)
-{
- string s;
- char buf[BUFSIZ];
-
- for (const auto& x: headers) {
- snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
- s += buf;
- }
-
- return s;
-}
-
-string log(const Request& req, const Response& res)
-{
- string s;
- char buf[BUFSIZ];
-
- s += "================================\n";
-
- snprintf(buf, sizeof(buf), "%s %s", req.method.c_str(), req.path.c_str());
- s += buf;
-
- string query;
- for (auto it = req.params.begin(); it != req.params.end(); ++it) {
- const auto& x = *it;
- snprintf(buf, sizeof(buf), "%c%s=%s",
- (it == req.params.begin()) ? '?' : '&', x.first.c_str(), x.second.c_str());
- query += buf;
- }
- snprintf(buf, sizeof(buf), "%s\n", query.c_str());
- s += buf;
-
- s += dump_headers(req.headers);
-
- s += "--------------------------------\n";
-
- snprintf(buf, sizeof(buf), "%d\n", res.status);
- s += buf;
- s += dump_headers(res.headers);
-
- return s;
-}
-
-int main(int argc, const char** argv)
-{
- if (argc > 1 && string("--help") == argv[1]) {
- cout << "usage: simplesvr [PORT] [DIR]" << endl;
- return 1;
- }
-
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
- SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-#else
- Server svr;
-#endif
-
- svr.set_error_handler([](const auto& req, auto& res) {
- const char* fmt = "
Error Status: %d
";
- char buf[BUFSIZ];
- snprintf(buf, sizeof(buf), fmt, res.status);
- res.set_content(buf, "text/html");
- });
-
- svr.set_logger([](const auto& req, const auto& res) {
- cout << log(req, res);
- });
-
- auto port = 80;
- if (argc > 1) {
- port = atoi(argv[1]);
- }
-
- auto base_dir = "./";
- if (argc > 2) {
- base_dir = argv[2];
- }
-
- svr.set_base_dir(base_dir);
-
- cout << "The server started at port " << port << "...";
-
- svr.listen("localhost", port);
-
- return 0;
-}
-
-// vim: et ts=4 sw=4 cin cino={1s ff=unix
diff --git a/src/3rdparty/cpp-httplib/test/Makefile b/src/3rdparty/cpp-httplib/test/Makefile
deleted file mode 100644
index 76809f33..00000000
--- a/src/3rdparty/cpp-httplib/test/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-CC = clang++
-CFLAGS = -std=c++14 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I.
-#OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto
-
-all : test
- ./test
-
-test : test.cc ../httplib.h Makefile
- $(CC) -o test $(CFLAGS) test.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT)
-
-pem:
- openssl genrsa 2048 > key.pem
- openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
-
-clean:
- rm test *.pem
diff --git a/src/3rdparty/cpp-httplib/test/gtest/gtest-all.cc b/src/3rdparty/cpp-httplib/test/gtest/gtest-all.cc
deleted file mode 100644
index 5ced66a9..00000000
--- a/src/3rdparty/cpp-httplib/test/gtest/gtest-all.cc
+++ /dev/null
@@ -1,9118 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: mheule@google.com (Markus Heule)
-//
-// Google C++ Testing Framework (Google Test)
-//
-// Sometimes it's desirable to build Google Test by compiling a single file.
-// This file serves this purpose.
-
-// This line ensures that gtest.h can be compiled on its own, even
-// when it's fused.
-#include "gtest/gtest.h"
-
-// The following lines pull in the real gtest *.cc files.
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-//
-// The Google C++ Testing Framework (Google Test)
-
-// Copyright 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan)
-//
-// Utilities for testing Google Test itself and code that uses Google Test
-// (e.g. frameworks built on top of Google Test).
-
-#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-
-
-namespace testing {
-
-// This helper class can be used to mock out Google Test failure reporting
-// so that we can test Google Test or code that builds on Google Test.
-//
-// An object of this class appends a TestPartResult object to the
-// TestPartResultArray object given in the constructor whenever a Google Test
-// failure is reported. It can either intercept only failures that are
-// generated in the same thread that created this object or it can intercept
-// all generated failures. The scope of this mock object can be controlled with
-// the second argument to the two arguments constructor.
-class GTEST_API_ ScopedFakeTestPartResultReporter
- : public TestPartResultReporterInterface {
- public:
- // The two possible mocking modes of this object.
- enum InterceptMode {
- INTERCEPT_ONLY_CURRENT_THREAD, // Intercepts only thread local failures.
- INTERCEPT_ALL_THREADS // Intercepts all failures.
- };
-
- // The c'tor sets this object as the test part result reporter used
- // by Google Test. The 'result' parameter specifies where to report the
- // results. This reporter will only catch failures generated in the current
- // thread. DEPRECATED
- explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
-
- // Same as above, but you can choose the interception scope of this object.
- ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
- TestPartResultArray* result);
-
- // The d'tor restores the previous test part result reporter.
- virtual ~ScopedFakeTestPartResultReporter();
-
- // Appends the TestPartResult object to the TestPartResultArray
- // received in the constructor.
- //
- // This method is from the TestPartResultReporterInterface
- // interface.
- virtual void ReportTestPartResult(const TestPartResult& result);
- private:
- void Init();
-
- const InterceptMode intercept_mode_;
- TestPartResultReporterInterface* old_reporter_;
- TestPartResultArray* const result_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
-};
-
-namespace internal {
-
-// A helper class for implementing EXPECT_FATAL_FAILURE() and
-// EXPECT_NONFATAL_FAILURE(). Its destructor verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring. If that's not the case, a
-// non-fatal failure will be generated.
-class GTEST_API_ SingleFailureChecker {
- public:
- // The constructor remembers the arguments.
- SingleFailureChecker(const TestPartResultArray* results,
- TestPartResult::Type type,
- const string& substr);
- ~SingleFailureChecker();
- private:
- const TestPartResultArray* const results_;
- const TestPartResult::Type type_;
- const string substr_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
-};
-
-} // namespace internal
-
-} // namespace testing
-
-// A set of macros for testing Google Test assertions or code that's expected
-// to generate Google Test fatal failures. It verifies that the given
-// statement will cause exactly one fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-// - 'statement' cannot reference local non-static variables or
-// non-static members of the current object.
-// - 'statement' cannot return a value.
-// - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works. The AcceptsMacroThatExpandsToUnprotectedComma test in
-// gtest_unittest.cc will fail to compile if we do that.
-#define EXPECT_FATAL_FAILURE(statement, substr) \
- do { \
- class GTestExpectFatalFailureHelper {\
- public:\
- static void Execute() { statement; }\
- };\
- ::testing::TestPartResultArray gtest_failures;\
- ::testing::internal::SingleFailureChecker gtest_checker(\
- >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
- {\
- ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
- ::testing::ScopedFakeTestPartResultReporter:: \
- INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\
- GTestExpectFatalFailureHelper::Execute();\
- }\
- } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
- do { \
- class GTestExpectFatalFailureHelper {\
- public:\
- static void Execute() { statement; }\
- };\
- ::testing::TestPartResultArray gtest_failures;\
- ::testing::internal::SingleFailureChecker gtest_checker(\
- >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
- {\
- ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
- ::testing::ScopedFakeTestPartResultReporter:: \
- INTERCEPT_ALL_THREADS, >est_failures);\
- GTestExpectFatalFailureHelper::Execute();\
- }\
- } while (::testing::internal::AlwaysFalse())
-
-// A macro for testing Google Test assertions or code that's expected to
-// generate Google Test non-fatal failures. It asserts that the given
-// statement will cause exactly one non-fatal Google Test failure with 'substr'
-// being part of the failure message.
-//
-// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
-// affects and considers failures generated in the current thread and
-// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
-//
-// 'statement' is allowed to reference local variables and members of
-// the current object.
-//
-// The verification of the assertion is done correctly even when the statement
-// throws an exception or aborts the current function.
-//
-// Known restrictions:
-// - You cannot stream a failure message to this macro.
-//
-// Note that even though the implementations of the following two
-// macros are much alike, we cannot refactor them to use a common
-// helper macro, due to some peculiarity in how the preprocessor
-// works. If we do that, the code won't compile when the user gives
-// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
-// expands to code containing an unprotected comma. The
-// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
-// catches that.
-//
-// For the same reason, we have to write
-// if (::testing::internal::AlwaysTrue()) { statement; }
-// instead of
-// GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
-// to avoid an MSVC warning on unreachable code.
-#define EXPECT_NONFATAL_FAILURE(statement, substr) \
- do {\
- ::testing::TestPartResultArray gtest_failures;\
- ::testing::internal::SingleFailureChecker gtest_checker(\
- >est_failures, ::testing::TestPartResult::kNonFatalFailure, \
- (substr));\
- {\
- ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
- ::testing::ScopedFakeTestPartResultReporter:: \
- INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\
- if (::testing::internal::AlwaysTrue()) { statement; }\
- }\
- } while (::testing::internal::AlwaysFalse())
-
-#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
- do {\
- ::testing::TestPartResultArray gtest_failures;\
- ::testing::internal::SingleFailureChecker gtest_checker(\
- >est_failures, ::testing::TestPartResult::kNonFatalFailure, \
- (substr));\
- {\
- ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
- ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS,\
- >est_failures);\
- if (::testing::internal::AlwaysTrue()) { statement; }\
- }\
- } while (::testing::internal::AlwaysFalse())
-
-#endif // GTEST_INCLUDE_GTEST_GTEST_SPI_H_
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include // NOLINT
-#include
-#include
-
-#if GTEST_OS_LINUX
-
-// TODO(kenton@google.com): Use autoconf to detect availability of
-// gettimeofday().
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-
-# include // NOLINT
-# include // NOLINT
-# include // NOLINT
-// Declares vsnprintf(). This header is not available on Windows.
-# include // NOLINT
-# include // NOLINT
-# include // NOLINT
-# include // NOLINT
-# include
-
-#elif GTEST_OS_SYMBIAN
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-# include // NOLINT
-
-#elif GTEST_OS_ZOS
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-# include // NOLINT
-
-// On z/OS we additionally need strings.h for strcasecmp.
-# include // NOLINT
-
-#elif GTEST_OS_WINDOWS_MOBILE // We are on Windows CE.
-
-# include // NOLINT
-
-#elif GTEST_OS_WINDOWS // We are on Windows proper.
-
-# include // NOLINT
-# include // NOLINT
-# include // NOLINT
-# include // NOLINT
-
-# if GTEST_OS_WINDOWS_MINGW
-// MinGW has gettimeofday() but not _ftime64().
-// TODO(kenton@google.com): Use autoconf to detect availability of
-// gettimeofday().
-// TODO(kenton@google.com): There are other ways to get the time on
-// Windows, like GetTickCount() or GetSystemTimeAsFileTime(). MinGW
-// supports these. consider using them instead.
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-# include // NOLINT
-# endif // GTEST_OS_WINDOWS_MINGW
-
-// cpplint thinks that the header is already included, so we want to
-// silence it.
-# include // NOLINT
-
-#else
-
-// Assume other platforms have gettimeofday().
-// TODO(kenton@google.com): Use autoconf to detect availability of
-// gettimeofday().
-# define GTEST_HAS_GETTIMEOFDAY_ 1
-
-// cpplint thinks that the header is already included, so we want to
-// silence it.
-# include // NOLINT
-# include // NOLINT
-
-#endif // GTEST_OS_LINUX
-
-#if GTEST_HAS_EXCEPTIONS
-# include
-#endif
-
-#if GTEST_CAN_STREAM_RESULTS_
-# include // NOLINT
-# include // NOLINT
-#endif
-
-// Indicates that this translation unit is part of Google Test's
-// implementation. It must come before gtest-internal-inl.h is
-// included, or there will be a compiler error. This trick is to
-// prevent a user from accidentally including gtest-internal-inl.h in
-// his code.
-#define GTEST_IMPLEMENTATION_ 1
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Utility functions and classes used by the Google C++ testing framework.
-//
-// Author: wan@google.com (Zhanyong Wan)
-//
-// This file contains purely Google Test's internal implementation. Please
-// DO NOT #INCLUDE IT IN A USER PROGRAM.
-
-#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_
-#define GTEST_SRC_GTEST_INTERNAL_INL_H_
-
-// GTEST_IMPLEMENTATION_ is defined to 1 iff the current translation unit is
-// part of Google Test's implementation; otherwise it's undefined.
-#if !GTEST_IMPLEMENTATION_
-// A user is trying to include this from his code - just say no.
-# error "gtest-internal-inl.h is part of Google Test's internal implementation."
-# error "It must not be included except by Google Test itself."
-#endif // GTEST_IMPLEMENTATION_
-
-#ifndef _WIN32_WCE
-# include
-#endif // !_WIN32_WCE
-#include
-#include // For strtoll/_strtoul64/malloc/free.
-#include // For memmove.
-
-#include
-#include
-#include
-
-
-#if GTEST_OS_WINDOWS
-# include // NOLINT
-#endif // GTEST_OS_WINDOWS
-
-
-namespace testing {
-
-// Declares the flags.
-//
-// We don't want the users to modify this flag in the code, but want
-// Google Test's own unit tests to be able to access it. Therefore we
-// declare it here as opposed to in gtest.h.
-GTEST_DECLARE_bool_(death_test_use_fork);
-
-namespace internal {
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library. This is solely for testing GetTestTypeId().
-GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
-
-// Names of the flags (needed for parsing Google Test flags).
-const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
-const char kBreakOnFailureFlag[] = "break_on_failure";
-const char kCatchExceptionsFlag[] = "catch_exceptions";
-const char kColorFlag[] = "color";
-const char kFilterFlag[] = "filter";
-const char kListTestsFlag[] = "list_tests";
-const char kOutputFlag[] = "output";
-const char kPrintTimeFlag[] = "print_time";
-const char kRandomSeedFlag[] = "random_seed";
-const char kRepeatFlag[] = "repeat";
-const char kShuffleFlag[] = "shuffle";
-const char kStackTraceDepthFlag[] = "stack_trace_depth";
-const char kStreamResultToFlag[] = "stream_result_to";
-const char kThrowOnFailureFlag[] = "throw_on_failure";
-
-// A valid random seed must be in [1, kMaxRandomSeed].
-const int kMaxRandomSeed = 99999;
-
-// g_help_flag is true iff the --help flag or an equivalent form is
-// specified on the command line.
-GTEST_API_ extern bool g_help_flag;
-
-// Returns the current time in milliseconds.
-GTEST_API_ TimeInMillis GetTimeInMillis();
-
-// Returns true iff Google Test should use colors in the output.
-GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
-
-// Formats the given time in milliseconds as seconds.
-GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
-
-// Parses a string for an Int32 flag, in the form of "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true. On failure, returns false without changing *value.
-GTEST_API_ bool ParseInt32Flag(
- const char* str, const char* flag, Int32* value);
-
-// Returns a random seed in range [1, kMaxRandomSeed] based on the
-// given --gtest_random_seed flag value.
-inline int GetRandomSeedFromFlag(Int32 random_seed_flag) {
- const unsigned int raw_seed = (random_seed_flag == 0) ?
- static_cast(GetTimeInMillis()) :
- static_cast(random_seed_flag);
-
- // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
- // it's easy to type.
- const int normalized_seed =
- static_cast((raw_seed - 1U) %
- static_cast(kMaxRandomSeed)) + 1;
- return normalized_seed;
-}
-
-// Returns the first valid random seed after 'seed'. The behavior is
-// undefined if 'seed' is invalid. The seed after kMaxRandomSeed is
-// considered to be 1.
-inline int GetNextRandomSeed(int seed) {
- GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
- << "Invalid random seed " << seed << " - must be in [1, "
- << kMaxRandomSeed << "].";
- const int next_seed = seed + 1;
- return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
-}
-
-// This class saves the values of all Google Test flags in its c'tor, and
-// restores them in its d'tor.
-class GTestFlagSaver {
- public:
- // The c'tor.
- GTestFlagSaver() {
- also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
- break_on_failure_ = GTEST_FLAG(break_on_failure);
- catch_exceptions_ = GTEST_FLAG(catch_exceptions);
- color_ = GTEST_FLAG(color);
- death_test_style_ = GTEST_FLAG(death_test_style);
- death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
- filter_ = GTEST_FLAG(filter);
- internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
- list_tests_ = GTEST_FLAG(list_tests);
- output_ = GTEST_FLAG(output);
- print_time_ = GTEST_FLAG(print_time);
- random_seed_ = GTEST_FLAG(random_seed);
- repeat_ = GTEST_FLAG(repeat);
- shuffle_ = GTEST_FLAG(shuffle);
- stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
- stream_result_to_ = GTEST_FLAG(stream_result_to);
- throw_on_failure_ = GTEST_FLAG(throw_on_failure);
- }
-
- // The d'tor is not virtual. DO NOT INHERIT FROM THIS CLASS.
- ~GTestFlagSaver() {
- GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
- GTEST_FLAG(break_on_failure) = break_on_failure_;
- GTEST_FLAG(catch_exceptions) = catch_exceptions_;
- GTEST_FLAG(color) = color_;
- GTEST_FLAG(death_test_style) = death_test_style_;
- GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
- GTEST_FLAG(filter) = filter_;
- GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
- GTEST_FLAG(list_tests) = list_tests_;
- GTEST_FLAG(output) = output_;
- GTEST_FLAG(print_time) = print_time_;
- GTEST_FLAG(random_seed) = random_seed_;
- GTEST_FLAG(repeat) = repeat_;
- GTEST_FLAG(shuffle) = shuffle_;
- GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
- GTEST_FLAG(stream_result_to) = stream_result_to_;
- GTEST_FLAG(throw_on_failure) = throw_on_failure_;
- }
- private:
- // Fields for saving the original values of flags.
- bool also_run_disabled_tests_;
- bool break_on_failure_;
- bool catch_exceptions_;
- String color_;
- String death_test_style_;
- bool death_test_use_fork_;
- String filter_;
- String internal_run_death_test_;
- bool list_tests_;
- String output_;
- bool print_time_;
- bool pretty_;
- internal::Int32 random_seed_;
- internal::Int32 repeat_;
- bool shuffle_;
- internal::Int32 stack_trace_depth_;
- String stream_result_to_;
- bool throw_on_failure_;
-} GTEST_ATTRIBUTE_UNUSED_;
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// The output buffer str must containt at least 32 characters.
-// The function returns the address of the output buffer.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'.
-GTEST_API_ char* CodePointToUtf8(UInt32 code_point, char* str);
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS)
-// UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-GTEST_API_ String WideStringToUtf8(const wchar_t* str, int num_chars);
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded();
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (e.g., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-GTEST_API_ bool ShouldShard(const char* total_shards_str,
- const char* shard_index_str,
- bool in_subprocess_for_death_test);
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error and
-// and aborts.
-GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val);
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true iff the test should be run on this shard. The test id is
-// some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-GTEST_API_ bool ShouldRunTestOnShard(
- int total_shards, int shard_index, int test_id);
-
-// STL container utilities.
-
-// Returns the number of elements in the given container that satisfy
-// the given predicate.
-template
-inline int CountIf(const Container& c, Predicate predicate) {
- // Implemented as an explicit loop since std::count_if() in libCstd on
- // Solaris has a non-standard signature.
- int count = 0;
- for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
- if (predicate(*it))
- ++count;
- }
- return count;
-}
-
-// Applies a function/functor to each element in the container.
-template
-void ForEach(const Container& c, Functor functor) {
- std::for_each(c.begin(), c.end(), functor);
-}
-
-// Returns the i-th element of the vector, or default_value if i is not
-// in range [0, v.size()).
-template
-inline E GetElementOr(const std::vector& v, int i, E default_value) {
- return (i < 0 || i >= static_cast(v.size())) ? default_value : v[i];
-}
-
-// Performs an in-place shuffle of a range of the vector's elements.
-// 'begin' and 'end' are element indices as an STL-style range;
-// i.e. [begin, end) are shuffled, where 'end' == size() means to
-// shuffle to the end of the vector.
-template
-void ShuffleRange(internal::Random* random, int begin, int end,
- std::vector* v) {
- const int size = static_cast(v->size());
- GTEST_CHECK_(0 <= begin && begin <= size)
- << "Invalid shuffle range start " << begin << ": must be in range [0, "
- << size << "].";
- GTEST_CHECK_(begin <= end && end <= size)
- << "Invalid shuffle range finish " << end << ": must be in range ["
- << begin << ", " << size << "].";
-
- // Fisher-Yates shuffle, from
- // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
- for (int range_width = end - begin; range_width >= 2; range_width--) {
- const int last_in_range = begin + range_width - 1;
- const int selected = begin + random->Generate(range_width);
- std::swap((*v)[selected], (*v)[last_in_range]);
- }
-}
-
-// Performs an in-place shuffle of the vector's elements.
-template
-inline void Shuffle(internal::Random* random, std::vector* v) {
- ShuffleRange(random, 0, static_cast(v->size()), v);
-}
-
-// A function for deleting an object. Handy for being used as a
-// functor.
-template
-static void Delete(T* x) {
- delete x;
-}
-
-// A predicate that checks the key of a TestProperty against a known key.
-//
-// TestPropertyKeyIs is copyable.
-class TestPropertyKeyIs {
- public:
- // Constructor.
- //
- // TestPropertyKeyIs has NO default constructor.
- explicit TestPropertyKeyIs(const char* key)
- : key_(key) {}
-
- // Returns true iff the test name of test property matches on key_.
- bool operator()(const TestProperty& test_property) const {
- return String(test_property.key()).Compare(key_) == 0;
- }
-
- private:
- String key_;
-};
-
-// Class UnitTestOptions.
-//
-// This class contains functions for processing options the user
-// specifies when running the tests. It has only static members.
-//
-// In most cases, the user can specify an option using either an
-// environment variable or a command line flag. E.g. you can set the
-// test filter using either GTEST_FILTER or --gtest_filter. If both
-// the variable and the flag are present, the latter overrides the
-// former.
-class GTEST_API_ UnitTestOptions {
- public:
- // Functions for processing the gtest_output flag.
-
- // Returns the output format, or "" for normal printed output.
- static String GetOutputFormat();
-
- // Returns the absolute path of the requested output file, or the
- // default (test_detail.xml in the original working directory) if
- // none was explicitly specified.
- static String GetAbsolutePathToOutputFile();
-
- // Functions for processing the gtest_filter flag.
-
- // Returns true iff the wildcard pattern matches the string. The
- // first ':' or '\0' character in pattern marks the end of it.
- //
- // This recursive algorithm isn't very efficient, but is clear and
- // works well enough for matching test names, which are short.
- static bool PatternMatchesString(const char *pattern, const char *str);
-
- // Returns true iff the user-specified filter matches the test case
- // name and the test name.
- static bool FilterMatchesTest(const String &test_case_name,
- const String &test_name);
-
-#if GTEST_OS_WINDOWS
- // Function for supporting the gtest_catch_exception flag.
-
- // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
- // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
- // This function is useful as an __except condition.
- static int GTestShouldProcessSEH(DWORD exception_code);
-#endif // GTEST_OS_WINDOWS
-
- // Returns true if "name" matches the ':' separated list of glob-style
- // filters in "filter".
- static bool MatchesFilter(const String& name, const char* filter);
-};
-
-// Returns the current application's name, removing directory path if that
-// is present. Used by UnitTestOptions::GetOutputFile.
-GTEST_API_ FilePath GetCurrentExecutableName();
-
-// The role interface for getting the OS stack trace as a string.
-class OsStackTraceGetterInterface {
- public:
- OsStackTraceGetterInterface() {}
- virtual ~OsStackTraceGetterInterface() {}
-
- // Returns the current OS stack trace as a String. Parameters:
- //
- // max_depth - the maximum number of stack frames to be included
- // in the trace.
- // skip_count - the number of top frames to be skipped; doesn't count
- // against max_depth.
- virtual String CurrentStackTrace(int max_depth, int skip_count) = 0;
-
- // UponLeavingGTest() should be called immediately before Google Test calls
- // user code. It saves some information about the current stack that
- // CurrentStackTrace() will use to find and hide Google Test stack frames.
- virtual void UponLeavingGTest() = 0;
-
- private:
- GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
-};
-
-// A working implementation of the OsStackTraceGetterInterface interface.
-class OsStackTraceGetter : public OsStackTraceGetterInterface {
- public:
- OsStackTraceGetter() : caller_frame_(NULL) {}
- virtual String CurrentStackTrace(int max_depth, int skip_count);
- virtual void UponLeavingGTest();
-
- // This string is inserted in place of stack frames that are part of
- // Google Test's implementation.
- static const char* const kElidedFramesMarker;
-
- private:
- Mutex mutex_; // protects all internal state
-
- // We save the stack frame below the frame that calls user code.
- // We do this because the address of the frame immediately below
- // the user code changes between the call to UponLeavingGTest()
- // and any calls to CurrentStackTrace() from within the user code.
- void* caller_frame_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
-};
-
-// Information about a Google Test trace point.
-struct TraceInfo {
- const char* file;
- int line;
- String message;
-};
-
-// This is the default global test part result reporter used in UnitTestImpl.
-// This class should only be used by UnitTestImpl.
-class DefaultGlobalTestPartResultReporter
- : public TestPartResultReporterInterface {
- public:
- explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
- // Implements the TestPartResultReporterInterface. Reports the test part
- // result in the current test.
- virtual void ReportTestPartResult(const TestPartResult& result);
-
- private:
- UnitTestImpl* const unit_test_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
-};
-
-// This is the default per thread test part result reporter used in
-// UnitTestImpl. This class should only be used by UnitTestImpl.
-class DefaultPerThreadTestPartResultReporter
- : public TestPartResultReporterInterface {
- public:
- explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
- // Implements the TestPartResultReporterInterface. The implementation just
- // delegates to the current global test part result reporter of *unit_test_.
- virtual void ReportTestPartResult(const TestPartResult& result);
-
- private:
- UnitTestImpl* const unit_test_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
-};
-
-// The private implementation of the UnitTest class. We don't protect
-// the methods under a mutex, as this class is not accessible by a
-// user and the UnitTest class that delegates work to this class does
-// proper locking.
-class GTEST_API_ UnitTestImpl {
- public:
- explicit UnitTestImpl(UnitTest* parent);
- virtual ~UnitTestImpl();
-
- // There are two different ways to register your own TestPartResultReporter.
- // You can register your own repoter to listen either only for test results
- // from the current thread or for results from all threads.
- // By default, each per-thread test result repoter just passes a new
- // TestPartResult to the global test result reporter, which registers the
- // test part result for the currently running test.
-
- // Returns the global test part result reporter.
- TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
-
- // Sets the global test part result reporter.
- void SetGlobalTestPartResultReporter(
- TestPartResultReporterInterface* reporter);
-
- // Returns the test part result reporter for the current thread.
- TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
-
- // Sets the test part result reporter for the current thread.
- void SetTestPartResultReporterForCurrentThread(
- TestPartResultReporterInterface* reporter);
-
- // Gets the number of successful test cases.
- int successful_test_case_count() const;
-
- // Gets the number of failed test cases.
- int failed_test_case_count() const;
-
- // Gets the number of all test cases.
- int total_test_case_count() const;
-
- // Gets the number of all test cases that contain at least one test
- // that should run.
- int test_case_to_run_count() const;
-
- // Gets the number of successful tests.
- int successful_test_count() const;
-
- // Gets the number of failed tests.
- int failed_test_count() const;
-
- // Gets the number of disabled tests.
- int disabled_test_count() const;
-
- // Gets the number of all tests.
- int total_test_count() const;
-
- // Gets the number of tests that should run.
- int test_to_run_count() const;
-
- // Gets the elapsed time, in milliseconds.
- TimeInMillis elapsed_time() const { return elapsed_time_; }
-
- // Returns true iff the unit test passed (i.e. all test cases passed).
- bool Passed() const { return !Failed(); }
-
- // Returns true iff the unit test failed (i.e. some test case failed
- // or something outside of all tests failed).
- bool Failed() const {
- return failed_test_case_count() > 0 || ad_hoc_test_result()->Failed();
- }
-
- // Gets the i-th test case among all the test cases. i can range from 0 to
- // total_test_case_count() - 1. If i is not in that range, returns NULL.
- const TestCase* GetTestCase(int i) const {
- const int index = GetElementOr(test_case_indices_, i, -1);
- return index < 0 ? NULL : test_cases_[i];
- }
-
- // Gets the i-th test case among all the test cases. i can range from 0 to
- // total_test_case_count() - 1. If i is not in that range, returns NULL.
- TestCase* GetMutableTestCase(int i) {
- const int index = GetElementOr(test_case_indices_, i, -1);
- return index < 0 ? NULL : test_cases_[index];
- }
-
- // Provides access to the event listener list.
- TestEventListeners* listeners() { return &listeners_; }
-
- // Returns the TestResult for the test that's currently running, or
- // the TestResult for the ad hoc test if no test is running.
- TestResult* current_test_result();
-
- // Returns the TestResult for the ad hoc test.
- const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
-
- // Sets the OS stack trace getter.
- //
- // Does nothing if the input and the current OS stack trace getter
- // are the same; otherwise, deletes the old getter and makes the
- // input the current getter.
- void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
-
- // Returns the current OS stack trace getter if it is not NULL;
- // otherwise, creates an OsStackTraceGetter, makes it the current
- // getter, and returns it.
- OsStackTraceGetterInterface* os_stack_trace_getter();
-
- // Returns the current OS stack trace as a String.
- //
- // The maximum number of stack frames to be included is specified by
- // the gtest_stack_trace_depth flag. The skip_count parameter
- // specifies the number of top frames to be skipped, which doesn't
- // count against the number of frames to be included.
- //
- // For example, if Foo() calls Bar(), which in turn calls
- // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
- // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
- String CurrentOsStackTraceExceptTop(int skip_count);
-
- // Finds and returns a TestCase with the given name. If one doesn't
- // exist, creates one and returns it.
- //
- // Arguments:
- //
- // test_case_name: name of the test case
- // type_param: the name of the test's type parameter, or NULL if
- // this is not a typed or a type-parameterized test.
- // set_up_tc: pointer to the function that sets up the test case
- // tear_down_tc: pointer to the function that tears down the test case
- TestCase* GetTestCase(const char* test_case_name,
- const char* type_param,
- Test::SetUpTestCaseFunc set_up_tc,
- Test::TearDownTestCaseFunc tear_down_tc);
-
- // Adds a TestInfo to the unit test.
- //
- // Arguments:
- //
- // set_up_tc: pointer to the function that sets up the test case
- // tear_down_tc: pointer to the function that tears down the test case
- // test_info: the TestInfo object
- void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc,
- Test::TearDownTestCaseFunc tear_down_tc,
- TestInfo* test_info) {
- // In order to support thread-safe death tests, we need to
- // remember the original working directory when the test program
- // was first invoked. We cannot do this in RUN_ALL_TESTS(), as
- // the user may have changed the current directory before calling
- // RUN_ALL_TESTS(). Therefore we capture the current directory in
- // AddTestInfo(), which is called to register a TEST or TEST_F
- // before main() is reached.
- if (original_working_dir_.IsEmpty()) {
- original_working_dir_.Set(FilePath::GetCurrentDir());
- GTEST_CHECK_(!original_working_dir_.IsEmpty())
- << "Failed to get the current working directory.";
- }
-
- GetTestCase(test_info->test_case_name(),
- test_info->type_param(),
- set_up_tc,
- tear_down_tc)->AddTestInfo(test_info);
- }
-
-#if GTEST_HAS_PARAM_TEST
- // Returns ParameterizedTestCaseRegistry object used to keep track of
- // value-parameterized tests and instantiate and register them.
- internal::ParameterizedTestCaseRegistry& parameterized_test_registry() {
- return parameterized_test_registry_;
- }
-#endif // GTEST_HAS_PARAM_TEST
-
- // Sets the TestCase object for the test that's currently running.
- void set_current_test_case(TestCase* a_current_test_case) {
- current_test_case_ = a_current_test_case;
- }
-
- // Sets the TestInfo object for the test that's currently running. If
- // current_test_info is NULL, the assertion results will be stored in
- // ad_hoc_test_result_.
- void set_current_test_info(TestInfo* a_current_test_info) {
- current_test_info_ = a_current_test_info;
- }
-
- // Registers all parameterized tests defined using TEST_P and
- // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter
- // combination. This method can be called more then once; it has guards
- // protecting from registering the tests more then once. If
- // value-parameterized tests are disabled, RegisterParameterizedTests is
- // present but does nothing.
- void RegisterParameterizedTests();
-
- // Runs all tests in this UnitTest object, prints the result, and
- // returns true if all tests are successful. If any exception is
- // thrown during a test, this test is considered to be failed, but
- // the rest of the tests will still be run.
- bool RunAllTests();
-
- // Clears the results of all tests, except the ad hoc tests.
- void ClearNonAdHocTestResult() {
- ForEach(test_cases_, TestCase::ClearTestCaseResult);
- }
-
- // Clears the results of ad-hoc test assertions.
- void ClearAdHocTestResult() {
- ad_hoc_test_result_.Clear();
- }
-
- enum ReactionToSharding {
- HONOR_SHARDING_PROTOCOL,
- IGNORE_SHARDING_PROTOCOL
- };
-
- // Matches the full name of each test against the user-specified
- // filter to decide whether the test should run, then records the
- // result in each TestCase and TestInfo object.
- // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
- // based on sharding variables in the environment.
- // Returns the number of tests that should run.
- int FilterTests(ReactionToSharding shard_tests);
-
- // Prints the names of the tests matching the user-specified filter flag.
- void ListTestsMatchingFilter();
-
- const TestCase* current_test_case() const { return current_test_case_; }
- TestInfo* current_test_info() { return current_test_info_; }
- const TestInfo* current_test_info() const { return current_test_info_; }
-
- // Returns the vector of environments that need to be set-up/torn-down
- // before/after the tests are run.
- std::vector& environments() { return environments_; }
-
- // Getters for the per-thread Google Test trace stack.
- std::vector& gtest_trace_stack() {
- return *(gtest_trace_stack_.pointer());
- }
- const std::vector& gtest_trace_stack() const {
- return gtest_trace_stack_.get();
- }
-
-#if GTEST_HAS_DEATH_TEST
- void InitDeathTestSubprocessControlInfo() {
- internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
- }
- // Returns a pointer to the parsed --gtest_internal_run_death_test
- // flag, or NULL if that flag was not specified.
- // This information is useful only in a death test child process.
- // Must not be called before a call to InitGoogleTest.
- const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
- return internal_run_death_test_flag_.get();
- }
-
- // Returns a pointer to the current death test factory.
- internal::DeathTestFactory* death_test_factory() {
- return death_test_factory_.get();
- }
-
- void SuppressTestEventsIfInSubprocess();
-
- friend class ReplaceDeathTestFactory;
-#endif // GTEST_HAS_DEATH_TEST
-
- // Initializes the event listener performing XML output as specified by
- // UnitTestOptions. Must not be called before InitGoogleTest.
- void ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
- // Initializes the event listener for streaming test results to a socket.
- // Must not be called before InitGoogleTest.
- void ConfigureStreamingOutput();
-#endif
-
- // Performs initialization dependent upon flag values obtained in
- // ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to
- // ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest
- // this function is also called from RunAllTests. Since this function can be
- // called more than once, it has to be idempotent.
- void PostFlagParsingInit();
-
- // Gets the random seed used at the start of the current test iteration.
- int random_seed() const { return random_seed_; }
-
- // Gets the random number generator.
- internal::Random* random() { return &random_; }
-
- // Shuffles all test cases, and the tests within each test case,
- // making sure that death tests are still run first.
- void ShuffleTests();
-
- // Restores the test cases and tests to their order before the first shuffle.
- void UnshuffleTests();
-
- // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
- // UnitTest::Run() starts.
- bool catch_exceptions() const { return catch_exceptions_; }
-
- private:
- friend class ::testing::UnitTest;
-
- // Used by UnitTest::Run() to capture the state of
- // GTEST_FLAG(catch_exceptions) at the moment it starts.
- void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
-
- // The UnitTest object that owns this implementation object.
- UnitTest* const parent_;
-
- // The working directory when the first TEST() or TEST_F() was
- // executed.
- internal::FilePath original_working_dir_;
-
- // The default test part result reporters.
- DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
- DefaultPerThreadTestPartResultReporter
- default_per_thread_test_part_result_reporter_;
-
- // Points to (but doesn't own) the global test part result reporter.
- TestPartResultReporterInterface* global_test_part_result_repoter_;
-
- // Protects read and write access to global_test_part_result_reporter_.
- internal::Mutex global_test_part_result_reporter_mutex_;
-
- // Points to (but doesn't own) the per-thread test part result reporter.
- internal::ThreadLocal
- per_thread_test_part_result_reporter_;
-
- // The vector of environments that need to be set-up/torn-down
- // before/after the tests are run.
- std::vector environments_;
-
- // The vector of TestCases in their original order. It owns the
- // elements in the vector.
- std::vector test_cases_;
-
- // Provides a level of indirection for the test case list to allow
- // easy shuffling and restoring the test case order. The i-th
- // element of this vector is the index of the i-th test case in the
- // shuffled order.
- std::vector test_case_indices_;
-
-#if GTEST_HAS_PARAM_TEST
- // ParameterizedTestRegistry object used to register value-parameterized
- // tests.
- internal::ParameterizedTestCaseRegistry parameterized_test_registry_;
-
- // Indicates whether RegisterParameterizedTests() has been called already.
- bool parameterized_tests_registered_;
-#endif // GTEST_HAS_PARAM_TEST
-
- // Index of the last death test case registered. Initially -1.
- int last_death_test_case_;
-
- // This points to the TestCase for the currently running test. It
- // changes as Google Test goes through one test case after another.
- // When no test is running, this is set to NULL and Google Test
- // stores assertion results in ad_hoc_test_result_. Initially NULL.
- TestCase* current_test_case_;
-
- // This points to the TestInfo for the currently running test. It
- // changes as Google Test goes through one test after another. When
- // no test is running, this is set to NULL and Google Test stores
- // assertion results in ad_hoc_test_result_. Initially NULL.
- TestInfo* current_test_info_;
-
- // Normally, a user only writes assertions inside a TEST or TEST_F,
- // or inside a function called by a TEST or TEST_F. Since Google
- // Test keeps track of which test is current running, it can
- // associate such an assertion with the test it belongs to.
- //
- // If an assertion is encountered when no TEST or TEST_F is running,
- // Google Test attributes the assertion result to an imaginary "ad hoc"
- // test, and records the result in ad_hoc_test_result_.
- TestResult ad_hoc_test_result_;
-
- // The list of event listeners that can be used to track events inside
- // Google Test.
- TestEventListeners listeners_;
-
- // The OS stack trace getter. Will be deleted when the UnitTest
- // object is destructed. By default, an OsStackTraceGetter is used,
- // but the user can set this field to use a custom getter if that is
- // desired.
- OsStackTraceGetterInterface* os_stack_trace_getter_;
-
- // True iff PostFlagParsingInit() has been called.
- bool post_flag_parse_init_performed_;
-
- // The random number seed used at the beginning of the test run.
- int random_seed_;
-
- // Our random number generator.
- internal::Random random_;
-
- // How long the test took to run, in milliseconds.
- TimeInMillis elapsed_time_;
-
-#if GTEST_HAS_DEATH_TEST
- // The decomposed components of the gtest_internal_run_death_test flag,
- // parsed when RUN_ALL_TESTS is called.
- internal::scoped_ptr internal_run_death_test_flag_;
- internal::scoped_ptr death_test_factory_;
-#endif // GTEST_HAS_DEATH_TEST
-
- // A per-thread stack of traces created by the SCOPED_TRACE() macro.
- internal::ThreadLocal > gtest_trace_stack_;
-
- // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
- // starts.
- bool catch_exceptions_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
-}; // class UnitTestImpl
-
-// Convenience function for accessing the global UnitTest
-// implementation object.
-inline UnitTestImpl* GetUnitTestImpl() {
- return UnitTest::GetInstance()->impl();
-}
-
-#if GTEST_USES_SIMPLE_RE
-
-// Internal helper functions for implementing the simple regular
-// expression matcher.
-GTEST_API_ bool IsInSet(char ch, const char* str);
-GTEST_API_ bool IsAsciiDigit(char ch);
-GTEST_API_ bool IsAsciiPunct(char ch);
-GTEST_API_ bool IsRepeat(char ch);
-GTEST_API_ bool IsAsciiWhiteSpace(char ch);
-GTEST_API_ bool IsAsciiWordChar(char ch);
-GTEST_API_ bool IsValidEscape(char ch);
-GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
-GTEST_API_ bool ValidateRegex(const char* regex);
-GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
-GTEST_API_ bool MatchRepetitionAndRegexAtHead(
- bool escaped, char ch, char repeat, const char* regex, const char* str);
-GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
-
-#endif // GTEST_USES_SIMPLE_RE
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
-GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
-
-#if GTEST_HAS_DEATH_TEST
-
-// Returns the message describing the last system error, regardless of the
-// platform.
-GTEST_API_ String GetLastErrnoDescription();
-
-# if GTEST_OS_WINDOWS
-// Provides leak-safe Windows kernel handle ownership.
-class AutoHandle {
- public:
- AutoHandle() : handle_(INVALID_HANDLE_VALUE) {}
- explicit AutoHandle(HANDLE handle) : handle_(handle) {}
-
- ~AutoHandle() { Reset(); }
-
- HANDLE Get() const { return handle_; }
- void Reset() { Reset(INVALID_HANDLE_VALUE); }
- void Reset(HANDLE handle) {
- if (handle != handle_) {
- if (handle_ != INVALID_HANDLE_VALUE)
- ::CloseHandle(handle_);
- handle_ = handle;
- }
- }
-
- private:
- HANDLE handle_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
-};
-# endif // GTEST_OS_WINDOWS
-
-// Attempts to parse a string into a positive integer pointed to by the
-// number parameter. Returns true if that is possible.
-// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
-// it here.
-template
-bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
- // Fail fast if the given string does not begin with a digit;
- // this bypasses strtoXXX's "optional leading whitespace and plus
- // or minus sign" semantics, which are undesirable here.
- if (str.empty() || !IsDigit(str[0])) {
- return false;
- }
- errno = 0;
-
- char* end;
- // BiggestConvertible is the largest integer type that system-provided
- // string-to-number conversion routines can return.
-
-# if GTEST_OS_WINDOWS && !defined(__GNUC__)
-
- // MSVC and C++ Builder define __int64 instead of the standard long long.
- typedef unsigned __int64 BiggestConvertible;
- const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10);
-
-# else
-
- typedef unsigned long long BiggestConvertible; // NOLINT
- const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);
-
-# endif // GTEST_OS_WINDOWS && !defined(__GNUC__)
-
- const bool parse_success = *end == '\0' && errno == 0;
-
- // TODO(vladl@google.com): Convert this to compile time assertion when it is
- // available.
- GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
-
- const Integer result = static_cast(parsed);
- if (parse_success && static_cast(result) == parsed) {
- *number = result;
- return true;
- }
- return false;
-}
-#endif // GTEST_HAS_DEATH_TEST
-
-// TestResult contains some private methods that should be hidden from
-// Google Test user but are required for testing. This class allow our tests
-// to access them.
-//
-// This class is supplied only for the purpose of testing Google Test's own
-// constructs. Do not use it in user tests, either directly or indirectly.
-class TestResultAccessor {
- public:
- static void RecordProperty(TestResult* test_result,
- const TestProperty& property) {
- test_result->RecordProperty(property);
- }
-
- static void ClearTestPartResults(TestResult* test_result) {
- test_result->ClearTestPartResults();
- }
-
- static const std::vector& test_part_results(
- const TestResult& test_result) {
- return test_result.test_part_results();
- }
-};
-
-} // namespace internal
-} // namespace testing
-
-#endif // GTEST_SRC_GTEST_INTERNAL_INL_H_
-#undef GTEST_IMPLEMENTATION_
-
-#if GTEST_OS_WINDOWS
-# define vsnprintf _vsnprintf
-#endif // GTEST_OS_WINDOWS
-
-namespace testing {
-
-using internal::CountIf;
-using internal::ForEach;
-using internal::GetElementOr;
-using internal::Shuffle;
-
-// Constants.
-
-// A test whose test case name or test name matches this filter is
-// disabled and not run.
-static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
-
-// A test case whose name matches this filter is considered a death
-// test case and will be run before test cases whose name doesn't
-// match this filter.
-static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*";
-
-// A test filter that matches everything.
-static const char kUniversalFilter[] = "*";
-
-// The default output file for XML output.
-static const char kDefaultOutputFile[] = "test_detail.xml";
-
-// The environment variable name for the test shard index.
-static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
-// The environment variable name for the total number of test shards.
-static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
-// The environment variable name for the test shard status file.
-static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
-
-namespace internal {
-
-// The text used in failure messages to indicate the start of the
-// stack trace.
-const char kStackTraceMarker[] = "\nStack trace:\n";
-
-// g_help_flag is true iff the --help flag or an equivalent form is
-// specified on the command line.
-bool g_help_flag = false;
-
-} // namespace internal
-
-GTEST_DEFINE_bool_(
- also_run_disabled_tests,
- internal::BoolFromGTestEnv("also_run_disabled_tests", false),
- "Run disabled tests too, in addition to the tests normally being run.");
-
-GTEST_DEFINE_bool_(
- break_on_failure,
- internal::BoolFromGTestEnv("break_on_failure", false),
- "True iff a failed assertion should be a debugger break-point.");
-
-GTEST_DEFINE_bool_(
- catch_exceptions,
- internal::BoolFromGTestEnv("catch_exceptions", true),
- "True iff " GTEST_NAME_
- " should catch exceptions and treat them as test failures.");
-
-GTEST_DEFINE_string_(
- color,
- internal::StringFromGTestEnv("color", "auto"),
- "Whether to use colors in the output. Valid values: yes, no, "
- "and auto. 'auto' means to use colors if the output is "
- "being sent to a terminal and the TERM environment variable "
- "is set to xterm, xterm-color, xterm-256color, linux or cygwin.");
-
-GTEST_DEFINE_string_(
- filter,
- internal::StringFromGTestEnv("filter", kUniversalFilter),
- "A colon-separated list of glob (not regex) patterns "
- "for filtering the tests to run, optionally followed by a "
- "'-' and a : separated list of negative patterns (tests to "
- "exclude). A test is run if it matches one of the positive "
- "patterns and does not match any of the negative patterns.");
-
-GTEST_DEFINE_bool_(list_tests, false,
- "List all tests without running them.");
-
-GTEST_DEFINE_string_(
- output,
- internal::StringFromGTestEnv("output", ""),
- "A format (currently must be \"xml\"), optionally followed "
- "by a colon and an output file name or directory. A directory "
- "is indicated by a trailing pathname separator. "
- "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
- "If a directory is specified, output files will be created "
- "within that directory, with file-names based on the test "
- "executable's name and, if necessary, made unique by adding "
- "digits.");
-
-GTEST_DEFINE_bool_(
- print_time,
- internal::BoolFromGTestEnv("print_time", true),
- "True iff " GTEST_NAME_
- " should display elapsed time in text output.");
-
-GTEST_DEFINE_int32_(
- random_seed,
- internal::Int32FromGTestEnv("random_seed", 0),
- "Random number seed to use when shuffling test orders. Must be in range "
- "[1, 99999], or 0 to use a seed based on the current time.");
-
-GTEST_DEFINE_int32_(
- repeat,
- internal::Int32FromGTestEnv("repeat", 1),
- "How many times to repeat each test. Specify a negative number "
- "for repeating forever. Useful for shaking out flaky tests.");
-
-GTEST_DEFINE_bool_(
- show_internal_stack_frames, false,
- "True iff " GTEST_NAME_ " should include internal stack frames when "
- "printing test failure stack traces.");
-
-GTEST_DEFINE_bool_(
- shuffle,
- internal::BoolFromGTestEnv("shuffle", false),
- "True iff " GTEST_NAME_
- " should randomize tests' order on every run.");
-
-GTEST_DEFINE_int32_(
- stack_trace_depth,
- internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
- "The maximum number of stack frames to print when an "
- "assertion fails. The valid range is 0 through 100, inclusive.");
-
-GTEST_DEFINE_string_(
- stream_result_to,
- internal::StringFromGTestEnv("stream_result_to", ""),
- "This flag specifies the host name and the port number on which to stream "
- "test results. Example: \"localhost:555\". The flag is effective only on "
- "Linux.");
-
-GTEST_DEFINE_bool_(
- throw_on_failure,
- internal::BoolFromGTestEnv("throw_on_failure", false),
- "When this flag is specified, a failed assertion will throw an exception "
- "if exceptions are enabled or exit the program with a non-zero code "
- "otherwise.");
-
-namespace internal {
-
-// Generates a random number from [0, range), using a Linear
-// Congruential Generator (LCG). Crashes if 'range' is 0 or greater
-// than kMaxRange.
-UInt32 Random::Generate(UInt32 range) {
- // These constants are the same as are used in glibc's rand(3).
- state_ = (1103515245U*state_ + 12345U) % kMaxRange;
-
- GTEST_CHECK_(range > 0)
- << "Cannot generate a number in the range [0, 0).";
- GTEST_CHECK_(range <= kMaxRange)
- << "Generation of a number in [0, " << range << ") was requested, "
- << "but this can only generate numbers in [0, " << kMaxRange << ").";
-
- // Converting via modulus introduces a bit of downward bias, but
- // it's simple, and a linear congruential generator isn't too good
- // to begin with.
- return state_ % range;
-}
-
-// GTestIsInitialized() returns true iff the user has initialized
-// Google Test. Useful for catching the user mistake of not initializing
-// Google Test before calling RUN_ALL_TESTS().
-//
-// A user must call testing::InitGoogleTest() to initialize Google
-// Test. g_init_gtest_count is set to the number of times
-// InitGoogleTest() has been called. We don't protect this variable
-// under a mutex as it is only accessed in the main thread.
-int g_init_gtest_count = 0;
-static bool GTestIsInitialized() { return g_init_gtest_count != 0; }
-
-// Iterates over a vector of TestCases, keeping a running sum of the
-// results of calling a given int-returning method on each.
-// Returns the sum.
-static int SumOverTestCaseList(const std::vector& case_list,
- int (TestCase::*method)() const) {
- int sum = 0;
- for (size_t i = 0; i < case_list.size(); i++) {
- sum += (case_list[i]->*method)();
- }
- return sum;
-}
-
-// Returns true iff the test case passed.
-static bool TestCasePassed(const TestCase* test_case) {
- return test_case->should_run() && test_case->Passed();
-}
-
-// Returns true iff the test case failed.
-static bool TestCaseFailed(const TestCase* test_case) {
- return test_case->should_run() && test_case->Failed();
-}
-
-// Returns true iff test_case contains at least one test that should
-// run.
-static bool ShouldRunTestCase(const TestCase* test_case) {
- return test_case->should_run();
-}
-
-// AssertHelper constructor.
-AssertHelper::AssertHelper(TestPartResult::Type type,
- const char* file,
- int line,
- const char* message)
- : data_(new AssertHelperData(type, file, line, message)) {
-}
-
-AssertHelper::~AssertHelper() {
- delete data_;
-}
-
-// Message assignment, for assertion streaming support.
-void AssertHelper::operator=(const Message& message) const {
- UnitTest::GetInstance()->
- AddTestPartResult(data_->type, data_->file, data_->line,
- AppendUserMessage(data_->message, message),
- UnitTest::GetInstance()->impl()
- ->CurrentOsStackTraceExceptTop(1)
- // Skips the stack frame for this function itself.
- ); // NOLINT
-}
-
-// Mutex for linked pointers.
-GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
-
-// Application pathname gotten in InitGoogleTest.
-String g_executable_path;
-
-// Returns the current application's name, removing directory path if that
-// is present.
-FilePath GetCurrentExecutableName() {
- FilePath result;
-
-#if GTEST_OS_WINDOWS
- result.Set(FilePath(g_executable_path).RemoveExtension("exe"));
-#else
- result.Set(FilePath(g_executable_path));
-#endif // GTEST_OS_WINDOWS
-
- return result.RemoveDirectoryName();
-}
-
-// Functions for processing the gtest_output flag.
-
-// Returns the output format, or "" for normal printed output.
-String UnitTestOptions::GetOutputFormat() {
- const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
- if (gtest_output_flag == NULL) return String("");
-
- const char* const colon = strchr(gtest_output_flag, ':');
- return (colon == NULL) ?
- String(gtest_output_flag) :
- String(gtest_output_flag, colon - gtest_output_flag);
-}
-
-// Returns the name of the requested output file, or the default if none
-// was explicitly specified.
-String UnitTestOptions::GetAbsolutePathToOutputFile() {
- const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
- if (gtest_output_flag == NULL)
- return String("");
-
- const char* const colon = strchr(gtest_output_flag, ':');
- if (colon == NULL)
- return String(internal::FilePath::ConcatPaths(
- internal::FilePath(
- UnitTest::GetInstance()->original_working_dir()),
- internal::FilePath(kDefaultOutputFile)).ToString() );
-
- internal::FilePath output_name(colon + 1);
- if (!output_name.IsAbsolutePath())
- // TODO(wan@google.com): on Windows \some\path is not an absolute
- // path (as its meaning depends on the current drive), yet the
- // following logic for turning it into an absolute path is wrong.
- // Fix it.
- output_name = internal::FilePath::ConcatPaths(
- internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
- internal::FilePath(colon + 1));
-
- if (!output_name.IsDirectory())
- return output_name.ToString();
-
- internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
- output_name, internal::GetCurrentExecutableName(),
- GetOutputFormat().c_str()));
- return result.ToString();
-}
-
-// Returns true iff the wildcard pattern matches the string. The
-// first ':' or '\0' character in pattern marks the end of it.
-//
-// This recursive algorithm isn't very efficient, but is clear and
-// works well enough for matching test names, which are short.
-bool UnitTestOptions::PatternMatchesString(const char *pattern,
- const char *str) {
- switch (*pattern) {
- case '\0':
- case ':': // Either ':' or '\0' marks the end of the pattern.
- return *str == '\0';
- case '?': // Matches any single character.
- return *str != '\0' && PatternMatchesString(pattern + 1, str + 1);
- case '*': // Matches any string (possibly empty) of characters.
- return (*str != '\0' && PatternMatchesString(pattern, str + 1)) ||
- PatternMatchesString(pattern + 1, str);
- default: // Non-special character. Matches itself.
- return *pattern == *str &&
- PatternMatchesString(pattern + 1, str + 1);
- }
-}
-
-bool UnitTestOptions::MatchesFilter(const String& name, const char* filter) {
- const char *cur_pattern = filter;
- for (;;) {
- if (PatternMatchesString(cur_pattern, name.c_str())) {
- return true;
- }
-
- // Finds the next pattern in the filter.
- cur_pattern = strchr(cur_pattern, ':');
-
- // Returns if no more pattern can be found.
- if (cur_pattern == NULL) {
- return false;
- }
-
- // Skips the pattern separater (the ':' character).
- cur_pattern++;
- }
-}
-
-// TODO(keithray): move String function implementations to gtest-string.cc.
-
-// Returns true iff the user-specified filter matches the test case
-// name and the test name.
-bool UnitTestOptions::FilterMatchesTest(const String &test_case_name,
- const String &test_name) {
- const String& full_name = String::Format("%s.%s",
- test_case_name.c_str(),
- test_name.c_str());
-
- // Split --gtest_filter at '-', if there is one, to separate into
- // positive filter and negative filter portions
- const char* const p = GTEST_FLAG(filter).c_str();
- const char* const dash = strchr(p, '-');
- String positive;
- String negative;
- if (dash == NULL) {
- positive = GTEST_FLAG(filter).c_str(); // Whole string is a positive filter
- negative = String("");
- } else {
- positive = String(p, dash - p); // Everything up to the dash
- negative = String(dash+1); // Everything after the dash
- if (positive.empty()) {
- // Treat '-test1' as the same as '*-test1'
- positive = kUniversalFilter;
- }
- }
-
- // A filter is a colon-separated list of patterns. It matches a
- // test if any pattern in it matches the test.
- return (MatchesFilter(full_name, positive.c_str()) &&
- !MatchesFilter(full_name, negative.c_str()));
-}
-
-#if GTEST_HAS_SEH
-// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
-// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
-// This function is useful as an __except condition.
-int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
- // Google Test should handle a SEH exception if:
- // 1. the user wants it to, AND
- // 2. this is not a breakpoint exception, AND
- // 3. this is not a C++ exception (VC++ implements them via SEH,
- // apparently).
- //
- // SEH exception code for C++ exceptions.
- // (see http://support.microsoft.com/kb/185294 for more information).
- const DWORD kCxxExceptionCode = 0xe06d7363;
-
- bool should_handle = true;
-
- if (!GTEST_FLAG(catch_exceptions))
- should_handle = false;
- else if (exception_code == EXCEPTION_BREAKPOINT)
- should_handle = false;
- else if (exception_code == kCxxExceptionCode)
- should_handle = false;
-
- return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
-}
-#endif // GTEST_HAS_SEH
-
-} // namespace internal
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test. The 'result' parameter specifies where to report the
-// results. Intercepts only failures from the current thread.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
- TestPartResultArray* result)
- : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
- result_(result) {
- Init();
-}
-
-// The c'tor sets this object as the test part result reporter used by
-// Google Test. The 'result' parameter specifies where to report the
-// results.
-ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
- InterceptMode intercept_mode, TestPartResultArray* result)
- : intercept_mode_(intercept_mode),
- result_(result) {
- Init();
-}
-
-void ScopedFakeTestPartResultReporter::Init() {
- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
- if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
- old_reporter_ = impl->GetGlobalTestPartResultReporter();
- impl->SetGlobalTestPartResultReporter(this);
- } else {
- old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
- impl->SetTestPartResultReporterForCurrentThread(this);
- }
-}
-
-// The d'tor restores the test part result reporter used by Google Test
-// before.
-ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
- if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
- impl->SetGlobalTestPartResultReporter(old_reporter_);
- } else {
- impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
- }
-}
-
-// Increments the test part result count and remembers the result.
-// This method is from the TestPartResultReporterInterface interface.
-void ScopedFakeTestPartResultReporter::ReportTestPartResult(
- const TestPartResult& result) {
- result_->Append(result);
-}
-
-namespace internal {
-
-// Returns the type ID of ::testing::Test. We should always call this
-// instead of GetTypeId< ::testing::Test>() to get the type ID of
-// testing::Test. This is to work around a suspected linker bug when
-// using Google Test as a framework on Mac OS X. The bug causes
-// GetTypeId< ::testing::Test>() to return different values depending
-// on whether the call is from the Google Test framework itself or
-// from user test code. GetTestTypeId() is guaranteed to always
-// return the same value, as it always calls GetTypeId<>() from the
-// gtest.cc, which is within the Google Test framework.
-TypeId GetTestTypeId() {
- return GetTypeId();
-}
-
-// The value of GetTestTypeId() as seen from within the Google Test
-// library. This is solely for testing GetTestTypeId().
-extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
-
-// This predicate-formatter checks that 'results' contains a test part
-// failure of the given type and that the failure message contains the
-// given substring.
-AssertionResult HasOneFailure(const char* /* results_expr */,
- const char* /* type_expr */,
- const char* /* substr_expr */,
- const TestPartResultArray& results,
- TestPartResult::Type type,
- const string& substr) {
- const String expected(type == TestPartResult::kFatalFailure ?
- "1 fatal failure" :
- "1 non-fatal failure");
- Message msg;
- if (results.size() != 1) {
- msg << "Expected: " << expected << "\n"
- << " Actual: " << results.size() << " failures";
- for (int i = 0; i < results.size(); i++) {
- msg << "\n" << results.GetTestPartResult(i);
- }
- return AssertionFailure() << msg;
- }
-
- const TestPartResult& r = results.GetTestPartResult(0);
- if (r.type() != type) {
- return AssertionFailure() << "Expected: " << expected << "\n"
- << " Actual:\n"
- << r;
- }
-
- if (strstr(r.message(), substr.c_str()) == NULL) {
- return AssertionFailure() << "Expected: " << expected << " containing \""
- << substr << "\"\n"
- << " Actual:\n"
- << r;
- }
-
- return AssertionSuccess();
-}
-
-// The constructor of SingleFailureChecker remembers where to look up
-// test part results, what type of failure we expect, and what
-// substring the failure message should contain.
-SingleFailureChecker:: SingleFailureChecker(
- const TestPartResultArray* results,
- TestPartResult::Type type,
- const string& substr)
- : results_(results),
- type_(type),
- substr_(substr) {}
-
-// The destructor of SingleFailureChecker verifies that the given
-// TestPartResultArray contains exactly one failure that has the given
-// type and contains the given substring. If that's not the case, a
-// non-fatal failure will be generated.
-SingleFailureChecker::~SingleFailureChecker() {
- EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
-}
-
-DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
- UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
- const TestPartResult& result) {
- unit_test_->current_test_result()->AddTestPartResult(result);
- unit_test_->listeners()->repeater()->OnTestPartResult(result);
-}
-
-DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
- UnitTestImpl* unit_test) : unit_test_(unit_test) {}
-
-void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
- const TestPartResult& result) {
- unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
-}
-
-// Returns the global test part result reporter.
-TestPartResultReporterInterface*
-UnitTestImpl::GetGlobalTestPartResultReporter() {
- internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
- return global_test_part_result_repoter_;
-}
-
-// Sets the global test part result reporter.
-void UnitTestImpl::SetGlobalTestPartResultReporter(
- TestPartResultReporterInterface* reporter) {
- internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
- global_test_part_result_repoter_ = reporter;
-}
-
-// Returns the test part result reporter for the current thread.
-TestPartResultReporterInterface*
-UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
- return per_thread_test_part_result_reporter_.get();
-}
-
-// Sets the test part result reporter for the current thread.
-void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
- TestPartResultReporterInterface* reporter) {
- per_thread_test_part_result_reporter_.set(reporter);
-}
-
-// Gets the number of successful test cases.
-int UnitTestImpl::successful_test_case_count() const {
- return CountIf(test_cases_, TestCasePassed);
-}
-
-// Gets the number of failed test cases.
-int UnitTestImpl::failed_test_case_count() const {
- return CountIf(test_cases_, TestCaseFailed);
-}
-
-// Gets the number of all test cases.
-int UnitTestImpl::total_test_case_count() const {
- return static_cast(test_cases_.size());
-}
-
-// Gets the number of all test cases that contain at least one test
-// that should run.
-int UnitTestImpl::test_case_to_run_count() const {
- return CountIf(test_cases_, ShouldRunTestCase);
-}
-
-// Gets the number of successful tests.
-int UnitTestImpl::successful_test_count() const {
- return SumOverTestCaseList(test_cases_, &TestCase::successful_test_count);
-}
-
-// Gets the number of failed tests.
-int UnitTestImpl::failed_test_count() const {
- return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count);
-}
-
-// Gets the number of disabled tests.
-int UnitTestImpl::disabled_test_count() const {
- return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count);
-}
-
-// Gets the number of all tests.
-int UnitTestImpl::total_test_count() const {
- return SumOverTestCaseList(test_cases_, &TestCase::total_test_count);
-}
-
-// Gets the number of tests that should run.
-int UnitTestImpl::test_to_run_count() const {
- return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count);
-}
-
-// Returns the current OS stack trace as a String.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag. The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
-// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
-String UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
- (void)skip_count;
- return String("");
-}
-
-// Returns the current time in milliseconds.
-TimeInMillis GetTimeInMillis() {
-#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__)
- // Difference between 1970-01-01 and 1601-01-01 in milliseconds.
- // http://analogous.blogspot.com/2005/04/epoch.html
- const TimeInMillis kJavaEpochToWinFileTimeDelta =
- static_cast(116444736UL) * 100000UL;
- const DWORD kTenthMicrosInMilliSecond = 10000;
-
- SYSTEMTIME now_systime;
- FILETIME now_filetime;
- ULARGE_INTEGER now_int64;
- // TODO(kenton@google.com): Shouldn't this just use
- // GetSystemTimeAsFileTime()?
- GetSystemTime(&now_systime);
- if (SystemTimeToFileTime(&now_systime, &now_filetime)) {
- now_int64.LowPart = now_filetime.dwLowDateTime;
- now_int64.HighPart = now_filetime.dwHighDateTime;
- now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) -
- kJavaEpochToWinFileTimeDelta;
- return now_int64.QuadPart;
- }
- return 0;
-#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_
- __timeb64 now;
-
-# ifdef _MSC_VER
-
- // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996
- // (deprecated function) there.
- // TODO(kenton@google.com): Use GetTickCount()? Or use
- // SystemTimeToFileTime()
-# pragma warning(push) // Saves the current warning state.
-# pragma warning(disable:4996) // Temporarily disables warning 4996.
- _ftime64(&now);
-# pragma warning(pop) // Restores the warning state.
-# else
-
- _ftime64(&now);
-
-# endif // _MSC_VER
-
- return static_cast(now.time) * 1000 + now.millitm;
-#elif GTEST_HAS_GETTIMEOFDAY_
- struct timeval now;
- gettimeofday(&now, NULL);
- return static_cast(now.tv_sec) * 1000 + now.tv_usec / 1000;
-#else
-# error "Don't know how to get the current time on your system."
-#endif
-}
-
-// Utilities
-
-// class String
-
-// Returns the input enclosed in double quotes if it's not NULL;
-// otherwise returns "(null)". For example, "\"Hello\"" is returned
-// for input "Hello".
-//
-// This is useful for printing a C string in the syntax of a literal.
-//
-// Known issue: escape sequences are not handled yet.
-String String::ShowCStringQuoted(const char* c_str) {
- return c_str ? String::Format("\"%s\"", c_str) : String("(null)");
-}
-
-// Copies at most length characters from str into a newly-allocated
-// piece of memory of size length+1. The memory is allocated with new[].
-// A terminating null byte is written to the memory, and a pointer to it
-// is returned. If str is NULL, NULL is returned.
-static char* CloneString(const char* str, size_t length) {
- if (str == NULL) {
- return NULL;
- } else {
- char* const clone = new char[length + 1];
- posix::StrNCpy(clone, str, length);
- clone[length] = '\0';
- return clone;
- }
-}
-
-// Clones a 0-terminated C string, allocating memory using new. The
-// caller is responsible for deleting[] the return value. Returns the
-// cloned string, or NULL if the input is NULL.
-const char * String::CloneCString(const char* c_str) {
- return (c_str == NULL) ?
- NULL : CloneString(c_str, strlen(c_str));
-}
-
-#if GTEST_OS_WINDOWS_MOBILE
-// Creates a UTF-16 wide string from the given ANSI string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the wide string, or NULL if the
-// input is NULL.
-LPCWSTR String::AnsiToUtf16(const char* ansi) {
- if (!ansi) return NULL;
- const int length = strlen(ansi);
- const int unicode_length =
- MultiByteToWideChar(CP_ACP, 0, ansi, length,
- NULL, 0);
- WCHAR* unicode = new WCHAR[unicode_length + 1];
- MultiByteToWideChar(CP_ACP, 0, ansi, length,
- unicode, unicode_length);
- unicode[unicode_length] = 0;
- return unicode;
-}
-
-// Creates an ANSI string from the given wide string, allocating
-// memory using new. The caller is responsible for deleting the return
-// value using delete[]. Returns the ANSI string, or NULL if the
-// input is NULL.
-const char* String::Utf16ToAnsi(LPCWSTR utf16_str) {
- if (!utf16_str) return NULL;
- const int ansi_length =
- WideCharToMultiByte(CP_ACP, 0, utf16_str, -1,
- NULL, 0, NULL, NULL);
- char* ansi = new char[ansi_length + 1];
- WideCharToMultiByte(CP_ACP, 0, utf16_str, -1,
- ansi, ansi_length, NULL, NULL);
- ansi[ansi_length] = 0;
- return ansi;
-}
-
-#endif // GTEST_OS_WINDOWS_MOBILE
-
-// Compares two C strings. Returns true iff they have the same content.
-//
-// Unlike strcmp(), this function can handle NULL argument(s). A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CStringEquals(const char * lhs, const char * rhs) {
- if ( lhs == NULL ) return rhs == NULL;
-
- if ( rhs == NULL ) return false;
-
- return strcmp(lhs, rhs) == 0;
-}
-
-#if GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
-
-// Converts an array of wide chars to a narrow string using the UTF-8
-// encoding, and streams the result to the given Message object.
-static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
- Message* msg) {
- // TODO(wan): consider allowing a testing::String object to
- // contain '\0'. This will make it behave more like std::string,
- // and will allow ToUtf8String() to return the correct encoding
- // for '\0' s.t. we can get rid of the conditional here (and in
- // several other places).
- for (size_t i = 0; i != length; ) { // NOLINT
- if (wstr[i] != L'\0') {
- *msg << WideStringToUtf8(wstr + i, static_cast(length - i));
- while (i != length && wstr[i] != L'\0')
- i++;
- } else {
- *msg << '\0';
- i++;
- }
- }
-}
-
-#endif // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
-
-} // namespace internal
-
-#if GTEST_HAS_STD_WSTRING
-// Converts the given wide string to a narrow string using the UTF-8
-// encoding, and streams the result to this Message object.
-Message& Message::operator <<(const ::std::wstring& wstr) {
- internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
- return *this;
-}
-#endif // GTEST_HAS_STD_WSTRING
-
-#if GTEST_HAS_GLOBAL_WSTRING
-// Converts the given wide string to a narrow string using the UTF-8
-// encoding, and streams the result to this Message object.
-Message& Message::operator <<(const ::wstring& wstr) {
- internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
- return *this;
-}
-#endif // GTEST_HAS_GLOBAL_WSTRING
-
-// AssertionResult constructors.
-// Used in EXPECT_TRUE/FALSE(assertion_result).
-AssertionResult::AssertionResult(const AssertionResult& other)
- : success_(other.success_),
- message_(other.message_.get() != NULL ?
- new ::std::string(*other.message_) :
- static_cast< ::std::string*>(NULL)) {
-}
-
-// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-AssertionResult AssertionResult::operator!() const {
- AssertionResult negation(!success_);
- if (message_.get() != NULL)
- negation << *message_;
- return negation;
-}
-
-// Makes a successful assertion result.
-AssertionResult AssertionSuccess() {
- return AssertionResult(true);
-}
-
-// Makes a failed assertion result.
-AssertionResult AssertionFailure() {
- return AssertionResult(false);
-}
-
-// Makes a failed assertion result with the given failure message.
-// Deprecated; use AssertionFailure() << message.
-AssertionResult AssertionFailure(const Message& message) {
- return AssertionFailure() << message;
-}
-
-namespace internal {
-
-// Constructs and returns the message for an equality assertion
-// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
-//
-// The first four parameters are the expressions used in the assertion
-// and their values, as strings. For example, for ASSERT_EQ(foo, bar)
-// where foo is 5 and bar is 6, we have:
-//
-// expected_expression: "foo"
-// actual_expression: "bar"
-// expected_value: "5"
-// actual_value: "6"
-//
-// The ignoring_case parameter is true iff the assertion is a
-// *_STRCASEEQ*. When it's true, the string " (ignoring case)" will
-// be inserted into the message.
-AssertionResult EqFailure(const char* expected_expression,
- const char* actual_expression,
- const String& expected_value,
- const String& actual_value,
- bool ignoring_case) {
- Message msg;
- msg << "Value of: " << actual_expression;
- if (actual_value != actual_expression) {
- msg << "\n Actual: " << actual_value;
- }
-
- msg << "\nExpected: " << expected_expression;
- if (ignoring_case) {
- msg << " (ignoring case)";
- }
- if (expected_value != expected_expression) {
- msg << "\nWhich is: " << expected_value;
- }
-
- return AssertionFailure() << msg;
-}
-
-// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
-String GetBoolAssertionFailureMessage(const AssertionResult& assertion_result,
- const char* expression_text,
- const char* actual_predicate_value,
- const char* expected_predicate_value) {
- const char* actual_message = assertion_result.message();
- Message msg;
- msg << "Value of: " << expression_text
- << "\n Actual: " << actual_predicate_value;
- if (actual_message[0] != '\0')
- msg << " (" << actual_message << ")";
- msg << "\nExpected: " << expected_predicate_value;
- return msg.GetString();
-}
-
-// Helper function for implementing ASSERT_NEAR.
-AssertionResult DoubleNearPredFormat(const char* expr1,
- const char* expr2,
- const char* abs_error_expr,
- double val1,
- double val2,
- double abs_error) {
- const double diff = fabs(val1 - val2);
- if (diff <= abs_error) return AssertionSuccess();
-
- // TODO(wan): do not print the value of an expression if it's
- // already a literal.
- return AssertionFailure()
- << "The difference between " << expr1 << " and " << expr2
- << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
- << expr1 << " evaluates to " << val1 << ",\n"
- << expr2 << " evaluates to " << val2 << ", and\n"
- << abs_error_expr << " evaluates to " << abs_error << ".";
-}
-
-
-// Helper template for implementing FloatLE() and DoubleLE().
-template
-AssertionResult FloatingPointLE(const char* expr1,
- const char* expr2,
- RawType val1,
- RawType val2) {
- // Returns success if val1 is less than val2,
- if (val1 < val2) {
- return AssertionSuccess();
- }
-
- // or if val1 is almost equal to val2.
- const FloatingPoint lhs(val1), rhs(val2);
- if (lhs.AlmostEquals(rhs)) {
- return AssertionSuccess();
- }
-
- // Note that the above two checks will both fail if either val1 or
- // val2 is NaN, as the IEEE floating-point standard requires that
- // any predicate involving a NaN must return false.
-
- ::std::stringstream val1_ss;
- val1_ss << std::setprecision(std::numeric_limits::digits10 + 2)
- << val1;
-
- ::std::stringstream val2_ss;
- val2_ss << std::setprecision(std::numeric_limits::digits10 + 2)
- << val2;
-
- return AssertionFailure()
- << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
- << " Actual: " << StringStreamToString(&val1_ss) << " vs "
- << StringStreamToString(&val2_ss);
-}
-
-} // namespace internal
-
-// Asserts that val1 is less than, or almost equal to, val2. Fails
-// otherwise. In particular, it fails if either val1 or val2 is NaN.
-AssertionResult FloatLE(const char* expr1, const char* expr2,
- float val1, float val2) {
- return internal::FloatingPointLE(expr1, expr2, val1, val2);
-}
-
-// Asserts that val1 is less than, or almost equal to, val2. Fails
-// otherwise. In particular, it fails if either val1 or val2 is NaN.
-AssertionResult DoubleLE(const char* expr1, const char* expr2,
- double val1, double val2) {
- return internal::FloatingPointLE(expr1, expr2, val1, val2);
-}
-
-namespace internal {
-
-// The helper function for {ASSERT|EXPECT}_EQ with int or enum
-// arguments.
-AssertionResult CmpHelperEQ(const char* expected_expression,
- const char* actual_expression,
- BiggestInt expected,
- BiggestInt actual) {
- if (expected == actual) {
- return AssertionSuccess();
- }
-
- return EqFailure(expected_expression,
- actual_expression,
- FormatForComparisonFailureMessage(expected, actual),
- FormatForComparisonFailureMessage(actual, expected),
- false);
-}
-
-// A macro for implementing the helper functions needed to implement
-// ASSERT_?? and EXPECT_?? with integer or enum arguments. It is here
-// just to avoid copy-and-paste of similar code.
-#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
-AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
- BiggestInt val1, BiggestInt val2) {\
- if (val1 op val2) {\
- return AssertionSuccess();\
- } else {\
- return AssertionFailure() \
- << "Expected: (" << expr1 << ") " #op " (" << expr2\
- << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
- << " vs " << FormatForComparisonFailureMessage(val2, val1);\
- }\
-}
-
-// Implements the helper function for {ASSERT|EXPECT}_NE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(NE, !=)
-// Implements the helper function for {ASSERT|EXPECT}_LE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(LE, <=)
-// Implements the helper function for {ASSERT|EXPECT}_LT with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(LT, < )
-// Implements the helper function for {ASSERT|EXPECT}_GE with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(GE, >=)
-// Implements the helper function for {ASSERT|EXPECT}_GT with int or
-// enum arguments.
-GTEST_IMPL_CMP_HELPER_(GT, > )
-
-#undef GTEST_IMPL_CMP_HELPER_
-
-// The helper function for {ASSERT|EXPECT}_STREQ.
-AssertionResult CmpHelperSTREQ(const char* expected_expression,
- const char* actual_expression,
- const char* expected,
- const char* actual) {
- if (String::CStringEquals(expected, actual)) {
- return AssertionSuccess();
- }
-
- return EqFailure(expected_expression,
- actual_expression,
- String::ShowCStringQuoted(expected),
- String::ShowCStringQuoted(actual),
- false);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
-AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression,
- const char* actual_expression,
- const char* expected,
- const char* actual) {
- if (String::CaseInsensitiveCStringEquals(expected, actual)) {
- return AssertionSuccess();
- }
-
- return EqFailure(expected_expression,
- actual_expression,
- String::ShowCStringQuoted(expected),
- String::ShowCStringQuoted(actual),
- true);
-}
-
-// The helper function for {ASSERT|EXPECT}_STRNE.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
- const char* s2_expression,
- const char* s1,
- const char* s2) {
- if (!String::CStringEquals(s1, s2)) {
- return AssertionSuccess();
- } else {
- return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
- << s2_expression << "), actual: \""
- << s1 << "\" vs \"" << s2 << "\"";
- }
-}
-
-// The helper function for {ASSERT|EXPECT}_STRCASENE.
-AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
- const char* s2_expression,
- const char* s1,
- const char* s2) {
- if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
- return AssertionSuccess();
- } else {
- return AssertionFailure()
- << "Expected: (" << s1_expression << ") != ("
- << s2_expression << ") (ignoring case), actual: \""
- << s1 << "\" vs \"" << s2 << "\"";
- }
-}
-
-} // namespace internal
-
-namespace {
-
-// Helper functions for implementing IsSubString() and IsNotSubstring().
-
-// This group of overloaded functions return true iff needle is a
-// substring of haystack. NULL is considered a substring of itself
-// only.
-
-bool IsSubstringPred(const char* needle, const char* haystack) {
- if (needle == NULL || haystack == NULL)
- return needle == haystack;
-
- return strstr(haystack, needle) != NULL;
-}
-
-bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
- if (needle == NULL || haystack == NULL)
- return needle == haystack;
-
- return wcsstr(haystack, needle) != NULL;
-}
-
-// StringType here can be either ::std::string or ::std::wstring.
-template
-bool IsSubstringPred(const StringType& needle,
- const StringType& haystack) {
- return haystack.find(needle) != StringType::npos;
-}
-
-// This function implements either IsSubstring() or IsNotSubstring(),
-// depending on the value of the expected_to_be_substring parameter.
-// StringType here can be const char*, const wchar_t*, ::std::string,
-// or ::std::wstring.
-template
-AssertionResult IsSubstringImpl(
- bool expected_to_be_substring,
- const char* needle_expr, const char* haystack_expr,
- const StringType& needle, const StringType& haystack) {
- if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
- return AssertionSuccess();
-
- const bool is_wide_string = sizeof(needle[0]) > 1;
- const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
- return AssertionFailure()
- << "Value of: " << needle_expr << "\n"
- << " Actual: " << begin_string_quote << needle << "\"\n"
- << "Expected: " << (expected_to_be_substring ? "" : "not ")
- << "a substring of " << haystack_expr << "\n"
- << "Which is: " << begin_string_quote << haystack << "\"";
-}
-
-} // namespace
-
-// IsSubstring() and IsNotSubstring() check whether needle is a
-// substring of haystack (NULL is considered a substring of itself
-// only), and return an appropriate error message when they fail.
-
-AssertionResult IsSubstring(
- const char* needle_expr, const char* haystack_expr,
- const char* needle, const char* haystack) {
- return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
- const char* needle_expr, const char* haystack_expr,
- const wchar_t* needle, const wchar_t* haystack) {
- return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
- const char* needle_expr, const char* haystack_expr,
- const char* needle, const char* haystack) {
- return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
- const char* needle_expr, const char* haystack_expr,
- const wchar_t* needle, const wchar_t* haystack) {
- return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsSubstring(
- const char* needle_expr, const char* haystack_expr,
- const ::std::string& needle, const ::std::string& haystack) {
- return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
- const char* needle_expr, const char* haystack_expr,
- const ::std::string& needle, const ::std::string& haystack) {
- return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-
-#if GTEST_HAS_STD_WSTRING
-AssertionResult IsSubstring(
- const char* needle_expr, const char* haystack_expr,
- const ::std::wstring& needle, const ::std::wstring& haystack) {
- return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
-}
-
-AssertionResult IsNotSubstring(
- const char* needle_expr, const char* haystack_expr,
- const ::std::wstring& needle, const ::std::wstring& haystack) {
- return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
-}
-#endif // GTEST_HAS_STD_WSTRING
-
-namespace internal {
-
-#if GTEST_OS_WINDOWS
-
-namespace {
-
-// Helper function for IsHRESULT{SuccessFailure} predicates
-AssertionResult HRESULTFailureHelper(const char* expr,
- const char* expected,
- long hr) { // NOLINT
-# if GTEST_OS_WINDOWS_MOBILE
-
- // Windows CE doesn't support FormatMessage.
- const char error_text[] = "";
-
-# else
-
- // Looks up the human-readable system message for the HRESULT code
- // and since we're not passing any params to FormatMessage, we don't
- // want inserts expanded.
- const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS;
- const DWORD kBufSize = 4096; // String::Format can't exceed this length.
- // Gets the system's human readable message string for this HRESULT.
- char error_text[kBufSize] = { '\0' };
- DWORD message_length = ::FormatMessageA(kFlags,
- 0, // no source, we're asking system
- hr, // the error
- 0, // no line width restrictions
- error_text, // output buffer
- kBufSize, // buf size
- NULL); // no arguments for inserts
- // Trims tailing white space (FormatMessage leaves a trailing cr-lf)
- for (; message_length && IsSpace(error_text[message_length - 1]);
- --message_length) {
- error_text[message_length - 1] = '\0';
- }
-
-# endif // GTEST_OS_WINDOWS_MOBILE
-
- const String error_hex(String::Format("0x%08X ", hr));
- return ::testing::AssertionFailure()
- << "Expected: " << expr << " " << expected << ".\n"
- << " Actual: " << error_hex << error_text << "\n";
-}
-
-} // namespace
-
-AssertionResult IsHRESULTSuccess(const char* expr, long hr) { // NOLINT
- if (SUCCEEDED(hr)) {
- return AssertionSuccess();
- }
- return HRESULTFailureHelper(expr, "succeeds", hr);
-}
-
-AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT
- if (FAILED(hr)) {
- return AssertionSuccess();
- }
- return HRESULTFailureHelper(expr, "fails", hr);
-}
-
-#endif // GTEST_OS_WINDOWS
-
-// Utility functions for encoding Unicode text (wide strings) in
-// UTF-8.
-
-// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8
-// like this:
-//
-// Code-point length Encoding
-// 0 - 7 bits 0xxxxxxx
-// 8 - 11 bits 110xxxxx 10xxxxxx
-// 12 - 16 bits 1110xxxx 10xxxxxx 10xxxxxx
-// 17 - 21 bits 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-
-// The maximum code-point a one-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint1 = (static_cast(1) << 7) - 1;
-
-// The maximum code-point a two-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint2 = (static_cast(1) << (5 + 6)) - 1;
-
-// The maximum code-point a three-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint3 = (static_cast(1) << (4 + 2*6)) - 1;
-
-// The maximum code-point a four-byte UTF-8 sequence can represent.
-const UInt32 kMaxCodePoint4 = (static_cast(1) << (3 + 3*6)) - 1;
-
-// Chops off the n lowest bits from a bit pattern. Returns the n
-// lowest bits. As a side effect, the original bit pattern will be
-// shifted to the right by n bits.
-inline UInt32 ChopLowBits(UInt32* bits, int n) {
- const UInt32 low_bits = *bits & ((static_cast(1) << n) - 1);
- *bits >>= n;
- return low_bits;
-}
-
-// Converts a Unicode code point to a narrow string in UTF-8 encoding.
-// code_point parameter is of type UInt32 because wchar_t may not be
-// wide enough to contain a code point.
-// The output buffer str must containt at least 32 characters.
-// The function returns the address of the output buffer.
-// If the code_point is not a valid Unicode code point
-// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'.
-char* CodePointToUtf8(UInt32 code_point, char* str) {
- if (code_point <= kMaxCodePoint1) {
- str[1] = '\0';
- str[0] = static_cast(code_point); // 0xxxxxxx
- } else if (code_point <= kMaxCodePoint2) {
- str[2] = '\0';
- str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
- str[0] = static_cast(0xC0 | code_point); // 110xxxxx
- } else if (code_point <= kMaxCodePoint3) {
- str[3] = '\0';
- str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
- str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
- str[0] = static_cast(0xE0 | code_point); // 1110xxxx
- } else if (code_point <= kMaxCodePoint4) {
- str[4] = '\0';
- str[3] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
- str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
- str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx
- str[0] = static_cast(0xF0 | code_point); // 11110xxx
- } else {
- // The longest string String::Format can produce when invoked
- // with these parameters is 28 character long (not including
- // the terminating nul character). We are asking for 32 character
- // buffer just in case. This is also enough for strncpy to
- // null-terminate the destination string.
- posix::StrNCpy(
- str, String::Format("(Invalid Unicode 0x%X)", code_point).c_str(), 32);
- str[31] = '\0'; // Makes sure no change in the format to strncpy leaves
- // the result unterminated.
- }
- return str;
-}
-
-// The following two functions only make sense if the the system
-// uses UTF-16 for wide string encoding. All supported systems
-// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
-
-// Determines if the arguments constitute UTF-16 surrogate pair
-// and thus should be combined into a single Unicode code point
-// using CreateCodePointFromUtf16SurrogatePair.
-inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
- return sizeof(wchar_t) == 2 &&
- (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
-}
-
-// Creates a Unicode code point from UTF16 surrogate pair.
-inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first,
- wchar_t second) {
- const UInt32 mask = (1 << 10) - 1;
- return (sizeof(wchar_t) == 2) ?
- (((first & mask) << 10) | (second & mask)) + 0x10000 :
- // This function should not be called when the condition is
- // false, but we provide a sensible default in case it is.
- static_cast(first);
-}
-
-// Converts a wide string to a narrow string in UTF-8 encoding.
-// The wide string is assumed to have the following encoding:
-// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS)
-// UTF-32 if sizeof(wchar_t) == 4 (on Linux)
-// Parameter str points to a null-terminated wide string.
-// Parameter num_chars may additionally limit the number
-// of wchar_t characters processed. -1 is used when the entire string
-// should be processed.
-// If the string contains code points that are not valid Unicode code points
-// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
-// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
-// and contains invalid UTF-16 surrogate pairs, values in those pairs
-// will be encoded as individual Unicode characters from Basic Normal Plane.
-String WideStringToUtf8(const wchar_t* str, int num_chars) {
- if (num_chars == -1)
- num_chars = static_cast(wcslen(str));
-
- ::std::stringstream stream;
- for (int i = 0; i < num_chars; ++i) {
- UInt32 unicode_code_point;
-
- if (str[i] == L'\0') {
- break;
- } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
- unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
- str[i + 1]);
- i++;
- } else {
- unicode_code_point = static_cast(str[i]);
- }
-
- char buffer[32]; // CodePointToUtf8 requires a buffer this big.
- stream << CodePointToUtf8(unicode_code_point, buffer);
- }
- return StringStreamToString(&stream);
-}
-
-// Converts a wide C string to a String using the UTF-8 encoding.
-// NULL will be converted to "(null)".
-String String::ShowWideCString(const wchar_t * wide_c_str) {
- if (wide_c_str == NULL) return String("(null)");
-
- return String(internal::WideStringToUtf8(wide_c_str, -1).c_str());
-}
-
-// Similar to ShowWideCString(), except that this function encloses
-// the converted string in double quotes.
-String String::ShowWideCStringQuoted(const wchar_t* wide_c_str) {
- if (wide_c_str == NULL) return String("(null)");
-
- return String::Format("L\"%s\"",
- String::ShowWideCString(wide_c_str).c_str());
-}
-
-// Compares two wide C strings. Returns true iff they have the same
-// content.
-//
-// Unlike wcscmp(), this function can handle NULL argument(s). A NULL
-// C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
- if (lhs == NULL) return rhs == NULL;
-
- if (rhs == NULL) return false;
-
- return wcscmp(lhs, rhs) == 0;
-}
-
-// Helper function for *_STREQ on wide strings.
-AssertionResult CmpHelperSTREQ(const char* expected_expression,
- const char* actual_expression,
- const wchar_t* expected,
- const wchar_t* actual) {
- if (String::WideCStringEquals(expected, actual)) {
- return AssertionSuccess();
- }
-
- return EqFailure(expected_expression,
- actual_expression,
- String::ShowWideCStringQuoted(expected),
- String::ShowWideCStringQuoted(actual),
- false);
-}
-
-// Helper function for *_STRNE on wide strings.
-AssertionResult CmpHelperSTRNE(const char* s1_expression,
- const char* s2_expression,
- const wchar_t* s1,
- const wchar_t* s2) {
- if (!String::WideCStringEquals(s1, s2)) {
- return AssertionSuccess();
- }
-
- return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
- << s2_expression << "), actual: "
- << String::ShowWideCStringQuoted(s1)
- << " vs " << String::ShowWideCStringQuoted(s2);
-}
-
-// Compares two C strings, ignoring case. Returns true iff they have
-// the same content.
-//
-// Unlike strcasecmp(), this function can handle NULL argument(s). A
-// NULL C string is considered different to any non-NULL C string,
-// including the empty string.
-bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
- if (lhs == NULL)
- return rhs == NULL;
- if (rhs == NULL)
- return false;
- return posix::StrCaseCmp(lhs, rhs) == 0;
-}
-
- // Compares two wide C strings, ignoring case. Returns true iff they
- // have the same content.
- //
- // Unlike wcscasecmp(), this function can handle NULL argument(s).
- // A NULL C string is considered different to any non-NULL wide C string,
- // including the empty string.
- // NB: The implementations on different platforms slightly differ.
- // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
- // environment variable. On GNU platform this method uses wcscasecmp
- // which compares according to LC_CTYPE category of the current locale.
- // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
- // current locale.
-bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
- const wchar_t* rhs) {
- if (lhs == NULL) return rhs == NULL;
-
- if (rhs == NULL) return false;
-
-#if GTEST_OS_WINDOWS
- return _wcsicmp(lhs, rhs) == 0;
-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
- return wcscasecmp(lhs, rhs) == 0;
-#else
- // Android, Mac OS X and Cygwin don't define wcscasecmp.
- // Other unknown OSes may not define it either.
- wint_t left, right;
- do {
- left = towlower(*lhs++);
- right = towlower(*rhs++);
- } while (left && left == right);
- return left == right;
-#endif // OS selector
-}
-
-// Compares this with another String.
-// Returns < 0 if this is less than rhs, 0 if this is equal to rhs, or > 0
-// if this is greater than rhs.
-int String::Compare(const String & rhs) const {
- const char* const lhs_c_str = c_str();
- const char* const rhs_c_str = rhs.c_str();
-
- if (lhs_c_str == NULL) {
- return rhs_c_str == NULL ? 0 : -1; // NULL < anything except NULL
- } else if (rhs_c_str == NULL) {
- return 1;
- }
-
- const size_t shorter_str_len =
- length() <= rhs.length() ? length() : rhs.length();
- for (size_t i = 0; i != shorter_str_len; i++) {
- if (lhs_c_str[i] < rhs_c_str[i]) {
- return -1;
- } else if (lhs_c_str[i] > rhs_c_str[i]) {
- return 1;
- }
- }
- return (length() < rhs.length()) ? -1 :
- (length() > rhs.length()) ? 1 : 0;
-}
-
-// Returns true iff this String ends with the given suffix. *Any*
-// String is considered to end with a NULL or empty suffix.
-bool String::EndsWith(const char* suffix) const {
- if (suffix == NULL || CStringEquals(suffix, "")) return true;
-
- if (c_str() == NULL) return false;
-
- const size_t this_len = strlen(c_str());
- const size_t suffix_len = strlen(suffix);
- return (this_len >= suffix_len) &&
- CStringEquals(c_str() + this_len - suffix_len, suffix);
-}
-
-// Returns true iff this String ends with the given suffix, ignoring case.
-// Any String is considered to end with a NULL or empty suffix.
-bool String::EndsWithCaseInsensitive(const char* suffix) const {
- if (suffix == NULL || CStringEquals(suffix, "")) return true;
-
- if (c_str() == NULL) return false;
-
- const size_t this_len = strlen(c_str());
- const size_t suffix_len = strlen(suffix);
- return (this_len >= suffix_len) &&
- CaseInsensitiveCStringEquals(c_str() + this_len - suffix_len, suffix);
-}
-
-// Formats a list of arguments to a String, using the same format
-// spec string as for printf.
-//
-// We do not use the StringPrintf class as it is not universally
-// available.
-//
-// The result is limited to 4096 characters (including the tailing 0).
-// If 4096 characters are not enough to format the input, or if
-// there's an error, "" is
-// returned.
-String String::Format(const char * format, ...) {
- va_list args;
- va_start(args, format);
-
- char buffer[4096];
- const int kBufferSize = sizeof(buffer)/sizeof(buffer[0]);
-
- // MSVC 8 deprecates vsnprintf(), so we want to suppress warning
- // 4996 (deprecated function) there.
-#ifdef _MSC_VER // We are using MSVC.
-# pragma warning(push) // Saves the current warning state.
-# pragma warning(disable:4996) // Temporarily disables warning 4996.
-
- const int size = vsnprintf(buffer, kBufferSize, format, args);
-
-# pragma warning(pop) // Restores the warning state.
-#else // We are not using MSVC.
- const int size = vsnprintf(buffer, kBufferSize, format, args);
-#endif // _MSC_VER
- va_end(args);
-
- // vsnprintf()'s behavior is not portable. When the buffer is not
- // big enough, it returns a negative value in MSVC, and returns the
- // needed buffer size on Linux. When there is an output error, it
- // always returns a negative value. For simplicity, we lump the two
- // error cases together.
- if (size < 0 || size >= kBufferSize) {
- return String("");
- } else {
- return String(buffer, size);
- }
-}
-
-// Converts the buffer in a stringstream to a String, converting NUL
-// bytes to "\\0" along the way.
-String StringStreamToString(::std::stringstream* ss) {
- const ::std::string& str = ss->str();
- const char* const start = str.c_str();
- const char* const end = start + str.length();
-
- // We need to use a helper stringstream to do this transformation
- // because String doesn't support push_back().
- ::std::stringstream helper;
- for (const char* ch = start; ch != end; ++ch) {
- if (*ch == '\0') {
- helper << "\\0"; // Replaces NUL with "\\0";
- } else {
- helper.put(*ch);
- }
- }
-
- return String(helper.str().c_str());
-}
-
-// Appends the user-supplied message to the Google-Test-generated message.
-String AppendUserMessage(const String& gtest_msg,
- const Message& user_msg) {
- // Appends the user message if it's non-empty.
- const String user_msg_string = user_msg.GetString();
- if (user_msg_string.empty()) {
- return gtest_msg;
- }
-
- Message msg;
- msg << gtest_msg << "\n" << user_msg_string;
-
- return msg.GetString();
-}
-
-} // namespace internal
-
-// class TestResult
-
-// Creates an empty TestResult.
-TestResult::TestResult()
- : death_test_count_(0),
- elapsed_time_(0) {
-}
-
-// D'tor.
-TestResult::~TestResult() {
-}
-
-// Returns the i-th test part result among all the results. i can
-// range from 0 to total_part_count() - 1. If i is not in that range,
-// aborts the program.
-const TestPartResult& TestResult::GetTestPartResult(int i) const {
- if (i < 0 || i >= total_part_count())
- internal::posix::Abort();
- return test_part_results_.at(i);
-}
-
-// Returns the i-th test property. i can range from 0 to
-// test_property_count() - 1. If i is not in that range, aborts the
-// program.
-const TestProperty& TestResult::GetTestProperty(int i) const {
- if (i < 0 || i >= test_property_count())
- internal::posix::Abort();
- return test_properties_.at(i);
-}
-
-// Clears the test part results.
-void TestResult::ClearTestPartResults() {
- test_part_results_.clear();
-}
-
-// Adds a test part result to the list.
-void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
- test_part_results_.push_back(test_part_result);
-}
-
-// Adds a test property to the list. If a property with the same key as the
-// supplied property is already represented, the value of this test_property
-// replaces the old value for that key.
-void TestResult::RecordProperty(const TestProperty& test_property) {
- if (!ValidateTestProperty(test_property)) {
- return;
- }
- internal::MutexLock lock(&test_properites_mutex_);
- const std::vector::iterator property_with_matching_key =
- std::find_if(test_properties_.begin(), test_properties_.end(),
- internal::TestPropertyKeyIs(test_property.key()));
- if (property_with_matching_key == test_properties_.end()) {
- test_properties_.push_back(test_property);
- return;
- }
- property_with_matching_key->SetValue(test_property.value());
-}
-
-// Adds a failure if the key is a reserved attribute of Google Test
-// testcase tags. Returns true if the property is valid.
-bool TestResult::ValidateTestProperty(const TestProperty& test_property) {
- internal::String key(test_property.key());
- if (key == "name" || key == "status" || key == "time" || key == "classname") {
- ADD_FAILURE()
- << "Reserved key used in RecordProperty(): "
- << key
- << " ('name', 'status', 'time', and 'classname' are reserved by "
- << GTEST_NAME_ << ")";
- return false;
- }
- return true;
-}
-
-// Clears the object.
-void TestResult::Clear() {
- test_part_results_.clear();
- test_properties_.clear();
- death_test_count_ = 0;
- elapsed_time_ = 0;
-}
-
-// Returns true iff the test failed.
-bool TestResult::Failed() const {
- for (int i = 0; i < total_part_count(); ++i) {
- if (GetTestPartResult(i).failed())
- return true;
- }
- return false;
-}
-
-// Returns true iff the test part fatally failed.
-static bool TestPartFatallyFailed(const TestPartResult& result) {
- return result.fatally_failed();
-}
-
-// Returns true iff the test fatally failed.
-bool TestResult::HasFatalFailure() const {
- return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
-}
-
-// Returns true iff the test part non-fatally failed.
-static bool TestPartNonfatallyFailed(const TestPartResult& result) {
- return result.nonfatally_failed();
-}
-
-// Returns true iff the test has a non-fatal failure.
-bool TestResult::HasNonfatalFailure() const {
- return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
-}
-
-// Gets the number of all test parts. This is the sum of the number
-// of successful test parts and the number of failed test parts.
-int TestResult::total_part_count() const {
- return static_cast(test_part_results_.size());
-}
-
-// Returns the number of the test properties.
-int TestResult::test_property_count() const {
- return static_cast(test_properties_.size());
-}
-
-// class Test
-
-// Creates a Test object.
-
-// The c'tor saves the values of all Google Test flags.
-Test::Test()
- : gtest_flag_saver_(new internal::GTestFlagSaver) {
-}
-
-// The d'tor restores the values of all Google Test flags.
-Test::~Test() {
- delete gtest_flag_saver_;
-}
-
-// Sets up the test fixture.
-//
-// A sub-class may override this.
-void Test::SetUp() {
-}
-
-// Tears down the test fixture.
-//
-// A sub-class may override this.
-void Test::TearDown() {
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const char* key, const char* value) {
- UnitTest::GetInstance()->RecordPropertyForCurrentTest(key, value);
-}
-
-// Allows user supplied key value pairs to be recorded for later output.
-void Test::RecordProperty(const char* key, int value) {
- Message value_message;
- value_message << value;
- RecordProperty(key, value_message.GetString().c_str());
-}
-
-namespace internal {
-
-void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
- const String& message) {
- // This function is a friend of UnitTest and as such has access to
- // AddTestPartResult.
- UnitTest::GetInstance()->AddTestPartResult(
- result_type,
- NULL, // No info about the source file where the exception occurred.
- -1, // We have no info on which line caused the exception.
- message,
- String()); // No stack trace, either.
-}
-
-} // namespace internal
-
-// Google Test requires all tests in the same test case to use the same test
-// fixture class. This function checks if the current test has the
-// same fixture class as the first test in the current test case. If
-// yes, it returns true; otherwise it generates a Google Test failure and
-// returns false.
-bool Test::HasSameFixtureClass() {
- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
- const TestCase* const test_case = impl->current_test_case();
-
- // Info about the first test in the current test case.
- const TestInfo* const first_test_info = test_case->test_info_list()[0];
- const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
- const char* const first_test_name = first_test_info->name();
-
- // Info about the current test.
- const TestInfo* const this_test_info = impl->current_test_info();
- const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
- const char* const this_test_name = this_test_info->name();
-
- if (this_fixture_id != first_fixture_id) {
- // Is the first test defined using TEST?
- const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
- // Is this test defined using TEST?
- const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
-
- if (first_is_TEST || this_is_TEST) {
- // The user mixed TEST and TEST_F in this test case - we'll tell
- // him/her how to fix it.
-
- // Gets the name of the TEST and the name of the TEST_F. Note
- // that first_is_TEST and this_is_TEST cannot both be true, as
- // the fixture IDs are different for the two tests.
- const char* const TEST_name =
- first_is_TEST ? first_test_name : this_test_name;
- const char* const TEST_F_name =
- first_is_TEST ? this_test_name : first_test_name;
-
- ADD_FAILURE()
- << "All tests in the same test case must use the same test fixture\n"
- << "class, so mixing TEST_F and TEST in the same test case is\n"
- << "illegal. In test case " << this_test_info->test_case_name()
- << ",\n"
- << "test " << TEST_F_name << " is defined using TEST_F but\n"
- << "test " << TEST_name << " is defined using TEST. You probably\n"
- << "want to change the TEST to TEST_F or move it to another test\n"
- << "case.";
- } else {
- // The user defined two fixture classes with the same name in
- // two namespaces - we'll tell him/her how to fix it.
- ADD_FAILURE()
- << "All tests in the same test case must use the same test fixture\n"
- << "class. However, in test case "
- << this_test_info->test_case_name() << ",\n"
- << "you defined test " << first_test_name
- << " and test " << this_test_name << "\n"
- << "using two different test fixture classes. This can happen if\n"
- << "the two classes are from different namespaces or translation\n"
- << "units and have the same name. You should probably rename one\n"
- << "of the classes to put the tests into different test cases.";
- }
- return false;
- }
-
- return true;
-}
-
-#if GTEST_HAS_SEH
-
-// Adds an "exception thrown" fatal failure to the current test. This
-// function returns its result via an output parameter pointer because VC++
-// prohibits creation of objects with destructors on stack in functions
-// using __try (see error C2712).
-static internal::String* FormatSehExceptionMessage(DWORD exception_code,
- const char* location) {
- Message message;
- message << "SEH exception with code 0x" << std::setbase(16) <<
- exception_code << std::setbase(10) << " thrown in " << location << ".";
-
- return new internal::String(message.GetString());
-}
-
-#endif // GTEST_HAS_SEH
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Adds an "exception thrown" fatal failure to the current test.
-static internal::String FormatCxxExceptionMessage(const char* description,
- const char* location) {
- Message message;
- if (description != NULL) {
- message << "C++ exception with description \"" << description << "\"";
- } else {
- message << "Unknown C++ exception";
- }
- message << " thrown in " << location << ".";
-
- return message.GetString();
-}
-
-static internal::String PrintTestPartResultToString(
- const TestPartResult& test_part_result);
-
-// A failed Google Test assertion will throw an exception of this type when
-// GTEST_FLAG(throw_on_failure) is true (if exceptions are enabled). We
-// derive it from std::runtime_error, which is for errors presumably
-// detectable only at run time. Since std::runtime_error inherits from
-// std::exception, many testing frameworks know how to extract and print the
-// message inside it.
-class GoogleTestFailureException : public ::std::runtime_error {
- public:
- explicit GoogleTestFailureException(const TestPartResult& failure)
- : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
-};
-#endif // GTEST_HAS_EXCEPTIONS
-
-namespace internal {
-// We put these helper functions in the internal namespace as IBM's xlC
-// compiler rejects the code if they were declared static.
-
-// Runs the given method and handles SEH exceptions it throws, when
-// SEH is supported; returns the 0-value for type Result in case of an
-// SEH exception. (Microsoft compilers cannot handle SEH and C++
-// exceptions in the same function. Therefore, we provide a separate
-// wrapper function for handling SEH exceptions.)
-template
-Result HandleSehExceptionsInMethodIfSupported(
- T* object, Result (T::*method)(), const char* location) {
-#if GTEST_HAS_SEH
- __try {
- return (object->*method)();
- } __except (internal::UnitTestOptions::GTestShouldProcessSEH( // NOLINT
- GetExceptionCode())) {
- // We create the exception message on the heap because VC++ prohibits
- // creation of objects with destructors on stack in functions using __try
- // (see error C2712).
- internal::String* exception_message = FormatSehExceptionMessage(
- GetExceptionCode(), location);
- internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
- *exception_message);
- delete exception_message;
- return static_cast(0);
- }
-#else
- (void)location;
- return (object->*method)();
-#endif // GTEST_HAS_SEH
-}
-
-// Runs the given method and catches and reports C++ and/or SEH-style
-// exceptions, if they are supported; returns the 0-value for type
-// Result in case of an SEH exception.
-template
-Result HandleExceptionsInMethodIfSupported(
- T* object, Result (T::*method)(), const char* location) {
- // NOTE: The user code can affect the way in which Google Test handles
- // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
- // RUN_ALL_TESTS() starts. It is technically possible to check the flag
- // after the exception is caught and either report or re-throw the
- // exception based on the flag's value:
- //
- // try {
- // // Perform the test method.
- // } catch (...) {
- // if (GTEST_FLAG(catch_exceptions))
- // // Report the exception as failure.
- // else
- // throw; // Re-throws the original exception.
- // }
- //
- // However, the purpose of this flag is to allow the program to drop into
- // the debugger when the exception is thrown. On most platforms, once the
- // control enters the catch block, the exception origin information is
- // lost and the debugger will stop the program at the point of the
- // re-throw in this function -- instead of at the point of the original
- // throw statement in the code under test. For this reason, we perform
- // the check early, sacrificing the ability to affect Google Test's
- // exception handling in the method where the exception is thrown.
- if (internal::GetUnitTestImpl()->catch_exceptions()) {
-#if GTEST_HAS_EXCEPTIONS
- try {
- return HandleSehExceptionsInMethodIfSupported(object, method, location);
- } catch (const GoogleTestFailureException&) { // NOLINT
- // This exception doesn't originate in code under test. It makes no
- // sense to report it as a test failure.
- throw;
- } catch (const std::exception& e) { // NOLINT
- internal::ReportFailureInUnknownLocation(
- TestPartResult::kFatalFailure,
- FormatCxxExceptionMessage(e.what(), location));
- } catch (...) { // NOLINT
- internal::ReportFailureInUnknownLocation(
- TestPartResult::kFatalFailure,
- FormatCxxExceptionMessage(NULL, location));
- }
- return static_cast(0);
-#else
- return HandleSehExceptionsInMethodIfSupported(object, method, location);
-#endif // GTEST_HAS_EXCEPTIONS
- } else {
- return (object->*method)();
- }
-}
-
-} // namespace internal
-
-// Runs the test and updates the test result.
-void Test::Run() {
- if (!HasSameFixtureClass()) return;
-
- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
- // We will run the test only if SetUp() was successful.
- if (!HasFatalFailure()) {
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- this, &Test::TestBody, "the test body");
- }
-
- // However, we want to clean up as much as possible. Hence we will
- // always call TearDown(), even if SetUp() or the test body has
- // failed.
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- this, &Test::TearDown, "TearDown()");
-}
-
-// Returns true iff the current test has a fatal failure.
-bool Test::HasFatalFailure() {
- return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
-}
-
-// Returns true iff the current test has a non-fatal failure.
-bool Test::HasNonfatalFailure() {
- return internal::GetUnitTestImpl()->current_test_result()->
- HasNonfatalFailure();
-}
-
-// class TestInfo
-
-// Constructs a TestInfo object. It assumes ownership of the test factory
-// object.
-// TODO(vladl@google.com): Make a_test_case_name and a_name const string&'s
-// to signify they cannot be NULLs.
-TestInfo::TestInfo(const char* a_test_case_name,
- const char* a_name,
- const char* a_type_param,
- const char* a_value_param,
- internal::TypeId fixture_class_id,
- internal::TestFactoryBase* factory)
- : test_case_name_(a_test_case_name),
- name_(a_name),
- type_param_(a_type_param ? new std::string(a_type_param) : NULL),
- value_param_(a_value_param ? new std::string(a_value_param) : NULL),
- fixture_class_id_(fixture_class_id),
- should_run_(false),
- is_disabled_(false),
- matches_filter_(false),
- factory_(factory),
- result_() {}
-
-// Destructs a TestInfo object.
-TestInfo::~TestInfo() { delete factory_; }
-
-namespace internal {
-
-// Creates a new TestInfo object and registers it with Google Test;
-// returns the created object.
-//
-// Arguments:
-//
-// test_case_name: name of the test case
-// name: name of the test
-// type_param: the name of the test's type parameter, or NULL if
-// this is not a typed or a type-parameterized test.
-// value_param: text representation of the test's value parameter,
-// or NULL if this is not a value-parameterized test.
-// fixture_class_id: ID of the test fixture class
-// set_up_tc: pointer to the function that sets up the test case
-// tear_down_tc: pointer to the function that tears down the test case
-// factory: pointer to the factory that creates a test object.
-// The newly created TestInfo instance will assume
-// ownership of the factory object.
-TestInfo* MakeAndRegisterTestInfo(
- const char* test_case_name, const char* name,
- const char* type_param,
- const char* value_param,
- TypeId fixture_class_id,
- SetUpTestCaseFunc set_up_tc,
- TearDownTestCaseFunc tear_down_tc,
- TestFactoryBase* factory) {
- TestInfo* const test_info =
- new TestInfo(test_case_name, name, type_param, value_param,
- fixture_class_id, factory);
- GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
- return test_info;
-}
-
-#if GTEST_HAS_PARAM_TEST
-void ReportInvalidTestCaseType(const char* test_case_name,
- const char* file, int line) {
- Message errors;
- errors
- << "Attempted redefinition of test case " << test_case_name << ".\n"
- << "All tests in the same test case must use the same test fixture\n"
- << "class. However, in test case " << test_case_name << ", you tried\n"
- << "to define a test using a fixture class different from the one\n"
- << "used earlier. This can happen if the two fixture classes are\n"
- << "from different namespaces and have the same name. You should\n"
- << "probably rename one of the classes to put the tests into different\n"
- << "test cases.";
-
- fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
- errors.GetString().c_str());
-}
-#endif // GTEST_HAS_PARAM_TEST
-
-} // namespace internal
-
-namespace {
-
-// A predicate that checks the test name of a TestInfo against a known
-// value.
-//
-// This is used for implementation of the TestCase class only. We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestNameIs is copyable.
-class TestNameIs {
- public:
- // Constructor.
- //
- // TestNameIs has NO default constructor.
- explicit TestNameIs(const char* name)
- : name_(name) {}
-
- // Returns true iff the test name of test_info matches name_.
- bool operator()(const TestInfo * test_info) const {
- return test_info && internal::String(test_info->name()).Compare(name_) == 0;
- }
-
- private:
- internal::String name_;
-};
-
-} // namespace
-
-namespace internal {
-
-// This method expands all parameterized tests registered with macros TEST_P
-// and INSTANTIATE_TEST_CASE_P into regular tests and registers those.
-// This will be done just once during the program runtime.
-void UnitTestImpl::RegisterParameterizedTests() {
-#if GTEST_HAS_PARAM_TEST
- if (!parameterized_tests_registered_) {
- parameterized_test_registry_.RegisterTests();
- parameterized_tests_registered_ = true;
- }
-#endif
-}
-
-} // namespace internal
-
-// Creates the test object, runs it, records its result, and then
-// deletes it.
-void TestInfo::Run() {
- if (!should_run_) return;
-
- // Tells UnitTest where to store test result.
- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
- impl->set_current_test_info(this);
-
- TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
- // Notifies the unit test event listeners that a test is about to start.
- repeater->OnTestStart(*this);
-
- const TimeInMillis start = internal::GetTimeInMillis();
-
- impl->os_stack_trace_getter()->UponLeavingGTest();
-
- // Creates the test object.
- Test* const test = internal::HandleExceptionsInMethodIfSupported(
- factory_, &internal::TestFactoryBase::CreateTest,
- "the test fixture's constructor");
-
- // Runs the test only if the test object was created and its
- // constructor didn't generate a fatal failure.
- if ((test != NULL) && !Test::HasFatalFailure()) {
- // This doesn't throw as all user code that can throw are wrapped into
- // exception handling code.
- test->Run();
- }
-
- // Deletes the test object.
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- test, &Test::DeleteSelf_, "the test fixture's destructor");
-
- result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
- // Notifies the unit test event listener that a test has just finished.
- repeater->OnTestEnd(*this);
-
- // Tells UnitTest to stop associating assertion results to this
- // test.
- impl->set_current_test_info(NULL);
-}
-
-// class TestCase
-
-// Gets the number of successful tests in this test case.
-int TestCase::successful_test_count() const {
- return CountIf(test_info_list_, TestPassed);
-}
-
-// Gets the number of failed tests in this test case.
-int TestCase::failed_test_count() const {
- return CountIf(test_info_list_, TestFailed);
-}
-
-int TestCase::disabled_test_count() const {
- return CountIf(test_info_list_, TestDisabled);
-}
-
-// Get the number of tests in this test case that should run.
-int TestCase::test_to_run_count() const {
- return CountIf(test_info_list_, ShouldRunTest);
-}
-
-// Gets the number of all tests.
-int TestCase::total_test_count() const {
- return static_cast(test_info_list_.size());
-}
-
-// Creates a TestCase with the given name.
-//
-// Arguments:
-//
-// name: name of the test case
-// a_type_param: the name of the test case's type parameter, or NULL if
-// this is not a typed or a type-parameterized test case.
-// set_up_tc: pointer to the function that sets up the test case
-// tear_down_tc: pointer to the function that tears down the test case
-TestCase::TestCase(const char* a_name, const char* a_type_param,
- Test::SetUpTestCaseFunc set_up_tc,
- Test::TearDownTestCaseFunc tear_down_tc)
- : name_(a_name),
- type_param_(a_type_param ? new std::string(a_type_param) : NULL),
- set_up_tc_(set_up_tc),
- tear_down_tc_(tear_down_tc),
- should_run_(false),
- elapsed_time_(0) {
-}
-
-// Destructor of TestCase.
-TestCase::~TestCase() {
- // Deletes every Test in the collection.
- ForEach(test_info_list_, internal::Delete);
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-const TestInfo* TestCase::GetTestInfo(int i) const {
- const int index = GetElementOr(test_indices_, i, -1);
- return index < 0 ? NULL : test_info_list_[index];
-}
-
-// Returns the i-th test among all the tests. i can range from 0 to
-// total_test_count() - 1. If i is not in that range, returns NULL.
-TestInfo* TestCase::GetMutableTestInfo(int i) {
- const int index = GetElementOr(test_indices_, i, -1);
- return index < 0 ? NULL : test_info_list_[index];
-}
-
-// Adds a test to this test case. Will delete the test upon
-// destruction of the TestCase object.
-void TestCase::AddTestInfo(TestInfo * test_info) {
- test_info_list_.push_back(test_info);
- test_indices_.push_back(static_cast(test_indices_.size()));
-}
-
-// Runs every test in this TestCase.
-void TestCase::Run() {
- if (!should_run_) return;
-
- internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
- impl->set_current_test_case(this);
-
- TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
-
- repeater->OnTestCaseStart(*this);
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- this, &TestCase::RunSetUpTestCase, "SetUpTestCase()");
-
- const internal::TimeInMillis start = internal::GetTimeInMillis();
- for (int i = 0; i < total_test_count(); i++) {
- GetMutableTestInfo(i)->Run();
- }
- elapsed_time_ = internal::GetTimeInMillis() - start;
-
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- this, &TestCase::RunTearDownTestCase, "TearDownTestCase()");
-
- repeater->OnTestCaseEnd(*this);
- impl->set_current_test_case(NULL);
-}
-
-// Clears the results of all tests in this test case.
-void TestCase::ClearResult() {
- ForEach(test_info_list_, TestInfo::ClearTestResult);
-}
-
-// Shuffles the tests in this test case.
-void TestCase::ShuffleTests(internal::Random* random) {
- Shuffle(random, &test_indices_);
-}
-
-// Restores the test order to before the first shuffle.
-void TestCase::UnshuffleTests() {
- for (size_t i = 0; i < test_indices_.size(); i++) {
- test_indices_[i] = static_cast(i);
- }
-}
-
-// Formats a countable noun. Depending on its quantity, either the
-// singular form or the plural form is used. e.g.
-//
-// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
-// FormatCountableNoun(5, "book", "books") returns "5 books".
-static internal::String FormatCountableNoun(int count,
- const char * singular_form,
- const char * plural_form) {
- return internal::String::Format("%d %s", count,
- count == 1 ? singular_form : plural_form);
-}
-
-// Formats the count of tests.
-static internal::String FormatTestCount(int test_count) {
- return FormatCountableNoun(test_count, "test", "tests");
-}
-
-// Formats the count of test cases.
-static internal::String FormatTestCaseCount(int test_case_count) {
- return FormatCountableNoun(test_case_count, "test case", "test cases");
-}
-
-// Converts a TestPartResult::Type enum to human-friendly string
-// representation. Both kNonFatalFailure and kFatalFailure are translated
-// to "Failure", as the user usually doesn't care about the difference
-// between the two when viewing the test result.
-static const char * TestPartResultTypeToString(TestPartResult::Type type) {
- switch (type) {
- case TestPartResult::kSuccess:
- return "Success";
-
- case TestPartResult::kNonFatalFailure:
- case TestPartResult::kFatalFailure:
-#ifdef _MSC_VER
- return "error: ";
-#else
- return "Failure\n";
-#endif
- default:
- return "Unknown result type";
- }
-}
-
-// Prints a TestPartResult to a String.
-static internal::String PrintTestPartResultToString(
- const TestPartResult& test_part_result) {
- return (Message()
- << internal::FormatFileLocation(test_part_result.file_name(),
- test_part_result.line_number())
- << " " << TestPartResultTypeToString(test_part_result.type())
- << test_part_result.message()).GetString();
-}
-
-// Prints a TestPartResult.
-static void PrintTestPartResult(const TestPartResult& test_part_result) {
- const internal::String& result =
- PrintTestPartResultToString(test_part_result);
- printf("%s\n", result.c_str());
- fflush(stdout);
- // If the test program runs in Visual Studio or a debugger, the
- // following statements add the test part result message to the Output
- // window such that the user can double-click on it to jump to the
- // corresponding source code location; otherwise they do nothing.
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
- // We don't call OutputDebugString*() on Windows Mobile, as printing
- // to stdout is done by OutputDebugString() there already - we don't
- // want the same message printed twice.
- ::OutputDebugStringA(result.c_str());
- ::OutputDebugStringA("\n");
-#endif
-}
-
-// class PrettyUnitTestResultPrinter
-
-namespace internal {
-
-enum GTestColor {
- COLOR_DEFAULT,
- COLOR_RED,
- COLOR_GREEN,
- COLOR_YELLOW
-};
-
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-
-// Returns the character attribute for the given color.
-WORD GetColorAttribute(GTestColor color) {
- switch (color) {
- case COLOR_RED: return FOREGROUND_RED;
- case COLOR_GREEN: return FOREGROUND_GREEN;
- case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN;
- default: return 0;
- }
-}
-
-#else
-
-// Returns the ANSI color code for the given color. COLOR_DEFAULT is
-// an invalid input.
-const char* GetAnsiColorCode(GTestColor color) {
- switch (color) {
- case COLOR_RED: return "1";
- case COLOR_GREEN: return "2";
- case COLOR_YELLOW: return "3";
- default: return NULL;
- };
-}
-
-#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
-
-// Returns true iff Google Test should use colors in the output.
-bool ShouldUseColor(bool stdout_is_tty) {
- const char* const gtest_color = GTEST_FLAG(color).c_str();
-
- if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
-#if GTEST_OS_WINDOWS
- // On Windows the TERM variable is usually not set, but the
- // console there does support colors.
- return stdout_is_tty;
-#else
- // On non-Windows platforms, we rely on the TERM variable.
- const char* const term = posix::GetEnv("TERM");
- const bool term_supports_color =
- String::CStringEquals(term, "xterm") ||
- String::CStringEquals(term, "xterm-color") ||
- String::CStringEquals(term, "xterm-256color") ||
- String::CStringEquals(term, "screen") ||
- String::CStringEquals(term, "linux") ||
- String::CStringEquals(term, "cygwin");
- return stdout_is_tty && term_supports_color;
-#endif // GTEST_OS_WINDOWS
- }
-
- return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
- String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
- String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
- String::CStringEquals(gtest_color, "1");
- // We take "yes", "true", "t", and "1" as meaning "yes". If the
- // value is neither one of these nor "auto", we treat it as "no" to
- // be conservative.
-}
-
-// Helpers for printing colored strings to stdout. Note that on Windows, we
-// cannot simply emit special characters and have the terminal change colors.
-// This routine must actually emit the characters rather than return a string
-// that would be colored when printed, as can be done on Linux.
-void ColoredPrintf(GTestColor color, const char* fmt, ...) {
- va_list args;
- va_start(args, fmt);
-
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS
- const bool use_color = false;
-#else
- static const bool in_color_mode =
- ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
- const bool use_color = in_color_mode && (color != COLOR_DEFAULT);
-#endif // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS
- // The '!= 0' comparison is necessary to satisfy MSVC 7.1.
-
- if (!use_color) {
- vprintf(fmt, args);
- va_end(args);
- return;
- }
-
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
- const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
- // Gets the current text color.
- CONSOLE_SCREEN_BUFFER_INFO buffer_info;
- GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
- const WORD old_color_attrs = buffer_info.wAttributes;
-
- // We need to flush the stream buffers into the console before each
- // SetConsoleTextAttribute call lest it affect the text that is already
- // printed but has not yet reached the console.
- fflush(stdout);
- SetConsoleTextAttribute(stdout_handle,
- GetColorAttribute(color) | FOREGROUND_INTENSITY);
- vprintf(fmt, args);
-
- fflush(stdout);
- // Restores the text color.
- SetConsoleTextAttribute(stdout_handle, old_color_attrs);
-#else
- printf("\033[0;3%sm", GetAnsiColorCode(color));
- vprintf(fmt, args);
- printf("\033[m"); // Resets the terminal to default.
-#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
- va_end(args);
-}
-
-void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
- const char* const type_param = test_info.type_param();
- const char* const value_param = test_info.value_param();
-
- if (type_param != NULL || value_param != NULL) {
- printf(", where ");
- if (type_param != NULL) {
- printf("TypeParam = %s", type_param);
- if (value_param != NULL)
- printf(" and ");
- }
- if (value_param != NULL) {
- printf("GetParam() = %s", value_param);
- }
- }
-}
-
-// This class implements the TestEventListener interface.
-//
-// Class PrettyUnitTestResultPrinter is copyable.
-class PrettyUnitTestResultPrinter : public TestEventListener {
- public:
- PrettyUnitTestResultPrinter() {}
- static void PrintTestName(const char * test_case, const char * test) {
- printf("%s.%s", test_case, test);
- }
-
- // The following methods override what's in the TestEventListener class.
- virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {}
- virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration);
- virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test);
- virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {}
- virtual void OnTestCaseStart(const TestCase& test_case);
- virtual void OnTestStart(const TestInfo& test_info);
- virtual void OnTestPartResult(const TestPartResult& result);
- virtual void OnTestEnd(const TestInfo& test_info);
- virtual void OnTestCaseEnd(const TestCase& test_case);
- virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test);
- virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {}
- virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
- virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {}
-
- private:
- static void PrintFailedTests(const UnitTest& unit_test);
-
- internal::String test_case_name_;
-};
-
- // Fired before each iteration of tests starts.
-void PrettyUnitTestResultPrinter::OnTestIterationStart(
- const UnitTest& unit_test, int iteration) {
- if (GTEST_FLAG(repeat) != 1)
- printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
-
- const char* const filter = GTEST_FLAG(filter).c_str();
-
- // Prints the filter if it's not *. This reminds the user that some
- // tests may be skipped.
- if (!internal::String::CStringEquals(filter, kUniversalFilter)) {
- ColoredPrintf(COLOR_YELLOW,
- "Note: %s filter = %s\n", GTEST_NAME_, filter);
- }
-
- if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
- const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
- ColoredPrintf(COLOR_YELLOW,
- "Note: This is test shard %d of %s.\n",
- static_cast(shard_index) + 1,
- internal::posix::GetEnv(kTestTotalShards));
- }
-
- if (GTEST_FLAG(shuffle)) {
- ColoredPrintf(COLOR_YELLOW,
- "Note: Randomizing tests' orders with a seed of %d .\n",
- unit_test.random_seed());
- }
-
- ColoredPrintf(COLOR_GREEN, "[==========] ");
- printf("Running %s from %s.\n",
- FormatTestCount(unit_test.test_to_run_count()).c_str(),
- FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str());
- fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
- const UnitTest& /*unit_test*/) {
- ColoredPrintf(COLOR_GREEN, "[----------] ");
- printf("Global test environment set-up.\n");
- fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
- test_case_name_ = test_case.name();
- const internal::String counts =
- FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
- ColoredPrintf(COLOR_GREEN, "[----------] ");
- printf("%s from %s", counts.c_str(), test_case_name_.c_str());
- if (test_case.type_param() == NULL) {
- printf("\n");
- } else {
- printf(", where TypeParam = %s\n", test_case.type_param());
- }
- fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
- ColoredPrintf(COLOR_GREEN, "[ RUN ] ");
- PrintTestName(test_case_name_.c_str(), test_info.name());
- printf("\n");
- fflush(stdout);
-}
-
-// Called after an assertion failure.
-void PrettyUnitTestResultPrinter::OnTestPartResult(
- const TestPartResult& result) {
- // If the test part succeeded, we don't need to do anything.
- if (result.type() == TestPartResult::kSuccess)
- return;
-
- // Print failure message from the assertion (e.g. expected this and got that).
- PrintTestPartResult(result);
- fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
- if (test_info.result()->Passed()) {
- ColoredPrintf(COLOR_GREEN, "[ OK ] ");
- } else {
- ColoredPrintf(COLOR_RED, "[ FAILED ] ");
- }
- PrintTestName(test_case_name_.c_str(), test_info.name());
- if (test_info.result()->Failed())
- PrintFullTestCommentIfPresent(test_info);
-
- if (GTEST_FLAG(print_time)) {
- printf(" (%s ms)\n", internal::StreamableToString(
- test_info.result()->elapsed_time()).c_str());
- } else {
- printf("\n");
- }
- fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
- if (!GTEST_FLAG(print_time)) return;
-
- test_case_name_ = test_case.name();
- const internal::String counts =
- FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
- ColoredPrintf(COLOR_GREEN, "[----------] ");
- printf("%s from %s (%s ms total)\n\n",
- counts.c_str(), test_case_name_.c_str(),
- internal::StreamableToString(test_case.elapsed_time()).c_str());
- fflush(stdout);
-}
-
-void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
- const UnitTest& /*unit_test*/) {
- ColoredPrintf(COLOR_GREEN, "[----------] ");
- printf("Global test environment tear-down\n");
- fflush(stdout);
-}
-
-// Internal helper for printing the list of failed tests.
-void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
- const int failed_test_count = unit_test.failed_test_count();
- if (failed_test_count == 0) {
- return;
- }
-
- for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
- const TestCase& test_case = *unit_test.GetTestCase(i);
- if (!test_case.should_run() || (test_case.failed_test_count() == 0)) {
- continue;
- }
- for (int j = 0; j < test_case.total_test_count(); ++j) {
- const TestInfo& test_info = *test_case.GetTestInfo(j);
- if (!test_info.should_run() || test_info.result()->Passed()) {
- continue;
- }
- ColoredPrintf(COLOR_RED, "[ FAILED ] ");
- printf("%s.%s", test_case.name(), test_info.name());
- PrintFullTestCommentIfPresent(test_info);
- printf("\n");
- }
- }
-}
-
-void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
- int /*iteration*/) {
- ColoredPrintf(COLOR_GREEN, "[==========] ");
- printf("%s from %s ran.",
- FormatTestCount(unit_test.test_to_run_count()).c_str(),
- FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str());
- if (GTEST_FLAG(print_time)) {
- printf(" (%s ms total)",
- internal::StreamableToString(unit_test.elapsed_time()).c_str());
- }
- printf("\n");
- ColoredPrintf(COLOR_GREEN, "[ PASSED ] ");
- printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
-
- int num_failures = unit_test.failed_test_count();
- if (!unit_test.Passed()) {
- const int failed_test_count = unit_test.failed_test_count();
- ColoredPrintf(COLOR_RED, "[ FAILED ] ");
- printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
- PrintFailedTests(unit_test);
- printf("\n%2d FAILED %s\n", num_failures,
- num_failures == 1 ? "TEST" : "TESTS");
- }
-
- int num_disabled = unit_test.disabled_test_count();
- if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
- if (!num_failures) {
- printf("\n"); // Add a spacer if no FAILURE banner is displayed.
- }
- ColoredPrintf(COLOR_YELLOW,
- " YOU HAVE %d DISABLED %s\n\n",
- num_disabled,
- num_disabled == 1 ? "TEST" : "TESTS");
- }
- // Ensure that Google Test output is printed before, e.g., heapchecker output.
- fflush(stdout);
-}
-
-// End PrettyUnitTestResultPrinter
-
-// class TestEventRepeater
-//
-// This class forwards events to other event listeners.
-class TestEventRepeater : public TestEventListener {
- public:
- TestEventRepeater() : forwarding_enabled_(true) {}
- virtual ~TestEventRepeater();
- void Append(TestEventListener *listener);
- TestEventListener* Release(TestEventListener* listener);
-
- // Controls whether events will be forwarded to listeners_. Set to false
- // in death test child processes.
- bool forwarding_enabled() const { return forwarding_enabled_; }
- void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
-
- virtual void OnTestProgramStart(const UnitTest& unit_test);
- virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration);
- virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test);
- virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test);
- virtual void OnTestCaseStart(const TestCase& test_case);
- virtual void OnTestStart(const TestInfo& test_info);
- virtual void OnTestPartResult(const TestPartResult& result);
- virtual void OnTestEnd(const TestInfo& test_info);
- virtual void OnTestCaseEnd(const TestCase& test_case);
- virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test);
- virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test);
- virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
- virtual void OnTestProgramEnd(const UnitTest& unit_test);
-
- private:
- // Controls whether events will be forwarded to listeners_. Set to false
- // in death test child processes.
- bool forwarding_enabled_;
- // The list of listeners that receive events.
- std::vector listeners_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
-};
-
-TestEventRepeater::~TestEventRepeater() {
- ForEach(listeners_, Delete);
-}
-
-void TestEventRepeater::Append(TestEventListener *listener) {
- listeners_.push_back(listener);
-}
-
-// TODO(vladl@google.com): Factor the search functionality into Vector::Find.
-TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
- for (size_t i = 0; i < listeners_.size(); ++i) {
- if (listeners_[i] == listener) {
- listeners_.erase(listeners_.begin() + i);
- return listener;
- }
- }
-
- return NULL;
-}
-
-// Since most methods are very similar, use macros to reduce boilerplate.
-// This defines a member that forwards the call to all listeners.
-#define GTEST_REPEATER_METHOD_(Name, Type) \
-void TestEventRepeater::Name(const Type& parameter) { \
- if (forwarding_enabled_) { \
- for (size_t i = 0; i < listeners_.size(); i++) { \
- listeners_[i]->Name(parameter); \
- } \
- } \
-}
-// This defines a member that forwards the call to all listeners in reverse
-// order.
-#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type) \
-void TestEventRepeater::Name(const Type& parameter) { \
- if (forwarding_enabled_) { \
- for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { \
- listeners_[i]->Name(parameter); \
- } \
- } \
-}
-
-GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
-GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
-GTEST_REPEATER_METHOD_(OnTestCaseStart, TestCase)
-GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
-GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
-GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestCase)
-GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
-
-#undef GTEST_REPEATER_METHOD_
-#undef GTEST_REVERSE_REPEATER_METHOD_
-
-void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
- int iteration) {
- if (forwarding_enabled_) {
- for (size_t i = 0; i < listeners_.size(); i++) {
- listeners_[i]->OnTestIterationStart(unit_test, iteration);
- }
- }
-}
-
-void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
- int iteration) {
- if (forwarding_enabled_) {
- for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) {
- listeners_[i]->OnTestIterationEnd(unit_test, iteration);
- }
- }
-}
-
-// End TestEventRepeater
-
-// This class generates an XML output file.
-class XmlUnitTestResultPrinter : public EmptyTestEventListener {
- public:
- explicit XmlUnitTestResultPrinter(const char* output_file);
-
- virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
-
- private:
- // Is c a whitespace character that is normalized to a space character
- // when it appears in an XML attribute value?
- static bool IsNormalizableWhitespace(char c) {
- return c == 0x9 || c == 0xA || c == 0xD;
- }
-
- // May c appear in a well-formed XML document?
- static bool IsValidXmlCharacter(char c) {
- return IsNormalizableWhitespace(c) || c >= 0x20;
- }
-
- // Returns an XML-escaped copy of the input string str. If
- // is_attribute is true, the text is meant to appear as an attribute
- // value, and normalizable whitespace is preserved by replacing it
- // with character references.
- static String EscapeXml(const char* str, bool is_attribute);
-
- // Returns the given string with all characters invalid in XML removed.
- static string RemoveInvalidXmlCharacters(const string& str);
-
- // Convenience wrapper around EscapeXml when str is an attribute value.
- static String EscapeXmlAttribute(const char* str) {
- return EscapeXml(str, true);
- }
-
- // Convenience wrapper around EscapeXml when str is not an attribute value.
- static String EscapeXmlText(const char* str) { return EscapeXml(str, false); }
-
- // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
- static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
-
- // Streams an XML representation of a TestInfo object.
- static void OutputXmlTestInfo(::std::ostream* stream,
- const char* test_case_name,
- const TestInfo& test_info);
-
- // Prints an XML representation of a TestCase object
- static void PrintXmlTestCase(FILE* out, const TestCase& test_case);
-
- // Prints an XML summary of unit_test to output stream out.
- static void PrintXmlUnitTest(FILE* out, const UnitTest& unit_test);
-
- // Produces a string representing the test properties in a result as space
- // delimited XML attributes based on the property key="value" pairs.
- // When the String is not empty, it includes a space at the beginning,
- // to delimit this attribute from prior attributes.
- static String TestPropertiesAsXmlAttributes(const TestResult& result);
-
- // The output file.
- const String output_file_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
-};
-
-// Creates a new XmlUnitTestResultPrinter.
-XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
- : output_file_(output_file) {
- if (output_file_.c_str() == NULL || output_file_.empty()) {
- fprintf(stderr, "XML output file may not be null\n");
- fflush(stderr);
- exit(EXIT_FAILURE);
- }
-}
-
-// Called after the unit test ends.
-void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
- int /*iteration*/) {
- FILE* xmlout = NULL;
- FilePath output_file(output_file_);
- FilePath output_dir(output_file.RemoveFileName());
-
- if (output_dir.CreateDirectoriesRecursively()) {
- xmlout = posix::FOpen(output_file_.c_str(), "w");
- }
- if (xmlout == NULL) {
- // TODO(wan): report the reason of the failure.
- //
- // We don't do it for now as:
- //
- // 1. There is no urgent need for it.
- // 2. It's a bit involved to make the errno variable thread-safe on
- // all three operating systems (Linux, Windows, and Mac OS).
- // 3. To interpret the meaning of errno in a thread-safe way,
- // we need the strerror_r() function, which is not available on
- // Windows.
- fprintf(stderr,
- "Unable to open file \"%s\"\n",
- output_file_.c_str());
- fflush(stderr);
- exit(EXIT_FAILURE);
- }
- PrintXmlUnitTest(xmlout, unit_test);
- fclose(xmlout);
-}
-
-// Returns an XML-escaped copy of the input string str. If is_attribute
-// is true, the text is meant to appear as an attribute value, and
-// normalizable whitespace is preserved by replacing it with character
-// references.
-//
-// Invalid XML characters in str, if any, are stripped from the output.
-// It is expected that most, if not all, of the text processed by this
-// module will consist of ordinary English text.
-// If this module is ever modified to produce version 1.1 XML output,
-// most invalid characters can be retained using character references.
-// TODO(wan): It might be nice to have a minimally invasive, human-readable
-// escaping scheme for invalid characters, rather than dropping them.
-String XmlUnitTestResultPrinter::EscapeXml(const char* str, bool is_attribute) {
- Message m;
-
- if (str != NULL) {
- for (const char* src = str; *src; ++src) {
- switch (*src) {
- case '<':
- m << "<";
- break;
- case '>':
- m << ">";
- break;
- case '&':
- m << "&";
- break;
- case '\'':
- if (is_attribute)
- m << "'";
- else
- m << '\'';
- break;
- case '"':
- if (is_attribute)
- m << """;
- else
- m << '"';
- break;
- default:
- if (IsValidXmlCharacter(*src)) {
- if (is_attribute && IsNormalizableWhitespace(*src))
- m << String::Format("%02X;", unsigned(*src));
- else
- m << *src;
- }
- break;
- }
- }
- }
-
- return m.GetString();
-}
-
-// Returns the given string with all characters invalid in XML removed.
-// Currently invalid characters are dropped from the string. An
-// alternative is to replace them with certain characters such as . or ?.
-string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(const string& str) {
- string output;
- output.reserve(str.size());
- for (string::const_iterator it = str.begin(); it != str.end(); ++it)
- if (IsValidXmlCharacter(*it))
- output.push_back(*it);
-
- return output;
-}
-
-// The following routines generate an XML representation of a UnitTest
-// object.
-//
-// This is how Google Test concepts map to the DTD:
-//
-// <-- corresponds to a UnitTest object
-// <-- corresponds to a TestCase object
-// <-- corresponds to a TestInfo object
-// ...
-// ...
-// ...
-// <-- individual assertion failures
-//
-//
-//
-
-// Formats the given time in milliseconds as seconds.
-std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
- ::std::stringstream ss;
- ss << ms/1000.0;
- return ss.str();
-}
-
-// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
-void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
- const char* data) {
- const char* segment = data;
- *stream << "");
- if (next_segment != NULL) {
- stream->write(
- segment, static_cast(next_segment - segment));
- *stream << "]]>]]>");
- } else {
- *stream << segment;
- break;
- }
- }
- *stream << "]]>";
-}
-
-// Prints an XML representation of a TestInfo object.
-// TODO(wan): There is also value in printing properties with the plain printer.
-void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
- const char* test_case_name,
- const TestInfo& test_info) {
- const TestResult& result = *test_info.result();
- *stream << " \n";
- *stream << " ";
- const string location = internal::FormatCompilerIndependentFileLocation(
- part.file_name(), part.line_number());
- const string message = location + "\n" + part.message();
- OutputXmlCDataSection(stream,
- RemoveInvalidXmlCharacters(message).c_str());
- *stream << "\n";
- }
- }
-
- if (failures == 0)
- *stream << " />\n";
- else
- *stream << " \n";
-}
-
-// Prints an XML representation of a TestCase object
-void XmlUnitTestResultPrinter::PrintXmlTestCase(FILE* out,
- const TestCase& test_case) {
- fprintf(out,
- " \n",
- FormatTimeInMillisAsSeconds(test_case.elapsed_time()).c_str());
- for (int i = 0; i < test_case.total_test_count(); ++i) {
- ::std::stringstream stream;
- OutputXmlTestInfo(&stream, test_case.name(), *test_case.GetTestInfo(i));
- fprintf(out, "%s", StringStreamToString(&stream).c_str());
- }
- fprintf(out, " \n");
-}
-
-// Prints an XML summary of unit_test to output stream out.
-void XmlUnitTestResultPrinter::PrintXmlUnitTest(FILE* out,
- const UnitTest& unit_test) {
- fprintf(out, "\n");
- fprintf(out,
- "\n");
- for (int i = 0; i < unit_test.total_test_case_count(); ++i)
- PrintXmlTestCase(out, *unit_test.GetTestCase(i));
- fprintf(out, "\n");
-}
-
-// Produces a string representing the test properties in a result as space
-// delimited XML attributes based on the property key="value" pairs.
-String XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
- const TestResult& result) {
- Message attributes;
- for (int i = 0; i < result.test_property_count(); ++i) {
- const TestProperty& property = result.GetTestProperty(i);
- attributes << " " << property.key() << "="
- << "\"" << EscapeXmlAttribute(property.value()) << "\"";
- }
- return attributes.GetString();
-}
-
-// End XmlUnitTestResultPrinter
-
-#if GTEST_CAN_STREAM_RESULTS_
-
-// Streams test results to the given port on the given host machine.
-class StreamingListener : public EmptyTestEventListener {
- public:
- // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
- static string UrlEncode(const char* str);
-
- StreamingListener(const string& host, const string& port)
- : sockfd_(-1), host_name_(host), port_num_(port) {
- MakeConnection();
- Send("gtest_streaming_protocol_version=1.0\n");
- }
-
- virtual ~StreamingListener() {
- if (sockfd_ != -1)
- CloseConnection();
- }
-
- void OnTestProgramStart(const UnitTest& /* unit_test */) {
- Send("event=TestProgramStart\n");
- }
-
- void OnTestProgramEnd(const UnitTest& unit_test) {
- // Note that Google Test current only report elapsed time for each
- // test iteration, not for the entire test program.
- Send(String::Format("event=TestProgramEnd&passed=%d\n",
- unit_test.Passed()));
-
- // Notify the streaming server to stop.
- CloseConnection();
- }
-
- void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) {
- Send(String::Format("event=TestIterationStart&iteration=%d\n",
- iteration));
- }
-
- void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) {
- Send(String::Format("event=TestIterationEnd&passed=%d&elapsed_time=%sms\n",
- unit_test.Passed(),
- StreamableToString(unit_test.elapsed_time()).c_str()));
- }
-
- void OnTestCaseStart(const TestCase& test_case) {
- Send(String::Format("event=TestCaseStart&name=%s\n", test_case.name()));
- }
-
- void OnTestCaseEnd(const TestCase& test_case) {
- Send(String::Format("event=TestCaseEnd&passed=%d&elapsed_time=%sms\n",
- test_case.Passed(),
- StreamableToString(test_case.elapsed_time()).c_str()));
- }
-
- void OnTestStart(const TestInfo& test_info) {
- Send(String::Format("event=TestStart&name=%s\n", test_info.name()));
- }
-
- void OnTestEnd(const TestInfo& test_info) {
- Send(String::Format(
- "event=TestEnd&passed=%d&elapsed_time=%sms\n",
- (test_info.result())->Passed(),
- StreamableToString((test_info.result())->elapsed_time()).c_str()));
- }
-
- void OnTestPartResult(const TestPartResult& test_part_result) {
- const char* file_name = test_part_result.file_name();
- if (file_name == NULL)
- file_name = "";
- Send(String::Format("event=TestPartResult&file=%s&line=%d&message=",
- UrlEncode(file_name).c_str(),
- test_part_result.line_number()));
- Send(UrlEncode(test_part_result.message()) + "\n");
- }
-
- private:
- // Creates a client socket and connects to the server.
- void MakeConnection();
-
- // Closes the socket.
- void CloseConnection() {
- GTEST_CHECK_(sockfd_ != -1)
- << "CloseConnection() can be called only when there is a connection.";
-
- close(sockfd_);
- sockfd_ = -1;
- }
-
- // Sends a string to the socket.
- void Send(const string& message) {
- GTEST_CHECK_(sockfd_ != -1)
- << "Send() can be called only when there is a connection.";
-
- const int len = static_cast(message.length());
- if (write(sockfd_, message.c_str(), len) != len) {
- GTEST_LOG_(WARNING)
- << "stream_result_to: failed to stream to "
- << host_name_ << ":" << port_num_;
- }
- }
-
- int sockfd_; // socket file descriptor
- const string host_name_;
- const string port_num_;
-
- GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
-}; // class StreamingListener
-
-// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
-// replaces them by "%xx" where xx is their hexadecimal value. For
-// example, replaces "=" with "%3D". This algorithm is O(strlen(str))
-// in both time and space -- important as the input str may contain an
-// arbitrarily long test failure message and stack trace.
-string StreamingListener::UrlEncode(const char* str) {
- string result;
- result.reserve(strlen(str) + 1);
- for (char ch = *str; ch != '\0'; ch = *++str) {
- switch (ch) {
- case '%':
- case '=':
- case '&':
- case '\n':
- result.append(String::Format("%%%02x", static_cast(ch)));
- break;
- default:
- result.push_back(ch);
- break;
- }
- }
- return result;
-}
-
-void StreamingListener::MakeConnection() {
- GTEST_CHECK_(sockfd_ == -1)
- << "MakeConnection() can't be called when there is already a connection.";
-
- addrinfo hints;
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_UNSPEC; // To allow both IPv4 and IPv6 addresses.
- hints.ai_socktype = SOCK_STREAM;
- addrinfo* servinfo = NULL;
-
- // Use the getaddrinfo() to get a linked list of IP addresses for
- // the given host name.
- const int error_num = getaddrinfo(
- host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
- if (error_num != 0) {
- GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
- << gai_strerror(error_num);
- }
-
- // Loop through all the results and connect to the first we can.
- for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL;
- cur_addr = cur_addr->ai_next) {
- sockfd_ = socket(
- cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
- if (sockfd_ != -1) {
- // Connect the client socket to the server socket.
- if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
- close(sockfd_);
- sockfd_ = -1;
- }
- }
- }
-
- freeaddrinfo(servinfo); // all done with this structure
-
- if (sockfd_ == -1) {
- GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
- << host_name_ << ":" << port_num_;
- }
-}
-
-// End of class Streaming Listener
-#endif // GTEST_CAN_STREAM_RESULTS__
-
-// Class ScopedTrace
-
-// Pushes the given source file location and message onto a per-thread
-// trace stack maintained by Google Test.
-// L < UnitTest::mutex_
-ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) {
- TraceInfo trace;
- trace.file = file;
- trace.line = line;
- trace.message = message.GetString();
-
- UnitTest::GetInstance()->PushGTestTrace(trace);
-}
-
-// Pops the info pushed by the c'tor.
-// L < UnitTest::mutex_
-ScopedTrace::~ScopedTrace() {
- UnitTest::GetInstance()->PopGTestTrace();
-}
-
-
-// class OsStackTraceGetter
-
-// Returns the current OS stack trace as a String. Parameters:
-//
-// max_depth - the maximum number of stack frames to be included
-// in the trace.
-// skip_count - the number of top frames to be skipped; doesn't count
-// against max_depth.
-//
-// L < mutex_
-// We use "L < mutex_" to denote that the function may acquire mutex_.
-String OsStackTraceGetter::CurrentStackTrace(int, int) {
- return String("");
-}
-
-// L < mutex_
-void OsStackTraceGetter::UponLeavingGTest() {
-}
-
-const char* const
-OsStackTraceGetter::kElidedFramesMarker =
- "... " GTEST_NAME_ " internal frames ...";
-
-} // namespace internal
-
-// class TestEventListeners
-
-TestEventListeners::TestEventListeners()
- : repeater_(new internal::TestEventRepeater()),
- default_result_printer_(NULL),
- default_xml_generator_(NULL) {
-}
-
-TestEventListeners::~TestEventListeners() { delete repeater_; }
-
-// Returns the standard listener responsible for the default console
-// output. Can be removed from the listeners list to shut down default
-// console output. Note that removing this object from the listener list
-// with Release transfers its ownership to the user.
-void TestEventListeners::Append(TestEventListener* listener) {
- repeater_->Append(listener);
-}
-
-// Removes the given event listener from the list and returns it. It then
-// becomes the caller's responsibility to delete the listener. Returns
-// NULL if the listener is not found in the list.
-TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
- if (listener == default_result_printer_)
- default_result_printer_ = NULL;
- else if (listener == default_xml_generator_)
- default_xml_generator_ = NULL;
- return repeater_->Release(listener);
-}
-
-// Returns repeater that broadcasts the TestEventListener events to all
-// subscribers.
-TestEventListener* TestEventListeners::repeater() { return repeater_; }
-
-// Sets the default_result_printer attribute to the provided listener.
-// The listener is also added to the listener list and previous
-// default_result_printer is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
- if (default_result_printer_ != listener) {
- // It is an error to pass this method a listener that is already in the
- // list.
- delete Release(default_result_printer_);
- default_result_printer_ = listener;
- if (listener != NULL)
- Append(listener);
- }
-}
-
-// Sets the default_xml_generator attribute to the provided listener. The
-// listener is also added to the listener list and previous
-// default_xml_generator is removed from it and deleted. The listener can
-// also be NULL in which case it will not be added to the list. Does
-// nothing if the previous and the current listener objects are the same.
-void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
- if (default_xml_generator_ != listener) {
- // It is an error to pass this method a listener that is already in the
- // list.
- delete Release(default_xml_generator_);
- default_xml_generator_ = listener;
- if (listener != NULL)
- Append(listener);
- }
-}
-
-// Controls whether events will be forwarded by the repeater to the
-// listeners in the list.
-bool TestEventListeners::EventForwardingEnabled() const {
- return repeater_->forwarding_enabled();
-}
-
-void TestEventListeners::SuppressEventForwarding() {
- repeater_->set_forwarding_enabled(false);
-}
-
-// class UnitTest
-
-// Gets the singleton UnitTest object. The first time this method is
-// called, a UnitTest object is constructed and returned. Consecutive
-// calls will return the same object.
-//
-// We don't protect this under mutex_ as a user is not supposed to
-// call this before main() starts, from which point on the return
-// value will never change.
-UnitTest * UnitTest::GetInstance() {
- // When compiled with MSVC 7.1 in optimized mode, destroying the
- // UnitTest object upon exiting the program messes up the exit code,
- // causing successful tests to appear failed. We have to use a
- // different implementation in this case to bypass the compiler bug.
- // This implementation makes the compiler happy, at the cost of
- // leaking the UnitTest object.
-
- // CodeGear C++Builder insists on a public destructor for the
- // default implementation. Use this implementation to keep good OO
- // design with private destructor.
-
-#if (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__)
- static UnitTest* const instance = new UnitTest;
- return instance;
-#else
- static UnitTest instance;
- return &instance;
-#endif // (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__)
-}
-
-// Gets the number of successful test cases.
-int UnitTest::successful_test_case_count() const {
- return impl()->successful_test_case_count();
-}
-
-// Gets the number of failed test cases.
-int UnitTest::failed_test_case_count() const {
- return impl()->failed_test_case_count();
-}
-
-// Gets the number of all test cases.
-int UnitTest::total_test_case_count() const {
- return impl()->total_test_case_count();
-}
-
-// Gets the number of all test cases that contain at least one test
-// that should run.
-int UnitTest::test_case_to_run_count() const {
- return impl()->test_case_to_run_count();
-}
-
-// Gets the number of successful tests.
-int UnitTest::successful_test_count() const {
- return impl()->successful_test_count();
-}
-
-// Gets the number of failed tests.
-int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
-
-// Gets the number of disabled tests.
-int UnitTest::disabled_test_count() const {
- return impl()->disabled_test_count();
-}
-
-// Gets the number of all tests.
-int UnitTest::total_test_count() const { return impl()->total_test_count(); }
-
-// Gets the number of tests that should run.
-int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
-
-// Gets the elapsed time, in milliseconds.
-internal::TimeInMillis UnitTest::elapsed_time() const {
- return impl()->elapsed_time();
-}
-
-// Returns true iff the unit test passed (i.e. all test cases passed).
-bool UnitTest::Passed() const { return impl()->Passed(); }
-
-// Returns true iff the unit test failed (i.e. some test case failed
-// or something outside of all tests failed).
-bool UnitTest::Failed() const { return impl()->Failed(); }
-
-// Gets the i-th test case among all the test cases. i can range from 0 to
-// total_test_case_count() - 1. If i is not in that range, returns NULL.
-const TestCase* UnitTest::GetTestCase(int i) const {
- return impl()->GetTestCase(i);
-}
-
-// Gets the i-th test case among all the test cases. i can range from 0 to
-// total_test_case_count() - 1. If i is not in that range, returns NULL.
-TestCase* UnitTest::GetMutableTestCase(int i) {
- return impl()->GetMutableTestCase(i);
-}
-
-// Returns the list of event listeners that can be used to track events
-// inside Google Test.
-TestEventListeners& UnitTest::listeners() {
- return *impl()->listeners();
-}
-
-// Registers and returns a global test environment. When a test
-// program is run, all global test environments will be set-up in the
-// order they were registered. After all tests in the program have
-// finished, all global test environments will be torn-down in the
-// *reverse* order they were registered.
-//
-// The UnitTest object takes ownership of the given environment.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-Environment* UnitTest::AddEnvironment(Environment* env) {
- if (env == NULL) {
- return NULL;
- }
-
- impl_->environments().push_back(env);
- return env;
-}
-
-// Adds a TestPartResult to the current TestResult object. All Google Test
-// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
-// this to report their results. The user code should use the
-// assertion macros instead of calling this directly.
-// L < mutex_
-void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
- const char* file_name,
- int line_number,
- const internal::String& message,
- const internal::String& os_stack_trace) {
- Message msg;
- msg << message;
-
- internal::MutexLock lock(&mutex_);
- if (impl_->gtest_trace_stack().size() > 0) {
- msg << "\n" << GTEST_NAME_ << " trace:";
-
- for (int i = static_cast(impl_->gtest_trace_stack().size());
- i > 0; --i) {
- const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
- msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
- << " " << trace.message;
- }
- }
-
- if (os_stack_trace.c_str() != NULL && !os_stack_trace.empty()) {
- msg << internal::kStackTraceMarker << os_stack_trace;
- }
-
- const TestPartResult result =
- TestPartResult(result_type, file_name, line_number,
- msg.GetString().c_str());
- impl_->GetTestPartResultReporterForCurrentThread()->
- ReportTestPartResult(result);
-
- if (result_type != TestPartResult::kSuccess) {
- // gtest_break_on_failure takes precedence over
- // gtest_throw_on_failure. This allows a user to set the latter
- // in the code (perhaps in order to use Google Test assertions
- // with another testing framework) and specify the former on the
- // command line for debugging.
- if (GTEST_FLAG(break_on_failure)) {
-#if GTEST_OS_WINDOWS
- // Using DebugBreak on Windows allows gtest to still break into a debugger
- // when a failure happens and both the --gtest_break_on_failure and
- // the --gtest_catch_exceptions flags are specified.
- DebugBreak();
-#else
- // Dereference NULL through a volatile pointer to prevent the compiler
- // from removing. We use this rather than abort() or __builtin_trap() for
- // portability: Symbian doesn't implement abort() well, and some debuggers
- // don't correctly trap abort().
- *static_cast(NULL) = 1;
-#endif // GTEST_OS_WINDOWS
- } else if (GTEST_FLAG(throw_on_failure)) {
-#if GTEST_HAS_EXCEPTIONS
- throw GoogleTestFailureException(result);
-#else
- // We cannot call abort() as it generates a pop-up in debug mode
- // that cannot be suppressed in VC 7.1 or below.
- exit(1);
-#endif
- }
- }
-}
-
-// Creates and adds a property to the current TestResult. If a property matching
-// the supplied value already exists, updates its value instead.
-void UnitTest::RecordPropertyForCurrentTest(const char* key,
- const char* value) {
- const TestProperty test_property(key, value);
- impl_->current_test_result()->RecordProperty(test_property);
-}
-
-// Runs all tests in this UnitTest object and prints the result.
-// Returns 0 if successful, or 1 otherwise.
-//
-// We don't protect this under mutex_, as we only support calling it
-// from the main thread.
-int UnitTest::Run() {
- // Captures the value of GTEST_FLAG(catch_exceptions). This value will be
- // used for the duration of the program.
- impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
-
-#if GTEST_HAS_SEH
- const bool in_death_test_child_process =
- internal::GTEST_FLAG(internal_run_death_test).length() > 0;
-
- // Either the user wants Google Test to catch exceptions thrown by the
- // tests or this is executing in the context of death test child
- // process. In either case the user does not want to see pop-up dialogs
- // about crashes - they are expected.
- if (impl()->catch_exceptions() || in_death_test_child_process) {
-
-# if !GTEST_OS_WINDOWS_MOBILE
- // SetErrorMode doesn't exist on CE.
- SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
- SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
-# endif // !GTEST_OS_WINDOWS_MOBILE
-
-# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
- // Death test children can be terminated with _abort(). On Windows,
- // _abort() can show a dialog with a warning message. This forces the
- // abort message to go to stderr instead.
- _set_error_mode(_OUT_TO_STDERR);
-# endif
-
-# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
- // In the debug version, Visual Studio pops up a separate dialog
- // offering a choice to debug the aborted program. We need to suppress
- // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
- // executed. Google Test will notify the user of any unexpected
- // failure via stderr.
- //
- // VC++ doesn't define _set_abort_behavior() prior to the version 8.0.
- // Users of prior VC versions shall suffer the agony and pain of
- // clicking through the countless debug dialogs.
- // TODO(vladl@google.com): find a way to suppress the abort dialog() in the
- // debug mode when compiled with VC 7.1 or lower.
- if (!GTEST_FLAG(break_on_failure))
- _set_abort_behavior(
- 0x0, // Clear the following flags:
- _WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump.
-# endif
-
- }
-#endif // GTEST_HAS_SEH
-
- return internal::HandleExceptionsInMethodIfSupported(
- impl(),
- &internal::UnitTestImpl::RunAllTests,
- "auxiliary test code (environments or event listeners)") ? 0 : 1;
-}
-
-// Returns the working directory when the first TEST() or TEST_F() was
-// executed.
-const char* UnitTest::original_working_dir() const {
- return impl_->original_working_dir_.c_str();
-}
-
-// Returns the TestCase object for the test that's currently running,
-// or NULL if no test is running.
-// L < mutex_
-const TestCase* UnitTest::current_test_case() const {
- internal::MutexLock lock(&mutex_);
- return impl_->current_test_case();
-}
-
-// Returns the TestInfo object for the test that's currently running,
-// or NULL if no test is running.
-// L < mutex_
-const TestInfo* UnitTest::current_test_info() const {
- internal::MutexLock lock(&mutex_);
- return impl_->current_test_info();
-}
-
-// Returns the random seed used at the start of the current test run.
-int UnitTest::random_seed() const { return impl_->random_seed(); }
-
-#if GTEST_HAS_PARAM_TEST
-// Returns ParameterizedTestCaseRegistry object used to keep track of
-// value-parameterized tests and instantiate and register them.
-// L < mutex_
-internal::ParameterizedTestCaseRegistry&
- UnitTest::parameterized_test_registry() {
- return impl_->parameterized_test_registry();
-}
-#endif // GTEST_HAS_PARAM_TEST
-
-// Creates an empty UnitTest.
-UnitTest::UnitTest() {
- impl_ = new internal::UnitTestImpl(this);
-}
-
-// Destructor of UnitTest.
-UnitTest::~UnitTest() {
- delete impl_;
-}
-
-// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
-// Google Test trace stack.
-// L < mutex_
-void UnitTest::PushGTestTrace(const internal::TraceInfo& trace) {
- internal::MutexLock lock(&mutex_);
- impl_->gtest_trace_stack().push_back(trace);
-}
-
-// Pops a trace from the per-thread Google Test trace stack.
-// L < mutex_
-void UnitTest::PopGTestTrace() {
- internal::MutexLock lock(&mutex_);
- impl_->gtest_trace_stack().pop_back();
-}
-
-namespace internal {
-
-UnitTestImpl::UnitTestImpl(UnitTest* parent)
- : parent_(parent),
-#ifdef _MSC_VER
-# pragma warning(push) // Saves the current warning state.
-# pragma warning(disable:4355) // Temporarily disables warning 4355
- // (using this in initializer).
- default_global_test_part_result_reporter_(this),
- default_per_thread_test_part_result_reporter_(this),
-# pragma warning(pop) // Restores the warning state again.
-#else
- default_global_test_part_result_reporter_(this),
- default_per_thread_test_part_result_reporter_(this),
-#endif // _MSC_VER
- global_test_part_result_repoter_(
- &default_global_test_part_result_reporter_),
- per_thread_test_part_result_reporter_(
- &default_per_thread_test_part_result_reporter_),
-#if GTEST_HAS_PARAM_TEST
- parameterized_test_registry_(),
- parameterized_tests_registered_(false),
-#endif // GTEST_HAS_PARAM_TEST
- last_death_test_case_(-1),
- current_test_case_(NULL),
- current_test_info_(NULL),
- ad_hoc_test_result_(),
- os_stack_trace_getter_(NULL),
- post_flag_parse_init_performed_(false),
- random_seed_(0), // Will be overridden by the flag before first use.
- random_(0), // Will be reseeded before first use.
- elapsed_time_(0),
-#if GTEST_HAS_DEATH_TEST
- internal_run_death_test_flag_(NULL),
- death_test_factory_(new DefaultDeathTestFactory),
-#endif
- // Will be overridden by the flag before first use.
- catch_exceptions_(false) {
- listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
-}
-
-UnitTestImpl::~UnitTestImpl() {
- // Deletes every TestCase.
- ForEach(test_cases_, internal::Delete);
-
- // Deletes every Environment.
- ForEach(environments_, internal::Delete);
-
- delete os_stack_trace_getter_;
-}
-
-#if GTEST_HAS_DEATH_TEST
-// Disables event forwarding if the control is currently in a death test
-// subprocess. Must not be called before InitGoogleTest.
-void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
- if (internal_run_death_test_flag_.get() != NULL)
- listeners()->SuppressEventForwarding();
-}
-#endif // GTEST_HAS_DEATH_TEST
-
-// Initializes event listeners performing XML output as specified by
-// UnitTestOptions. Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureXmlOutput() {
- const String& output_format = UnitTestOptions::GetOutputFormat();
- if (output_format == "xml") {
- listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
- UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
- } else if (output_format != "") {
- printf("WARNING: unrecognized output format \"%s\" ignored.\n",
- output_format.c_str());
- fflush(stdout);
- }
-}
-
-#if GTEST_CAN_STREAM_RESULTS_
-// Initializes event listeners for streaming test results in String form.
-// Must not be called before InitGoogleTest.
-void UnitTestImpl::ConfigureStreamingOutput() {
- const string& target = GTEST_FLAG(stream_result_to);
- if (!target.empty()) {
- const size_t pos = target.find(':');
- if (pos != string::npos) {
- listeners()->Append(new StreamingListener(target.substr(0, pos),
- target.substr(pos+1)));
- } else {
- printf("WARNING: unrecognized streaming target \"%s\" ignored.\n",
- target.c_str());
- fflush(stdout);
- }
- }
-}
-#endif // GTEST_CAN_STREAM_RESULTS_
-
-// Performs initialization dependent upon flag values obtained in
-// ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to
-// ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest
-// this function is also called from RunAllTests. Since this function can be
-// called more than once, it has to be idempotent.
-void UnitTestImpl::PostFlagParsingInit() {
- // Ensures that this function does not execute more than once.
- if (!post_flag_parse_init_performed_) {
- post_flag_parse_init_performed_ = true;
-
-#if GTEST_HAS_DEATH_TEST
- InitDeathTestSubprocessControlInfo();
- SuppressTestEventsIfInSubprocess();
-#endif // GTEST_HAS_DEATH_TEST
-
- // Registers parameterized tests. This makes parameterized tests
- // available to the UnitTest reflection API without running
- // RUN_ALL_TESTS.
- RegisterParameterizedTests();
-
- // Configures listeners for XML output. This makes it possible for users
- // to shut down the default XML output before invoking RUN_ALL_TESTS.
- ConfigureXmlOutput();
-
-#if GTEST_CAN_STREAM_RESULTS_
- // Configures listeners for streaming test results to the specified server.
- ConfigureStreamingOutput();
-#endif // GTEST_CAN_STREAM_RESULTS_
- }
-}
-
-// A predicate that checks the name of a TestCase against a known
-// value.
-//
-// This is used for implementation of the UnitTest class only. We put
-// it in the anonymous namespace to prevent polluting the outer
-// namespace.
-//
-// TestCaseNameIs is copyable.
-class TestCaseNameIs {
- public:
- // Constructor.
- explicit TestCaseNameIs(const String& name)
- : name_(name) {}
-
- // Returns true iff the name of test_case matches name_.
- bool operator()(const TestCase* test_case) const {
- return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0;
- }
-
- private:
- String name_;
-};
-
-// Finds and returns a TestCase with the given name. If one doesn't
-// exist, creates one and returns it. It's the CALLER'S
-// RESPONSIBILITY to ensure that this function is only called WHEN THE
-// TESTS ARE NOT SHUFFLED.
-//
-// Arguments:
-//
-// test_case_name: name of the test case
-// type_param: the name of the test case's type parameter, or NULL if
-// this is not a typed or a type-parameterized test case.
-// set_up_tc: pointer to the function that sets up the test case
-// tear_down_tc: pointer to the function that tears down the test case
-TestCase* UnitTestImpl::GetTestCase(const char* test_case_name,
- const char* type_param,
- Test::SetUpTestCaseFunc set_up_tc,
- Test::TearDownTestCaseFunc tear_down_tc) {
- // Can we find a TestCase with the given name?
- const std::vector::const_iterator test_case =
- std::find_if(test_cases_.begin(), test_cases_.end(),
- TestCaseNameIs(test_case_name));
-
- if (test_case != test_cases_.end())
- return *test_case;
-
- // No. Let's create one.
- TestCase* const new_test_case =
- new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc);
-
- // Is this a death test case?
- if (internal::UnitTestOptions::MatchesFilter(String(test_case_name),
- kDeathTestCaseFilter)) {
- // Yes. Inserts the test case after the last death test case
- // defined so far. This only works when the test cases haven't
- // been shuffled. Otherwise we may end up running a death test
- // after a non-death test.
- ++last_death_test_case_;
- test_cases_.insert(test_cases_.begin() + last_death_test_case_,
- new_test_case);
- } else {
- // No. Appends to the end of the list.
- test_cases_.push_back(new_test_case);
- }
-
- test_case_indices_.push_back(static_cast(test_case_indices_.size()));
- return new_test_case;
-}
-
-// Helpers for setting up / tearing down the given environment. They
-// are for use in the ForEach() function.
-static void SetUpEnvironment(Environment* env) { env->SetUp(); }
-static void TearDownEnvironment(Environment* env) { env->TearDown(); }
-
-// Runs all tests in this UnitTest object, prints the result, and
-// returns true if all tests are successful. If any exception is
-// thrown during a test, the test is considered to be failed, but the
-// rest of the tests will still be run.
-//
-// When parameterized tests are enabled, it expands and registers
-// parameterized tests first in RegisterParameterizedTests().
-// All other functions called from RunAllTests() may safely assume that
-// parameterized tests are ready to be counted and run.
-bool UnitTestImpl::RunAllTests() {
- // Makes sure InitGoogleTest() was called.
- if (!GTestIsInitialized()) {
- printf("%s",
- "\nThis test program did NOT call ::testing::InitGoogleTest "
- "before calling RUN_ALL_TESTS(). Please fix it.\n");
- return false;
- }
-
- // Do not run any test if the --help flag was specified.
- if (g_help_flag)
- return true;
-
- // Repeats the call to the post-flag parsing initialization in case the
- // user didn't call InitGoogleTest.
- PostFlagParsingInit();
-
- // Even if sharding is not on, test runners may want to use the
- // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
- // protocol.
- internal::WriteToShardStatusFileIfNeeded();
-
- // True iff we are in a subprocess for running a thread-safe-style
- // death test.
- bool in_subprocess_for_death_test = false;
-
-#if GTEST_HAS_DEATH_TEST
- in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL);
-#endif // GTEST_HAS_DEATH_TEST
-
- const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
- in_subprocess_for_death_test);
-
- // Compares the full test names with the filter to decide which
- // tests to run.
- const bool has_tests_to_run = FilterTests(should_shard
- ? HONOR_SHARDING_PROTOCOL
- : IGNORE_SHARDING_PROTOCOL) > 0;
-
- // Lists the tests and exits if the --gtest_list_tests flag was specified.
- if (GTEST_FLAG(list_tests)) {
- // This must be called *after* FilterTests() has been called.
- ListTestsMatchingFilter();
- return true;
- }
-
- random_seed_ = GTEST_FLAG(shuffle) ?
- GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
-
- // True iff at least one test has failed.
- bool failed = false;
-
- TestEventListener* repeater = listeners()->repeater();
-
- repeater->OnTestProgramStart(*parent_);
-
- // How many times to repeat the tests? We don't want to repeat them
- // when we are inside the subprocess of a death test.
- const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
- // Repeats forever if the repeat count is negative.
- const bool forever = repeat < 0;
- for (int i = 0; forever || i != repeat; i++) {
- // We want to preserve failures generated by ad-hoc test
- // assertions executed before RUN_ALL_TESTS().
- ClearNonAdHocTestResult();
-
- const TimeInMillis start = GetTimeInMillis();
-
- // Shuffles test cases and tests if requested.
- if (has_tests_to_run && GTEST_FLAG(shuffle)) {
- random()->Reseed(random_seed_);
- // This should be done before calling OnTestIterationStart(),
- // such that a test event listener can see the actual test order
- // in the event.
- ShuffleTests();
- }
-
- // Tells the unit test event listeners that the tests are about to start.
- repeater->OnTestIterationStart(*parent_, i);
-
- // Runs each test case if there is at least one test to run.
- if (has_tests_to_run) {
- // Sets up all environments beforehand.
- repeater->OnEnvironmentsSetUpStart(*parent_);
- ForEach(environments_, SetUpEnvironment);
- repeater->OnEnvironmentsSetUpEnd(*parent_);
-
- // Runs the tests only if there was no fatal failure during global
- // set-up.
- if (!Test::HasFatalFailure()) {
- for (int test_index = 0; test_index < total_test_case_count();
- test_index++) {
- GetMutableTestCase(test_index)->Run();
- }
- }
-
- // Tears down all environments in reverse order afterwards.
- repeater->OnEnvironmentsTearDownStart(*parent_);
- std::for_each(environments_.rbegin(), environments_.rend(),
- TearDownEnvironment);
- repeater->OnEnvironmentsTearDownEnd(*parent_);
- }
-
- elapsed_time_ = GetTimeInMillis() - start;
-
- // Tells the unit test event listener that the tests have just finished.
- repeater->OnTestIterationEnd(*parent_, i);
-
- // Gets the result and clears it.
- if (!Passed()) {
- failed = true;
- }
-
- // Restores the original test order after the iteration. This
- // allows the user to quickly repro a failure that happens in the
- // N-th iteration without repeating the first (N - 1) iterations.
- // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
- // case the user somehow changes the value of the flag somewhere
- // (it's always safe to unshuffle the tests).
- UnshuffleTests();
-
- if (GTEST_FLAG(shuffle)) {
- // Picks a new random seed for each iteration.
- random_seed_ = GetNextRandomSeed(random_seed_);
- }
- }
-
- repeater->OnTestProgramEnd(*parent_);
-
- return !failed;
-}
-
-// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
-// if the variable is present. If a file already exists at this location, this
-// function will write over it. If the variable is present, but the file cannot
-// be created, prints an error and exits.
-void WriteToShardStatusFileIfNeeded() {
- const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
- if (test_shard_file != NULL) {
- FILE* const file = posix::FOpen(test_shard_file, "w");
- if (file == NULL) {
- ColoredPrintf(COLOR_RED,
- "Could not write to the test shard status file \"%s\" "
- "specified by the %s environment variable.\n",
- test_shard_file, kTestShardStatusFile);
- fflush(stdout);
- exit(EXIT_FAILURE);
- }
- fclose(file);
- }
-}
-
-// Checks whether sharding is enabled by examining the relevant
-// environment variable values. If the variables are present,
-// but inconsistent (i.e., shard_index >= total_shards), prints
-// an error and exits. If in_subprocess_for_death_test, sharding is
-// disabled because it must only be applied to the original test
-// process. Otherwise, we could filter out death tests we intended to execute.
-bool ShouldShard(const char* total_shards_env,
- const char* shard_index_env,
- bool in_subprocess_for_death_test) {
- if (in_subprocess_for_death_test) {
- return false;
- }
-
- const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1);
- const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1);
-
- if (total_shards == -1 && shard_index == -1) {
- return false;
- } else if (total_shards == -1 && shard_index != -1) {
- const Message msg = Message()
- << "Invalid environment variables: you have "
- << kTestShardIndex << " = " << shard_index
- << ", but have left " << kTestTotalShards << " unset.\n";
- ColoredPrintf(COLOR_RED, msg.GetString().c_str());
- fflush(stdout);
- exit(EXIT_FAILURE);
- } else if (total_shards != -1 && shard_index == -1) {
- const Message msg = Message()
- << "Invalid environment variables: you have "
- << kTestTotalShards << " = " << total_shards
- << ", but have left " << kTestShardIndex << " unset.\n";
- ColoredPrintf(COLOR_RED, msg.GetString().c_str());
- fflush(stdout);
- exit(EXIT_FAILURE);
- } else if (shard_index < 0 || shard_index >= total_shards) {
- const Message msg = Message()
- << "Invalid environment variables: we require 0 <= "
- << kTestShardIndex << " < " << kTestTotalShards
- << ", but you have " << kTestShardIndex << "=" << shard_index
- << ", " << kTestTotalShards << "=" << total_shards << ".\n";
- ColoredPrintf(COLOR_RED, msg.GetString().c_str());
- fflush(stdout);
- exit(EXIT_FAILURE);
- }
-
- return total_shards > 1;
-}
-
-// Parses the environment variable var as an Int32. If it is unset,
-// returns default_val. If it is not an Int32, prints an error
-// and aborts.
-Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
- const char* str_val = posix::GetEnv(var);
- if (str_val == NULL) {
- return default_val;
- }
-
- Int32 result;
- if (!ParseInt32(Message() << "The value of environment variable " << var,
- str_val, &result)) {
- exit(EXIT_FAILURE);
- }
- return result;
-}
-
-// Given the total number of shards, the shard index, and the test id,
-// returns true iff the test should be run on this shard. The test id is
-// some arbitrary but unique non-negative integer assigned to each test
-// method. Assumes that 0 <= shard_index < total_shards.
-bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
- return (test_id % total_shards) == shard_index;
-}
-
-// Compares the name of each test with the user-specified filter to
-// decide whether the test should be run, then records the result in
-// each TestCase and TestInfo object.
-// If shard_tests == true, further filters tests based on sharding
-// variables in the environment - see
-// http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide.
-// Returns the number of tests that should run.
-int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
- const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
- Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
- const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
- Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
-
- // num_runnable_tests are the number of tests that will
- // run across all shards (i.e., match filter and are not disabled).
- // num_selected_tests are the number of tests to be run on
- // this shard.
- int num_runnable_tests = 0;
- int num_selected_tests = 0;
- for (size_t i = 0; i < test_cases_.size(); i++) {
- TestCase* const test_case = test_cases_[i];
- const String &test_case_name = test_case->name();
- test_case->set_should_run(false);
-
- for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
- TestInfo* const test_info = test_case->test_info_list()[j];
- const String test_name(test_info->name());
- // A test is disabled if test case name or test name matches
- // kDisableTestFilter.
- const bool is_disabled =
- internal::UnitTestOptions::MatchesFilter(test_case_name,
- kDisableTestFilter) ||
- internal::UnitTestOptions::MatchesFilter(test_name,
- kDisableTestFilter);
- test_info->is_disabled_ = is_disabled;
-
- const bool matches_filter =
- internal::UnitTestOptions::FilterMatchesTest(test_case_name,
- test_name);
- test_info->matches_filter_ = matches_filter;
-
- const bool is_runnable =
- (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
- matches_filter;
-
- const bool is_selected = is_runnable &&
- (shard_tests == IGNORE_SHARDING_PROTOCOL ||
- ShouldRunTestOnShard(total_shards, shard_index,
- num_runnable_tests));
-
- num_runnable_tests += is_runnable;
- num_selected_tests += is_selected;
-
- test_info->should_run_ = is_selected;
- test_case->set_should_run(test_case->should_run() || is_selected);
- }
- }
- return num_selected_tests;
-}
-
-// Prints the names of the tests matching the user-specified filter flag.
-void UnitTestImpl::ListTestsMatchingFilter() {
- for (size_t i = 0; i < test_cases_.size(); i++) {
- const TestCase* const test_case = test_cases_[i];
- bool printed_test_case_name = false;
-
- for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
- const TestInfo* const test_info =
- test_case->test_info_list()[j];
- if (test_info->matches_filter_) {
- if (!printed_test_case_name) {
- printed_test_case_name = true;
- printf("%s.\n", test_case->name());
- }
- printf(" %s\n", test_info->name());
- }
- }
- }
- fflush(stdout);
-}
-
-// Sets the OS stack trace getter.
-//
-// Does nothing if the input and the current OS stack trace getter are
-// the same; otherwise, deletes the old getter and makes the input the
-// current getter.
-void UnitTestImpl::set_os_stack_trace_getter(
- OsStackTraceGetterInterface* getter) {
- if (os_stack_trace_getter_ != getter) {
- delete os_stack_trace_getter_;
- os_stack_trace_getter_ = getter;
- }
-}
-
-// Returns the current OS stack trace getter if it is not NULL;
-// otherwise, creates an OsStackTraceGetter, makes it the current
-// getter, and returns it.
-OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
- if (os_stack_trace_getter_ == NULL) {
- os_stack_trace_getter_ = new OsStackTraceGetter;
- }
-
- return os_stack_trace_getter_;
-}
-
-// Returns the TestResult for the test that's currently running, or
-// the TestResult for the ad hoc test if no test is running.
-TestResult* UnitTestImpl::current_test_result() {
- return current_test_info_ ?
- &(current_test_info_->result_) : &ad_hoc_test_result_;
-}
-
-// Shuffles all test cases, and the tests within each test case,
-// making sure that death tests are still run first.
-void UnitTestImpl::ShuffleTests() {
- // Shuffles the death test cases.
- ShuffleRange(random(), 0, last_death_test_case_ + 1, &test_case_indices_);
-
- // Shuffles the non-death test cases.
- ShuffleRange(random(), last_death_test_case_ + 1,
- static_cast(test_cases_.size()), &test_case_indices_);
-
- // Shuffles the tests inside each test case.
- for (size_t i = 0; i < test_cases_.size(); i++) {
- test_cases_[i]->ShuffleTests(random());
- }
-}
-
-// Restores the test cases and tests to their order before the first shuffle.
-void UnitTestImpl::UnshuffleTests() {
- for (size_t i = 0; i < test_cases_.size(); i++) {
- // Unshuffles the tests in each test case.
- test_cases_[i]->UnshuffleTests();
- // Resets the index of each test case.
- test_case_indices_[i] = static_cast(i);
- }
-}
-
-// Returns the current OS stack trace as a String.
-//
-// The maximum number of stack frames to be included is specified by
-// the gtest_stack_trace_depth flag. The skip_count parameter
-// specifies the number of top frames to be skipped, which doesn't
-// count against the number of frames to be included.
-//
-// For example, if Foo() calls Bar(), which in turn calls
-// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
-// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
-String GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
- int skip_count) {
- // We pass skip_count + 1 to skip this wrapper function in addition
- // to what the user really wants to skip.
- return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
-}
-
-// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
-// suppress unreachable code warnings.
-namespace {
-class ClassUniqueToAlwaysTrue {};
-}
-
-bool IsTrue(bool condition) { return condition; }
-
-bool AlwaysTrue() {
-#if GTEST_HAS_EXCEPTIONS
- // This condition is always false so AlwaysTrue() never actually throws,
- // but it makes the compiler think that it may throw.
- if (IsTrue(false))
- throw ClassUniqueToAlwaysTrue();
-#endif // GTEST_HAS_EXCEPTIONS
- return true;
-}
-
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false. None of pstr, *pstr, and prefix can be NULL.
-bool SkipPrefix(const char* prefix, const char** pstr) {
- const size_t prefix_len = strlen(prefix);
- if (strncmp(*pstr, prefix, prefix_len) == 0) {
- *pstr += prefix_len;
- return true;
- }
- return false;
-}
-
-// Parses a string as a command line flag. The string should have
-// the format "--flag=value". When def_optional is true, the "=value"
-// part can be omitted.
-//
-// Returns the value of the flag, or NULL if the parsing failed.
-const char* ParseFlagValue(const char* str,
- const char* flag,
- bool def_optional) {
- // str and flag must not be NULL.
- if (str == NULL || flag == NULL) return NULL;
-
- // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
- const String flag_str = String::Format("--%s%s", GTEST_FLAG_PREFIX_, flag);
- const size_t flag_len = flag_str.length();
- if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL;
-
- // Skips the flag name.
- const char* flag_end = str + flag_len;
-
- // When def_optional is true, it's OK to not have a "=value" part.
- if (def_optional && (flag_end[0] == '\0')) {
- return flag_end;
- }
-
- // If def_optional is true and there are more characters after the
- // flag name, or if def_optional is false, there must be a '=' after
- // the flag name.
- if (flag_end[0] != '=') return NULL;
-
- // Returns the string after "=".
- return flag_end + 1;
-}
-
-// Parses a string for a bool flag, in the form of either
-// "--flag=value" or "--flag".
-//
-// In the former case, the value is taken as true as long as it does
-// not start with '0', 'f', or 'F'.
-//
-// In the latter case, the value is taken as true.
-//
-// On success, stores the value of the flag in *value, and returns
-// true. On failure, returns false without changing *value.
-bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
- // Gets the value of the flag as a string.
- const char* const value_str = ParseFlagValue(str, flag, true);
-
- // Aborts if the parsing failed.
- if (value_str == NULL) return false;
-
- // Converts the string value to a bool.
- *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
- return true;
-}
-
-// Parses a string for an Int32 flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true. On failure, returns false without changing *value.
-bool ParseInt32Flag(const char* str, const char* flag, Int32* value) {
- // Gets the value of the flag as a string.
- const char* const value_str = ParseFlagValue(str, flag, false);
-
- // Aborts if the parsing failed.
- if (value_str == NULL) return false;
-
- // Sets *value to the value of the flag.
- return ParseInt32(Message() << "The value of flag --" << flag,
- value_str, value);
-}
-
-// Parses a string for a string flag, in the form of
-// "--flag=value".
-//
-// On success, stores the value of the flag in *value, and returns
-// true. On failure, returns false without changing *value.
-bool ParseStringFlag(const char* str, const char* flag, String* value) {
- // Gets the value of the flag as a string.
- const char* const value_str = ParseFlagValue(str, flag, false);
-
- // Aborts if the parsing failed.
- if (value_str == NULL) return false;
-
- // Sets *value to the value of the flag.
- *value = value_str;
- return true;
-}
-
-// Determines whether a string has a prefix that Google Test uses for its
-// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
-// If Google Test detects that a command line flag has its prefix but is not
-// recognized, it will print its help message. Flags starting with
-// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
-// internal flags and do not trigger the help message.
-static bool HasGoogleTestFlagPrefix(const char* str) {
- return (SkipPrefix("--", &str) ||
- SkipPrefix("-", &str) ||
- SkipPrefix("/", &str)) &&
- !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
- (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
- SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
-}
-
-// Prints a string containing code-encoded text. The following escape
-// sequences can be used in the string to control the text color:
-//
-// @@ prints a single '@' character.
-// @R changes the color to red.
-// @G changes the color to green.
-// @Y changes the color to yellow.
-// @D changes to the default terminal text color.
-//
-// TODO(wan@google.com): Write tests for this once we add stdout
-// capturing to Google Test.
-static void PrintColorEncoded(const char* str) {
- GTestColor color = COLOR_DEFAULT; // The current color.
-
- // Conceptually, we split the string into segments divided by escape
- // sequences. Then we print one segment at a time. At the end of
- // each iteration, the str pointer advances to the beginning of the
- // next segment.
- for (;;) {
- const char* p = strchr(str, '@');
- if (p == NULL) {
- ColoredPrintf(color, "%s", str);
- return;
- }
-
- ColoredPrintf(color, "%s", String(str, p - str).c_str());
-
- const char ch = p[1];
- str = p + 2;
- if (ch == '@') {
- ColoredPrintf(color, "@");
- } else if (ch == 'D') {
- color = COLOR_DEFAULT;
- } else if (ch == 'R') {
- color = COLOR_RED;
- } else if (ch == 'G') {
- color = COLOR_GREEN;
- } else if (ch == 'Y') {
- color = COLOR_YELLOW;
- } else {
- --str;
- }
- }
-}
-
-static const char kColorEncodedHelpMessage[] =
-"This program contains tests written using " GTEST_NAME_ ". You can use the\n"
-"following command line flags to control its behavior:\n"
-"\n"
-"Test Selection:\n"
-" @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n"
-" List the names of all tests instead of running them. The name of\n"
-" TEST(Foo, Bar) is \"Foo.Bar\".\n"
-" @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS"
- "[@G-@YNEGATIVE_PATTERNS]@D\n"
-" Run only the tests whose name matches one of the positive patterns but\n"
-" none of the negative patterns. '?' matches any single character; '*'\n"
-" matches any substring; ':' separates two patterns.\n"
-" @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n"
-" Run all disabled tests too.\n"
-"\n"
-"Test Execution:\n"
-" @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n"
-" Run the tests repeatedly; use a negative count to repeat forever.\n"
-" @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n"
-" Randomize tests' orders on every iteration.\n"
-" @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n"
-" Random number seed to use for shuffling test orders (between 1 and\n"
-" 99999, or 0 to use a seed based on the current time).\n"
-"\n"
-"Test Output:\n"
-" @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
-" Enable/disable colored output. The default is @Gauto@D.\n"
-" -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n"
-" Don't print the elapsed time of each test.\n"
-" @G--" GTEST_FLAG_PREFIX_ "output=xml@Y[@G:@YDIRECTORY_PATH@G"
- GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n"
-" Generate an XML report in the given directory or with the given file\n"
-" name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n"
-#if GTEST_CAN_STREAM_RESULTS_
-" @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n"
-" Stream test results to the given server.\n"
-#endif // GTEST_CAN_STREAM_RESULTS_
-"\n"
-"Assertion Behavior:\n"
-#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-" @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
-" Set the default death test style.\n"
-#endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
-" @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n"
-" Turn assertion failures into debugger break-points.\n"
-" @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
-" Turn assertion failures into C++ exceptions.\n"
-" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
-" Do not report exceptions as test failures. Instead, allow them\n"
-" to crash the program or throw a pop-up (on Windows).\n"
-"\n"
-"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
- "the corresponding\n"
-"environment variable of a flag (all letters in upper-case). For example, to\n"
-"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_
- "color=no@D or set\n"
-"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n"
-"\n"
-"For more information, please read the " GTEST_NAME_ " documentation at\n"
-"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n"
-"(not one in your own code or tests), please report it to\n"
-"@G<" GTEST_DEV_EMAIL_ ">@D.\n";
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test. The type parameter CharType can be
-// instantiated to either char or wchar_t.
-template
-void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
- for (int i = 1; i < *argc; i++) {
- const String arg_string = StreamableToString(argv[i]);
- const char* const arg = arg_string.c_str();
-
- using internal::ParseBoolFlag;
- using internal::ParseInt32Flag;
- using internal::ParseStringFlag;
-
- // Do we see a Google Test flag?
- if (ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
- >EST_FLAG(also_run_disabled_tests)) ||
- ParseBoolFlag(arg, kBreakOnFailureFlag,
- >EST_FLAG(break_on_failure)) ||
- ParseBoolFlag(arg, kCatchExceptionsFlag,
- >EST_FLAG(catch_exceptions)) ||
- ParseStringFlag(arg, kColorFlag, >EST_FLAG(color)) ||
- ParseStringFlag(arg, kDeathTestStyleFlag,
- >EST_FLAG(death_test_style)) ||
- ParseBoolFlag(arg, kDeathTestUseFork,
- >EST_FLAG(death_test_use_fork)) ||
- ParseStringFlag(arg, kFilterFlag, >EST_FLAG(filter)) ||
- ParseStringFlag(arg, kInternalRunDeathTestFlag,
- >EST_FLAG(internal_run_death_test)) ||
- ParseBoolFlag(arg, kListTestsFlag, >EST_FLAG(list_tests)) ||
- ParseStringFlag(arg, kOutputFlag, >EST_FLAG(output)) ||
- ParseBoolFlag(arg, kPrintTimeFlag, >EST_FLAG(print_time)) ||
- ParseInt32Flag(arg, kRandomSeedFlag, >EST_FLAG(random_seed)) ||
- ParseInt32Flag(arg, kRepeatFlag, >EST_FLAG(repeat)) ||
- ParseBoolFlag(arg, kShuffleFlag, >EST_FLAG(shuffle)) ||
- ParseInt32Flag(arg, kStackTraceDepthFlag,
- >EST_FLAG(stack_trace_depth)) ||
- ParseStringFlag(arg, kStreamResultToFlag,
- >EST_FLAG(stream_result_to)) ||
- ParseBoolFlag(arg, kThrowOnFailureFlag,
- >EST_FLAG(throw_on_failure))
- ) {
- // Yes. Shift the remainder of the argv list left by one. Note
- // that argv has (*argc + 1) elements, the last one always being
- // NULL. The following loop moves the trailing NULL element as
- // well.
- for (int j = i; j != *argc; j++) {
- argv[j] = argv[j + 1];
- }
-
- // Decrements the argument count.
- (*argc)--;
-
- // We also need to decrement the iterator as we just removed
- // an element.
- i--;
- } else if (arg_string == "--help" || arg_string == "-h" ||
- arg_string == "-?" || arg_string == "/?" ||
- HasGoogleTestFlagPrefix(arg)) {
- // Both help flag and unrecognized Google Test flags (excluding
- // internal ones) trigger help display.
- g_help_flag = true;
- }
- }
-
- if (g_help_flag) {
- // We print the help here instead of in RUN_ALL_TESTS(), as the
- // latter may not be called at all if the user is using Google
- // Test with another testing framework.
- PrintColorEncoded(kColorEncodedHelpMessage);
- }
-}
-
-// Parses the command line for Google Test flags, without initializing
-// other parts of Google Test.
-void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
- ParseGoogleTestFlagsOnlyImpl(argc, argv);
-}
-void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
- ParseGoogleTestFlagsOnlyImpl(argc, argv);
-}
-
-// The internal implementation of InitGoogleTest().
-//
-// The type parameter CharType can be instantiated to either char or
-// wchar_t.
-template
-void InitGoogleTestImpl(int* argc, CharType** argv) {
- g_init_gtest_count++;
-
- // We don't want to run the initialization code twice.
- if (g_init_gtest_count != 1) return;
-
- if (*argc <= 0) return;
-
- internal::g_executable_path = internal::StreamableToString(argv[0]);
-
-#if GTEST_HAS_DEATH_TEST
-
- g_argvs.clear();
- for (int i = 0; i != *argc; i++) {
- g_argvs.push_back(StreamableToString(argv[i]));
- }
-
-#endif // GTEST_HAS_DEATH_TEST
-
- ParseGoogleTestFlagsOnly(argc, argv);
- GetUnitTestImpl()->PostFlagParsingInit();
-}
-
-} // namespace internal
-
-// Initializes Google Test. This must be called before calling
-// RUN_ALL_TESTS(). In particular, it parses a command line for the
-// flags that Google Test recognizes. Whenever a Google Test flag is
-// seen, it is removed from argv, and *argc is decremented.
-//
-// No value is returned. Instead, the Google Test flag variables are
-// updated.
-//
-// Calling the function for the second time has no user-visible effect.
-void InitGoogleTest(int* argc, char** argv) {
- internal::InitGoogleTestImpl(argc, argv);
-}
-
-// This overloaded version can be used in Windows programs compiled in
-// UNICODE mode.
-void InitGoogleTest(int* argc, wchar_t** argv) {
- internal::InitGoogleTestImpl(argc, argv);
-}
-
-} // namespace testing
-// Copyright 2005, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev)
-//
-// This file implements death tests.
-
-
-#if GTEST_HAS_DEATH_TEST
-
-# if GTEST_OS_MAC
-# include
-# endif // GTEST_OS_MAC
-
-# include
-# include
-# include
-# include
-
-# if GTEST_OS_WINDOWS
-# include
-# else
-# include
-# include