#1014 Fixed regression, default value for algo option was not applied.

Repair compilation with Clang 9.0.0

CHANGELOG.md

@@ -1,3 +1,186 @@
+# v2.15.3-beta
+- [#1014](https://github.com/xmrig/xmrig/issues/1014) Fixed regression, default value for `algo` option was not applied.
+
+# v2.15.2-beta
+- [#1010](https://github.com/xmrig/xmrig/pull/1010#issuecomment-482632107) Added daemon support (solo mining).
+- [#1012](https://github.com/xmrig/xmrig/pull/1012) Fixed compatibility with clang 9.
+- Config subsystem was rewritten, internally JSON is primary format now.
+- Fixed regression, big HTTP responses was truncated.
+
+# v2.15.1-beta
+- [#1007](https://github.com/xmrig/xmrig/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser).
+- [#257](https://github.com/xmrig/xmrig-nvidia/pull/257) New logging subsystem, file and syslog now always without colors.
+
+# v2.15.0-beta
+- [#314](https://github.com/xmrig/xmrig-proxy/issues/314) Added donate over proxy feature.
+  - Added new option `donate-over-proxy`.
+  - Added real graceful exit.
+  
+# v2.14.1
+* [#975](https://github.com/xmrig/xmrig/issues/975) Fixed crash on Linux if double thread mode used.
+
+# v2.14.0
+- **[#969](https://github.com/xmrig/xmrig/pull/969) Added new algorithm `cryptonight/rwz`, short alias `cn/rwz` (also known as CryptoNight ReverseWaltz), for upcoming [Graft](https://www.graft.network/) fork.**
+- **[#931](https://github.com/xmrig/xmrig/issues/931) Added new algorithm `cryptonight/zls`, short alias `cn/zls` for [Zelerius Network](https://zelerius.org) fork.**
+- **[#940](https://github.com/xmrig/xmrig/issues/940) Added new algorithm `cryptonight/double`, short alias `cn/double` (also known as CryptoNight HeavyX), for [X-CASH](https://x-cash.org/).**
+- [#951](https://github.com/xmrig/xmrig/issues/951#issuecomment-469581529) Fixed crash if AVX was disabled on OS level.
+- [#952](https://github.com/xmrig/xmrig/issues/952) Fixed compile error on some Linux.
+- [#957](https://github.com/xmrig/xmrig/issues/957#issuecomment-468890667) Added support for embedded config.
+- [#958](https://github.com/xmrig/xmrig/pull/958) Fixed incorrect user agent on ARM platforms.
+- [#968](https://github.com/xmrig/xmrig/pull/968) Optimized `cn/r` algorithm performance.
+
+# v2.13.1
+- [#946](https://github.com/xmrig/xmrig/pull/946) Optimized software AES implementations for CPUs without hardware AES support. `cn/r`, `cn/wow` up to 2.6 times faster, 4-9% improvements for other algorithms.
+
+# v2.13.0
+- **[#938](https://github.com/xmrig/xmrig/issues/938) Added support for new algorithm `cryptonight/r`, short alias `cn/r` (also known as CryptoNightR or CryptoNight variant 4), for upcoming [Monero](https://www.getmonero.org/) fork on March 9, thanks [@SChernykh](https://github.com/SChernykh).**
+- [#939](https://github.com/xmrig/xmrig/issues/939) Added support for dynamic (runtime) pools reload.
+- [#932](https://github.com/xmrig/xmrig/issues/932) Fixed `cn-pico` hashrate drop, regression since v2.11.0.
+
+# v2.12.0
+- [#929](https://github.com/xmrig/xmrig/pull/929) Added support for new algorithm `cryptonight/wow`, short alias `cn/wow` (also known as CryptonightR), for upcoming [Wownero](http://wownero.org) fork on February 14.
+
+# v2.11.0
+- [#928](https://github.com/xmrig/xmrig/issues/928) Added support for new algorithm `cryptonight/gpu`, short alias `cn/gpu` (original name `cryptonight-gpu`), for upcoming [Ryo currency](https://ryo-currency.com) fork on February 14.
+- [#749](https://github.com/xmrig/xmrig/issues/749) Added support for detect hardware AES in runtime on ARMv8 platforms.
+- [#292](https://github.com/xmrig/xmrig/issues/292) Fixed build on ARMv8 platforms if compiler not support hardware AES.
+
+# v2.10.0
+- [#904](https://github.com/xmrig/xmrig/issues/904) Added new algorithm `cn-pico/trtl` (aliases `cryptonight-turtle`, `cn-trtl`) for upcoming TurtleCoin (TRTL) fork.
+- Default value for option `max-cpu-usage` changed to `100` also this option now deprecated.
+
+# v2.9.4
+- [#913](https://github.com/xmrig/xmrig/issues/913) Fixed Masari (MSR) support (this update required for upcoming fork).
+- [#915](https://github.com/xmrig/xmrig/pull/915) Improved security, JIT memory now read-only after patching.
+
+# v2.9.3
+- [#909](https://github.com/xmrig/xmrig/issues/909) Fixed compile errors on FreeBSD.
+- [#912](https://github.com/xmrig/xmrig/pull/912) Fixed, C++ implementation of `cn/half` was produce up to 13% of invalid hashes.
+
+# v2.9.2
+- [#907](https://github.com/xmrig/xmrig/pull/907) Fixed crash on Linux.
+
+# v2.9.1
+- Restored compatibility with https://stellite.hashvault.pro.
+
+# v2.9.0
+- [#899](https://github.com/xmrig/xmrig/issues/899) Added support for new algorithm `cn/half` for Masari and Stellite forks.
+- [#834](https://github.com/xmrig/xmrig/pull/834) Added ASM optimized code for AMD Bulldozer.
+- [#839](https://github.com/xmrig/xmrig/issues/839) Fixed FreeBSD compile.
+- [#857](https://github.com/xmrig/xmrig/pull/857) Fixed impossible to build for macOS without clang.
+
+# v2.8.3
+- [#813](https://github.com/xmrig/xmrig/issues/813) Fixed critical bug with Minergate pool and variant 2.
+
+# v2.8.1
+- [#768](https://github.com/xmrig/xmrig/issues/768) Fixed build with Visual Studio 2015.
+- [#769](https://github.com/xmrig/xmrig/issues/769) Fixed regression, some ANSI escape sequences was in log with disabled colors.
+- [#777](https://github.com/xmrig/xmrig/issues/777) Better report about pool connection issues. 
+- Simplified checks for ASM auto detection, only AES support necessary.
+- Added missing options to `--help` output.
+
+# v2.8.0
+- **[#753](https://github.com/xmrig/xmrig/issues/753) Added new algorithm [CryptoNight variant 2](https://github.com/xmrig/xmrig/issues/753) for Monero fork, thanks [@SChernykh](https://github.com/SChernykh).**
+  - Added global and per thread option `"asm"` and and command line equivalent.
+- **[#758](https://github.com/xmrig/xmrig/issues/758) Added SSL/TLS support for secure connections to pools.**
+  - Added per pool options `"tls"` and `"tls-fingerprint"` and command line equivalents.
+- [#767](https://github.com/xmrig/xmrig/issues/767) Added config autosave feature, same with GPU miners.  
+- [#245](https://github.com/xmrig/xmrig-proxy/issues/245) Fixed API ID collision when run multiple miners on same machine.
+- [#757](https://github.com/xmrig/xmrig/issues/757) Fixed send buffer overflow.
+
+# v2.6.4
+- [#700](https://github.com/xmrig/xmrig/issues/700) `cryptonight-lite/ipbc` replaced to `cryptonight-heavy/tube` for **Bittube (TUBE)**.
+- Added `cryptonight/rto` (cryptonight variant 1 with IPBC/TUBE mod) variant for **Arto (RTO)** coin.
+- Added `cryptonight/xao` (original cryptonight with bigger iteration count) variant for **Alloy (XAO)** coin.
+- Better variant detection for **nicehash.com** and **minergate.com**.
+- [#692](https://github.com/xmrig/xmrig/issues/692) Added support for specify both algorithm and variant via single `algo` option.
+
+# v2.6.3
+- **Added support for new cryptonight-heavy variant xhv** (`cn-heavy/xhv`) for upcoming Haven Protocol fork.
+- **Added support for new cryptonight variant msr** (`cn/msr`) also known as `cryptonight-fast` for upcoming Masari fork.
+- Added new detailed hashrate report.
+- [#446](https://github.com/xmrig/xmrig/issues/446) Likely fixed SIGBUS error on 32 bit ARM CPUs.
+- [#551](https://github.com/xmrig/xmrig/issues/551) Fixed `cn-heavy` algorithm on ARMv8.
+- [#614](https://github.com/xmrig/xmrig/issues/614) Fixed display issue with huge pages percentage when colors disabled.
+- [#615](https://github.com/xmrig/xmrig/issues/615) Fixed build without libcpuid.
+- [#629](https://github.com/xmrig/xmrig/pull/629) Fixed file logging with non-seekable files.
+- [#672](https://github.com/xmrig/xmrig/pull/672) Reverted back `cryptonight-light` and exit if no valid algorithm specified.
+
+# v2.6.2
+ - [#607](https://github.com/xmrig/xmrig/issues/607) Fixed donation bug.
+ - [#610](https://github.com/xmrig/xmrig/issues/610) Fixed ARM build.
+
+# v2.6.1
+ - [#168](https://github.com/xmrig/xmrig-proxy/issues/168) Added support for [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/blob/dev/doc/STRATUM_EXT.md#1-mining-algorithm-negotiation).
+ - Added IPBC coin support, base algorithm `cn-lite` variant `ipbc`.
+ - [#581](https://github.com/xmrig/xmrig/issues/581) Added support for upcoming Stellite (XTL) fork, base algorithm `cn` variant `xtl`, variant can set now, no need do it after fork.
+ - Added support for **rig-id** stratum protocol extensions, compatible with xmr-stak.
+ - Changed behavior for option `variant=-1` for `cryptonight`, now variant is `1` by default, if you mine old coins need change `variant` to `0`.
+ - A lot of small fixes and better unification with proxy code.
+
+# v2.6.0-beta3
+- [#563](https://github.com/xmrig/xmrig/issues/563) **Added [advanced threads mode](https://github.com/xmrig/xmrig/issues/563), now possible configure each thread individually.**
+- [#255](https://github.com/xmrig/xmrig/issues/563) Low power mode extended to **triple**, **quard** and **penta** modes.
+- [#519](https://github.com/xmrig/xmrig/issues/519) Fixed high donation levels, improved donation start time randomization.
+- [#554](https://github.com/xmrig/xmrig/issues/554) Fixed regression with `print-time` option.
+
+# v2.6.0-beta2
+- Improved performance for `cryptonight v7` especially in double hash mode.
+- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 disabled for internal HTTP API by default, was causing issues on some systems.
+- Added short aliases for algorithm names: `cn`, `cn-lite` and `cn-heavy`.
+- Fixed regressions (v2.6.0-beta1 affected)
+  - [#494](https://github.com/xmrig/xmrig/issues/494) Command line option `--donate-level` was broken.
+  - [#502](https://github.com/xmrig/xmrig/issues/502) Build without libmicrohttpd was broken.
+  - Fixed nonce calculation for `--av 4` (software AES, double hash) was causing reduction of effective hashrate and rejected shares on nicehash.
+
+# v2.6.0-beta1
+ - [#476](https://github.com/xmrig/xmrig/issues/476) **Added Cryptonight-Heavy support for Sumokoin ASIC resistance fork.**
+ - HTTP server now runs in main loop, it make possible easy extend API without worry about thread synchronization.
+ - Added initial graceful reload support, miner will reload configuration if config file changed, disabled by default until it will be fully implemented and tested.
+ - Added API endpoint `PUT /1/config` to update current config.
+ - Added API endpoint `GET /1/config` to get current active config.
+ - Added API endpoint `GET /1/threads` to get current active threads configuration.
+ - API endpoint `GET /` now deprecated, use `GET /1/summary` instead.
+ - Added `--api-no-ipv6` and similar config option to disable IPv6 support for HTTP API.
+ - Added `--api-no-restricted` to enable full access to api, this option has no effect if `--api-access-token` not specified.
+
+# v2.5.3
+- Fixed critical bug, in some cases miner was can't recovery connection and switch to failover pool, version 2.5.2 affected. If you use v2.6.0-beta3 this issue doesn't concern you.
+- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 support disabled for internal HTTP API.
+- Added workaround for nicehash.com if you use `cryptonightv7.<region>.nicehash.com` option `variant=1` will be set automatically.
+
+# v2.5.2
+- [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect.
+
+# v2.5.1
+- [#454](https://github.com/xmrig/xmrig/issues/454) Fixed build with libmicrohttpd version below v0.9.35.
+- [#456](https://github.com/xmrig/xmrig/issues/459) Verbose errors related to donation pool was not fully silenced.
+- [#459](https://github.com/xmrig/xmrig/issues/459) Fixed regression (version 2.5.0 affected) with connection to **xmr.f2pool.com**.
+
+# v2.5.0
+- [#434](https://github.com/xmrig/xmrig/issues/434) **Added support for Monero v7 PoW, scheduled on April 6.**
+- Added full IPv6 support.
+- Added protocol extension, when use the miner with xmrig-proxy 2.5+ no more need manually specify `nicehash` option.
+- [#123](https://github.com/xmrig/xmrig-proxy/issues/123) Fixed regression (all versions since 2.4 affected) fragmented responses from pool/proxy was parsed incorrectly.
+- [#428](https://github.com/xmrig/xmrig/issues/428) Fixed regression (version 2.4.5 affected) with CPU cache size detection.
+
+# v2.4.5
+- [#324](https://github.com/xmrig/xmrig/pull/324) Fixed build without libmicrohttpd (CMake cache issue).
+- [#341](https://github.com/xmrig/xmrig/issues/341) Fixed wrong exit code and added command line option `--dry-run`.
+- [#385](https://github.com/xmrig/xmrig/pull/385) Up to 20% performance increase for non-AES CPU and fixed Intel Core 2 cache detection.
+
+# v2.4.4
+ - Added libmicrohttpd version to --version output.
+ - Fixed bug in singal handler, in some cases miner wasn't shutdown properly.
+ - Fixed recent MSVC 2017 version detection.
+ - [#279](https://github.com/xmrig/xmrig/pull/279) Fixed build on some macOS versions.
+
+# v2.4.3
+ - [#94](https://github.com/xmrig/xmrig/issues/94#issuecomment-342019257) [#216](https://github.com/xmrig/xmrig/issues/216) Added **ARMv8** and **ARMv7** support. Hardware AES supported, thanks [Imran Yusuff](https://github.com/imranyusuff).
+ - [#157](https://github.com/xmrig/xmrig/issues/157) [#196](https://github.com/xmrig/xmrig/issues/196) Fixed Linux compile issues.
+ - [#184](https://github.com/xmrig/xmrig/issues/184) Fixed cache size detection for CPUs with disabled Hyper-Threading.
+ - [#200](https://github.com/xmrig/xmrig/issues/200) In some cases miner was doesn't write log to stdout.
+
 # v2.4.2
  - [#60](https://github.com/xmrig/xmrig/issues/60) Added FreeBSD support, thanks [vcambur](https://github.com/vcambur).
  - [#153](https://github.com/xmrig/xmrig/issues/153) Fixed issues with dwarfpool.com.

CMakeLists.txt

@@ -1,50 +1,56 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 2.8)
 project(xmrig)
 
-option(WITH_LIBCPUID "Use Libcpuid" ON)
-option(WITH_AEON     "CryptoNight-Lite support" ON)
-option(WITH_HTTPD    "HTTP REST API" ON)
+option(WITH_LIBCPUID        "Use Libcpuid" ON)
+option(WITH_AEON            "CryptoNight-Lite support" ON)
+option(WITH_SUMO            "CryptoNight-Heavy support" ON)
+option(WITH_CN_PICO         "CryptoNight-Pico support" ON)
+option(WITH_CN_GPU          "CryptoNight-GPU support" ON)
+option(WITH_HTTP            "HTTP protocol support (client/server)" 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(BUILD_STATIC         "Build static binary" OFF)
+option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
+option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 
 include (CheckIncludeFile)
+include (cmake/cpu.cmake)
+include (src/base/base.cmake)
 
 
 set(HEADERS
-    src/3rdparty/align.h
-    src/api/Api.h
-    src/api/ApiState.h
-    src/api/NetworkState.h
+    "${HEADERS_BASE}"
+    "${HEADERS_BASE_HTTP}"
+    src/api/interfaces/IApiListener.h
     src/App.h
-    src/Console.h
-    src/Cpu.h
-    src/interfaces/IClientListener.h
-    src/interfaces/IConsoleListener.h
+    src/common/cpu/Cpu.h
+    src/common/crypto/Algorithm.h
+    src/common/crypto/keccak.h
+    src/common/interfaces/ICpuInfo.h
+    src/common/Platform.h
+    src/common/utils/mm_malloc.h
+    src/common/xmrig.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/interfaces/IJobResultListener.h
-    src/interfaces/ILogBackend.h
-    src/interfaces/IStrategy.h
-    src/interfaces/IStrategyListener.h
+    src/interfaces/IThread.h
     src/interfaces/IWorker.h
-    src/log/ConsoleLog.h
-    src/log/FileLog.h
-    src/log/Log.h
     src/Mem.h
-    src/net/Client.h
-    src/net/Job.h
-    src/net/JobId.h
     src/net/JobResult.h
     src/net/Network.h
+    src/net/NetworkState.h
     src/net/strategies/DonateStrategy.h
-    src/net/strategies/FailoverStrategy.h
-    src/net/strategies/SinglePoolStrategy.h
-    src/net/SubmitResult.h
-    src/net/Url.h
-    src/Options.h
-    src/Platform.h
     src/Summary.h
     src/version.h
-    src/workers/DoubleWorker.h
-    src/workers/Handle.h
+    src/workers/CpuThread.h
     src/workers/Hashrate.h
-    src/workers/SingleWorker.h
+    src/workers/MultiWorker.h
+    src/workers/ThreadHandle.h
     src/workers/Worker.h
     src/workers/Workers.h
    )
@@ -53,188 +59,174 @@ set(HEADERS_CRYPTO
     src/crypto/c_blake256.h
     src/crypto/c_groestl.h
     src/crypto/c_jh.h
-    src/crypto/c_keccak.h
     src/crypto/c_skein.h
     src/crypto/CryptoNight.h
-    src/crypto/CryptoNight_p.h
+    src/crypto/CryptoNight_constants.h
+    src/crypto/CryptoNight_monero.h
     src/crypto/CryptoNight_test.h
     src/crypto/groestl_tables.h
     src/crypto/hash.h
     src/crypto/skein_port.h
+    src/crypto/soft_aes.h
+    src/crypto/asm/CryptonightR_template.h
    )
 
+if (XMRIG_ARM)
+    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/CryptoNight_arm.h)
+else()
+    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/CryptoNight_x86.h)
+endif()
+
 set(SOURCES
-    src/api/Api.cpp
-    src/api/ApiState.cpp
-    src/api/NetworkState.cpp
+    "${SOURCES_BASE}"
+    "${SOURCES_BASE_HTTP}"
     src/App.cpp
-    src/Console.cpp
-    src/log/ConsoleLog.cpp
-    src/log/FileLog.cpp
-    src/log/Log.cpp
+    src/common/crypto/Algorithm.cpp
+    src/common/crypto/keccak.cpp
+    src/common/Platform.cpp
+    src/core/config/Config.cpp
+    src/core/config/ConfigTransform.cpp
+    src/core/Controller.cpp
     src/Mem.cpp
-    src/net/Client.cpp
-    src/net/Job.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/net/Url.cpp
-    src/Options.cpp
-    src/Platform.cpp
     src/Summary.cpp
-    src/workers/DoubleWorker.cpp
-    src/workers/Handle.cpp
+    src/workers/CpuThread.cpp
     src/workers/Hashrate.cpp
-    src/workers/SingleWorker.cpp
+    src/workers/MultiWorker.cpp
+    src/workers/ThreadHandle.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/soft_aes.c
-    src/crypto/soft_aes.c
-    src/crypto/CryptoNight.cpp
    )
 
 if (WIN32)
     set(SOURCES_OS
+        "${SOURCES_OS}"
         res/app.rc
         src/App_win.cpp
-        src/Cpu_win.cpp
+        src/common/Platform_win.cpp
         src/Mem_win.cpp
-        src/Platform_win.cpp
         )
 
     add_definitions(/DWIN32)
     set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
 elseif (APPLE)
     set(SOURCES_OS
+        "${SOURCES_OS}"
         src/App_unix.cpp
-        src/Cpu_mac.cpp
+        src/common/Platform_mac.cpp
         src/Mem_unix.cpp
-        src/Platform_mac.cpp
         )
 else()
     set(SOURCES_OS
+        "${SOURCES_OS}"
         src/App_unix.cpp
-        src/Cpu_unix.cpp
+        src/common/Platform_unix.cpp
         src/Mem_unix.cpp
-        src/Platform_unix.cpp
         )
 
-    set(EXTRA_LIBS pthread)
+    if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+        set(EXTRA_LIBS kvm pthread)
+    else()
+        set(EXTRA_LIBS pthread rt dl)
+    endif()
 endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-    set(EXTRA_LIBS ${EXTRA_LIBS} kvm)
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    EXECUTE_PROCESS(COMMAND uname -o COMMAND tr -d '\n' OUTPUT_VARIABLE OPERATING_SYSTEM)
+    if (OPERATING_SYSTEM MATCHES "Android")
+        set(EXTRA_LIBS ${EXTRA_LIBS} log)
+    endif()
 endif()
 
 add_definitions(/D__STDC_FORMAT_MACROS)
 add_definitions(/DUNICODE)
-add_definitions(/DRAPIDJSON_SSE2)
-#add_definitions(/DAPP_DEBUG)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 find_package(UV REQUIRED)
 
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 11)
-
-
-# https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_ID.html
-if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
-
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall -Wno-strict-aliasing")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
-
-    if (WIN32)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-    else()
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-    endif()
-
-    add_definitions(/D_GNU_SOURCE)
-
-    if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-
-    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-2")
-
-elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Ox /Ot /Oi /MT /GL")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox /Ot /Oi /MT /GL")
-    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-    add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
-    add_definitions(/DNOMINMAX)
-
-elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
-
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes -Wall")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes -Wall -fno-exceptions -fno-rtti -Wno-missing-braces")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
-
-endif()
+include(cmake/flags.cmake)
 
 if (WITH_LIBCPUID)
     add_subdirectory(src/3rdparty/libcpuid)
 
     include_directories(src/3rdparty/libcpuid)
     set(CPUID_LIB cpuid)
-    set(SOURCES_CPUID src/Cpu.cpp)
+    set(SOURCES_CPUID src/core/cpu/AdvancedCpuInfo.h src/core/cpu/AdvancedCpuInfo.cpp src/core/cpu/Cpu.cpp)
 else()
     add_definitions(/DXMRIG_NO_LIBCPUID)
-    set(SOURCES_CPUID src/Cpu_stub.cpp)
+    set(SOURCES_CPUID src/common/cpu/BasicCpuInfo.h src/common/cpu/Cpu.cpp)
+
+    if (XMRIG_ARM)
+        set(SOURCES_CPUID ${SOURCES_CPUID} src/common/cpu/BasicCpuInfo_arm.cpp)
+    else()
+        set(SOURCES_CPUID ${SOURCES_CPUID} src/common/cpu/BasicCpuInfo.cpp)
+    endif()
 endif()
 
-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)
-endif()
+include(cmake/OpenSSL.cmake)
+include(cmake/asm.cmake)
+include(cmake/cn-gpu.cmake)
 
 if (NOT WITH_AEON)
     add_definitions(/DXMRIG_NO_AEON)
 endif()
 
-if (WITH_HTTPD)
-    find_package(MHD)
+if (NOT WITH_SUMO)
+    add_definitions(/DXMRIG_NO_SUMO)
+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()
+if (NOT WITH_IPBC)
+    add_definitions(/DXMRIG_NO_IPBC)
+endif()
+
+if (NOT WITH_CN_PICO)
+    add_definitions(/DXMRIG_NO_CN_PICO)
+endif()
+
+if (WITH_EMBEDDED_CONFIG)
+    add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG)
+endif()
+
+if (WITH_HTTP)
+    set(HTTP_SOURCES
+        src/api/Api.cpp
+        src/api/Api.h
+        src/api/Httpd.cpp
+        src/api/Httpd.h
+        src/api/interfaces/IApiRequest.h
+        src/api/requests/ApiRequest.cpp
+        src/api/requests/ApiRequest.h
+        src/api/requests/HttpApiRequest.cpp
+        src/api/requests/HttpApiRequest.h
+        src/api/v1/ApiRouter.cpp
+        src/api/v1/ApiRouter.h
+        )
 else()
-    add_definitions(/DXMRIG_NO_HTTPD)
-    add_definitions(/DXMRIG_NO_API)
+    set(HTTP_SOURCES "")
 endif()
 
 include_directories(src)
 include_directories(src/3rdparty)
 include_directories(${UV_INCLUDE_DIR})
 
-add_executable(xmrig ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES})
-target_link_libraries(xmrig ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
+if (BUILD_STATIC)
+    set(CMAKE_EXE_LINKER_FLAGS " -static")
+endif()
+
+if (WITH_DEBUG_LOG)
+    add_definitions(/DAPP_DEBUG)
+endif()
+
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTP_SOURCES} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB})

README.md

@@ -1,8 +1,16 @@
 # XMRig
-XMRig is high performance Monero (XMR) CPU miner, with the official full Windows support.
-Originally based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of legacy code, since version 1.0.0 complete rewritten from scratch on C++.
 
-* This is the CPU-mining version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia).
+[![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/xmrig/xmrig/releases)
+[![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/xmrig/xmrig/releases)
+[![GitHub Release Date](https://img.shields.io/github/release-date-pre/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/releases)
+[![GitHub license](https://img.shields.io/github/license/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/blob/master/LICENSE)
+[![GitHub stars](https://img.shields.io/github/stars/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/network)
+
+XMRig is a high performance Monero (XMR) CPU miner, with official support for Windows.
+Originally based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of legacy code, since version 1.0.0 completely rewritten from scratch on C++.
+
+* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
 * [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
 
 <img src="http://i.imgur.com/OKZRVDh.png" width="619" >
@@ -16,6 +24,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
 * [Common Issues](#common-issues)
 * [Other information](#other-information)
 * [Donations](#donations)
+* [Release checksums](#release-checksums)
 * [Contacts](#contacts)
 
 ## Features
@@ -37,64 +46,81 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
   * Clone with `git clone https://github.com/xmrig/xmrig.git` :hammer: [Build instructions](https://github.com/xmrig/xmrig/wiki/Build).
 
 ## Usage
-### Basic example
-```
-xmrig.exe -o pool.minemonero.pro:5555 -u YOUR_WALLET -p x -k
-```
-
-### Failover
-```
-xmrig.exe -o pool.minemonero.pro:5555 -u YOUR_WALLET1 -p x -k -o pool.supportxmr.com:5555 -u YOUR_WALLET2 -p x -k
-```
-For failover you can add multiple pools, maximum count not limited.
+Use [config.xmrig.com](https://config.xmrig.com/xmrig) to generate, edit or share configurations.
 
 ### Options
 ```
-  -a, --algo=ALGO       cryptonight (default) or cryptonight-lite
-  -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
-  -v, --av=N            algorithm variation, 0 auto select
-  -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)
-      --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
-      --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 support
-      --print-time=N    print hashrate report every N seconds
-  -h, --help            display this help and exit
-  -V, --version         output version information and exit
+  -a, --algo=ALGO          specify the algorithm to use
+                             cryptonight
+                             cryptonight-lite
+                             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
+      --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
+  -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
+      --variant            algorithm PoW variant
+      --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
+      --max-cpu-usage=N    maximum CPU usage for automatic threads mode (default 75)
+      --safe               safe adjust threads and av settings for current CPU
+      --asm=ASM            ASM code for cn/2, possible values: auto, none, intel, ryzen.
+      --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
+      --api-id=ID          custom instance ID for API
+      --api-ipv6           enable IPv6 support for API
+      --api-no-restricted  enable full remote access (only if API token set)
+      --dry-run            test configuration and exit
+  -h, --help               display this help and exit
+  -V, --version            output version information and exit
 ```
 
-Also you can use configuration via config file, default **config.json**. You can load multiple config files and combine it with command line options.
+Also you can use configuration via config file, default name **config.json**. Some options available only via config file: [`autosave`](https://github.com/xmrig/xmrig/issues/767), [`hw-aes`](https://github.com/xmrig/xmrig/issues/563). `watch` option currently not implemented in miners only in proxy.
 
 ## Algorithm variations
-Since version 0.8.0.
-* `--av=1` For CPUs with hardware AES.
-* `--av=2` Lower power mode (double hash) of `1`.
-* `--av=3` Software AES implementation.
-* `--av=4` Lower power mode (double hash) of `3`.
+
+- `av` option used for automatic and simple threads mode (when you specify only threads count).
+- For [advanced threads mode](https://github.com/xmrig/xmrig/issues/563) each thread configured individually and `av` option not used.
+
+| av | Hashes per round | Hardware AES |
+|----|------------------|--------------|
+| 1  | 1 (Single)       | yes          |
+| 2  | 2 (Double)       | yes          |
+| 3  | 1 (Single)       | no           |
+| 4  | 2 (Double)       | no           |
+| 5  | 3 (Triple)       | yes          |
+| 6  | 4 (Quard)        | yes          |
+| 7  | 5 (Penta)        | yes          |
+| 8  | 3 (Triple)       | no           |
+| 9  | 4 (Quard)        | no           |
+| 10 | 5 (Penta)        | no           |
 
 ## Common Issues
 ### HUGE PAGES unavailable
 * Run XMRig as Administrator.
-* Since version 0.8.0 XMRig automatically enable SeLockMemoryPrivilege for current user, but reboot or sign out still required. [Manual instruction](https://msdn.microsoft.com/en-gb/library/ms190730.aspx).
+* 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).
 
 ## Other information
 * No HTTP support, only stratum protocol support.
-* No TLS support.
-* Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via command line option `--donate-level`.
+* Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via option `donate-level`.
 
 
 ### CPU mining performance
@@ -106,7 +132,7 @@ Please note performance is highly dependent on system load. The numbers above ar
 ### Maximum performance checklist
 * Idle operating system.
 * Do not exceed optimal thread count.
-* Use modern CPUs with AES-NI instructuon set.
+* Use modern CPUs with AES-NI instruction set.
 * Try setup optimal cpu affinity.
 * Enable fast memory (Large/Huge pages).
 
@@ -117,3 +143,4 @@ Please note performance is highly dependent on system load. The numbers above ar
 ## Contacts
 * support@xmrig.com
 * [reddit](https://www.reddit.com/user/XMRig/)
+* [twitter](https://twitter.com/xmrig_dev)

cmake/FindMHD.cmake

@@ -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)
-

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})

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()

cmake/asm.cmake

@@ -0,0 +1,45 @@
+if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(XMRIG_ASM_LIBRARY "xmrig-asm")
+
+    if (CMAKE_C_COMPILER_ID MATCHES MSVC)
+        enable_language(ASM_MASM)
+
+        if (MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/cn_main_loop.asm"
+                "src/crypto/asm/CryptonightR_template.asm"
+            )
+        else()
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/win64/cn_main_loop.asm"
+                "src/crypto/asm/win64/CryptonightR_template.asm"
+            )
+        endif()
+
+        set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY ASM_MASM)
+    else()
+        enable_language(ASM)
+
+        if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU)
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/win64/cn_main_loop.S"
+                "src/crypto/asm/CryptonightR_template.S"
+            )
+        else()
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/cn_main_loop.S"
+                "src/crypto/asm/CryptonightR_template.S"
+            )
+        endif()
+
+        set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY C)
+    endif()
+
+    add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES})
+    set(XMRIG_ASM_SOURCES src/crypto/Asm.h src/crypto/Asm.cpp src/crypto/CryptonightR_gen.cpp)
+    set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C)
+else()
+    set(XMRIG_ASM_SOURCES "")
+    set(XMRIG_ASM_LIBRARY "")
+    add_definitions(/DXMRIG_NO_ASM)
+endif()

cmake/cn-gpu.cmake

@@ -0,0 +1,23 @@
+if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+    if (XMRIG_ARM)
+        set(CN_GPU_SOURCES src/crypto/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_arm.cpp PROPERTIES COMPILE_FLAGS "-O3")
+        endif()
+    else()
+        set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/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_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2")
+            set_source_files_properties(src/crypto/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3")
+        elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+            set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX")
+        endif()
+    endif()
+else()
+    set(CN_GPU_SOURCES "")
+
+    add_definitions(/DXMRIG_NO_CN_GPU)
+endif()

cmake/cpu.cmake

@@ -0,0 +1,43 @@
+if (NOT CMAKE_SYSTEM_PROCESSOR)
+    message(WARNING "CMAKE_SYSTEM_PROCESSOR not defined")
+endif()
+
+
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
+    add_definitions(/DRAPIDJSON_SSE2)
+endif()
+
+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()

cmake/flags.cmake

@@ -0,0 +1,83 @@
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+
+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)
+
+    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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s")
+
+    if (XMRIG_ARMv8)
+        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")
+    else()
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+    endif()
+
+    add_definitions(/D_GNU_SOURCE)
+
+    if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    endif()
+
+    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-2")
+
+elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Ox /Ot /Oi /MT /GL")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox /Ot /Oi /MT /GL")
+    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
+    add_definitions(/DNOMINMAX)
+    add_definitions(/DHAVE_ROTR)
+
+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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
+
+    if (XMRIG_ARMv8)
+        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}")
+    else()
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+
+        check_symbol_exists("_rotr" "x86intrin.h" HAVE_ROTR)
+        if (HAVE_ROTR)
+            add_definitions(/DHAVE_ROTR)
+        endif()
+    endif()
+
+endif()

doc/ALGORITHMS.md

@@ -0,0 +1,31 @@
+# Algorithms
+
+XMRig uses a different way to specify algorithms, compared to other miners.
+
+Algorithm selection splitted to 2 parts:
+
+ * Global base algorithm per miner or proxy instance, `algo` option. Possible values: `cryptonight`, `cryptonight-lite`, `cryptonight-heavy`.
+ * Algorithm variant specified separately for each pool, `variant` option.
+ * [Full table for supported algorithm and variants.](https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-algorithm-names-and-variants)
+ 
+#### Example
+```json
+{
+  "algo": "cryptonight",
+  ...
+  "pools": [
+    {
+      "url": "...",
+      "variant": 1,
+      ...
+    }
+ ],
+ ...
+}
+```
+
+## Mining algorithm negotiation
+If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) miner will choice proper variant automaticaly and if you choice wrong base algorithm you will see error message.
+
+Pools with mining algorithm negotiation support.
+ * [www.hashvault.pro](https://www.hashvault.pro/)

doc/API.md

@@ -0,0 +1,53 @@
+# HTTP API
+
+If you want use API you need choice a port where is internal HTTP server will listen for incoming connections. API will not available if miner built without `libmicrohttpd`.
+
+Example configuration:
+
+```json
+"api": {
+    "port": 44444,
+    "access-token": "TOKEN",
+    "worker-id": null,
+    "ipv6": false,
+    "restricted": false
+},
+```
+
+* **port** Port for incoming connections `http://<miner ip>:<port>`.
+* **access-token** [Bearer](https://gist.github.com/xmrig/c75fdd1f8e0f3bac05500be2ab718f8e#file-api-html-L54) access token to secure access to API.
+* **worker-id** Optional worker name, if not set will be detected automatically.
+* **ipv6** Enable (`true`) or disable (`false`) IPv6 for API.
+* **restricted** Use `false` to allow remote configuration.
+
+If you prefer use command line options instead of config file, you can use options: `--api-port`, `--api-access-token`, `--api-worker-id`, `--api-ipv6` and `api-no-restricted`.
+
+## 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
+```

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
+}

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": []
+    }
+}

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
+            ]
+        }
+    ]
+}

res/app.rc

@@ -1,11 +1,11 @@
 #include <windows.h>
 #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
+  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

src/3rdparty/aligned_malloc.h

@@ -21,55 +21,45 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __ALIGNED_MALLOC_H__
+#define __ALIGNED_MALLOC_H__
 
-#ifdef __FreeBSD__
-#   include <sys/types.h>
-#   include <sys/param.h>
-#   include <sys/cpuset.h>
-#   include <pthread_np.h>
+
+#include <stdlib.h>
+
+
+#ifndef __cplusplus
+extern int posix_memalign(void **__memptr, size_t __alignment, size_t __size);
+#else
+// Some systems (e.g. those with GNU libc) declare posix_memalign with an
+// exception specifier. Via an "egregious workaround" in
+// Sema::CheckEquivalentExceptionSpec, Clang accepts the following as a valid
+// redeclaration of glibc's declaration.
+extern "C" int posix_memalign(void **__memptr, size_t __alignment, size_t __size);
 #endif
 
 
-#include <pthread.h>
-#include <sched.h>
-#include <unistd.h>
-#include <string.h>
-
-
-#include "Cpu.h"
-
-
-#ifdef __FreeBSD__
-typedef cpuset_t cpu_set_t;
-#endif
-
-
-void Cpu::init()
+static __inline__ void *__attribute__((__always_inline__, __malloc__)) _mm_malloc(size_t __size, size_t __align)
 {
-#   ifdef XMRIG_NO_LIBCPUID
-    m_totalThreads = sysconf(_SC_NPROCESSORS_CONF);
-#   endif
+  if (__align == 1) {
+    return malloc(__size);
+  }
 
-    initCommon();
+  if (!(__align & (__align - 1)) && __align < sizeof(void *))
+    __align = sizeof(void *);
+
+  void *__mallocedMemory;
+  if (posix_memalign(&__mallocedMemory, __align, __size)) {
+    return 0;
+  }
+
+  return __mallocedMemory;
 }
 
 
-void Cpu::setAffinity(int id, uint64_t mask)
+static __inline__ void __attribute__((__always_inline__)) _mm_free(void *__p)
 {
-    cpu_set_t set;
-    CPU_ZERO(&set);
-
-    for (int i = 0; i < m_totalThreads; i++) {
-        if (mask & (1UL << i)) {
-            CPU_SET(i, &set);
-        }
-    }
-
-    if (id == -1) {
-#       ifndef __FreeBSD__
-        sched_setaffinity(0, sizeof(&set), &set);
-#       endif
-    } else {
-        pthread_setaffinity_np(pthread_self(), sizeof(&set), &set);
-    }
+  free(__p);
 }
+
+#endif /* __ALIGNED_MALLOC_H__ */

src/3rdparty/http-parser/AUTHORS

@@ -0,0 +1,68 @@
+# Authors ordered by first contribution.
+Ryan Dahl <ry@tinyclouds.org>
+Jeremy Hinegardner <jeremy@hinegardner.org>
+Sergey Shepelev <temotor@gmail.com>
+Joe Damato <ice799@gmail.com>
+tomika <tomika_nospam@freemail.hu>
+Phoenix Sol <phoenix@burninglabs.com>
+Cliff Frey <cliff@meraki.com>
+Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
+Santiago Gala <sgala@apache.org>
+Tim Becker <tim.becker@syngenio.de>
+Jeff Terrace <jterrace@gmail.com>
+Ben Noordhuis <info@bnoordhuis.nl>
+Nathan Rajlich <nathan@tootallnate.net>
+Mark Nottingham <mnot@mnot.net>
+Aman Gupta <aman@tmm1.net>
+Tim Becker <tim.becker@kuriositaet.de>
+Sean Cunningham <sean.cunningham@mandiant.com>
+Peter Griess <pg@std.in>
+Salman Haq <salman.haq@asti-usa.com>
+Cliff Frey <clifffrey@gmail.com>
+Jon Kolb <jon@b0g.us>
+Fouad Mardini <f.mardini@gmail.com>
+Paul Querna <pquerna@apache.org>
+Felix Geisendörfer <felix@debuggable.com>
+koichik <koichik@improvement.jp>
+Andre Caron <andre.l.caron@gmail.com>
+Ivo Raisr <ivosh@ivosh.net>
+James McLaughlin <jamie@lacewing-project.org>
+David Gwynne <loki@animata.net>
+Thomas LE ROUX <thomas@november-eleven.fr>
+Randy Rizun <rrizun@ortivawireless.com>
+Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
+Simon Zimmermann <simonz05@gmail.com>
+Erik Dubbelboer <erik@dubbelboer.com>
+Martell Malone <martellmalone@gmail.com>
+Bertrand Paquet <bpaquet@octo.com>
+BogDan Vatra <bogdan@kde.org>
+Peter Faiman <peter@thepicard.org>
+Corey Richardson <corey@octayn.net>
+Tóth Tamás <tomika_nospam@freemail.hu>
+Cam Swords <cam.swords@gmail.com>
+Chris Dickinson <christopher.s.dickinson@gmail.com>
+Uli Köhler <ukoehler@btronik.de>
+Charlie Somerville <charlie@charliesomerville.com>
+Patrik Stutz <patrik.stutz@gmail.com>
+Fedor Indutny <fedor.indutny@gmail.com>
+runner <runner.mei@gmail.com>
+Alexis Campailla <alexis@janeasystems.com>
+David Wragg <david@wragg.org>
+Vinnie Falco <vinnie.falco@gmail.com>
+Alex Butum <alexbutum@linux.com>
+Rex Feng <rexfeng@gmail.com>
+Alex Kocharin <alex@kocharin.ru>
+Mark Koopman <markmontymark@yahoo.com>
+Helge Heß <me@helgehess.eu>
+Alexis La Goutte <alexis.lagoutte@gmail.com>
+George Miroshnykov <george.miroshnykov@gmail.com>
+Maciej Małecki <me@mmalecki.com>
+Marc O'Morain <github.com@marcomorain.com>
+Jeff Pinner <jpinner@twitter.com>
+Timothy J Fontaine <tjfontaine@gmail.com>
+Akagi201 <akagi201@gmail.com>
+Romain Giraud <giraud.romain@gmail.com>
+Jay Satiro <raysatiro@yahoo.com>
+Arne Steen <Arne.Steen@gmx.de>
+Kjell Schubert <kjell.schubert@gmail.com>
+Olivier Mengué <dolmen@cpan.org>

src/3rdparty/http-parser/LICENSE-MIT

@@ -0,0 +1,19 @@
+Copyright Joyent, Inc. and other Node contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE. 

src/3rdparty/http-parser/README.md

@@ -0,0 +1,246 @@
+HTTP Parser
+===========
+
+[![Build Status](https://api.travis-ci.org/nodejs/http-parser.svg?branch=master)](https://travis-ci.org/nodejs/http-parser)
+
+This is a parser for HTTP messages written in C. It parses both requests and
+responses. The parser is designed to be used in performance HTTP
+applications. It does not make any syscalls nor allocations, it does not
+buffer data, it can be interrupted at anytime. Depending on your
+architecture, it only requires about 40 bytes of data per message
+stream (in a web server that is per connection).
+
+Features:
+
+  * No dependencies
+  * Handles persistent streams (keep-alive).
+  * Decodes chunked encoding.
+  * Upgrade support
+  * Defends against buffer overflow attacks.
+
+The parser extracts the following information from HTTP messages:
+
+  * Header fields and values
+  * Content-Length
+  * Request method
+  * Response status code
+  * Transfer-Encoding
+  * HTTP version
+  * Request URL
+  * Message body
+
+
+Usage
+-----
+
+One `http_parser` object is used per TCP connection. Initialize the struct
+using `http_parser_init()` and set the callbacks. That might look something
+like this for a request parser:
+```c
+http_parser_settings settings;
+settings.on_url = my_url_callback;
+settings.on_header_field = my_header_field_callback;
+/* ... */
+
+http_parser *parser = malloc(sizeof(http_parser));
+http_parser_init(parser, HTTP_REQUEST);
+parser->data = my_socket;
+```
+
+When data is received on the socket execute the parser and check for errors.
+
+```c
+size_t len = 80*1024, nparsed;
+char buf[len];
+ssize_t recved;
+
+recved = recv(fd, buf, len, 0);
+
+if (recved < 0) {
+  /* Handle error. */
+}
+
+/* Start up / continue the parser.
+ * Note we pass recved==0 to signal that EOF has been received.
+ */
+nparsed = http_parser_execute(parser, &settings, buf, recved);
+
+if (parser->upgrade) {
+  /* handle new protocol */
+} else if (nparsed != recved) {
+  /* Handle error. Usually just close the connection. */
+}
+```
+
+`http_parser` needs to know where the end of the stream is. For example, sometimes
+servers send responses without Content-Length and expect the client to
+consume input (for the body) until EOF. To tell `http_parser` about EOF, give
+`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
+can still be encountered during an EOF, so one must still be prepared
+to receive them.
+
+Scalar valued message information such as `status_code`, `method`, and the
+HTTP version are stored in the parser structure. This data is only
+temporally stored in `http_parser` and gets reset on each new message. If
+this information is needed later, copy it out of the structure during the
+`headers_complete` callback.
+
+The parser decodes the transfer-encoding for both requests and responses
+transparently. That is, a chunked encoding is decoded before being sent to
+the on_body callback.
+
+
+The Special Problem of Upgrade
+------------------------------
+
+`http_parser` supports upgrading the connection to a different protocol. An
+increasingly common example of this is the WebSocket protocol which sends
+a request like
+
+        GET /demo HTTP/1.1
+        Upgrade: WebSocket
+        Connection: Upgrade
+        Host: example.com
+        Origin: http://example.com
+        WebSocket-Protocol: sample
+
+followed by non-HTTP data.
+
+(See [RFC6455](https://tools.ietf.org/html/rfc6455) for more information the
+WebSocket protocol.)
+
+To support this, the parser will treat this as a normal HTTP message without a
+body, issuing both on_headers_complete and on_message_complete callbacks. However
+http_parser_execute() will stop parsing at the end of the headers and return.
+
+The user is expected to check if `parser->upgrade` has been set to 1 after
+`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
+offset by the return value of `http_parser_execute()`.
+
+
+Callbacks
+---------
+
+During the `http_parser_execute()` call, the callbacks set in
+`http_parser_settings` will be executed. The parser maintains state and
+never looks behind, so buffering the data is not necessary. If you need to
+save certain data for later usage, you can do that from the callbacks.
+
+There are two types of callbacks:
+
+* notification `typedef int (*http_cb) (http_parser*);`
+    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
+* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
+    Callbacks: (requests only) on_url,
+               (common) on_header_field, on_header_value, on_body;
+
+Callbacks must return 0 on success. Returning a non-zero value indicates
+error to the parser, making it exit immediately.
+
+For cases where it is necessary to pass local information to/from a callback,
+the `http_parser` object's `data` field can be used.
+An example of such a case is when using threads to handle a socket connection,
+parse a request, and then give a response over that socket. By instantiation
+of a thread-local struct containing relevant data (e.g. accepted socket,
+allocated memory for callbacks to write into, etc), a parser's callbacks are
+able to communicate data between the scope of the thread and the scope of the
+callback in a threadsafe manner. This allows `http_parser` to be used in
+multi-threaded contexts.
+
+Example:
+```c
+ typedef struct {
+  socket_t sock;
+  void* buffer;
+  int buf_len;
+ } custom_data_t;
+
+
+int my_url_callback(http_parser* parser, const char *at, size_t length) {
+  /* access to thread local custom_data_t struct.
+  Use this access save parsed data for later use into thread local
+  buffer, or communicate over socket
+  */
+  parser->data;
+  ...
+  return 0;
+}
+
+...
+
+void http_parser_thread(socket_t sock) {
+ int nparsed = 0;
+ /* allocate memory for user data */
+ custom_data_t *my_data = malloc(sizeof(custom_data_t));
+
+ /* some information for use by callbacks.
+ * achieves thread -> callback information flow */
+ my_data->sock = sock;
+
+ /* instantiate a thread-local parser */
+ http_parser *parser = malloc(sizeof(http_parser));
+ http_parser_init(parser, HTTP_REQUEST); /* initialise parser */
+ /* this custom data reference is accessible through the reference to the
+ parser supplied to callback functions */
+ parser->data = my_data;
+
+ http_parser_settings settings; /* set up callbacks */
+ settings.on_url = my_url_callback;
+
+ /* execute parser */
+ nparsed = http_parser_execute(parser, &settings, buf, recved);
+
+ ...
+ /* parsed information copied from callback.
+ can now perform action on data copied into thread-local memory from callbacks.
+ achieves callback -> thread information flow */
+ my_data->buffer;
+ ...
+}
+
+```
+
+In case you parse HTTP message in chunks (i.e. `read()` request line
+from socket, parse, read half headers, parse, etc) your data callbacks
+may be called more than once. `http_parser` guarantees that data pointer is only
+valid for the lifetime of callback. You can also `read()` into a heap allocated
+buffer to avoid copying memory around if this fits your application.
+
+Reading headers may be a tricky task if you read/parse headers partially.
+Basically, you need to remember whether last header callback was field or value
+and apply the following logic:
+
+    (on_header_field and on_header_value shortened to on_h_*)
+     ------------------------ ------------ --------------------------------------------
+    | State (prev. callback) | Callback   | Description/action                         |
+     ------------------------ ------------ --------------------------------------------
+    | nothing (first call)   | on_h_field | Allocate new buffer and copy callback data |
+    |                        |            | into it                                    |
+     ------------------------ ------------ --------------------------------------------
+    | value                  | on_h_field | New header started.                        |
+    |                        |            | Copy current name,value buffers to headers |
+    |                        |            | list and allocate new buffer for new name  |
+     ------------------------ ------------ --------------------------------------------
+    | field                  | on_h_field | Previous name continues. Reallocate name   |
+    |                        |            | buffer and append callback data to it      |
+     ------------------------ ------------ --------------------------------------------
+    | field                  | on_h_value | Value for current header started. Allocate |
+    |                        |            | new buffer and copy callback data to it    |
+     ------------------------ ------------ --------------------------------------------
+    | value                  | on_h_value | Value continues. Reallocate value buffer   |
+    |                        |            | and append callback data to it             |
+     ------------------------ ------------ --------------------------------------------
+
+
+Parsing URLs
+------------
+
+A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
+Users of this library may wish to use it to parse URLs constructed from
+consecutive `on_url` callbacks.
+
+See examples of reading in headers:
+
+* [partial example](http://gist.github.com/155877) in C
+* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
+* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript

src/3rdparty/http-parser/http_parser.h

@@ -0,0 +1,439 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#ifndef http_parser_h
+#define http_parser_h
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Also update SONAME in the Makefile whenever you change these. */
+#define HTTP_PARSER_VERSION_MAJOR 2
+#define HTTP_PARSER_VERSION_MINOR 9
+#define HTTP_PARSER_VERSION_PATCH 0
+
+#include <stddef.h>
+#if defined(_WIN32) && !defined(__MINGW32__) && \
+  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
+#include <BaseTsd.h>
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <stdint.h>
+#endif
+
+/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
+ * faster
+ */
+#ifndef HTTP_PARSER_STRICT
+# define HTTP_PARSER_STRICT 1
+#endif
+
+/* Maximium header size allowed. If the macro is not defined
+ * before including this header then the default is used. To
+ * change the maximum header size, define the macro in the build
+ * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
+ * the effective limit on the size of the header, define the macro
+ * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
+ */
+#ifndef HTTP_MAX_HEADER_SIZE
+# define HTTP_MAX_HEADER_SIZE (80*1024)
+#endif
+
+typedef struct http_parser http_parser;
+typedef struct http_parser_settings http_parser_settings;
+
+
+/* Callbacks should return non-zero to indicate an error. The parser will
+ * then halt execution.
+ *
+ * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
+ * returning '1' from on_headers_complete will tell the parser that it
+ * should not expect a body. This is used when receiving a response to a
+ * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
+ * chunked' headers that indicate the presence of a body.
+ *
+ * Returning `2` from on_headers_complete will tell parser that it should not
+ * expect neither a body nor any futher responses on this connection. This is
+ * useful for handling responses to a CONNECT request which may not contain
+ * `Upgrade` or `Connection: upgrade` headers.
+ *
+ * http_data_cb does not return data chunks. It will be called arbitrarily
+ * many times for each string. E.G. you might get 10 callbacks for "on_url"
+ * each providing just a few characters more data.
+ */
+typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
+typedef int (*http_cb) (http_parser*);
+
+
+/* Status Codes */
+#define HTTP_STATUS_MAP(XX)                                                 \
+  XX(100, CONTINUE,                        Continue)                        \
+  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
+  XX(102, PROCESSING,                      Processing)                      \
+  XX(200, OK,                              OK)                              \
+  XX(201, CREATED,                         Created)                         \
+  XX(202, ACCEPTED,                        Accepted)                        \
+  XX(203, NON_AUTHORITATIVE_INFORMATION,   Non-Authoritative Information)   \
+  XX(204, NO_CONTENT,                      No Content)                      \
+  XX(205, RESET_CONTENT,                   Reset Content)                   \
+  XX(206, PARTIAL_CONTENT,                 Partial Content)                 \
+  XX(207, MULTI_STATUS,                    Multi-Status)                    \
+  XX(208, ALREADY_REPORTED,                Already Reported)                \
+  XX(226, IM_USED,                         IM Used)                         \
+  XX(300, MULTIPLE_CHOICES,                Multiple Choices)                \
+  XX(301, MOVED_PERMANENTLY,               Moved Permanently)               \
+  XX(302, FOUND,                           Found)                           \
+  XX(303, SEE_OTHER,                       See Other)                       \
+  XX(304, NOT_MODIFIED,                    Not Modified)                    \
+  XX(305, USE_PROXY,                       Use Proxy)                       \
+  XX(307, TEMPORARY_REDIRECT,              Temporary Redirect)              \
+  XX(308, PERMANENT_REDIRECT,              Permanent Redirect)              \
+  XX(400, BAD_REQUEST,                     Bad Request)                     \
+  XX(401, UNAUTHORIZED,                    Unauthorized)                    \
+  XX(402, PAYMENT_REQUIRED,                Payment Required)                \
+  XX(403, FORBIDDEN,                       Forbidden)                       \
+  XX(404, NOT_FOUND,                       Not Found)                       \
+  XX(405, METHOD_NOT_ALLOWED,              Method Not Allowed)              \
+  XX(406, NOT_ACCEPTABLE,                  Not Acceptable)                  \
+  XX(407, PROXY_AUTHENTICATION_REQUIRED,   Proxy Authentication Required)   \
+  XX(408, REQUEST_TIMEOUT,                 Request Timeout)                 \
+  XX(409, CONFLICT,                        Conflict)                        \
+  XX(410, GONE,                            Gone)                            \
+  XX(411, LENGTH_REQUIRED,                 Length Required)                 \
+  XX(412, PRECONDITION_FAILED,             Precondition Failed)             \
+  XX(413, PAYLOAD_TOO_LARGE,               Payload Too Large)               \
+  XX(414, URI_TOO_LONG,                    URI Too Long)                    \
+  XX(415, UNSUPPORTED_MEDIA_TYPE,          Unsupported Media Type)          \
+  XX(416, RANGE_NOT_SATISFIABLE,           Range Not Satisfiable)           \
+  XX(417, EXPECTATION_FAILED,              Expectation Failed)              \
+  XX(421, MISDIRECTED_REQUEST,             Misdirected Request)             \
+  XX(422, UNPROCESSABLE_ENTITY,            Unprocessable Entity)            \
+  XX(423, LOCKED,                          Locked)                          \
+  XX(424, FAILED_DEPENDENCY,               Failed Dependency)               \
+  XX(426, UPGRADE_REQUIRED,                Upgrade Required)                \
+  XX(428, PRECONDITION_REQUIRED,           Precondition Required)           \
+  XX(429, TOO_MANY_REQUESTS,               Too Many Requests)               \
+  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
+  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS,   Unavailable For Legal Reasons)   \
+  XX(500, INTERNAL_SERVER_ERROR,           Internal Server Error)           \
+  XX(501, NOT_IMPLEMENTED,                 Not Implemented)                 \
+  XX(502, BAD_GATEWAY,                     Bad Gateway)                     \
+  XX(503, SERVICE_UNAVAILABLE,             Service Unavailable)             \
+  XX(504, GATEWAY_TIMEOUT,                 Gateway Timeout)                 \
+  XX(505, HTTP_VERSION_NOT_SUPPORTED,      HTTP Version Not Supported)      \
+  XX(506, VARIANT_ALSO_NEGOTIATES,         Variant Also Negotiates)         \
+  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
+  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
+  XX(510, NOT_EXTENDED,                    Not Extended)                    \
+  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
+
+enum http_status
+  {
+#define XX(num, name, string) HTTP_STATUS_##name = num,
+  HTTP_STATUS_MAP(XX)
+#undef XX
+  };
+
+
+/* Request Methods */
+#define HTTP_METHOD_MAP(XX)         \
+  XX(0,  DELETE,      DELETE)       \
+  XX(1,  GET,         GET)          \
+  XX(2,  HEAD,        HEAD)         \
+  XX(3,  POST,        POST)         \
+  XX(4,  PUT,         PUT)          \
+  /* pathological */                \
+  XX(5,  CONNECT,     CONNECT)      \
+  XX(6,  OPTIONS,     OPTIONS)      \
+  XX(7,  TRACE,       TRACE)        \
+  /* WebDAV */                      \
+  XX(8,  COPY,        COPY)         \
+  XX(9,  LOCK,        LOCK)         \
+  XX(10, MKCOL,       MKCOL)        \
+  XX(11, MOVE,        MOVE)         \
+  XX(12, PROPFIND,    PROPFIND)     \
+  XX(13, PROPPATCH,   PROPPATCH)    \
+  XX(14, SEARCH,      SEARCH)       \
+  XX(15, UNLOCK,      UNLOCK)       \
+  XX(16, BIND,        BIND)         \
+  XX(17, REBIND,      REBIND)       \
+  XX(18, UNBIND,      UNBIND)       \
+  XX(19, ACL,         ACL)          \
+  /* subversion */                  \
+  XX(20, REPORT,      REPORT)       \
+  XX(21, MKACTIVITY,  MKACTIVITY)   \
+  XX(22, CHECKOUT,    CHECKOUT)     \
+  XX(23, MERGE,       MERGE)        \
+  /* upnp */                        \
+  XX(24, MSEARCH,     M-SEARCH)     \
+  XX(25, NOTIFY,      NOTIFY)       \
+  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
+  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
+  /* RFC-5789 */                    \
+  XX(28, PATCH,       PATCH)        \
+  XX(29, PURGE,       PURGE)        \
+  /* CalDAV */                      \
+  XX(30, MKCALENDAR,  MKCALENDAR)   \
+  /* RFC-2068, section 19.6.1.2 */  \
+  XX(31, LINK,        LINK)         \
+  XX(32, UNLINK,      UNLINK)       \
+  /* icecast */                     \
+  XX(33, SOURCE,      SOURCE)       \
+
+enum http_method
+  {
+#define XX(num, name, string) HTTP_##name = num,
+  HTTP_METHOD_MAP(XX)
+#undef XX
+  };
+
+
+enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
+
+
+/* Flag values for http_parser.flags field */
+enum flags
+  { F_CHUNKED               = 1 << 0
+  , F_CONNECTION_KEEP_ALIVE = 1 << 1
+  , F_CONNECTION_CLOSE      = 1 << 2
+  , F_CONNECTION_UPGRADE    = 1 << 3
+  , F_TRAILING              = 1 << 4
+  , F_UPGRADE               = 1 << 5
+  , F_SKIPBODY              = 1 << 6
+  , F_CONTENTLENGTH         = 1 << 7
+  };
+
+
+/* Map for errno-related constants
+ *
+ * The provided argument should be a macro that takes 2 arguments.
+ */
+#define HTTP_ERRNO_MAP(XX)                                           \
+  /* No error */                                                     \
+  XX(OK, "success")                                                  \
+                                                                     \
+  /* Callback-related errors */                                      \
+  XX(CB_message_begin, "the on_message_begin callback failed")       \
+  XX(CB_url, "the on_url callback failed")                           \
+  XX(CB_header_field, "the on_header_field callback failed")         \
+  XX(CB_header_value, "the on_header_value callback failed")         \
+  XX(CB_headers_complete, "the on_headers_complete callback failed") \
+  XX(CB_body, "the on_body callback failed")                         \
+  XX(CB_message_complete, "the on_message_complete callback failed") \
+  XX(CB_status, "the on_status callback failed")                     \
+  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
+  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
+                                                                     \
+  /* Parsing-related errors */                                       \
+  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
+  XX(HEADER_OVERFLOW,                                                \
+     "too many header bytes seen; overflow detected")                \
+  XX(CLOSED_CONNECTION,                                              \
+     "data received after completed connection: close message")      \
+  XX(INVALID_VERSION, "invalid HTTP version")                        \
+  XX(INVALID_STATUS, "invalid HTTP status code")                     \
+  XX(INVALID_METHOD, "invalid HTTP method")                          \
+  XX(INVALID_URL, "invalid URL")                                     \
+  XX(INVALID_HOST, "invalid host")                                   \
+  XX(INVALID_PORT, "invalid port")                                   \
+  XX(INVALID_PATH, "invalid path")                                   \
+  XX(INVALID_QUERY_STRING, "invalid query string")                   \
+  XX(INVALID_FRAGMENT, "invalid fragment")                           \
+  XX(LF_EXPECTED, "LF character expected")                           \
+  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
+  XX(INVALID_CONTENT_LENGTH,                                         \
+     "invalid character in content-length header")                   \
+  XX(UNEXPECTED_CONTENT_LENGTH,                                      \
+     "unexpected content-length header")                             \
+  XX(INVALID_CHUNK_SIZE,                                             \
+     "invalid character in chunk size header")                       \
+  XX(INVALID_CONSTANT, "invalid constant string")                    \
+  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
+  XX(STRICT, "strict mode assertion failed")                         \
+  XX(PAUSED, "parser is paused")                                     \
+  XX(UNKNOWN, "an unknown error occurred")
+
+
+/* Define HPE_* values for each errno value above */
+#define HTTP_ERRNO_GEN(n, s) HPE_##n,
+enum http_errno {
+  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
+};
+#undef HTTP_ERRNO_GEN
+
+
+/* Get an http_errno value from an http_parser */
+#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
+
+
+struct http_parser {
+  /** PRIVATE **/
+  unsigned int type : 2;         /* enum http_parser_type */
+  unsigned int flags : 8;        /* F_* values from 'flags' enum; semi-public */
+  unsigned int state : 7;        /* enum state from http_parser.c */
+  unsigned int header_state : 7; /* enum header_state from http_parser.c */
+  unsigned int index : 7;        /* index into current matcher */
+  unsigned int lenient_http_headers : 1;
+
+  uint32_t nread;          /* # bytes read in various scenarios */
+  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
+
+  /** READ-ONLY **/
+  unsigned short http_major;
+  unsigned short http_minor;
+  unsigned int status_code : 16; /* responses only */
+  unsigned int method : 8;       /* requests only */
+  unsigned int http_errno : 7;
+
+  /* 1 = Upgrade header was present and the parser has exited because of that.
+   * 0 = No upgrade header present.
+   * Should be checked when http_parser_execute() returns in addition to
+   * error checking.
+   */
+  unsigned int upgrade : 1;
+
+  /** PUBLIC **/
+  void *data; /* A pointer to get hook to the "connection" or "socket" object */
+};
+
+
+struct http_parser_settings {
+  http_cb      on_message_begin;
+  http_data_cb on_url;
+  http_data_cb on_status;
+  http_data_cb on_header_field;
+  http_data_cb on_header_value;
+  http_cb      on_headers_complete;
+  http_data_cb on_body;
+  http_cb      on_message_complete;
+  /* When on_chunk_header is called, the current chunk length is stored
+   * in parser->content_length.
+   */
+  http_cb      on_chunk_header;
+  http_cb      on_chunk_complete;
+};
+
+
+enum http_parser_url_fields
+  { UF_SCHEMA           = 0
+  , UF_HOST             = 1
+  , UF_PORT             = 2
+  , UF_PATH             = 3
+  , UF_QUERY            = 4
+  , UF_FRAGMENT         = 5
+  , UF_USERINFO         = 6
+  , UF_MAX              = 7
+  };
+
+
+/* Result structure for http_parser_parse_url().
+ *
+ * Callers should index into field_data[] with UF_* values iff field_set
+ * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
+ * because we probably have padding left over), we convert any port to
+ * a uint16_t.
+ */
+struct http_parser_url {
+  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
+  uint16_t port;                /* Converted UF_PORT string */
+
+  struct {
+    uint16_t off;               /* Offset into buffer in which field starts */
+    uint16_t len;               /* Length of run in buffer */
+  } field_data[UF_MAX];
+};
+
+
+/* Returns the library version. Bits 16-23 contain the major version number,
+ * bits 8-15 the minor version number and bits 0-7 the patch level.
+ * Usage example:
+ *
+ *   unsigned long version = http_parser_version();
+ *   unsigned major = (version >> 16) & 255;
+ *   unsigned minor = (version >> 8) & 255;
+ *   unsigned patch = version & 255;
+ *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
+ */
+unsigned long http_parser_version(void);
+
+void http_parser_init(http_parser *parser, enum http_parser_type type);
+
+
+/* Initialize http_parser_settings members to 0
+ */
+void http_parser_settings_init(http_parser_settings *settings);
+
+
+/* Executes the parser. Returns number of parsed bytes. Sets
+ * `parser->http_errno` on error. */
+size_t http_parser_execute(http_parser *parser,
+                           const http_parser_settings *settings,
+                           const char *data,
+                           size_t len);
+
+
+/* If http_should_keep_alive() in the on_headers_complete or
+ * on_message_complete callback returns 0, then this should be
+ * the last message on the connection.
+ * If you are the server, respond with the "Connection: close" header.
+ * If you are the client, close the connection.
+ */
+int http_should_keep_alive(const http_parser *parser);
+
+/* Returns a string version of the HTTP method. */
+const char *http_method_str(enum http_method m);
+
+/* Returns a string version of the HTTP status code. */
+const char *http_status_str(enum http_status s);
+
+/* Return a string name of the given error */
+const char *http_errno_name(enum http_errno err);
+
+/* Return a string description of the given error */
+const char *http_errno_description(enum http_errno err);
+
+/* Initialize all http_parser_url members to 0 */
+void http_parser_url_init(struct http_parser_url *u);
+
+/* Parse a URL; return nonzero on failure */
+int http_parser_parse_url(const char *buf, size_t buflen,
+                          int is_connect,
+                          struct http_parser_url *u);
+
+/* Pause or un-pause the parser; a nonzero value pauses */
+void http_parser_pause(http_parser *parser, int paused);
+
+/* Checks if this is the final chunk of the body. */
+int http_body_is_final(const http_parser *parser);
+
+/* Change the maximum header size provided at compile time. */
+void http_parser_set_max_header_size(uint32_t size);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

src/3rdparty/libcpuid/asm-bits.h

@@ -1,53 +1,71 @@
-/*
- * Copyright 2008  Veselin Georgiev,
- * anrieffNOSPAM @ mgail_DOT.com (convert to gmail)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-#ifndef __ASM_BITS_H__
-#define __ASM_BITS_H__
-#include "libcpuid.h"
-
-/* Determine Compiler: */
-#if defined(_MSC_VER)
-#	define COMPILER_MICROSOFT
-#elif defined(__GNUC__)
-#	define COMPILER_GCC
-#endif
-
-/* Determine Platform */
-#if defined(__x86_64__) || defined(_M_AMD64)
-#	define PLATFORM_X64
-#elif defined(__i386__) || defined(_M_IX86)
-#	define PLATFORM_X86
-#endif
-
-/* Under Windows/AMD64 with MSVC, inline assembly isn't supported */
-#if (defined(COMPILER_GCC) && defined(PLATFORM_X64)) || defined(PLATFORM_X86)
-#	define INLINE_ASM_SUPPORTED
-#endif
-
-int cpuid_exists_by_eflags(void);
-void exec_cpuid(uint32_t *regs);
-void busy_sse_loop(int cycles);
-
-#endif /* __ASM_BITS_H__ */
+/*
+ * Copyright 2008  Veselin Georgiev,
+ * anrieffNOSPAM @ mgail_DOT.com (convert to gmail)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#ifndef __ASM_BITS_H__
+#define __ASM_BITS_H__
+#include "libcpuid.h"
+
+/* Determine Compiler: */
+#if defined(_MSC_VER)
+#if !defined(COMPILER_MICROSOFT)
+#	define COMPILER_MICROSOFT
+#endif
+#elif defined(__GNUC__)
+#if !defined(COMPILER_GCC)
+#	define COMPILER_GCC
+#endif
+#elif defined(__clang__)
+#if !defined(COMPILER_CLANG)
+#	define COMPILER_CLANG
+#endif
+#endif
+
+/* Determine Platform */
+#if defined(__x86_64__) || defined(_M_AMD64)
+#if !defined(PLATFORM_X64)
+#	define PLATFORM_X64
+#endif
+#elif defined(__i386__) || defined(_M_IX86)
+#if !defined(PLATFORM_X86)
+#	define PLATFORM_X86
+#endif
+#elif defined(__ARMEL__)
+#if !defined(PLATFORM_ARM)
+#	define PLATFORM_ARM
+#endif
+#endif
+
+/* Under Windows/AMD64 with MSVC, inline assembly isn't supported */
+#if (((defined(COMPILER_GCC) || defined(COMPILER_CLANG))) &&  \
+     (defined(PLATFORM_X64) || defined(PLATFORM_X86) || defined(PLATFORM_ARM))) || \
+	 (defined(COMPILER_MICROSOFT) && defined(PLATFORM_X86))
+#	define INLINE_ASM_SUPPORTED
+#endif
+
+int cpuid_exists_by_eflags(void);
+void exec_cpuid(uint32_t *regs);
+void busy_sse_loop(int cycles);
+
+#endif /* __ASM_BITS_H__ */

src/3rdparty/libcpuid/cpuid_main.c

@@ -221,42 +221,42 @@ static void load_features_common(struct cpu_raw_data_t* raw, struct cpu_id_t* da
 
 static cpu_vendor_t cpuid_vendor_identify(const uint32_t *raw_vendor, char *vendor_str)
 {
-    int i;
-    cpu_vendor_t vendor = VENDOR_UNKNOWN;
-    const struct { cpu_vendor_t vendor; char match[16]; }
-    matchtable[NUM_CPU_VENDORS] = {
-        /* source: http://www.sandpile.org/ia32/cpuid.htm */
-        { VENDOR_INTEL		, "GenuineIntel" },
-        { VENDOR_AMD		, "AuthenticAMD" },
-        { VENDOR_CYRIX		, "CyrixInstead" },
-        { VENDOR_NEXGEN		, "NexGenDriven" },
-        { VENDOR_TRANSMETA	, "GenuineTMx86" },
-        { VENDOR_UMC		, "UMC UMC UMC " },
-        { VENDOR_CENTAUR	, "CentaurHauls" },
-        { VENDOR_RISE		, "RiseRiseRise" },
-        { VENDOR_SIS		, "SiS SiS SiS " },
-        { VENDOR_NSC		, "Geode by NSC" },
-    };
+	int i;
+	cpu_vendor_t vendor = VENDOR_UNKNOWN;
+	const struct { cpu_vendor_t vendor; char match[16]; }
+	matchtable[NUM_CPU_VENDORS] = {
+		/* source: http://www.sandpile.org/ia32/cpuid.htm */
+		{ VENDOR_INTEL		, "GenuineIntel" },
+		{ VENDOR_AMD		, "AuthenticAMD" },
+		{ VENDOR_CYRIX		, "CyrixInstead" },
+		{ VENDOR_NEXGEN		, "NexGenDriven" },
+		{ VENDOR_TRANSMETA	, "GenuineTMx86" },
+		{ VENDOR_UMC		, "UMC UMC UMC " },
+		{ VENDOR_CENTAUR	, "CentaurHauls" },
+		{ VENDOR_RISE		, "RiseRiseRise" },
+		{ VENDOR_SIS		, "SiS SiS SiS " },
+		{ VENDOR_NSC		, "Geode by NSC" },
+	};
 
-    memcpy(vendor_str + 0, &raw_vendor[1], 4);
-    memcpy(vendor_str + 4, &raw_vendor[3], 4);
-    memcpy(vendor_str + 8, &raw_vendor[2], 4);
-    vendor_str[12] = 0;
+	memcpy(vendor_str + 0, &raw_vendor[1], 4);
+	memcpy(vendor_str + 4, &raw_vendor[3], 4);
+	memcpy(vendor_str + 8, &raw_vendor[2], 4);
+	vendor_str[12] = 0;
 
-    /* Determine vendor: */
-    for (i = 0; i < NUM_CPU_VENDORS; i++)
-        if (!strcmp(vendor_str, matchtable[i].match)) {
-            vendor = matchtable[i].vendor;
-            break;
-        }
-    return vendor;
+	/* Determine vendor: */
+	for (i = 0; i < NUM_CPU_VENDORS; i++)
+		if (!strcmp(vendor_str, matchtable[i].match)) {
+			vendor = matchtable[i].vendor;
+			break;
+		}
+	return vendor;
 }
 
 static int cpuid_basic_identify(struct cpu_raw_data_t* raw, struct cpu_id_t* data)
 {
 	int i, j, basic, xmodel, xfamily, ext;
 	char brandstr[64] = {0};
-    data->vendor = cpuid_vendor_identify(raw->basic_cpuid[0], data->vendor_str);
+	data->vendor = cpuid_vendor_identify(raw->basic_cpuid[0], data->vendor_str);
 
 	if (data->vendor == VENDOR_UNKNOWN)
 		return set_error(ERR_CPU_UNKN);

src/3rdparty/libcpuid/libcpuid.h

@@ -60,7 +60,7 @@
  */
 
 /** @mainpage A simple libcpuid introduction
- *
+ * 
  * LibCPUID provides CPU identification and access to the CPUID and RDTSC
  * instructions on the x86.
  * <p>
@@ -82,6 +82,7 @@
  */
 
 /** @defgroup libcpuid LibCPUID
+ * @brief LibCPUID provides CPU identification
  @{ */
 
 /* Include some integer type specifications: */
@@ -535,23 +536,23 @@ typedef enum {
  * @brief Describes common library error codes
  */
 typedef enum {
-	ERR_OK       =  0,	/*!< "No error" */
-	ERR_NO_CPUID = -1,	/*!< "CPUID instruction is not supported" */
-	ERR_NO_RDTSC = -2,	/*!< "RDTSC instruction is not supported" */
-	ERR_NO_MEM   = -3,	/*!< "Memory allocation failed" */
-	ERR_OPEN     = -4,	/*!< "File open operation failed" */
-	ERR_BADFMT   = -5,	/*!< "Bad file format" */
-	ERR_NOT_IMP  = -6,	/*!< "Not implemented" */
-	ERR_CPU_UNKN = -7,	/*!< "Unsupported processor" */
-	ERR_NO_RDMSR = -8,	/*!< "RDMSR instruction is not supported" */
-	ERR_NO_DRIVER= -9,	/*!< "RDMSR driver error (generic)" */
-	ERR_NO_PERMS = -10,	/*!< "No permissions to install RDMSR driver" */
-	ERR_EXTRACT  = -11,	/*!< "Cannot extract RDMSR driver (read only media?)" */
-	ERR_HANDLE   = -12,	/*!< "Bad handle" */
-	ERR_INVMSR   = -13,	/*!< "Invalid MSR" */
-	ERR_INVCNB   = -14,	/*!< "Invalid core number" */
-	ERR_HANDLE_R = -15,	/*!< "Error on handle read" */
-	ERR_INVRANGE = -16,	/*!< "Invalid given range" */
+	ERR_OK       =  0,	/*!< No error */
+	ERR_NO_CPUID = -1,	/*!< CPUID instruction is not supported */
+	ERR_NO_RDTSC = -2,	/*!< RDTSC instruction is not supported */
+	ERR_NO_MEM   = -3,	/*!< Memory allocation failed */
+	ERR_OPEN     = -4,	/*!< File open operation failed */
+	ERR_BADFMT   = -5,	/*!< Bad file format */
+	ERR_NOT_IMP  = -6,	/*!< Not implemented */
+	ERR_CPU_UNKN = -7,	/*!< Unsupported processor */
+	ERR_NO_RDMSR = -8,	/*!< RDMSR instruction is not supported */
+	ERR_NO_DRIVER= -9,	/*!< RDMSR driver error (generic) */
+	ERR_NO_PERMS = -10,	/*!< No permissions to install RDMSR driver */
+	ERR_EXTRACT  = -11,	/*!< Cannot extract RDMSR driver (read only media?) */
+	ERR_HANDLE   = -12,	/*!< Bad handle */
+	ERR_INVMSR   = -13,	/*!< Invalid MSR */
+	ERR_INVCNB   = -14,	/*!< Invalid core number */
+	ERR_HANDLE_R = -15,	/*!< Error on handle read */
+	ERR_INVRANGE = -16,	/*!< Invalid given range */
 } cpu_error_t;
 
 /**
@@ -668,7 +669,7 @@ struct cpu_epc_t cpuid_get_epc(int index, const struct cpu_raw_data_t* raw);
 const char* cpuid_lib_version(void);
 
 #ifdef __cplusplus
-}; /* extern "C" */
+} /* extern "C" */
 #endif
 
 

src/3rdparty/libcpuid/libcpuid_internal.h

@@ -75,8 +75,9 @@ enum _intel_bits_t {
 	_3                      = LBIT( 14 ),
 	_5                      = LBIT( 15 ),
 	_7                      = LBIT( 16 ),
-	XEON_                   = LBIT( 17 ),
-	ATOM_                   = LBIT( 18 ),
+	_9                      = LBIT( 17 ),
+	XEON_                   = LBIT( 18 ),
+	ATOM_                   = LBIT( 19 ),
 };
 typedef enum _intel_bits_t intel_bits_t;
 

src/3rdparty/libcpuid/libcpuid_types.h

@@ -32,6 +32,32 @@
 #ifndef __LIBCPUID_TYPES_H__
 #define __LIBCPUID_TYPES_H__
 
-#include <stdint.h>
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
+#  include <stdint.h>
+#else
+/* we have to provide our own: */
+#  if !defined(__int32_t_defined)
+typedef int int32_t;
+#  endif
+
+#  if !defined(__uint32_t_defined)
+typedef unsigned uint32_t;
+#  endif
+
+typedef signed char		int8_t;
+typedef unsigned char		uint8_t;
+typedef signed short		int16_t;
+typedef unsigned short		uint16_t;
+#if (defined _MSC_VER) && (_MSC_VER <= 1300)
+	/* MSVC 6.0: no long longs ... */
+	typedef signed __int64		int64_t;
+	typedef unsigned __int64	uint64_t;
+#else
+	/* all other sane compilers: */
+	typedef signed long long   int64_t;
+	typedef unsigned long long uint64_t;
+#endif
+
+#endif
 
 #endif /* __LIBCPUID_TYPES_H__ */

src/3rdparty/libcpuid/recog_amd.c

@@ -49,6 +49,10 @@ enum _amd_model_codes_t {
 	_1400,
 	_1500,
 	_1600,
+	_1900,
+	_2400,
+	_2500,
+	_2700,
 };
 
 static void load_amd_features(struct cpu_raw_data_t* raw, struct cpu_id_t* data)

src/3rdparty/libcpuid/recog_intel.c

@@ -376,7 +376,7 @@ static intel_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data)
 			bits |= bit_matchtable[i].bit;
 	}
 	
-	if ((i = match_pattern(bs, "Core(TM) [im][357]")) != 0) {
+	if ((i = match_pattern(bs, "Core(TM) [im][3579]")) != 0) {
 		bits |= CORE_;
 		i--;
 		switch (bs[i + 9]) {
@@ -387,6 +387,7 @@ static intel_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data)
 			case '3': bits |= _3; break;
 			case '5': bits |= _5; break;
 			case '7': bits |= _7; break;
+			case '9': bits |= _9; break;
 		}
 	}
 	for (i = 0; i < COUNT_OF(matchtable); i++)

src/App.cpp

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018      SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -28,133 +30,76 @@
 
 #include "api/Api.h"
 #include "App.h"
-#include "Console.h"
-#include "Cpu.h"
+#include "base/io/Console.h"
+#include "base/io/log/Log.h"
+#include "base/kernel/Signals.h"
+#include "common/cpu/Cpu.h"
+#include "common/Platform.h"
+#include "core/config/Config.h"
+#include "core/Controller.h"
 #include "crypto/CryptoNight.h"
-#include "log/ConsoleLog.h"
-#include "log/FileLog.h"
-#include "log/Log.h"
 #include "Mem.h"
 #include "net/Network.h"
-#include "Options.h"
-#include "Platform.h"
 #include "Summary.h"
 #include "version.h"
 #include "workers/Workers.h"
 
 
-#ifdef HAVE_SYSLOG_H
-#   include "log/SysLog.h"
-#endif
-
-#ifndef XMRIG_NO_HTTPD
-#   include "api/Httpd.h"
-#endif
-
-
-App *App::m_self = nullptr;
-
-
-
-App::App(int argc, char **argv) :
+xmrig::App::App(Process *process) :
     m_console(nullptr),
-    m_httpd(nullptr),
-    m_network(nullptr),
-    m_options(nullptr)
+    m_signals(nullptr)
 {
-    m_self = this;
-
-    Cpu::init();
-    m_options = Options::parse(argc, argv);
-    if (!m_options) {
+    m_controller = new Controller(process);
+    if (m_controller->init() != 0) {
         return;
     }
 
-    Log::init();
-
-    if (!m_options->background()) {
-        Log::add(new ConsoleLog(m_options->colors()));
+    if (!m_controller->config()->isBackground()) {
         m_console = new Console(this);
     }
-
-    if (m_options->logFile()) {
-        Log::add(new FileLog(m_options->logFile()));
-    }
-
-#   ifdef HAVE_SYSLOG_H
-    if (m_options->syslog()) {
-        Log::add(new SysLog());
-    }
-#   endif
-
-    Platform::init(m_options->userAgent());
-    Platform::setProcessPriority(m_options->priority());
-
-    m_network = new Network(m_options);
-
-    uv_signal_init(uv_default_loop(), &m_signal);
 }
 
 
-App::~App()
+xmrig::App::~App()
 {
-    uv_tty_reset_mode();
-
-#   ifndef XMRIG_NO_HTTPD
-    delete m_httpd;
-#   endif
-
+    delete m_signals;
     delete m_console;
+    delete m_controller;
 }
 
 
-int App::exec()
+int xmrig::App::exec()
 {
-    if (!m_options) {
-        return 0;
+    if (!m_controller->isReady()) {
+        return 2;
     }
 
-    uv_signal_start(&m_signal, App::onSignal, SIGHUP);
-    uv_signal_start(&m_signal, App::onSignal, SIGTERM);
-    uv_signal_start(&m_signal, App::onSignal, SIGINT);
+    m_signals = new Signals(this);
 
     background();
 
-    if (!CryptoNight::init(m_options->algo(), m_options->algoVariant())) {
-        LOG_ERR("\"%s\" hash self-test failed.", m_options->algoName());
-        return 1;
+    Mem::init(m_controller->config()->isHugePages());
+
+    Summary::print(m_controller);
+
+    if (m_controller->config()->isDryRun()) {
+        LOG_NOTICE("OK");
+
+        return 0;
     }
 
-    Mem::allocate(m_options->algo(), m_options->threads(), m_options->doubleHash(), m_options->hugePages());
-    Summary::print();
+    Workers::start(m_controller);
 
-#   ifndef XMRIG_NO_API
-    Api::start();
-#   endif
-
-#   ifndef XMRIG_NO_HTTPD
-    m_httpd = new Httpd(m_options->apiPort(), m_options->apiToken());
-    m_httpd->start();
-#   endif
-
-    Workers::start(m_options->affinity(), m_options->priority());
-
-    m_network->connect();
+    m_controller->start();
 
     const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
     uv_loop_close(uv_default_loop());
 
-    delete m_network;
-
-    Options::release();
-    Mem::release();
-    Platform::release();
-
     return r;
 }
 
 
-void App::onConsoleCommand(char command)
+void xmrig::App::onConsoleCommand(char command)
 {
     switch (command) {
     case 'h':
@@ -164,14 +109,16 @@ void App::onConsoleCommand(char command)
 
     case 'p':
     case 'P':
-        LOG_INFO(m_options->colors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume");
-        Workers::setEnabled(false);
+        if (Workers::isEnabled()) {
+            LOG_INFO(YELLOW_BOLD("paused") ", press " MAGENTA_BOLD("r") " to resume");
+            Workers::setEnabled(false);
+        }
         break;
 
     case 'r':
     case 'R':
         if (!Workers::isEnabled()) {
-            LOG_INFO(m_options->colors() ? "\x1B[01;32mresumed" : "resumed");
+            LOG_INFO(GREEN_BOLD("resumed"));
             Workers::setEnabled(true);
         }
         break;
@@ -187,16 +134,7 @@ void App::onConsoleCommand(char command)
 }
 
 
-void App::close()
-{
-    m_network->stop();
-    Workers::stop();
-
-    uv_stop(uv_default_loop());
-}
-
-
-void App::onSignal(uv_signal_t *handle, int signum)
+void xmrig::App::onSignal(int signum)
 {
     switch (signum)
     {
@@ -213,9 +151,19 @@ void App::onSignal(uv_signal_t *handle, int signum)
         break;
 
     default:
-        break;
+        return;
     }
 
-    uv_signal_stop(handle);
-    m_self->close();
+    close();
+}
+
+
+void xmrig::App::close()
+{
+    m_signals->stop();
+    m_console->stop();
+    m_controller->stop();
+
+    Workers::stop();
+    Log::destroy();
 }

src/App.h

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,47 +23,47 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __APP_H__
-#define __APP_H__
+#ifndef XMRIG_APP_H
+#define XMRIG_APP_H
 
 
-#include <uv.h>
+#include "base/kernel/interfaces/IConsoleListener.h"
+#include "base/kernel/interfaces/ISignalListener.h"
 
 
-#include "interfaces/IConsoleListener.h"
+namespace xmrig {
 
 
 class Console;
-class Httpd;
+class Controller;
 class Network;
-class Options;
+class Process;
+class Signals;
 
 
-class App : public IConsoleListener
+class App : public IConsoleListener, public ISignalListener
 {
 public:
-  App(int argc, char **argv);
-  ~App();
+    App(Process *process);
+    ~App() override;
 
-  int exec();
+    int exec();
 
 protected:
-  void onConsoleCommand(char command) override;
+    void onConsoleCommand(char command) override;
+    void onSignal(int signum) override;
 
 private:
-  void background();
-  void close();
+    void background();
+    void close();
 
-  static void onSignal(uv_signal_t *handle, int signum);
-
-  static App *m_self;
-
-  Console *m_console;
-  Httpd *m_httpd;
-  Network *m_network;
-  Options *m_options;
-  uv_signal_t m_signal;
+    Console *m_console;
+    Controller *m_controller;
+    Signals *m_signals;
 };
 
 
-#endif /* __APP_H__ */
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_APP_H */

src/App_unix.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -29,18 +30,16 @@
 
 
 #include "App.h"
-#include "Cpu.h"
-#include "log/Log.h"
-#include "Options.h"
+#include "base/io/log/Log.h"
+#include "core/config/Config.h"
+#include "core/Controller.h"
 
 
-void App::background()
+void xmrig::App::background()
 {
-    if (m_options->affinity() != -1L) {
-        Cpu::setAffinity(-1, m_options->affinity());
-    }
+    signal(SIGPIPE, SIG_IGN);
 
-    if (!m_options->background()) {
+    if (!m_controller->config()->isBackground()) {
         return;
     }
 

src/App_win.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -27,17 +28,13 @@
 
 
 #include "App.h"
-#include "Options.h"
-#include "Cpu.h"
+#include "core/Controller.h"
+#include "core/config/Config.h"
 
 
-void App::background()
+void xmrig::App::background()
 {
-    if (m_options->affinity() != -1L) {
-        Cpu::setAffinity(-1, m_options->affinity());
-    }
-
-    if (!m_options->background()) {
+    if (!m_controller->config()->isBackground()) {
         return;
     }
 

src/Cpu.cpp

@@ -1,114 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-
-#include <libcpuid.h>
-#include <math.h>
-#include <string.h>
-
-#include "Cpu.h"
-
-
-bool Cpu::m_l2_exclusive = false;
-char Cpu::m_brand[64]    = { 0 };
-int Cpu::m_flags         = 0;
-int Cpu::m_l2_cache      = 0;
-int Cpu::m_l3_cache      = 0;
-int Cpu::m_sockets       = 1;
-int Cpu::m_totalCores    = 0;
-int Cpu::m_totalThreads  = 0;
-
-
-int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
-{
-    if (m_totalThreads == 1) {
-        return 1;
-    }
-
-    int cache = 0;
-    if (m_l3_cache) {
-        cache = m_l2_exclusive ? (m_l2_cache + m_l3_cache) : m_l3_cache;
-    }
-    else {
-        cache = m_l2_cache;
-    }
-
-    int count = 0;
-    const int size = (algo ? 1024 : 2048) * (doubleHash ? 2 : 1);
-
-    if (cache) {
-        count = cache / size;
-    }
-    else {
-        count = m_totalThreads / 2;
-    }
-
-    if (count > m_totalThreads) {
-        count = m_totalThreads;
-    }
-
-    if (((float) count / m_totalThreads * 100) > maxCpuUsage) {
-        count = (int) ceil((float) m_totalThreads * (maxCpuUsage / 100.0));
-    }
-
-    return count < 1 ? 1 : count;
-}
-
-
-void Cpu::initCommon()
-{
-    struct cpu_raw_data_t raw = { 0 };
-    struct cpu_id_t data = { 0 };
-
-    cpuid_get_raw_data(&raw);
-    cpu_identify(&raw, &data);
-
-    strncpy(m_brand, data.brand_str, sizeof(m_brand) - 1);
-
-    m_totalThreads = data.total_logical_cpus;
-    m_sockets = m_totalThreads / data.num_logical_cpus;
-    m_totalCores = data.num_cores *m_sockets;
-
-    m_l3_cache = data.l3_cache > 0 ? data.l3_cache * m_sockets : 0;
-
-    // Workaround for AMD CPUs https://github.com/anrieff/libcpuid/issues/97
-    if (data.vendor == VENDOR_AMD && data.ext_family >= 0x15 && data.ext_family < 0x17) {
-        m_l2_cache = data.l2_cache * (m_totalCores / 2) * m_sockets;
-        m_l2_exclusive = true;
-    }
-    else {
-        m_l2_cache = data.l2_cache > 0 ? data.l2_cache * m_totalCores * m_sockets : 0;
-    }
-
-#   if defined(__x86_64__) || defined(_M_AMD64)
-    m_flags |= X86_64;
-#   endif
-
-    if (data.flags[CPU_FEATURE_AES]) {
-        m_flags |= AES;
-    }
-
-    if (data.flags[CPU_FEATURE_BMI2]) {
-        m_flags |= BMI2;
-    }
-}

src/Cpu.h

@@ -1,67 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __CPU_H__
-#define __CPU_H__
-
-
-#include <stdint.h>
-
-
-class Cpu
-{
-public:
-    enum Flags {
-        X86_64 = 1,
-        AES    = 2,
-        BMI2   = 4
-    };
-
-    static int optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage);
-    static void init();
-    static void setAffinity(int id, uint64_t mask);
-
-    static inline bool hasAES()       { return (m_flags & AES) != 0; }
-    static inline bool isX64()        { return (m_flags & X86_64) != 0; }
-    static inline const char *brand() { return m_brand; }
-    static inline int cores()         { return m_totalCores; }
-    static inline int l2()            { return m_l2_cache; }
-    static inline int l3()            { return m_l3_cache; }
-    static inline int sockets()       { return m_sockets; }
-    static inline int threads()       { return m_totalThreads; }
-
-private:
-    static void initCommon();
-
-    static bool m_l2_exclusive;
-    static char m_brand[64];
-    static int m_flags;
-    static int m_l2_cache;
-    static int m_l3_cache;
-    static int m_sockets;
-    static int m_totalCores;
-    static int m_totalThreads;
-};
-
-
-#endif /* __CPU_H__ */

src/Mem.cpp

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -22,66 +24,54 @@
  */
 
 
-#include <memory.h>
-
-
+#include "common/utils/mm_malloc.h"
 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
 #include "Mem.h"
-#include "Options.h"
 
 
-bool Mem::m_doubleHash = false;
-int Mem::m_algo        = 0;
-int Mem::m_flags       = 0;
-int Mem::m_threads     = 0;
-size_t Mem::m_offset   = 0;
-uint8_t *Mem::m_memory = nullptr;
+bool Mem::m_enabled = true;
+int Mem::m_flags    = 0;
 
 
-cryptonight_ctx *Mem::create(int threadId)
+MemInfo Mem::create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count)
 {
-#   ifndef XMRIG_NO_AEON
-    if (m_algo == Options::ALGO_CRYPTONIGHT_LITE) {
-        return createLite(threadId);
-    }
-#   endif
+    using namespace xmrig;
 
-    cryptonight_ctx *ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[MEMORY - sizeof(cryptonight_ctx) * (threadId + 1)]);
+    MemInfo info;
+    info.size = cn_select_memory(algorithm) * count;
 
-    const int ratio = m_doubleHash ? 2 : 1;
-    ctx->memory = &m_memory[MEMORY * (threadId * ratio + 1)];
+    constexpr const size_t align_size = 2 * 1024 * 1024;
+    info.size  = ((info.size + align_size - 1) / align_size) * align_size;
+    info.pages = info.size / align_size;
 
-    return ctx;
-}
+    allocate(info, m_enabled);
 
+    for (size_t i = 0; i < count; ++i) {
+        cryptonight_ctx *c = static_cast<cryptonight_ctx *>(_mm_malloc(sizeof(cryptonight_ctx), 4096));
+        c->memory          = info.memory + (i * cn_select_memory(algorithm));
 
+        uint8_t* p = reinterpret_cast<uint8_t*>(allocateExecutableMemory(0x4000));
+        c->generated_code  = reinterpret_cast<cn_mainloop_fun_ms_abi>(p);
+        c->generated_code_double = reinterpret_cast<cn_mainloop_fun_ms_abi>(p + 0x2000);
 
-void *Mem::calloc(size_t num, size_t size)
-{
-    void *mem = &m_memory[m_offset];
-    m_offset += (num * size);
+        c->generated_code_data.variant = xmrig::VARIANT_MAX;
+        c->generated_code_data.height = (uint64_t)(-1);
+        c->generated_code_double_data = c->generated_code_data;
 
-    memset(mem, 0, num * size);
-
-    return mem;
-}
-
-
-#ifndef XMRIG_NO_AEON
-cryptonight_ctx *Mem::createLite(int threadId) {
-    cryptonight_ctx *ctx;
-
-    if (!m_doubleHash) {
-        const size_t offset = MEMORY * (threadId + 1);
-
-        ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[offset + MEMORY_LITE]);
-        ctx->memory = &m_memory[offset];
-        return ctx;
+        ctx[i] = c;
     }
 
-    ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[MEMORY - sizeof(cryptonight_ctx) * (threadId + 1)]);
-    ctx->memory = &m_memory[MEMORY * (threadId + 1)];
-
-    return ctx;
+    return info;
 }
-#endif
+
+
+void Mem::release(cryptonight_ctx **ctx, size_t count, MemInfo &info)
+{
+    release(info);
+
+    for (size_t i = 0; i < count; ++i) {
+        _mm_free(ctx[i]);
+    }
+}
+

src/Mem.h

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,20 +23,30 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MEM_H__
-#define __MEM_H__
+#ifndef XMRIG_MEM_H
+#define XMRIG_MEM_H
 
 
 #include <stddef.h>
 #include <stdint.h>
 
 
-#include "align.h"
+#include "common/xmrig.h"
 
 
 struct cryptonight_ctx;
 
 
+struct MemInfo
+{
+    alignas(16) uint8_t *memory;
+
+    size_t hugePages;
+    size_t pages;
+    size_t size;
+};
+
+
 class Mem
 {
 public:
@@ -44,29 +56,23 @@ public:
         Lock               = 4
     };
 
-    static bool allocate(int algo, int threads, bool doubleHash, bool enabled);
-    static cryptonight_ctx *create(int threadId);
-    static void *calloc(size_t num, size_t size);
-    static void release();
+    static MemInfo create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count);
+    static void init(bool enabled);
+    static void release(cryptonight_ctx **ctx, size_t count, MemInfo &info);
+
+    static void *allocateExecutableMemory(size_t size);
+    static void protectExecutableMemory(void *p, size_t size);
+    static void flushInstructionCache(void *p, size_t size);
 
-    static inline bool isDoubleHash()         { return m_doubleHash; }
     static inline bool isHugepagesAvailable() { return (m_flags & HugepagesAvailable) != 0; }
-    static inline bool isHugepagesEnabled()   { return (m_flags & HugepagesEnabled) != 0; }
-    static inline int flags()                 { return m_flags; }
-    static inline int threads()               { return m_threads; }
 
 private:
-    static bool m_doubleHash;
-    static int m_algo;
-    static int m_flags;
-    static int m_threads;
-    static size_t m_offset;
-    VAR_ALIGN(16, static uint8_t *m_memory);
+    static void allocate(MemInfo &info, bool enabled);
+    static void release(MemInfo &info);
 
-#   ifndef XMRIG_NO_AEON
-    static cryptonight_ctx *createLite(int threadId);
-#   endif
+    static int m_flags;
+    static bool m_enabled;
 };
 
 
-#endif /* __MEM_H__ */
+#endif /* XMRIG_MEM_H */

src/Mem_unix.cpp

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -23,70 +25,95 @@
 
 
 #include <stdlib.h>
-#include <mm_malloc.h>
 #include <sys/mman.h>
 
 
+#include "base/io/log/Log.h"
+#include "common/utils/mm_malloc.h"
+#include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
-#include "log/Log.h"
 #include "Mem.h"
-#include "Options.h"
 
 
-bool Mem::allocate(int algo, int threads, bool doubleHash, bool enabled)
+#if defined(__APPLE__)
+#   include <mach/vm_statistics.h>
+#endif
+
+
+void Mem::init(bool enabled)
 {
-    m_algo       = algo;
-    m_threads    = threads;
-    m_doubleHash = doubleHash;
+    m_enabled = enabled;
+}
 
-    const int ratio   = (doubleHash && algo != Options::ALGO_CRYPTONIGHT_LITE) ? 2 : 1;
-    const size_t size = MEMORY * (threads * ratio + 1);
+
+void Mem::allocate(MemInfo &info, bool enabled)
+{
+    info.hugePages = 0;
 
     if (!enabled) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(size, 16));
-        return true;
-    }
+        info.memory = static_cast<uint8_t*>(_mm_malloc(info.size, 4096));
 
-    m_flags |= HugepagesAvailable;
+        return;
+    }
 
 #   if defined(__APPLE__)
-    m_memory = static_cast<uint8_t*>(mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, VM_FLAGS_SUPERPAGE_SIZE_2MB, 0));
+    info.memory = static_cast<uint8_t*>(mmap(0, info.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, VM_FLAGS_SUPERPAGE_SIZE_2MB, 0));
 #   elif defined(__FreeBSD__)
-    m_memory = static_cast<uint8_t*>(mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_ALIGNED_SUPER | MAP_PREFAULT_READ, -1, 0));
+    info.memory = static_cast<uint8_t*>(mmap(0, info.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_ALIGNED_SUPER | MAP_PREFAULT_READ, -1, 0));
 #   else
-    m_memory = static_cast<uint8_t*>(mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE, 0, 0));
+    info.memory = static_cast<uint8_t*>(mmap(0, info.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE, 0, 0));
 #   endif
-    if (m_memory == MAP_FAILED) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(size, 16));
-        return true;
+
+    if (info.memory == MAP_FAILED) {
+        return allocate(info, false);;
     }
 
-    m_flags |= HugepagesEnabled;
+    info.hugePages = info.pages;
 
-    if (madvise(m_memory, size, MADV_RANDOM | MADV_WILLNEED) != 0) {
+    if (madvise(info.memory, info.size, MADV_RANDOM | MADV_WILLNEED) != 0) {
         LOG_ERR("madvise failed");
     }
 
-    if (mlock(m_memory, size) == 0) {
+    if (mlock(info.memory, info.size) == 0) {
         m_flags |= Lock;
     }
-
-    return true;
 }
 
 
-void Mem::release()
+void Mem::release(MemInfo &info)
 {
-    const int size = MEMORY * (m_threads + 1);
-
-    if (m_flags & HugepagesEnabled) {
+    if (info.hugePages) {
         if (m_flags & Lock) {
-            munlock(m_memory, size);
+            munlock(info.memory, info.size);
         }
 
-        munmap(m_memory, size);
+        munmap(info.memory, info.size);
     }
     else {
-        _mm_free(m_memory);
+        _mm_free(info.memory);
     }
 }
+
+
+void *Mem::allocateExecutableMemory(size_t size)
+{
+#   if defined(__APPLE__)
+    return mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1, 0);
+#   else
+    return mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#   endif
+}
+
+
+void Mem::protectExecutableMemory(void *p, size_t size)
+{
+    mprotect(p, size, PROT_READ | PROT_EXEC);
+}
+
+
+void Mem::flushInstructionCache(void *p, size_t size)
+{
+#   ifndef __FreeBSD__
+    __builtin___clear_cache(reinterpret_cast<char*>(p), reinterpret_cast<char*>(p) + size);
+#   endif
+}

src/Mem_win.cpp

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -27,16 +29,13 @@
 #include <ntsecapi.h>
 #include <tchar.h>
 
-#ifdef __GNUC__
-#   include <mm_malloc.h>
-#else
-#   include <malloc.h>
-#endif
 
-#include "log/Log.h"
+#include "base/io/log/Log.h"
+#include "common/utils/mm_malloc.h"
+#include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
 #include "Mem.h"
-#include "Options.h"
 
 
 /*****************************************************************
@@ -68,11 +67,11 @@ static BOOL SetLockPagesPrivilege() {
     tp.PrivilegeCount = 1;
     tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
 
-    if (LookupPrivilegeValue(NULL, SE_LOCK_MEMORY_NAME, &(tp.Privileges[0].Luid)) != TRUE) {
+    if (LookupPrivilegeValue(nullptr, SE_LOCK_MEMORY_NAME, &(tp.Privileges[0].Luid)) != TRUE) {
         return FALSE;
     }
 
-    BOOL rc = AdjustTokenPrivileges(token, FALSE, (PTOKEN_PRIVILEGES) &tp, 0, NULL, NULL);
+    BOOL rc = AdjustTokenPrivileges(token, FALSE, (PTOKEN_PRIVILEGES) &tp, 0, nullptr, nullptr);
     if (rc != TRUE || GetLastError() != ERROR_SUCCESS) {
         return FALSE;
     }
@@ -96,12 +95,12 @@ static LSA_UNICODE_STRING StringToLsaUnicodeString(LPCTSTR string) {
 
 static BOOL ObtainLockPagesPrivilege() {
     HANDLE token;
-    PTOKEN_USER user = NULL;
+    PTOKEN_USER user = nullptr;
 
     if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token) == TRUE) {
         DWORD size = 0;
 
-        GetTokenInformation(token, TokenUser, NULL, 0, &size);
+        GetTokenInformation(token, TokenUser, nullptr, 0, &size);
         if (size) {
             user = (PTOKEN_USER) LocalAlloc(LPTR, size);
         }
@@ -119,7 +118,7 @@ static BOOL ObtainLockPagesPrivilege() {
     ZeroMemory(&attributes, sizeof(attributes));
 
     BOOL result = FALSE;
-    if (LsaOpenPolicy(NULL, &attributes, POLICY_ALL_ACCESS, &handle) == 0) {
+    if (LsaOpenPolicy(nullptr, &attributes, POLICY_ALL_ACCESS, &handle) == 0) {
         LSA_UNICODE_STRING str = StringToLsaUnicodeString(_T(SE_LOCK_MEMORY_NAME));
 
         if (LsaAddAccountRights(handle, user->User.Sid, &str, 1) == 0) {
@@ -144,42 +143,62 @@ static BOOL TrySetLockPagesPrivilege() {
 }
 
 
-bool Mem::allocate(int algo, int threads, bool doubleHash, bool enabled)
+void Mem::init(bool enabled)
 {
-    m_algo       = algo;
-    m_threads    = threads;
-    m_doubleHash = doubleHash;
+    m_enabled = enabled;
 
-    const int ratio = (doubleHash && algo != Options::ALGO_CRYPTONIGHT_LITE) ? 2 : 1;
-    const size_t size  = MEMORY * (threads * ratio + 1);
-
-    if (!enabled) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(size, 16));
-        return true;
-    }
-
-    if (TrySetLockPagesPrivilege()) {
+    if (enabled && TrySetLockPagesPrivilege()) {
         m_flags |= HugepagesAvailable;
     }
-
-    m_memory = static_cast<uint8_t*>(VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE));
-    if (!m_memory) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(size, 16));
-    }
-    else {
-        m_flags |= HugepagesEnabled;
-    }
-
-    return true;
 }
 
 
-void Mem::release()
+void Mem::allocate(MemInfo &info, bool enabled)
 {
-    if (m_flags & HugepagesEnabled) {
-        VirtualFree(m_memory, 0, MEM_RELEASE);
+    info.hugePages = 0;
+
+    if (!enabled) {
+        info.memory = static_cast<uint8_t*>(_mm_malloc(info.size, 4096));
+
+        return;
+    }
+
+    info.memory = static_cast<uint8_t*>(VirtualAlloc(nullptr, info.size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE));
+    if (info.memory) {
+        info.hugePages = info.pages;
+
+        return;
+    }
+
+    allocate(info, false);
+}
+
+
+void Mem::release(MemInfo &info)
+{
+    if (info.hugePages) {
+        VirtualFree(info.memory, 0, MEM_RELEASE);
     }
     else {
-        _mm_free(m_memory);
+        _mm_free(info.memory);
     }
 }
+
+
+void *Mem::allocateExecutableMemory(size_t size)
+{
+    return VirtualAlloc(nullptr, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
+}
+
+
+void Mem::protectExecutableMemory(void *p, size_t size)
+{
+    DWORD oldProtect;
+    VirtualProtect(p, size, PAGE_EXECUTE_READ, &oldProtect);
+}
+
+
+void Mem::flushInstructionCache(void *p, size_t size)
+{
+    ::FlushInstructionCache(GetCurrentProcess(), p, size);
+}

src/Options.cpp

@@ -1,729 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-
-#include <string.h>
-#include <uv.h>
-
-
-#ifdef _MSC_VER
-#   include "getopt/getopt.h"
-#else
-#   include <getopt.h>
-#endif
-
-
-#include "Cpu.h"
-#include "donate.h"
-#include "net/Url.h"
-#include "Options.h"
-#include "Platform.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-#include "rapidjson/filereadstream.h"
-#include "version.h"
-
-
-#ifndef ARRAY_SIZE
-#   define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
-
-
-Options *Options::m_self = nullptr;
-
-
-static char const usage[] = "\
-Usage: " APP_ID " [OPTIONS]\n\
-Options:\n\
-  -a, --algo=ALGO          cryptonight (default) or cryptonight-lite\n\
-  -o, --url=URL            URL of mining server\n\
-  -O, --userpass=U:P       username:password pair for mining server\n\
-  -u, --user=USERNAME      username for mining server\n\
-  -p, --pass=PASSWORD      password for mining server\n\
-  -t, --threads=N          number of miner threads\n\
-  -v, --av=N               algorithm variation, 0 auto select\n\
-  -k, --keepalive          send keepalived for prevent timeout (need pool support)\n\
-  -r, --retries=N          number of times to retry before switch to backup server (default: 5)\n\
-  -R, --retry-pause=N      time to pause between retries (default: 5)\n\
-      --cpu-affinity       set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n\
-      --cpu-priority       set process priority (0 idle, 2 normal to 5 highest)\n\
-      --no-huge-pages      disable huge pages support\n\
-      --no-color           disable colored output\n\
-      --donate-level=N     donate level, default 5%% (5 minutes in 100 minutes)\n\
-      --user-agent         set custom user-agent string for pool\n\
-  -B, --background         run the miner in the background\n\
-  -c, --config=FILE        load a JSON-format configuration file\n\
-  -l, --log-file=FILE      log all output to a file\n"
-# ifdef HAVE_SYSLOG_H
-"\
-  -S, --syslog             use system log for output messages\n"
-# endif
-"\
-      --max-cpu-usage=N    maximum CPU usage for automatic threads mode (default 75)\n\
-      --safe               safe adjust threads and av settings for current CPU\n\
-      --nicehash           enable nicehash/xmrig-proxy support\n\
-      --print-time=N       print hashrate report every N seconds\n\
-      --api-port=N         port for the miner API\n\
-      --api-access-token=T access token for API\n\
-      --api-worker-id=ID   custom worker-id for API\n\
-  -h, --help               display this help and exit\n\
-  -V, --version            output version information and exit\n\
-";
-
-
-static char const short_options[] = "a:c:khBp:Px:r:R:s:t:T:o:u:O:v:Vl:S";
-
-
-static struct option const options[] = {
-    { "algo",             1, nullptr, 'a'  },
-    { "av",               1, nullptr, 'v'  },
-    { "background",       0, nullptr, 'B'  },
-    { "config",           1, nullptr, 'c'  },
-    { "cpu-affinity",     1, nullptr, 1020 },
-    { "cpu-priority",     1, nullptr, 1021 },
-    { "donate-level",     1, nullptr, 1003 },
-    { "help",             0, nullptr, 'h'  },
-    { "keepalive",        0, nullptr ,'k'  },
-    { "log-file",         1, nullptr, 'l'  },
-    { "max-cpu-usage",    1, nullptr, 1004 },
-    { "nicehash",         0, nullptr, 1006 },
-    { "no-color",         0, nullptr, 1002 },
-    { "no-huge-pages",    0, nullptr, 1009 },
-    { "pass",             1, nullptr, 'p'  },
-    { "print-time",       1, nullptr, 1007 },
-    { "retries",          1, nullptr, 'r'  },
-    { "retry-pause",      1, nullptr, 'R'  },
-    { "safe",             0, nullptr, 1005 },
-    { "syslog",           0, nullptr, 'S'  },
-    { "threads",          1, nullptr, 't'  },
-    { "url",              1, nullptr, 'o'  },
-    { "user",             1, nullptr, 'u'  },
-    { "user-agent",       1, nullptr, 1008 },
-    { "userpass",         1, nullptr, 'O'  },
-    { "version",          0, nullptr, 'V'  },
-    { "api-port",         1, nullptr, 4000 },
-    { "api-access-token", 1, nullptr, 4001 },
-    { "api-worker-id",    1, nullptr, 4002 },
-    { 0, 0, 0, 0 }
-};
-
-
-static struct option const config_options[] = {
-    { "algo",          1, nullptr, 'a'  },
-    { "av",            1, nullptr, 'v'  },
-    { "background",    0, nullptr, 'B'  },
-    { "colors",        0, nullptr, 2000 },
-    { "cpu-affinity",  1, nullptr, 1020 },
-    { "cpu-priority",  1, nullptr, 1021 },
-    { "donate-level",  1, nullptr, 1003 },
-    { "huge-pages",    0, nullptr, 1009 },
-    { "log-file",      1, nullptr, 'l'  },
-    { "max-cpu-usage", 1, nullptr, 1004 },
-    { "print-time",    1, nullptr, 1007 },
-    { "retries",       1, nullptr, 'r'  },
-    { "retry-pause",   1, nullptr, 'R'  },
-    { "safe",          0, nullptr, 1005 },
-    { "syslog",        0, nullptr, 'S'  },
-    { "threads",       1, nullptr, 't'  },
-    { "user-agent",    1, nullptr, 1008 },
-    { 0, 0, 0, 0 }
-};
-
-
-static struct option const pool_options[] = {
-    { "url",           1, nullptr, 'o'  },
-    { "pass",          1, nullptr, 'p'  },
-    { "user",          1, nullptr, 'u'  },
-    { "userpass",      1, nullptr, 'O'  },
-    { "keepalive",     0, nullptr ,'k'  },
-    { "nicehash",      0, nullptr, 1006 },
-    { 0, 0, 0, 0 }
-};
-
-
-static struct option const api_options[] = {
-    { "port",          1, nullptr, 4000 },
-    { "access-token",  1, nullptr, 4001 },
-    { "worker-id",     1, nullptr, 4002 },
-    { 0, 0, 0, 0 }
-};
-
-
-static const char *algo_names[] = {
-    "cryptonight",
-#   ifndef XMRIG_NO_AEON
-    "cryptonight-lite"
-#   endif
-};
-
-
-Options *Options::parse(int argc, char **argv)
-{
-    Options *options = new Options(argc, argv);
-    if (options->isReady()) {
-        m_self = options;
-        return m_self;
-    }
-
-    delete options;
-    return nullptr;
-}
-
-
-const char *Options::algoName() const
-{
-    return algo_names[m_algo];
-}
-
-
-Options::Options(int argc, char **argv) :
-    m_background(false),
-    m_colors(true),
-    m_doubleHash(false),
-    m_hugePages(true),
-    m_ready(false),
-    m_safe(false),
-    m_syslog(false),
-    m_apiToken(nullptr),
-    m_apiWorkerId(nullptr),
-    m_logFile(nullptr),
-    m_userAgent(nullptr),
-    m_algo(0),
-    m_algoVariant(0),
-    m_apiPort(0),
-    m_donateLevel(kDonateLevel),
-    m_maxCpuUsage(75),
-    m_printTime(60),
-    m_priority(-1),
-    m_retries(5),
-    m_retryPause(5),
-    m_threads(0),
-    m_affinity(-1L)
-{
-    m_pools.push_back(new Url());
-
-    int key;
-
-    while (1) {
-        key = getopt_long(argc, argv, short_options, options, NULL);
-        if (key < 0) {
-            break;
-        }
-
-        if (!parseArg(key, optarg)) {
-            return;
-        }
-    }
-
-    if (optind < argc) {
-        fprintf(stderr, "%s: unsupported non-option argument '%s'\n", argv[0], argv[optind]);
-        return;
-    }
-
-    if (!m_pools[0]->isValid()) {
-        parseConfig(Platform::defaultConfigName());
-    }
-
-    if (!m_pools[0]->isValid()) {
-        fprintf(stderr, "No pool URL supplied. Exiting.\n");
-        return;
-    }
-
-    m_algoVariant = getAlgoVariant();
-    if (m_algoVariant == AV2_AESNI_DOUBLE || m_algoVariant == AV4_SOFT_AES_DOUBLE) {
-        m_doubleHash = true;
-    }
-
-    if (!m_threads) {
-        m_threads = Cpu::optimalThreadsCount(m_algo, m_doubleHash, m_maxCpuUsage);
-    }
-    else if (m_safe) {
-        const int count = Cpu::optimalThreadsCount(m_algo, m_doubleHash, m_maxCpuUsage);
-        if (m_threads > count) {
-            m_threads = count;
-        }
-    }
-
-    for (Url *url : m_pools) {
-        url->applyExceptions();
-    }
-
-    m_ready = true;
-}
-
-
-Options::~Options()
-{
-}
-
-
-bool Options::getJSON(const char *fileName, rapidjson::Document &doc)
-{
-    uv_fs_t req;
-    const int fd = uv_fs_open(uv_default_loop(), &req, fileName, O_RDONLY, 0644, nullptr);
-    if (fd < 0) {
-        fprintf(stderr, "unable to open %s: %s\n", fileName, uv_strerror(fd));
-        return false;
-    }
-
-    uv_fs_req_cleanup(&req);
-
-    FILE *fp = fdopen(fd, "rb");
-    char buf[8192];
-    rapidjson::FileReadStream is(fp, buf, sizeof(buf));
-
-    doc.ParseStream(is);
-
-    uv_fs_close(uv_default_loop(), &req, fd, nullptr);
-    uv_fs_req_cleanup(&req);
-
-    if (doc.HasParseError()) {
-        printf("%s:%d: %s\n", fileName, (int) doc.GetErrorOffset(), rapidjson::GetParseError_En(doc.GetParseError()));
-        return false;
-    }
-
-    return doc.IsObject();
-}
-
-
-bool Options::parseArg(int key, const char *arg)
-{
-    switch (key) {
-    case 'a': /* --algo */
-        if (!setAlgo(arg)) {
-            return false;
-        }
-        break;
-
-    case 'o': /* --url */
-        if (m_pools.size() > 1 || m_pools[0]->isValid()) {
-            Url *url = new Url(arg);
-            if (url->isValid()) {
-                m_pools.push_back(url);
-            }
-            else {
-                delete url;
-            }
-        }
-        else {
-            m_pools[0]->parse(arg);
-        }
-
-        if (!m_pools.back()->isValid()) {
-            return false;
-        }
-        break;
-
-    case 'O': /* --userpass */
-        if (!m_pools.back()->setUserpass(arg)) {
-            return false;
-        }
-        break;
-
-    case 'u': /* --user */
-        m_pools.back()->setUser(arg);
-        break;
-
-    case 'p': /* --pass */
-        m_pools.back()->setPassword(arg);
-        break;
-
-    case 'l': /* --log-file */
-        free(m_logFile);
-        m_logFile = strdup(arg);
-        m_colors = false;
-        break;
-
-    case 4001: /* --access-token */
-        free(m_apiToken);
-        m_apiToken = strdup(arg);
-        break;
-
-    case 4002: /* --worker-id */
-        free(m_apiWorkerId);
-        m_apiWorkerId = strdup(arg);
-        break;
-
-    case 'r':  /* --retries */
-    case 'R':  /* --retry-pause */
-    case 'v':  /* --av */
-    case 1003: /* --donate-level */
-    case 1004: /* --max-cpu-usage */
-    case 1007: /* --print-time */
-    case 1021: /* --cpu-priority */
-    case 4000: /* --api-port */
-        return parseArg(key, strtol(arg, nullptr, 10));
-
-    case 'B':  /* --background */
-    case 'k':  /* --keepalive */
-    case 'S':  /* --syslog */
-    case 1005: /* --safe */
-    case 1006: /* --nicehash */
-        return parseBoolean(key, true);
-
-    case 1002: /* --no-color */
-    case 1009: /* --no-huge-pages */
-        return parseBoolean(key, false);
-
-    case 't':  /* --threads */
-        if (strncmp(arg, "all", 3) == 0) {
-            m_threads = Cpu::threads();
-            return true;
-        }
-
-        return parseArg(key, strtol(arg, nullptr, 10));
-
-    case 'V': /* --version */
-        showVersion();
-        return false;
-
-    case 'h': /* --help */
-        showUsage(0);
-        return false;
-
-    case 'c': /* --config */
-        parseConfig(arg);
-        break;
-
-    case 1020: { /* --cpu-affinity */
-            const char *p  = strstr(arg, "0x");
-            return parseArg(key, p ? strtoull(p, nullptr, 16) : strtoull(arg, nullptr, 10));
-        }
-
-    case 1008: /* --user-agent */
-        free(m_userAgent);
-        m_userAgent = strdup(arg);
-        break;
-
-    default:
-        showUsage(1);
-        return false;
-    }
-
-    return true;
-}
-
-
-bool Options::parseArg(int key, uint64_t arg)
-{
-    switch (key) {
-        case 'r': /* --retries */
-        if (arg < 1 || arg > 1000) {
-            showUsage(1);
-            return false;
-        }
-
-        m_retries = (int) arg;
-        break;
-
-    case 'R': /* --retry-pause */
-        if (arg < 1 || arg > 3600) {
-            showUsage(1);
-            return false;
-        }
-
-        m_retryPause = (int) arg;
-        break;
-
-    case 't': /* --threads */
-        if (arg < 1 || arg > 1024) {
-            showUsage(1);
-            return false;
-        }
-
-        m_threads = (int) arg;
-        break;
-
-    case 'v': /* --av */
-        if (arg > 1000) {
-            showUsage(1);
-            return false;
-        }
-
-        m_algoVariant = (int) arg;
-        break;
-
-    case 1003: /* --donate-level */
-        if (arg < 1 || arg > 99) {
-            return true;
-        }
-
-        m_donateLevel = (int) arg;
-        break;
-
-    case 1004: /* --max-cpu-usage */
-        if (arg < 1 || arg > 100) {
-            showUsage(1);
-            return false;
-        }
-
-        m_maxCpuUsage = (int) arg;
-        break;
-
-    case 1007: /* --print-time */
-        if (arg > 1000) {
-            showUsage(1);
-            return false;
-        }
-
-        m_printTime = (int) arg;
-        break;
-
-    case 1020: /* --cpu-affinity */
-        if (arg) {
-            m_affinity = arg;
-        }
-        break;
-
-    case 1021: /* --cpu-priority */
-        if (arg <= 5) {
-            m_priority = (int) arg;
-        }
-        break;
-
-    case 4000: /* --api-port */
-        if (arg <= 65536) {
-            m_apiPort = (int) arg;
-        }
-        break;
-
-    default:
-        break;
-    }
-
-    return true;
-}
-
-
-bool Options::parseBoolean(int key, bool enable)
-{
-    switch (key) {
-    case 'k': /* --keepalive */
-        m_pools.back()->setKeepAlive(enable);
-        break;
-
-    case 'B': /* --background */
-        m_background = enable;
-        m_colors = enable ? false : m_colors;
-        break;
-
-    case 'S': /* --syslog */
-        m_syslog = enable;
-        m_colors = enable ? false : m_colors;
-        break;
-
-    case 1002: /* --no-color */
-        m_colors = enable;
-        break;
-
-    case 1005: /* --safe */
-        m_safe = enable;
-        break;
-
-    case 1006: /* --nicehash */
-        m_pools.back()->setNicehash(enable);
-        break;
-
-    case 1009: /* --no-huge-pages */
-        m_hugePages = enable;
-        break;
-
-    case 2000: /* colors */
-        m_colors = enable;
-        break;
-
-    default:
-        break;
-    }
-
-    return true;
-}
-
-
-Url *Options::parseUrl(const char *arg) const
-{
-    auto url = new Url(arg);
-    if (!url->isValid()) {
-        delete url;
-        return nullptr;
-    }
-
-    return url;
-}
-
-
-void Options::parseConfig(const char *fileName)
-{
-    rapidjson::Document doc;
-    if (!getJSON(fileName, doc)) {
-        return;
-    }
-
-    for (size_t i = 0; i < ARRAY_SIZE(config_options); i++) {
-        parseJSON(&config_options[i], doc);
-    }
-
-    const rapidjson::Value &pools = doc["pools"];
-    if (pools.IsArray()) {
-        for (const rapidjson::Value &value : pools.GetArray()) {
-            if (!value.IsObject()) {
-                continue;
-            }
-
-            for (size_t i = 0; i < ARRAY_SIZE(pool_options); i++) {
-                parseJSON(&pool_options[i], value);
-            }
-        }
-    }
-
-    const rapidjson::Value &api = doc["api"];
-    if (api.IsObject()) {
-        for (size_t i = 0; i < ARRAY_SIZE(api_options); i++) {
-            parseJSON(&api_options[i], api);
-        }
-    }
-}
-
-
-void Options::parseJSON(const struct option *option, const rapidjson::Value &object)
-{
-    if (!option->name || !object.HasMember(option->name)) {
-        return;
-    }
-
-    const rapidjson::Value &value = object[option->name];
-
-    if (option->has_arg && value.IsString()) {
-        parseArg(option->val, value.GetString());
-    }
-    else if (option->has_arg && value.IsUint64()) {
-        parseArg(option->val, value.GetUint64());
-    }
-    else if (!option->has_arg && value.IsBool()) {
-        parseBoolean(option->val, value.IsTrue());
-    }
-}
-
-
-void Options::showUsage(int status) const
-{
-    if (status) {
-        fprintf(stderr, "Try \"" APP_ID "\" --help' for more information.\n");
-    }
-    else {
-        printf(usage);
-    }
-}
-
-
-void Options::showVersion()
-{
-    printf(APP_NAME " " APP_VERSION "\n built on " __DATE__
-
-#   if defined(__clang__)
-    " with clang " __clang_version__);
-#   elif defined(__GNUC__)
-    " with GCC");
-    printf(" %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#   elif defined(_MSC_VER)
-    " with MSVC");
-    printf(" %d", MSVC_VERSION);
-#   else
-    );
-#   endif
-
-    printf("\n features:"
-#   if defined(__i386__) || defined(_M_IX86)
-    " i386"
-#   elif defined(__x86_64__) || defined(_M_AMD64)
-    " x86_64"
-#   endif
-
-#   if defined(__AES__) || defined(_MSC_VER)
-    " AES-NI"
-#   endif
-    "\n");
-
-    printf("\nlibuv/%s\n", uv_version_string());
-}
-
-
-bool Options::setAlgo(const char *algo)
-{
-    for (size_t i = 0; i < ARRAY_SIZE(algo_names); i++) {
-        if (algo_names[i] && !strcmp(algo, algo_names[i])) {
-            m_algo = (int) i;
-            break;
-        }
-
-#       ifndef XMRIG_NO_AEON
-        if (i == ARRAY_SIZE(algo_names) - 1 && !strcmp(algo, "cryptonight-light")) {
-            m_algo = ALGO_CRYPTONIGHT_LITE;
-            break;
-        }
-#       endif
-
-        if (i == ARRAY_SIZE(algo_names) - 1) {
-            showUsage(1);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-int Options::getAlgoVariant() const
-{
-#   ifndef XMRIG_NO_AEON
-    if (m_algo == ALGO_CRYPTONIGHT_LITE) {
-        return getAlgoVariantLite();
-    }
-#   endif
-
-    if (m_algoVariant <= AV0_AUTO || m_algoVariant >= AV_MAX) {
-        return Cpu::hasAES() ? AV1_AESNI : AV3_SOFT_AES;
-    }
-
-    if (m_safe && !Cpu::hasAES() && m_algoVariant <= AV2_AESNI_DOUBLE) {
-        return m_algoVariant + 2;
-    }
-
-    return m_algoVariant;
-}
-
-
-#ifndef XMRIG_NO_AEON
-int Options::getAlgoVariantLite() const
-{
-    if (m_algoVariant <= AV0_AUTO || m_algoVariant >= AV_MAX) {
-        return Cpu::hasAES() ? AV2_AESNI_DOUBLE : AV4_SOFT_AES_DOUBLE;
-    }
-
-    if (m_safe && !Cpu::hasAES() && m_algoVariant <= AV2_AESNI_DOUBLE) {
-        return m_algoVariant + 2;
-    }
-
-    return m_algoVariant;
-}
-#endif

src/Options.h

@@ -1,134 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __OPTIONS_H__
-#define __OPTIONS_H__
-
-
-#include <stdint.h>
-#include <vector>
-
-
-#include "rapidjson/fwd.h"
-
-
-class Url;
-struct option;
-
-
-class Options
-{
-public:
-    enum Algo {
-        ALGO_CRYPTONIGHT,      /* CryptoNight (Monero) */
-        ALGO_CRYPTONIGHT_LITE, /* CryptoNight-Lite (AEON) */
-    };
-
-    enum AlgoVariant {
-        AV0_AUTO,
-        AV1_AESNI,
-        AV2_AESNI_DOUBLE,
-        AV3_SOFT_AES,
-        AV4_SOFT_AES_DOUBLE,
-        AV_MAX
-    };
-
-    static inline Options* i() { return m_self; }
-    static Options *parse(int argc, char **argv);
-
-    inline bool background() const                { return m_background; }
-    inline bool colors() const                    { return m_colors; }
-    inline bool doubleHash() const                { return m_doubleHash; }
-    inline bool hugePages() const                 { return m_hugePages; }
-    inline bool syslog() const                    { return m_syslog; }
-    inline const char *apiToken() const           { return m_apiToken; }
-    inline const char *apiWorkerId() const        { return m_apiWorkerId; }
-    inline const char *logFile() const            { return m_logFile; }
-    inline const char *userAgent() const          { return m_userAgent; }
-    inline const std::vector<Url*> &pools() const { return m_pools; }
-    inline int algo() const                       { return m_algo; }
-    inline int algoVariant() const                { return m_algoVariant; }
-    inline int apiPort() const                    { return m_apiPort; }
-    inline int donateLevel() const                { return m_donateLevel; }
-    inline int printTime() const                  { return m_printTime; }
-    inline int priority() const                   { return m_priority; }
-    inline int retries() const                    { return m_retries; }
-    inline int retryPause() const                 { return m_retryPause; }
-    inline int threads() const                    { return m_threads; }
-    inline int64_t affinity() const               { return m_affinity; }
-
-    inline static void release()                  { delete m_self; }
-
-    const char *algoName() const;
-
-private:
-    Options(int argc, char **argv);
-    ~Options();
-
-    inline bool isReady() const { return m_ready; }
-
-    static Options *m_self;
-
-    bool getJSON(const char *fileName, rapidjson::Document &doc);
-    bool parseArg(int key, const char *arg);
-    bool parseArg(int key, uint64_t arg);
-    bool parseBoolean(int key, bool enable);
-    Url *parseUrl(const char *arg) const;
-    void parseConfig(const char *fileName);
-    void parseJSON(const struct option *option, const rapidjson::Value &object);
-    void showUsage(int status) const;
-    void showVersion(void);
-
-    bool setAlgo(const char *algo);
-
-    int getAlgoVariant() const;
-#   ifndef XMRIG_NO_AEON
-    int getAlgoVariantLite() const;
-#   endif
-
-    bool m_background;
-    bool m_colors;
-    bool m_doubleHash;
-    bool m_hugePages;
-    bool m_ready;
-    bool m_safe;
-    bool m_syslog;
-    char *m_apiToken;
-    char *m_apiWorkerId;
-    char *m_logFile;
-    char *m_userAgent;
-    int m_algo;
-    int m_algoVariant;
-    int m_apiPort;
-    int m_donateLevel;
-    int m_maxCpuUsage;
-    int m_printTime;
-    int m_priority;
-    int m_retries;
-    int m_retryPause;
-    int m_threads;
-    int64_t m_affinity;
-    std::vector<Url*> m_pools;
-};
-
-#endif /* __OPTIONS_H__ */

src/Platform_mac.cpp

@@ -1,108 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-
-#include <stdlib.h>
-#include <sys/resource.h>
-#include <uv.h>
-
-
-#include "Platform.h"
-#include "version.h"
-
-#ifdef XMRIG_NVIDIA_PROJECT
-#   include "nvidia/cryptonight.h"
-#endif
-
-
-static inline char *createUserAgent()
-{
-    const size_t max = 160;
-
-    char *buf = new char[max];
-
-#   ifdef XMRIG_NVIDIA_PROJECT
-    const int cudaVersion = cuda_get_runtime_version();
-    snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s CUDA/%d.%d clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), cudaVersion / 1000, cudaVersion % 100, __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   else
-    snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   endif
-
-    return buf;
-}
-
-
-void Platform::init(const char *userAgent)
-{
-    m_userAgent = userAgent ? strdup(userAgent) : createUserAgent();
-}
-
-
-void Platform::release()
-{
-    delete [] m_userAgent;
-}
-
-
-void Platform::setProcessPriority(int priority)
-{
-
-}
-
-
-void Platform::setThreadPriority(int priority)
-{
-    if (priority == -1) {
-        return;
-    }
-
-    int prio = 19;
-    switch (priority)
-    {
-    case 1:
-        prio = 5;
-        break;
-
-    case 2:
-        prio = 0;
-        break;
-
-    case 3:
-        prio = -5;
-        break;
-
-    case 4:
-        prio = -10;
-        break;
-
-    case 5:
-        prio = -15;
-        break;
-
-    default:
-        break;
-    }
-
-    setpriority(PRIO_PROCESS, 0, prio);
-}
-

src/Summary.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <support@xmrig.com>
  *
  *   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
@@ -23,146 +24,127 @@
 
 
 #include <inttypes.h>
+#include <stdio.h>
 #include <uv.h>
 
 
-#include "Cpu.h"
-#include "log/Log.h"
+#include "base/io/log/Log.h"
+#include "base/net/stratum/Pool.h"
+#include "common/cpu/Cpu.h"
+#include "core/config/Config.h"
+#include "core/Controller.h"
+#include "crypto/Asm.h"
 #include "Mem.h"
-#include "net/Url.h"
-#include "Options.h"
 #include "Summary.h"
 #include "version.h"
 
 
-static void print_versions()
+#ifndef XMRIG_NO_ASM
+static const char *coloredAsmNames[] = {
+    RED_BOLD("none"),
+    "auto",
+    GREEN_BOLD("intel"),
+    GREEN_BOLD("ryzen"),
+    GREEN_BOLD("bulldozer")
+};
+
+
+inline static const char *asmName(xmrig::Assembly assembly)
 {
-    char buf[16];
-
-#   if defined(__clang__)
-    snprintf(buf, 16, " clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   elif defined(__GNUC__)
-    snprintf(buf, 16, " gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#   elif defined(_MSC_VER)
-    snprintf(buf, 16, " MSVC/%d", MSVC_VERSION);
-#   else
-    buf[0] = '\0';
-#   endif
-
-
-    Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mVERSIONS:     \x1B[01;36mXMRig/%s\x1B[01;37m libuv/%s%s" : " * VERSIONS:     XMRig/%s libuv/%s%s",
-                   APP_VERSION, uv_version_string(), buf);
-}
-
-
-static void print_memory() {
-    if (Options::i()->colors()) {
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mHUGE PAGES:   %s, %s",
-                       Mem::isHugepagesAvailable() ? "\x1B[01;32mavailable" : "\x1B[01;31munavailable",
-                       Mem::isHugepagesEnabled() ? "\x1B[01;32menabled" : "\x1B[01;31mdisabled");
-    }
-    else {
-        Log::i()->text(" * HUGE PAGES:   %s, %s", Mem::isHugepagesAvailable() ? "available" : "unavailable", Mem::isHugepagesEnabled() ? "enabled" : "disabled");
-    }
-}
-
-
-static void print_cpu()
-{
-    if (Options::i()->colors()) {
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mCPU:          %s (%d) %sx64 %sAES-NI",
-                       Cpu::brand(),
-                       Cpu::sockets(),
-                       Cpu::isX64() ? "\x1B[01;32m" : "\x1B[01;31m-",
-                       Cpu::hasAES() ? "\x1B[01;32m" : "\x1B[01;31m-");
-#       ifndef XMRIG_NO_LIBCPUID
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mCPU L2/L3:    %.1f MB/%.1f MB", Cpu::l2() / 1024.0, Cpu::l3() / 1024.0);
-#       endif
-    }
-    else {
-        Log::i()->text(" * CPU:          %s (%d) %sx64 %sAES-NI", Cpu::brand(), Cpu::sockets(), Cpu::isX64() ? "" : "-", Cpu::hasAES() ? "" : "-");
-#       ifndef XMRIG_NO_LIBCPUID
-        Log::i()->text(" * CPU L2/L3:    %.1f MB/%.1f MB", Cpu::l2() / 1024.0, Cpu::l3() / 1024.0);
-#       endif
-    }
-}
-
-
-static void print_threads()
-{
-    char buf[32];
-    if (Options::i()->affinity() != -1L) {
-        snprintf(buf, 32, ", affinity=0x%" PRIX64, Options::i()->affinity());
-    }
-    else {
-        buf[0] = '\0';
-    }
-
-    Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mTHREADS:      \x1B[01;36m%d\x1B[01;37m, %s, av=%d, %sdonate=%d%%%s" : " * THREADS:      %d, %s, av=%d, %sdonate=%d%%%s",
-                   Options::i()->threads(),
-                   Options::i()->algoName(),
-                   Options::i()->algoVariant(),
-                   Options::i()->colors() && Options::i()->donateLevel() == 0 ? "\x1B[01;31m" : "",
-                   Options::i()->donateLevel(),
-                   buf);
-}
-
-
-static void print_pools()
-{
-    const std::vector<Url*> &pools = Options::i()->pools();
-
-    for (size_t i = 0; i < pools.size(); ++i) {
-        Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mPOOL #%d:      \x1B[01;36m%s:%d" : " * POOL #%d:      %s:%d",
-                       i + 1,
-                       pools[i]->host(),
-                       pools[i]->port());
-    }
-
-#   ifdef APP_DEBUG
-    for (size_t i = 0; i < pools.size(); ++i) {
-        Log::i()->text("%s:%d, user: %s, pass: %s, ka: %d, nicehash: %d", pools[i]->host(), pools[i]->port(), pools[i]->user(), pools[i]->password(), pools[i]->isKeepAlive(), pools[i]->isNicehash());
-    }
-#   endif
-}
-
-
-#ifndef XMRIG_NO_API
-static void print_api()
-{
-    if (Options::i()->apiPort() == 0) {
-        return;
-    }
-
-    Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mAPI PORT:     \x1B[01;36m%d" : " * API PORT:     %d", Options::i()->apiPort());
+    return coloredAsmNames[assembly];
 }
 #endif
 
 
-static void print_commands()
+static void print_memory(xmrig::Config *) {
+#   ifdef _WIN32
+    xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "%s",
+                      "HUGE PAGES", Mem::isHugepagesAvailable() ? GREEN_BOLD("available") : RED_BOLD("unavailable"));
+#   endif
+}
+
+
+static void print_cpu(xmrig::Config *)
 {
-    if (Options::i()->colors()) {
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mCOMMANDS:     \x1B[01;35mh\x1B[01;37mashrate, \x1B[01;35mp\x1B[01;37mause, \x1B[01;35mr\x1B[01;37mesume");
+    using namespace xmrig;
+
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%d)") " %sx64 %sAES %sAVX2",
+               "CPU",
+               Cpu::info()->brand(),
+               Cpu::info()->sockets(),
+               Cpu::info()->isX64()   ? GREEN_BOLD_S : RED_BOLD_S "-",
+               Cpu::info()->hasAES()  ? GREEN_BOLD_S : RED_BOLD_S "-",
+               Cpu::info()->hasAVX2() ? GREEN_BOLD_S : RED_BOLD_S "-"
+               );
+#   ifndef XMRIG_NO_LIBCPUID
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%.1f MB/%.1f MB"), "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0);
+#   endif
+}
+
+
+static void print_threads(xmrig::Config *config)
+{
+    if (config->threadsMode() != xmrig::Config::Advanced) {
+        char buf[32] = { 0 };
+        if (config->affinity() != -1L) {
+            snprintf(buf, sizeof buf, ", affinity=0x%" PRIX64, config->affinity());
+        }
+
+        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, av=%d, %sdonate=%d%%") WHITE_BOLD("%s"),
+                          "THREADS",
+                          config->threadsCount(),
+                          config->algorithm().shortName(),
+                          config->algoVariant(),
+                          config->pools().donateLevel() == 0 ? RED_BOLD_S : "",
+                          config->pools().donateLevel(),
+                          buf
+                          );
     }
     else {
-        Log::i()->text(" * COMMANDS:     'h' hashrate, 'p' pause, 'r' resume");
+        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, %sdonate=%d%%"),
+                          "THREADS",
+                          config->threadsCount(),
+                          config->algorithm().shortName(),
+                          config->pools().donateLevel() == 0 ? RED_BOLD_S : "",
+                          config->pools().donateLevel()
+                          );
+    }
+
+#   ifndef XMRIG_NO_ASM
+    if (config->assembly() == xmrig::ASM_AUTO) {
+        const xmrig::Assembly assembly = xmrig::Cpu::info()->assembly();
+
+        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13sauto:%s"), "ASSEMBLY", asmName(assembly));
+    }
+    else {
+        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s"), "ASSEMBLY", asmName(config->assembly()));
+    }
+#   endif
+}
+
+
+static void print_commands(xmrig::Config *)
+{
+    if (xmrig::Log::colors) {
+        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("COMMANDS     ") MAGENTA_BOLD("h") WHITE_BOLD("ashrate, ")
+                                                                     MAGENTA_BOLD("p") WHITE_BOLD("ause, ")
+                                                                     MAGENTA_BOLD("r") WHITE_BOLD("esume"));
+    }
+    else {
+        xmrig::Log::print(" * COMMANDS     'h' hashrate, 'p' pause, 'r' resume");
     }
 }
 
 
-void Summary::print()
+void Summary::print(xmrig::Controller *controller)
 {
-    print_versions();
-    print_memory();
-    print_cpu();
-    print_threads();
-    print_pools();
+    controller->config()->printVersions();
+    print_memory(controller->config());
+    print_cpu(controller->config());
+    print_threads(controller->config());
+    controller->config()->pools().print();
 
-#   ifndef XMRIG_NO_API
-    print_api();
-#   endif
-
-    print_commands();
+    print_commands(controller->config());
 }
 
 

src/Summary.h

@@ -4,8 +4,8 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -25,10 +25,15 @@
 #define __SUMMARY_H__
 
 
+namespace xmrig {
+    class Controller;
+}
+
+
 class Summary
 {
 public:
-    static void print();
+    static void print(xmrig::Controller *controller);
 };
 
 

src/api/Api.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,65 +22,167 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+
+#include <uv.h>
 
 
+#ifndef _WIN32
+#   include <unistd.h>
+#endif
+
+
+#include "3rdparty/http-parser/http_parser.h"
 #include "api/Api.h"
-#include "api/ApiState.h"
+#include "api/interfaces/IApiListener.h"
+#include "api/requests/HttpApiRequest.h"
+#include "api/v1/ApiRouter.h"
+#include "base/kernel/Base.h"
+#include "base/tools/Buffer.h"
+#include "common/crypto/keccak.h"
+#include "core/config/Config.h"
+#include "core/Controller.h"
+#include "version.h"
 
 
-ApiState *Api::m_state = nullptr;
-uv_mutex_t Api::m_mutex;
+#ifdef XMRIG_FEATURE_HTTP
+#   include "api/Httpd.h"
+#endif
 
 
-bool Api::start()
+xmrig::Api::Api(Base *base) :
+    m_base(base),
+    m_id(),
+    m_workerId(),
+    m_httpd(nullptr)
 {
-    uv_mutex_init(&m_mutex);
-    m_state = new ApiState();
+    base->addListener(this);
 
-    return true;
+    genId(base->config()->apiId());
+
+    m_v1 = new ApiRouter(base);
+    addListener(m_v1);
 }
 
 
-void Api::release()
+xmrig::Api::~Api()
 {
-    delete m_state;
+    delete m_v1;
+
+#   ifdef XMRIG_FEATURE_HTTP
+    delete m_httpd;
+#   endif
 }
 
 
-char *Api::get(const char *url, int *status)
+void xmrig::Api::request(const HttpData &req)
 {
-    if (!m_state) {
-        return nullptr;
+    HttpApiRequest request(req, m_base->config()->http().isRestricted());
+
+    exec(request);
+}
+
+
+void xmrig::Api::start()
+{
+    genWorkerId(m_base->config()->apiWorkerId());
+
+#   ifdef XMRIG_FEATURE_HTTP
+    m_httpd = new Httpd(m_base);
+    m_httpd->start();
+#   endif
+}
+
+
+void xmrig::Api::stop()
+{
+#   ifdef XMRIG_FEATURE_HTTP
+    m_httpd->stop();
+#   endif
+}
+
+
+void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig)
+{
+    if (config->apiId() != previousConfig->apiId()) {
+        genId(config->apiId());
     }
 
-    uv_mutex_lock(&m_mutex);
-    char *buf = m_state->get(url, status);
-    uv_mutex_unlock(&m_mutex);
-
-    return buf;
+    if (config->apiWorkerId() != previousConfig->apiWorkerId()) {
+        genWorkerId(config->apiWorkerId());
+    }
 }
 
 
-void Api::tick(const Hashrate *hashrate)
+void xmrig::Api::exec(IApiRequest &request)
 {
-    if (!m_state) {
+    using namespace rapidjson;
+
+    if (request.method() == IApiRequest::METHOD_GET && (request.url() == "/1/summary" || request.url() == "/api.json")) {
+        request.accept();
+        request.reply().AddMember("id",        StringRef(m_id),       request.doc().GetAllocator());
+        request.reply().AddMember("worker_id", StringRef(m_workerId), request.doc().GetAllocator());;
+    }
+
+    for (IApiListener *listener : m_listeners) {
+        listener->onRequest(request);
+
+        if (request.isDone()) {
+            return;
+        }
+    }
+
+    request.done(request.isNew() ? HTTP_STATUS_NOT_FOUND : HTTP_STATUS_OK);
+}
+
+
+void xmrig::Api::genId(const String &id)
+{
+    memset(m_id, 0, sizeof(m_id));
+
+    if (id.size() > 0) {
+        strncpy(m_id, id.data(), sizeof(m_id) - 1);
         return;
     }
 
-    uv_mutex_lock(&m_mutex);
-    m_state->tick(hashrate);
-    uv_mutex_unlock(&m_mutex);
-}
+    uv_interface_address_t *interfaces;
+    int count = 0;
 
-
-void Api::tick(const NetworkState &network)
-{
-    if (!m_state) {
+    if (uv_interface_addresses(&interfaces, &count) < 0) {
         return;
     }
 
-    uv_mutex_lock(&m_mutex);
-    m_state->tick(network);
-    uv_mutex_unlock(&m_mutex);
+    for (int i = 0; i < count; i++) {
+        if (!interfaces[i].is_internal && interfaces[i].address.address4.sin_family == AF_INET) {
+            uint8_t hash[200];
+            const size_t addrSize = sizeof(interfaces[i].phys_addr);
+            const size_t inSize   = strlen(APP_KIND) + addrSize + sizeof(uint16_t);
+            const uint16_t port   = static_cast<uint16_t>(m_base->config()->http().port());
+
+            uint8_t *input = new uint8_t[inSize]();
+            memcpy(input, &port, sizeof(uint16_t));
+            memcpy(input + sizeof(uint16_t), interfaces[i].phys_addr, addrSize);
+            memcpy(input + sizeof(uint16_t) + addrSize, APP_KIND, strlen(APP_KIND));
+
+            xmrig::keccak(input, inSize, hash);
+            xmrig::Buffer::toHex(hash, 8, m_id);
+
+            delete [] input;
+            break;
+        }
+    }
+
+    uv_free_interface_addresses(interfaces, count);
+}
+
+
+void xmrig::Api::genWorkerId(const String &id)
+{
+    memset(m_workerId, 0, sizeof(m_workerId));
+
+    if (id.size() > 0) {
+        strncpy(m_workerId, id.data(), sizeof(m_workerId) - 1);
+    }
+    else {
+        gethostname(m_workerId, sizeof(m_workerId) - 1);
+    }
 }

src/api/Api.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,31 +22,60 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __API_H__
-#define __API_H__
+#ifndef XMRIG_API_H
+#define XMRIG_API_H
 
 
-#include <uv.h>
+#include <vector>
 
 
-class ApiState;
-class Hashrate;
-class NetworkState;
+#include "base/kernel/interfaces/IBaseListener.h"
 
 
-class Api
+namespace xmrig {
+
+
+class ApiRouter;
+class Base;
+class Httpd;
+class HttpData;
+class IApiListener;
+class IApiRequest;
+class String;
+
+
+class Api : public IBaseListener
 {
 public:
-    static bool start();
-    static void release();
+    Api(Base *base);
+    ~Api() override;
 
-    static char *get(const char *url, int *status);
-    static void tick(const Hashrate *hashrate);
-    static void tick(const NetworkState &results);
+    inline const char *id() const                   { return m_id; }
+    inline const char *workerId() const             { return m_workerId; }
+    inline void addListener(IApiListener *listener) { m_listeners.push_back(listener); }
+
+    void request(const HttpData &req);
+    void start();
+    void stop();
+
+protected:
+    void onConfigChanged(Config *config, Config *previousConfig) override;
 
 private:
-    static ApiState *m_state;
-    static uv_mutex_t m_mutex;
+    void exec(IApiRequest &request);
+    void genId(const String &id);
+    void genWorkerId(const String &id);
+
+    ApiRouter *m_v1;
+    Base *m_base;
+    char m_id[32];
+    char m_workerId[128];
+    Httpd *m_httpd;
+    std::vector<IApiListener *> m_listeners;
 };
 
-#endif /* __API_H__ */
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_API_H */

src/api/ApiState.cpp

@@ -1,260 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#include <cmath>
-#include <string.h>
-#include <uv.h>
-
-#if _WIN32
-#   include "winsock2.h"
-#else
-#   include "unistd.h"
-#endif
-
-
-#include "api/ApiState.h"
-#include "Cpu.h"
-#include "Mem.h"
-#include "net/Job.h"
-#include "Options.h"
-#include "Platform.h"
-#include "rapidjson/document.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/prettywriter.h"
-#include "version.h"
-#include "workers/Hashrate.h"
-
-
-extern "C"
-{
-#include "crypto/c_keccak.h"
-}
-
-
-static inline double normalize(double d)
-{
-    if (!std::isnormal(d)) {
-        return 0.0;
-    }
-
-    return std::floor(d * 100.0) / 100.0;
-}
-
-
-ApiState::ApiState()
-{
-    m_threads  = Options::i()->threads();
-    m_hashrate = new double[m_threads * 3]();
-
-    memset(m_totalHashrate, 0, sizeof(m_totalHashrate));
-    memset(m_workerId, 0, sizeof(m_workerId));
-
-    if (Options::i()->apiWorkerId()) {
-        strncpy(m_workerId, Options::i()->apiWorkerId(), sizeof(m_workerId) - 1);
-    }
-    else {
-        gethostname(m_workerId, sizeof(m_workerId) - 1);
-    }
-
-    genId();
-}
-
-
-ApiState::~ApiState()
-{
-    delete [] m_hashrate;
-}
-
-
-char *ApiState::get(const char *url, int *status) const
-{
-    rapidjson::Document doc;
-    doc.SetObject();
-
-    getIdentify(doc);
-    getMiner(doc);
-    getHashrate(doc);
-    getResults(doc);
-    getConnection(doc);
-
-    return finalize(doc);
-}
-
-
-void ApiState::tick(const Hashrate *hashrate)
-{
-    for (int i = 0; i < m_threads; ++i) {
-        m_hashrate[i * 3]     = hashrate->calc((size_t) i, Hashrate::ShortInterval);
-        m_hashrate[i * 3 + 1] = hashrate->calc((size_t) i, Hashrate::MediumInterval);
-        m_hashrate[i * 3 + 2] = hashrate->calc((size_t) i, Hashrate::LargeInterval);
-    }
-
-    m_totalHashrate[0] = hashrate->calc(Hashrate::ShortInterval);
-    m_totalHashrate[1] = hashrate->calc(Hashrate::MediumInterval);
-    m_totalHashrate[2] = hashrate->calc(Hashrate::LargeInterval);
-    m_highestHashrate  = hashrate->highest();
-}
-
-
-void ApiState::tick(const NetworkState &network)
-{
-    m_network = network;
-}
-
-
-char *ApiState::finalize(rapidjson::Document &doc) const
-{
-    rapidjson::StringBuffer buffer(0, 4096);
-    rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
-    writer.SetMaxDecimalPlaces(10);
-    doc.Accept(writer);
-
-    return strdup(buffer.GetString());
-}
-
-
-void ApiState::genId()
-{
-    memset(m_id, 0, sizeof(m_id));
-
-    uv_interface_address_t *interfaces;
-    int count = 0;
-
-    if (uv_interface_addresses(&interfaces, &count) < 0) {
-        return;
-    }
-
-    for (int i = 0; i < count; i++) {
-        if (!interfaces[i].is_internal && interfaces[i].address.address4.sin_family == AF_INET) {
-            uint8_t hash[200];
-            const size_t addrSize = sizeof(interfaces[i].phys_addr);
-            const size_t inSize   = strlen(APP_KIND) + addrSize;
-
-            uint8_t *input = new uint8_t[inSize]();
-            memcpy(input, interfaces[i].phys_addr, addrSize);
-            memcpy(input + addrSize, APP_KIND, strlen(APP_KIND));
-
-            keccak(input, static_cast<int>(inSize), hash, sizeof(hash));
-            Job::toHex(hash, 8, m_id);
-
-            delete [] input;
-            break;
-        }
-    }
-
-    uv_free_interface_addresses(interfaces, count);
-}
-
-
-void ApiState::getConnection(rapidjson::Document &doc) const
-{
-    auto &allocator = doc.GetAllocator();
-
-    rapidjson::Value connection(rapidjson::kObjectType);
-    connection.AddMember("pool",      rapidjson::StringRef(m_network.pool), allocator);
-    connection.AddMember("uptime",    m_network.connectionTime(), allocator);
-    connection.AddMember("ping",      m_network.latency(), allocator);
-    connection.AddMember("failures",  m_network.failures, allocator);
-    connection.AddMember("error_log", rapidjson::Value(rapidjson::kArrayType), allocator);
-
-    doc.AddMember("connection", connection, allocator);
-}
-
-
-void ApiState::getHashrate(rapidjson::Document &doc) const
-{
-    auto &allocator = doc.GetAllocator();
-
-    rapidjson::Value hashrate(rapidjson::kObjectType);
-    rapidjson::Value total(rapidjson::kArrayType);
-    rapidjson::Value threads(rapidjson::kArrayType);
-
-    for (int i = 0; i < 3; ++i) {
-        total.PushBack(normalize(m_totalHashrate[i]), allocator);
-    }
-
-    for (int i = 0; i < m_threads * 3; i += 3) {
-        rapidjson::Value thread(rapidjson::kArrayType);
-        thread.PushBack(normalize(m_hashrate[i]),     allocator);
-        thread.PushBack(normalize(m_hashrate[i + 1]), allocator);
-        thread.PushBack(normalize(m_hashrate[i + 2]), allocator);
-
-        threads.PushBack(thread, allocator);
-    }
-
-    hashrate.AddMember("total", total, allocator);
-    hashrate.AddMember("highest", normalize(m_highestHashrate), allocator);
-    hashrate.AddMember("threads", threads, allocator);
-    doc.AddMember("hashrate", hashrate, allocator);
-}
-
-
-void ApiState::getIdentify(rapidjson::Document &doc) const
-{
-    doc.AddMember("id",        rapidjson::StringRef(m_id),       doc.GetAllocator());
-    doc.AddMember("worker_id", rapidjson::StringRef(m_workerId), doc.GetAllocator());
-}
-
-
-void ApiState::getMiner(rapidjson::Document &doc) const
-{
-    auto &allocator = doc.GetAllocator();
-
-    rapidjson::Value cpu(rapidjson::kObjectType);
-    cpu.AddMember("brand",   rapidjson::StringRef(Cpu::brand()), allocator);
-    cpu.AddMember("aes",     Cpu::hasAES(), allocator);
-    cpu.AddMember("x64",     Cpu::isX64(), allocator);
-    cpu.AddMember("sockets", Cpu::sockets(), allocator);
-
-    doc.AddMember("version",      APP_VERSION, allocator);
-    doc.AddMember("kind",         APP_KIND, allocator);
-    doc.AddMember("ua",           rapidjson::StringRef(Platform::userAgent()), allocator);
-    doc.AddMember("cpu",          cpu, allocator);
-    doc.AddMember("algo",         rapidjson::StringRef(Options::i()->algoName()), allocator);
-    doc.AddMember("hugepages",    Mem::isHugepagesEnabled(), allocator);
-    doc.AddMember("donate_level", Options::i()->donateLevel(), allocator);
-}
-
-
-void ApiState::getResults(rapidjson::Document &doc) const
-{
-    auto &allocator = doc.GetAllocator();
-
-    rapidjson::Value results(rapidjson::kObjectType);
-
-    results.AddMember("diff_current",  m_network.diff, allocator);
-    results.AddMember("shares_good",   m_network.accepted, allocator);
-    results.AddMember("shares_total",  m_network.accepted + m_network.rejected, allocator);
-    results.AddMember("avg_time",      m_network.avgTime(), allocator);
-    results.AddMember("hashes_total",  m_network.total, allocator);
-
-    rapidjson::Value best(rapidjson::kArrayType);
-    for (size_t i = 0; i < m_network.topDiff.size(); ++i) {
-        best.PushBack(m_network.topDiff[i], allocator);
-    }
-
-    results.AddMember("best",      best, allocator);
-    results.AddMember("error_log", rapidjson::Value(rapidjson::kArrayType), allocator);
-
-    doc.AddMember("results", results, allocator);
-}

src/api/Httpd.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -22,95 +23,171 @@
  */
 
 
-#include <microhttpd.h>
-#include <string.h>
-
-
+#include "3rdparty/http-parser/http_parser.h"
 #include "api/Api.h"
 #include "api/Httpd.h"
-#include "log/Log.h"
+#include "base/io/log/Log.h"
+#include "base/net/http/HttpApiResponse.h"
+#include "base/net/http/HttpData.h"
+#include "base/net/http/HttpServer.h"
+#include "base/net/tools/TcpServer.h"
+#include "core/config/Config.h"
+#include "core/Controller.h"
 
 
-Httpd::Httpd(int port, const char *accessToken) :
-    m_accessToken(accessToken),
-    m_port(port),
-    m_daemon(nullptr)
+namespace xmrig {
+
+static const char *kAuthorization = "authorization";
+static const char *kContentType   = "content-type";
+
+#ifdef _WIN32
+static const char *favicon = nullptr;
+static size_t faviconSize  = 0;
+#endif
+
+} // namespace xmrig
+
+
+xmrig::Httpd::Httpd(Base *base) :
+    m_base(base),
+    m_http(nullptr),
+    m_server(nullptr),
+    m_port(0)
+{
+    base->addListener(this);
+}
+
+
+xmrig::Httpd::~Httpd()
 {
 }
 
 
-bool Httpd::start()
+bool xmrig::Httpd::start()
 {
-    if (!m_port) {
+    const Http &config = m_base->config()->http();
+
+    if (!config.isEnabled()) {
+        return true;
+    }
+
+    m_http   = new HttpServer(this);
+    m_server = new TcpServer(config.host(), config.port(), m_http);
+
+    const int rc = m_server->bind();
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") BLUE_BOLD("%s:%d") " " RED_BOLD("%s"),
+               "HTTP API",
+               config.host().data(),
+               rc < 0 ? config.port() : rc,
+               rc < 0 ? uv_strerror(rc) : ""
+               );
+
+    if (rc < 0) {
+        stop();
+
         return false;
     }
 
-    m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, m_port, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END);
-    if (!m_daemon) {
-        LOG_ERR("HTTP Daemon failed to start.");
-        return false;
+    m_port = static_cast<uint16_t>(rc);
+
+#   ifdef _WIN32
+    HRSRC src = FindResource(nullptr, MAKEINTRESOURCE(1), RT_ICON);
+    if (src != nullptr) {
+        HGLOBAL res = LoadResource(nullptr, src);
+        if (res != nullptr) {
+            favicon     = static_cast<const char *>(LockResource(res));
+            faviconSize = SizeofResource(nullptr, src);
+        }
     }
+#   endif
 
     return true;
 }
 
 
-int Httpd::auth(const char *header)
+void xmrig::Httpd::stop()
 {
-    if (!m_accessToken) {
-        return MHD_HTTP_OK;
-    }
+    delete m_server;
+    delete m_http;
 
-    if (m_accessToken && !header) {
-        return MHD_HTTP_UNAUTHORIZED;
-    }
-
-    const size_t size = strlen(header);
-    if (size < 8 || strlen(m_accessToken) != size - 7 || memcmp("Bearer ", header, 7) != 0) {
-        return MHD_HTTP_FORBIDDEN;
-    }
-
-    return strncmp(m_accessToken, header + 7, strlen(m_accessToken)) == 0 ? MHD_HTTP_OK : MHD_HTTP_FORBIDDEN;
+    m_server = nullptr;
+    m_http   = nullptr;
+    m_port   = 0;
 }
 
 
-int Httpd::done(MHD_Connection *connection, int status, MHD_Response *rsp)
+
+void xmrig::Httpd::onConfigChanged(Config *config, Config *previousConfig)
 {
-    if (!rsp) {
-        rsp = MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
+    if (config->http() == previousConfig->http()) {
+        return;
     }
 
-    MHD_add_response_header(rsp, "Content-Type", "application/json");
-    MHD_add_response_header(rsp, "Access-Control-Allow-Origin", "*");
-    MHD_add_response_header(rsp, "Access-Control-Allow-Methods", "GET");
-    MHD_add_response_header(rsp, "Access-Control-Allow-Headers", "Authorization");
-
-    const int ret = MHD_queue_response(connection, status, rsp);
-    MHD_destroy_response(rsp);
-    return ret;
+    stop();
+    start();
 }
 
 
-int Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)
+void xmrig::Httpd::onHttpData(const HttpData &data)
 {
-    if (strcmp(method, "OPTIONS") == 0) {
-        return done(connection, MHD_HTTP_OK, nullptr);
+    if (data.method == HTTP_OPTIONS) {
+        return HttpApiResponse(data.id()).end();
     }
 
-    if (strcmp(method, "GET") != 0) {
-        return MHD_NO;
+    if (data.method == HTTP_GET && data.url == "/favicon.ico") {
+#       ifdef _WIN32
+        if (favicon != nullptr) {
+            HttpResponse response(data.id());
+            response.setHeader("Content-Type", "image/x-icon");
+
+            return response.end(favicon, faviconSize);
+        }
+#       endif
+
+        return HttpResponse(data.id(), 404).end();
     }
 
-    int status = static_cast<Httpd*>(cls)->auth(MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Authorization"));
-    if (status != MHD_HTTP_OK) {
-        return done(connection, status, nullptr);
+    if (data.method > 4) {
+        return HttpApiResponse(data.id(), HTTP_STATUS_METHOD_NOT_ALLOWED).end();
     }
 
-    char *buf = Api::get(url, &status);
-    if (buf == nullptr) {
-        return MHD_NO;
+    const int status = auth(data);
+    if (status != HTTP_STATUS_OK) {
+        return HttpApiResponse(data.id(), status).end();
     }
 
-    MHD_Response *rsp = MHD_create_response_from_buffer(strlen(buf), (void*) buf, MHD_RESPMEM_MUST_FREE);
-    return done(connection, status, rsp);
+    if (data.method != HTTP_GET) {
+        if (m_base->config()->http().isRestricted()) {
+            return HttpApiResponse(data.id(), HTTP_STATUS_FORBIDDEN).end();
+        }
+
+        if (!data.headers.count(kContentType) || data.headers.at(kContentType) != "application/json") {
+            return HttpApiResponse(data.id(), HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE).end();
+        }
+    }
+
+    m_base->api()->request(data);
+}
+
+
+int xmrig::Httpd::auth(const HttpData &req) const
+{
+    const Http &config = m_base->config()->http();
+
+    if (!req.headers.count(kAuthorization)) {
+        return config.isAuthRequired() ? HTTP_STATUS_UNAUTHORIZED : HTTP_STATUS_OK;
+    }
+
+    if (config.token().isNull()) {
+        return HTTP_STATUS_UNAUTHORIZED;
+    }
+
+    const std::string &token = req.headers.at(kAuthorization);
+    const size_t size        = token.size();
+
+    if (token.size() < 8 || config.token().size() != size - 7 || memcmp("Bearer ", token.c_str(), 7) != 0) {
+        return HTTP_STATUS_FORBIDDEN;
+    }
+
+    return strncmp(config.token().data(), token.c_str() + 7, config.token().size()) == 0 ? HTTP_STATUS_OK : HTTP_STATUS_FORBIDDEN;
 }

src/api/Httpd.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,33 +22,49 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __HTTPD_H__
-#define __HTTPD_H__
+#ifndef XMRIG_HTTPD_H
+#define XMRIG_HTTPD_H
 
 
-#include <uv.h>
+#include <stdint.h>
 
 
-struct MHD_Connection;
-struct MHD_Daemon;
-struct MHD_Response;
+#include "base/kernel/interfaces/IBaseListener.h"
+#include "base/kernel/interfaces/IHttpListener.h"
 
 
-class Httpd
+namespace xmrig {
+
+
+class Base;
+class HttpServer;
+class TcpServer;
+
+
+class Httpd : public IBaseListener, public IHttpListener
 {
 public:
-    Httpd(int port, const char *accessToken);
+    Httpd(Base *base);
+    ~Httpd() override;
+
     bool start();
+    void stop();
+
+protected:
+    void onConfigChanged(Config *config, Config *previousConfig) override;
+    void onHttpData(const HttpData &data) override;
 
 private:
-    int auth(const char *header);
+    int auth(const HttpData &req) const;
 
-    static int done(MHD_Connection *connection, int status, MHD_Response *rsp);
-    static int handler(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
-
-    const char *m_accessToken;
-    const int m_port;
-    MHD_Daemon *m_daemon;
+    Base *m_base;
+    HttpServer *m_http;
+    TcpServer *m_server;
+    uint16_t m_port;
 };
 
-#endif /* __HTTPD_H__ */
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_HTTPD_H */

src/api/interfaces/IApiListener.h

@@ -4,8 +4,7 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2016-2018 XMRig       <support@xmrig.com>
  *
  *   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,17 +20,26 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ICONSOLELISTENER_H__
-#define __ICONSOLELISTENER_H__
+#ifndef XMRIG_IAPILISTENER_H
+#define XMRIG_IAPILISTENER_H
 
 
-class IConsoleListener
+namespace xmrig {
+
+
+class IApiRequest;
+
+
+class IApiListener
 {
 public:
-    virtual ~IConsoleListener() {}
+    virtual ~IApiListener() = default;
 
-    virtual void onConsoleCommand(char command) = 0;
+    virtual void onRequest(IApiRequest &request) = 0;
 };
 
 
-#endif // __ICONSOLELISTENER_H__
+} /* namespace xmrig */
+
+
+#endif // XMRIG_IAPILISTENER_H

src/api/interfaces/IApiRequest.h

@@ -0,0 +1,72 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2018 XMRig       <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_IAPIREQUEST_H
+#define XMRIG_IAPIREQUEST_H
+
+
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class String;
+
+
+class IApiRequest
+{
+public:
+    enum Method {
+        METHOD_DELETE,
+        METHOD_GET,
+        METHOD_HEAD,
+        METHOD_POST,
+        METHOD_PUT
+    };
+
+
+    enum Source {
+        SOURCE_HTTP
+    };
+
+
+    virtual ~IApiRequest() = default;
+
+    virtual bool isDone() const                                  = 0;
+    virtual bool isNew() const                                   = 0;
+    virtual bool isRestricted() const                            = 0;
+    virtual const rapidjson::Value &json() const                 = 0;
+    virtual const String &url() const                            = 0;
+    virtual Method method() const                                = 0;
+    virtual rapidjson::Document &doc()                           = 0;
+    virtual rapidjson::Value &reply()                            = 0;
+    virtual Source source() const                                = 0;
+    virtual void accept()                                        = 0;
+    virtual void done(int status)                                = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_IAPIREQUEST_H

src/api/requests/ApiRequest.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -22,24 +23,17 @@
  */
 
 
-#include <pthread.h>
-#include <sched.h>
-#include <unistd.h>
+#include "api/requests/ApiRequest.h"
 
 
-#include "Cpu.h"
-
-
-void Cpu::init()
-{
-#   ifdef XMRIG_NO_LIBCPUID
-    m_totalThreads = sysconf(_SC_NPROCESSORS_CONF);
-#   endif
-
-    initCommon();
-}
-
-
-void Cpu::setAffinity(int id, uint64_t mask)
+xmrig::ApiRequest::ApiRequest(Source source, bool restricted) :
+    m_restricted(restricted),
+    m_source(source),
+    m_state(STATE_NEW)
+{
+}
+
+
+xmrig::ApiRequest::~ApiRequest()
 {
 }

src/api/requests/ApiRequest.h

@@ -0,0 +1,67 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef XMRIG_APIREQUEST_H
+#define XMRIG_APIREQUEST_H
+
+
+#include "api/interfaces/IApiRequest.h"
+
+
+namespace xmrig {
+
+
+class ApiRequest : public IApiRequest
+{
+public:
+    ApiRequest(Source source, bool restricted);
+    ~ApiRequest() override;
+
+protected:
+    inline bool isDone() const override          { return m_state == STATE_DONE; }
+    inline bool isNew() const override           { return m_state == STATE_NEW; }
+    inline bool isRestricted() const override    { return m_restricted; }
+    inline Source source() const override        { return m_source; }
+    inline void accept() override                { m_state = STATE_ACCEPTED; }
+    inline void done(int) override               { m_state = STATE_DONE; }
+
+private:
+    enum State {
+        STATE_NEW,
+        STATE_ACCEPTED,
+        STATE_DONE
+    };
+
+    bool m_restricted;
+    Source m_source;
+    State m_state;
+};
+
+
+} // namespace xmrig
+
+
+#endif // XMRIG_APIREQUEST_H
+

src/api/requests/HttpApiRequest.cpp

@@ -0,0 +1,76 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "api/requests/HttpApiRequest.h"
+#include "base/net/http/HttpData.h"
+#include "rapidjson/error/en.h"
+
+
+xmrig::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) :
+    ApiRequest(SOURCE_HTTP, restricted),
+    m_parsed(false),
+    m_req(req),
+    m_res(req.id()),
+    m_url(req.url.c_str())
+{
+}
+
+
+const rapidjson::Value &xmrig::HttpApiRequest::json() const
+{
+    return m_body;
+}
+
+
+xmrig::IApiRequest::Method xmrig::HttpApiRequest::method() const
+{
+    return static_cast<IApiRequest::Method>(m_req.method);
+}
+
+
+void xmrig::HttpApiRequest::accept()
+{
+    using namespace rapidjson;
+
+    ApiRequest::accept();
+
+    if (!m_parsed && !m_req.body.empty()) {
+        m_parsed = true;
+        m_body.Parse<kParseCommentsFlag | kParseTrailingCommasFlag>(m_req.body.c_str());
+
+        if (m_body.HasParseError()) {
+            reply().AddMember("error", StringRef(GetParseError_En(m_body.GetParseError())), doc().GetAllocator());;
+        }
+    }
+}
+
+
+void xmrig::HttpApiRequest::done(int status)
+{
+    ApiRequest::done(status);
+
+    m_res.setStatus(status);
+    m_res.end();
+}

src/api/requests/HttpApiRequest.h

@@ -0,0 +1,69 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef XMRIG_HTTPAPIREQUEST_H
+#define XMRIG_HTTPAPIREQUEST_H
+
+
+#include "api/requests/ApiRequest.h"
+#include "base/net/http/HttpApiResponse.h"
+#include "base/tools/String.h"
+
+
+namespace xmrig {
+
+
+class HttpData;
+
+
+class HttpApiRequest : public ApiRequest
+{
+public:
+    HttpApiRequest(const HttpData &req, bool restricted);
+
+protected:
+    inline rapidjson::Document &doc() override           { return m_res.doc(); }
+    inline rapidjson::Value &reply() override            { return m_res.doc(); }
+    inline const String &url() const override            { return m_url; }
+
+    const rapidjson::Value &json() const override;
+    Method method() const override;
+    void accept() override;
+    void done(int status) override;
+
+private:
+    bool m_parsed;
+    const HttpData &m_req;
+    HttpApiResponse m_res;
+    rapidjson::Document m_body;
+    String m_url;
+};
+
+
+} // namespace xmrig
+
+
+#endif // XMRIG_HTTPAPIREQUEST_H
+

src/api/v1/ApiRouter.cpp

@@ -0,0 +1,178 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <math.h>
+#include <string.h>
+#include <uv.h>
+
+
+#include "api/interfaces/IApiRequest.h"
+#include "api/v1/ApiRouter.h"
+#include "base/kernel/Base.h"
+#include "common/cpu/Cpu.h"
+#include "common/Platform.h"
+#include "core/config/Config.h"
+#include "interfaces/IThread.h"
+#include "rapidjson/document.h"
+#include "version.h"
+#include "workers/Hashrate.h"
+#include "workers/Workers.h"
+
+
+static inline double normalize(double d)
+{
+    if (!isnormal(d)) {
+        return 0.0;
+    }
+
+    return floor(d * 100.0) / 100.0;
+}
+
+
+xmrig::ApiRouter::ApiRouter(Base *base) :
+    m_base(base)
+{
+}
+
+
+xmrig::ApiRouter::~ApiRouter()
+{
+}
+
+
+void xmrig::ApiRouter::onRequest(IApiRequest &request)
+{
+    if (request.method() == IApiRequest::METHOD_GET) {
+        if (request.url() == "/1/summary" || request.url() == "/api.json") {
+            request.accept();
+            getMiner(request.reply(), request.doc());
+            getHashrate(request.reply(), request.doc());
+        }
+        else if (request.url() == "/1/threads") {
+            request.accept();
+            getThreads(request.reply(), request.doc());
+        }
+        else if (request.url() == "/1/config") {
+            if (request.isRestricted()) {
+                return request.done(403);
+            }
+
+            request.accept();
+            m_base->config()->getJSON(request.doc());
+        }
+    }
+    else if (request.method() == IApiRequest::METHOD_PUT || request.method() == IApiRequest::METHOD_POST) {
+        if (request.url() == "/1/config") {
+            request.accept();
+
+            if (!m_base->reload(request.json())) {
+                return request.done(400);
+            }
+
+            request.done(204);
+        }
+    }
+}
+
+
+void xmrig::ApiRouter::getHashrate(rapidjson::Value &reply, rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+    auto &allocator = doc.GetAllocator();
+
+    Value hashrate(kObjectType);
+    Value total(kArrayType);
+    Value threads(kArrayType);
+
+    const Hashrate *hr = Workers::hashrate();
+
+    total.PushBack(normalize(hr->calc(Hashrate::ShortInterval)),  allocator);
+    total.PushBack(normalize(hr->calc(Hashrate::MediumInterval)), allocator);
+    total.PushBack(normalize(hr->calc(Hashrate::LargeInterval)),  allocator);
+
+    for (size_t i = 0; i < Workers::threads(); i++) {
+        Value thread(kArrayType);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
+
+        threads.PushBack(thread, allocator);
+    }
+
+    hashrate.AddMember("total",   total, allocator);
+    hashrate.AddMember("highest", normalize(hr->highest()), allocator);
+    hashrate.AddMember("threads", threads, allocator);
+    reply.AddMember("hashrate", hashrate, allocator);
+}
+
+
+void xmrig::ApiRouter::getMiner(rapidjson::Value &reply, rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+    auto &allocator = doc.GetAllocator();
+
+    Value cpu(kObjectType);
+    cpu.AddMember("brand",   StringRef(Cpu::info()->brand()), allocator);
+    cpu.AddMember("aes",     Cpu::info()->hasAES(), allocator);
+    cpu.AddMember("x64",     Cpu::info()->isX64(), allocator);
+    cpu.AddMember("sockets", Cpu::info()->sockets(), allocator);
+
+    reply.AddMember("version",      APP_VERSION, allocator);
+    reply.AddMember("kind",         APP_KIND, allocator);
+    reply.AddMember("ua",           StringRef(Platform::userAgent()), allocator);
+    reply.AddMember("cpu",          cpu, allocator);
+    reply.AddMember("algo",         StringRef(m_base->config()->algorithm().shortName()), allocator);
+    reply.AddMember("hugepages",    Workers::hugePages() > 0, allocator);
+    reply.AddMember("donate_level", m_base->config()->pools().donateLevel(), allocator);
+}
+
+
+void xmrig::ApiRouter::getThreads(rapidjson::Value &reply, rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+    auto &allocator = doc.GetAllocator();
+    const Hashrate *hr = Workers::hashrate();
+
+    Workers::threadsSummary(doc);
+
+    const std::vector<IThread *> &threads = m_base->config()->threads();
+    Value list(kArrayType);
+
+    size_t i = 0;
+    for (const xmrig::IThread *thread : threads) {
+        Value value = thread->toAPI(doc);
+
+        Value hashrate(kArrayType);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
+
+        i++;
+
+        value.AddMember("hashrate", hashrate, allocator);
+        list.PushBack(value, allocator);
+    }
+
+    reply.AddMember("threads", list, allocator);
+}

src/api/v1/ApiRouter.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,43 +22,42 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __APISTATE_H__
-#define __APISTATE_H__
+#ifndef XMRIG_APIROUTER_H
+#define XMRIG_APIROUTER_H
 
 
-#include "api/NetworkState.h"
+#include "api/interfaces/IApiListener.h"
 #include "rapidjson/fwd.h"
 
 
 class Hashrate;
 
 
-class ApiState
+namespace xmrig {
+
+
+class Base;
+
+
+class ApiRouter : public xmrig::IApiListener
 {
 public:
-    ApiState();
-    ~ApiState();
+    ApiRouter(Base *base);
+    ~ApiRouter() override;
 
-    char *get(const char *url, int *status) const;
-    void tick(const Hashrate *hashrate);
-    void tick(const NetworkState &results);
+protected:
+    void onRequest(IApiRequest &request) override;
 
 private:
-    char *finalize(rapidjson::Document &doc) const;
-    void genId();
-    void getConnection(rapidjson::Document &doc) const;
-    void getHashrate(rapidjson::Document &doc) const;
-    void getIdentify(rapidjson::Document &doc) const;
-    void getMiner(rapidjson::Document &doc) const;
-    void getResults(rapidjson::Document &doc) const;
+    void getHashrate(rapidjson::Value &reply, rapidjson::Document &doc) const;
+    void getMiner(rapidjson::Value &reply, rapidjson::Document &doc) const;
+    void getThreads(rapidjson::Value &reply, rapidjson::Document &doc) const;
 
-    char m_id[17];
-    char m_workerId[128];
-    double *m_hashrate;
-    double m_highestHashrate;
-    double m_totalHashrate[3];
-    int m_threads;
-    NetworkState m_network;
+    Base *m_base;
 };
 
-#endif /* __APISTATE_H__ */
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_APIROUTER_H */

src/base/base.cmake

@@ -0,0 +1,137 @@
+set(HEADERS_BASE
+    src/base/io/Console.h
+    src/base/io/json/Json.h
+    src/base/io/json/JsonChain.h
+    src/base/io/json/JsonRequest.h
+    src/base/io/log/backends/ConsoleLog.h
+    src/base/io/log/backends/FileLog.h
+    src/base/io/log/Log.h
+    src/base/io/Watcher.h
+    src/base/kernel/Base.h
+    src/base/kernel/config/BaseConfig.h
+    src/base/kernel/config/BaseTransform.h
+    src/base/kernel/Entry.h
+    src/base/kernel/interfaces/IBaseListener.h
+    src/base/kernel/interfaces/IClient.h
+    src/base/kernel/interfaces/IClientListener.h
+    src/base/kernel/interfaces/IConfig.h
+    src/base/kernel/interfaces/IConfigListener.h
+    src/base/kernel/interfaces/IConfigTransform.h
+    src/base/kernel/interfaces/IConsoleListener.h
+    src/base/kernel/interfaces/IDnsListener.h
+    src/base/kernel/interfaces/ILineListener.h
+    src/base/kernel/interfaces/ILogBackend.h
+    src/base/kernel/interfaces/ISignalListener.h
+    src/base/kernel/interfaces/IStrategy.h
+    src/base/kernel/interfaces/IStrategyListener.h
+    src/base/kernel/interfaces/ITimerListener.h
+    src/base/kernel/interfaces/IWatcherListener.h
+    src/base/kernel/Process.h
+    src/base/kernel/Signals.h
+    src/base/net/dns/Dns.h
+    src/base/net/dns/DnsRecord.h
+    src/base/net/http/Http.h
+    src/base/net/stratum/BaseClient.h
+    src/base/net/stratum/Client.h
+    src/base/net/stratum/Job.h
+    src/base/net/stratum/Pool.h
+    src/base/net/stratum/Pools.h
+    src/base/net/stratum/strategies/FailoverStrategy.h
+    src/base/net/stratum/strategies/SinglePoolStrategy.h
+    src/base/net/stratum/SubmitResult.h
+    src/base/net/tools/RecvBuf.h
+    src/base/net/tools/Storage.h
+    src/base/tools/Arguments.h
+    src/base/tools/Baton.h
+    src/base/tools/Buffer.h
+    src/base/tools/Chrono.h
+    src/base/tools/Handle.h
+    src/base/tools/String.h
+    src/base/tools/Timer.h
+   )
+
+set(SOURCES_BASE
+    src/base/io/Console.cpp
+    src/base/io/json/Json.cpp
+    src/base/io/json/JsonChain.cpp
+    src/base/io/json/JsonRequest.cpp
+    src/base/io/log/backends/ConsoleLog.cpp
+    src/base/io/log/backends/FileLog.cpp
+    src/base/io/log/Log.cpp
+    src/base/io/Watcher.cpp
+    src/base/kernel/Base.cpp
+    src/base/kernel/config/BaseConfig.cpp
+    src/base/kernel/config/BaseTransform.cpp
+    src/base/kernel/Entry.cpp
+    src/base/kernel/Process.cpp
+    src/base/kernel/Signals.cpp
+    src/base/net/dns/Dns.cpp
+    src/base/net/dns/DnsRecord.cpp
+    src/base/net/http/Http.cpp
+    src/base/net/stratum/BaseClient.cpp
+    src/base/net/stratum/Client.cpp
+    src/base/net/stratum/Job.cpp
+    src/base/net/stratum/Pool.cpp
+    src/base/net/stratum/Pools.cpp
+    src/base/net/stratum/strategies/FailoverStrategy.cpp
+    src/base/net/stratum/strategies/SinglePoolStrategy.cpp
+    src/base/tools/Arguments.cpp
+    src/base/tools/Buffer.cpp
+    src/base/tools/String.cpp
+    src/base/tools/Timer.cpp
+   )
+
+
+if (WIN32)
+    set(SOURCES_OS src/base/io/json/Json_win.cpp)
+else()
+    set(SOURCES_OS src/base/io/json/Json_unix.cpp)
+endif()
+
+
+if (NOT WIN32)
+    CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H)
+    if (HAVE_SYSLOG_H)
+        add_definitions(/DHAVE_SYSLOG_H)
+        set(SOURCES_SYSLOG src/base/io/log/backends/SysLog.h src/base/io/log/backends/SysLog.cpp)
+    endif()
+endif()
+
+
+if (WITH_HTTP)
+    set(HEADERS_BASE_HTTP
+        src/3rdparty/http-parser/http_parser.h
+        src/base/kernel/interfaces/IHttpListener.h
+        src/base/kernel/interfaces/IJsonReader.h
+        src/base/kernel/interfaces/ITcpServerListener.h
+        src/base/net/http/HttpApiResponse.h
+        src/base/net/http/HttpClient.h
+        src/base/net/http/HttpContext.h
+        src/base/net/http/HttpData.h
+        src/base/net/http/HttpResponse.h
+        src/base/net/http/HttpServer.h
+        src/base/net/stratum/DaemonClient.h
+        src/base/net/tools/TcpServer.h
+        )
+
+    set(SOURCES_BASE_HTTP
+        src/3rdparty/http-parser/http_parser.c
+        src/base/net/http/HttpApiResponse.cpp
+        src/base/net/http/HttpClient.cpp
+        src/base/net/http/HttpContext.cpp
+        src/base/net/http/HttpResponse.cpp
+        src/base/net/http/HttpServer.cpp
+        src/base/net/stratum/DaemonClient.cpp
+        src/base/net/tools/TcpServer.cpp
+        )
+
+    add_definitions(/DXMRIG_FEATURE_HTTP)
+    add_definitions(/DXMRIG_FEATURE_API)
+else()
+    set(HEADERS_BASE_HTTP "")
+    set(SOURCES_BASE_HTTP "")
+    remove_definitions(/DXMRIG_FEATURE_HTTP)
+    remove_definitions(/DXMRIG_FEATURE_API)
+endif()
+
+add_definitions(/DXMRIG_DEPRECATED)

src/base/io/Console.cpp

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -22,26 +23,44 @@
  */
 
 
-#include "Console.h"
-#include "interfaces/IConsoleListener.h"
+#include "base/io/Console.h"
+#include "base/kernel/interfaces/IConsoleListener.h"
+#include "base/tools/Handle.h"
 
 
-Console::Console(IConsoleListener *listener)
+xmrig::Console::Console(IConsoleListener *listener)
     : m_listener(listener)
 {
-    m_tty.data = this;
-    uv_tty_init(uv_default_loop(), &m_tty, 0, 1);
+    m_tty = new uv_tty_t;
 
-    if (!uv_is_readable(reinterpret_cast<uv_stream_t*>(&m_tty))) {
+    m_tty->data = this;
+    uv_tty_init(uv_default_loop(), m_tty, 0, 1);
+
+    if (!uv_is_readable(reinterpret_cast<uv_stream_t*>(m_tty))) {
         return;
     }
 
-    uv_tty_set_mode(&m_tty, UV_TTY_MODE_RAW);
-    uv_read_start(reinterpret_cast<uv_stream_t*>(&m_tty), Console::onAllocBuffer, Console::onRead);
+    uv_tty_set_mode(m_tty, UV_TTY_MODE_RAW);
+    uv_read_start(reinterpret_cast<uv_stream_t*>(m_tty), Console::onAllocBuffer, Console::onRead);
 }
 
 
-void Console::onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf)
+xmrig::Console::~Console()
+{
+    stop();
+}
+
+
+void xmrig::Console::stop()
+{
+    uv_tty_reset_mode();
+
+    Handle::close(m_tty);
+    m_tty = nullptr;
+}
+
+
+void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
 {
     auto console = static_cast<Console*>(handle->data);
     buf->len  = 1;
@@ -49,7 +68,7 @@ void Console::onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t
 }
 
 
-void Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
+void xmrig::Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
 {
     if (nread < 0) {
         return uv_close(reinterpret_cast<uv_handle_t*>(stream), nullptr);

src/base/io/Console.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,13 +22,17 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
+#ifndef XMRIG_CONSOLE_H
+#define XMRIG_CONSOLE_H
 
 
 #include <uv.h>
 
 
+
+namespace xmrig {
+
+
 class IConsoleListener;
 
 
@@ -35,6 +40,9 @@ class Console
 {
 public:
     Console(IConsoleListener *listener);
+    ~Console();
+
+    void stop();
 
 private:
     static void onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);
@@ -42,8 +50,11 @@ private:
 
     char m_buf[1];
     IConsoleListener *m_listener;
-    uv_tty_t m_tty;
+    uv_tty_t *m_tty;
 };
 
 
-#endif /* __CONSOLE_H__ */
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_CONSOLE_H */

src/base/io/Watcher.cpp

@@ -0,0 +1,88 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+
+
+#include "base/kernel/interfaces/IWatcherListener.h"
+#include "base/io/Watcher.h"
+#include "base/tools/Handle.h"
+#include "base/tools/Timer.h"
+
+
+xmrig::Watcher::Watcher(const String &path, IWatcherListener *listener) :
+    m_listener(listener),
+    m_path(path)
+{
+    m_timer = new Timer(this);
+
+    m_fsEvent = new uv_fs_event_t;
+    m_fsEvent->data = this;
+    uv_fs_event_init(uv_default_loop(), m_fsEvent);
+
+    start();
+}
+
+
+xmrig::Watcher::~Watcher()
+{
+    delete m_timer;
+
+    Handle::close(m_fsEvent);
+}
+
+
+void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int, int)
+{
+    if (!filename) {
+        return;
+    }
+
+    static_cast<Watcher *>(handle->data)->queueUpdate();
+}
+
+
+void xmrig::Watcher::queueUpdate()
+{
+    m_timer->stop();
+    m_timer->start(kDelay, 0);
+}
+
+
+void xmrig::Watcher::reload()
+{
+    m_listener->onFileChanged(m_path);
+
+#   ifndef _WIN32
+    uv_fs_event_stop(m_fsEvent);
+    start();
+#   endif
+}
+
+
+void xmrig::Watcher::start()
+{
+    uv_fs_event_start(m_fsEvent, xmrig::Watcher::onFsEvent, m_path, 0);
+}

src/base/io/Watcher.h

@@ -0,0 +1,71 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_WATCHER_H
+#define XMRIG_WATCHER_H
+
+
+#include "base/kernel/interfaces/ITimerListener.h"
+#include "base/tools/String.h"
+
+
+typedef struct uv_fs_event_s uv_fs_event_t;
+
+
+namespace xmrig {
+
+
+class IWatcherListener;
+class Timer;
+
+
+class Watcher : public ITimerListener
+{
+public:
+    Watcher(const String &path, IWatcherListener *listener);
+    ~Watcher() override;
+
+protected:
+    inline void onTimer(const Timer *) override { reload(); }
+
+private:
+    constexpr static int kDelay = 500;
+
+    static void onFsEvent(uv_fs_event_t *handle, const char *filename, int events, int status);
+
+    void queueUpdate();
+    void reload();
+    void start();
+
+    IWatcherListener *m_listener;
+    String m_path;
+    Timer *m_timer;
+    uv_fs_event_t *m_fsEvent;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_WATCHER_H */

src/base/io/json/Json.cpp

@@ -0,0 +1,139 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/io/json/Json.h"
+#include "rapidjson/document.h"
+
+
+namespace xmrig {
+
+static const rapidjson::Value kNullValue;
+
+}
+
+
+bool xmrig::Json::getBool(const rapidjson::Value &obj, const char *key, bool defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsBool()) {
+        return i->value.GetBool();
+    }
+
+    return defaultValue;
+}
+
+
+const char *xmrig::Json::getString(const rapidjson::Value &obj, const char *key,  const char *defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsString()) {
+        return i->value.GetString();
+    }
+
+    return defaultValue;
+}
+
+
+const rapidjson::Value &xmrig::Json::getArray(const rapidjson::Value &obj, const char *key)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsArray()) {
+        return i->value;
+    }
+
+    return kNullValue;
+}
+
+
+const rapidjson::Value &xmrig::Json::getObject(const rapidjson::Value &obj, const char *key)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsObject()) {
+        return i->value;
+    }
+
+    return kNullValue;
+}
+
+
+const rapidjson::Value &xmrig::Json::getValue(const rapidjson::Value &obj, const char *key)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd()) {
+        return i->value;
+    }
+
+    return kNullValue;
+}
+
+
+int xmrig::Json::getInt(const rapidjson::Value &obj, const char *key, int defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsInt()) {
+        return i->value.GetInt();
+    }
+
+    return defaultValue;
+}
+
+
+int64_t xmrig::Json::getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsInt64()) {
+        return i->value.GetInt64();
+    }
+
+    return defaultValue;
+}
+
+
+uint64_t xmrig::Json::getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsUint64()) {
+        return i->value.GetUint64();
+    }
+
+    return defaultValue;
+}
+
+
+unsigned xmrig::Json::getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsUint()) {
+        return i->value.GetUint();
+    }
+
+    return defaultValue;
+}
+
+
+bool xmrig::JsonReader::isEmpty() const
+{
+    return !m_obj.IsObject() || m_obj.ObjectEmpty();
+}

src/base/io/json/Json.h

@@ -0,0 +1,79 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_JSON_H
+#define XMRIG_JSON_H
+
+
+#include "base/kernel/interfaces/IJsonReader.h"
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class Json
+{
+public:
+    static bool getBool(const rapidjson::Value &obj, const char *key, bool defaultValue = false);
+    static const char *getString(const rapidjson::Value &obj, const char *key, const char *defaultValue = nullptr);
+    static const rapidjson::Value &getArray(const rapidjson::Value &obj, const char *key);
+    static const rapidjson::Value &getObject(const rapidjson::Value &obj, const char *key);
+    static const rapidjson::Value &getValue(const rapidjson::Value &obj, const char *key);
+    static int getInt(const rapidjson::Value &obj, const char *key, int defaultValue = 0);
+    static int64_t getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue = 0);
+    static uint64_t getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue = 0);
+    static unsigned getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue = 0);
+
+    static bool get(const char *fileName, rapidjson::Document &doc);
+    static bool save(const char *fileName, const rapidjson::Document &doc);
+};
+
+
+class JsonReader : public IJsonReader
+{
+public:
+    inline JsonReader(const rapidjson::Value &obj) : m_obj(obj) {}
+
+    inline bool getBool(const char *key, bool defaultValue = false) const override                   { return Json::getBool(m_obj, key, defaultValue); }
+    inline const char *getString(const char *key, const char *defaultValue = nullptr) const override { return Json::getString(m_obj, key, defaultValue); }
+    inline const rapidjson::Value &getArray(const char *key) const override                          { return Json::getArray(m_obj, key); }
+    inline const rapidjson::Value &getObject(const char *key) const override                         { return Json::getObject(m_obj, key); }
+    inline const rapidjson::Value &getValue(const char *key) const override                          { return Json::getValue(m_obj, key); }
+    inline int getInt(const char *key, int defaultValue = 0) const override                          { return Json::getInt(m_obj, key, defaultValue); }
+    inline int64_t getInt64(const char *key, int64_t defaultValue = 0) const override                { return Json::getInt64(m_obj, key, defaultValue); }
+    inline uint64_t getUint64(const char *key, uint64_t defaultValue = 0) const override             { return Json::getUint64(m_obj, key, defaultValue); }
+    inline unsigned getUint(const char *key, unsigned defaultValue = 0) const override               { return Json::getUint(m_obj, key, defaultValue); }
+
+    bool isEmpty() const override;
+
+private:
+    const rapidjson::Value &m_obj;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_JSON_H */

src/base/io/json/JsonChain.cpp

@@ -0,0 +1,213 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/io/json/Json.h"
+#include "base/io/json/JsonChain.h"
+#include "base/io/log/Log.h"
+#include "rapidjson/error/en.h"
+
+
+namespace xmrig {
+
+static const rapidjson::Value kNullValue;
+
+}
+
+
+xmrig::JsonChain::JsonChain()
+{
+}
+
+
+bool xmrig::JsonChain::add(rapidjson::Document &&doc)
+{
+    if (doc.HasParseError() || !doc.IsObject() || doc.ObjectEmpty()) {
+        return false;
+    }
+
+    m_chain.push_back(std::move(doc));
+
+    return true;
+}
+
+
+bool xmrig::JsonChain::addFile(const char *fileName)
+{
+    using namespace rapidjson;
+    Document doc;
+    if (Json::get(fileName, doc)) {
+        m_fileName = fileName;
+
+        return add(std::move(doc));
+    }
+
+    if (doc.HasParseError()) {
+        LOG_ERR("%s<offset:%zu>: \"%s\"", fileName, doc.GetErrorOffset(), GetParseError_En(doc.GetParseError()));
+    }
+    else {
+        LOG_ERR("unable to open \"%s\".", fileName);
+    }
+
+    return false;
+}
+
+
+bool xmrig::JsonChain::addRaw(const char *json)
+{
+    using namespace rapidjson;
+    Document doc;
+    doc.Parse<kParseCommentsFlag | kParseTrailingCommasFlag>(json);
+
+    return add(std::move(doc));
+}
+
+
+void xmrig::JsonChain::dump(const char *fileName)
+{
+    rapidjson::Document doc(rapidjson::kArrayType);
+
+    for (rapidjson::Document &value : m_chain) {
+        doc.PushBack(value, doc.GetAllocator());
+    }
+
+    Json::save(fileName, doc);
+}
+
+
+bool xmrig::JsonChain::getBool(const char *key, bool defaultValue) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsBool()) {
+            return i->value.GetBool();
+        }
+    }
+
+    return defaultValue;
+}
+
+
+const char *xmrig::JsonChain::getString(const char *key, const char *defaultValue) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsString()) {
+            return i->value.GetString();
+        }
+    }
+
+    return defaultValue;
+}
+
+
+const rapidjson::Value &xmrig::JsonChain::getArray(const char *key) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsArray()) {
+            return i->value;
+        }
+    }
+
+    return kNullValue;
+}
+
+
+const rapidjson::Value &xmrig::JsonChain::getObject(const char *key) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsObject()) {
+            return i->value;
+        }
+    }
+
+    return kNullValue;
+}
+
+
+const rapidjson::Value &xmrig::JsonChain::getValue(const char *key) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd()) {
+            return i->value;
+        }
+    }
+
+    return kNullValue;
+}
+
+
+int xmrig::JsonChain::getInt(const char *key, int defaultValue) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsInt()) {
+            return i->value.GetInt();
+        }
+    }
+
+    return defaultValue;
+}
+
+
+int64_t xmrig::JsonChain::getInt64(const char *key, int64_t defaultValue) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsInt64()) {
+            return i->value.GetInt64();
+        }
+    }
+
+    return defaultValue;
+}
+
+
+uint64_t xmrig::JsonChain::getUint64(const char *key, uint64_t defaultValue) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsUint64()) {
+            return i->value.GetUint64();
+        }
+    }
+
+    return defaultValue;
+}
+
+
+unsigned xmrig::JsonChain::getUint(const char *key, unsigned defaultValue) const
+{
+    for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) {
+        auto i = it->FindMember(key);
+        if (i != it->MemberEnd() && i->value.IsUint()) {
+            return i->value.GetUint();
+        }
+    }
+
+    return defaultValue;
+}

src/base/io/json/JsonChain.h

@@ -0,0 +1,76 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_JSONCHAIN_H
+#define XMRIG_JSONCHAIN_H
+
+
+#include <vector>
+
+
+#include "base/kernel/interfaces/IJsonReader.h"
+#include "base/tools/String.h"
+#include "rapidjson/document.h"
+
+
+namespace xmrig {
+
+
+class JsonChain : public IJsonReader
+{
+public:
+    JsonChain();
+
+    bool add(rapidjson::Document &&doc);
+    bool addFile(const char *fileName);
+    bool addRaw(const char *json);
+
+    void dump(const char *fileName);
+
+    inline const String &fileName() const { return m_fileName; }
+    inline size_t size() const            { return m_chain.size(); }
+
+protected:
+    inline bool isEmpty() const override  { return m_chain.empty(); }
+
+    bool getBool(const char *key, bool defaultValue = false) const override;
+    const char *getString(const char *key, const char *defaultValue = nullptr) const override;
+    const rapidjson::Value &getArray(const char *key) const override;
+    const rapidjson::Value &getObject(const char *key) const override;
+    const rapidjson::Value &getValue(const char *key) const override;
+    int getInt(const char *key, int defaultValue = 0) const override;
+    int64_t getInt64(const char *key, int64_t defaultValue = 0) const override;
+    uint64_t getUint64(const char *key, uint64_t defaultValue = 0) const override;
+    unsigned getUint(const char *key, unsigned defaultValue = 0) const override;
+
+private:
+    std::vector<rapidjson::Document> m_chain;
+    String m_fileName;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_JSONCHAIN_H */

src/base/io/json/JsonRequest.cpp

@@ -0,0 +1,38 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/io/json/JsonRequest.h"
+#include "rapidjson/document.h"
+
+
+void xmrig::JsonRequest::create(rapidjson::Document &doc, int64_t id, const char *method, rapidjson::Value &params)
+{
+    auto &allocator = doc.GetAllocator();
+
+    doc.AddMember("id",      id, allocator);
+    doc.AddMember("jsonrpc", "2.0", allocator);
+    doc.AddMember("method",  rapidjson::StringRef(method), allocator);
+    doc.AddMember("params",  params, allocator);
+}

src/base/io/json/JsonRequest.h

@@ -0,0 +1,45 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_JSONREQUEST_H
+#define XMRIG_JSONREQUEST_H
+
+
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class JsonRequest
+{
+public:
+    static void create(rapidjson::Document &doc, int64_t id, const char *method, rapidjson::Value &params);
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_JSONREQUEST_H */

src/base/io/json/Json_unix.cpp

@@ -0,0 +1,62 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <fstream>
+
+
+#include "base/io/json/Json.h"
+#include "rapidjson/document.h"
+#include "rapidjson/istreamwrapper.h"
+#include "rapidjson/ostreamwrapper.h"
+#include "rapidjson/prettywriter.h"
+
+
+bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc)
+{
+    std::ifstream ifs(fileName, std::ios_base::in | std::ios_base::binary);
+    if (!ifs.is_open()) {
+        return false;
+    }
+
+    rapidjson::IStreamWrapper isw(ifs);
+    doc.ParseStream<rapidjson::kParseCommentsFlag | rapidjson::kParseTrailingCommasFlag>(isw);
+
+    return !doc.HasParseError() && doc.IsObject();
+}
+
+
+bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc)
+{
+    std::ofstream ofs(fileName, std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
+    if (!ofs.is_open()) {
+        return false;
+    }
+
+    rapidjson::OStreamWrapper osw(ofs);
+    rapidjson::PrettyWriter<rapidjson::OStreamWrapper> writer(osw);
+    doc.Accept(writer);
+
+    return true;
+}

src/base/io/json/Json_win.cpp

@@ -0,0 +1,124 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <windows.h>
+
+
+#ifdef __GNUC__
+#   include <fcntl.h>
+#   include <ext/stdio_filebuf.h>
+#endif
+
+
+#include <fstream>
+
+
+#include "base/io/json/Json.h"
+#include "rapidjson/document.h"
+#include "rapidjson/istreamwrapper.h"
+#include "rapidjson/ostreamwrapper.h"
+#include "rapidjson/prettywriter.h"
+
+
+#if defined(_MSC_VER) || defined (__GNUC__)
+static std::wstring toUtf16(const char *str)
+{
+    const int size = static_cast<int>(strlen(str));
+    std::wstring ret;
+
+    int len = MultiByteToWideChar(CP_UTF8, 0, str, size, nullptr, 0);
+    if (len > 0) {
+        ret.resize(static_cast<size_t>(len));
+        MultiByteToWideChar(CP_UTF8, 0, str, size, &ret[0], len);
+    }
+
+    return ret;
+}
+#endif
+
+
+bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+    constexpr const std::ios_base::openmode mode = std::ios_base::in | std::ios_base::binary;
+
+#   if defined(_MSC_VER)
+    std::ifstream ifs(toUtf16(fileName), mode);
+    if (!ifs.is_open()) {
+        return false;
+    }
+#   elif defined(__GNUC__)
+    const int fd = _wopen(toUtf16(fileName).c_str(), _O_RDONLY | _O_BINARY);
+    if (fd == -1) {
+        return false;
+    }
+
+    __gnu_cxx::stdio_filebuf<char> buf(fd, mode);
+    std::istream ifs(&buf);
+#   else
+    std::ifstream ifs(fileName, mode);
+    if (!ifs.is_open()) {
+        return false;
+    }
+#   endif
+
+    IStreamWrapper isw(ifs);
+    doc.ParseStream<kParseCommentsFlag | kParseTrailingCommasFlag>(isw);
+
+    return !doc.HasParseError() && doc.IsObject();
+}
+
+
+bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+    constexpr const std::ios_base::openmode mode = std::ios_base::out | std::ios_base::binary | std::ios_base::trunc;
+
+#   if defined(_MSC_VER)
+    std::ofstream ofs(toUtf16(fileName), mode);
+    if (!ofs.is_open()) {
+        return false;
+    }
+#   elif defined(__GNUC__)
+    const int fd = _wopen(toUtf16(fileName).c_str(), _O_WRONLY | _O_BINARY | _O_CREAT | _O_TRUNC);
+    if (fd == -1) {
+        return false;
+    }
+
+    __gnu_cxx::stdio_filebuf<char> buf(fd, mode);
+    std::ostream ofs(&buf);
+#   else
+    std::ofstream ofs(fileName, mode);
+    if (!ofs.is_open()) {
+        return false;
+    }
+#   endif
+
+    OStreamWrapper osw(ofs);
+    PrettyWriter<OStreamWrapper> writer(osw);
+    doc.Accept(writer);
+
+    return true;
+}

src/base/io/log/Log.cpp

@@ -0,0 +1,250 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifdef WIN32
+#   include <winsock2.h>
+#   include <windows.h>
+#endif
+
+
+#include <algorithm>
+#include <string.h>
+#include <string>
+#include <time.h>
+#include <uv.h>
+#include <vector>
+
+
+#include "base/io/log/Log.h"
+#include "base/kernel/interfaces/ILogBackend.h"
+#include "base/tools/Chrono.h"
+
+
+namespace xmrig {
+
+
+static const char *colors_map[] = {
+    RED_BOLD_S,    // EMERG
+    RED_BOLD_S,    // ALERT
+    RED_BOLD_S,    // CRIT
+    RED_S,         // ERR
+    YELLOW_S,      // WARNING
+    WHITE_BOLD_S,  // NOTICE
+    nullptr,       // INFO
+#   ifdef WIN32
+    BLACK_BOLD_S   // DEBUG
+#   else
+    BRIGHT_BLACK_S // DEBUG
+#   endif
+};
+
+
+
+class LogPrivate
+{
+public:
+    inline LogPrivate() :
+        m_buf()
+    {
+        uv_mutex_init(&m_mutex);
+    }
+
+
+    inline ~LogPrivate()
+    {
+        uv_mutex_destroy(&m_mutex);
+
+        for (ILogBackend *backend : m_backends) {
+            delete backend;
+        }
+    }
+
+
+    inline void add(ILogBackend *backend) { m_backends.push_back(backend); }
+
+
+    void print(Log::Level level, const char *fmt, va_list args)
+    {
+        size_t size   = 0;
+        size_t offset = 0;
+
+        lock();
+        timestamp(level, size, offset);
+        color(level, size);
+
+        const int rc = vsnprintf(m_buf + size, sizeof (m_buf) - offset - 32, fmt, args);
+        if (rc < 0) {
+            return unlock();
+        }
+
+        size += std::min(static_cast<size_t>(rc), sizeof (m_buf) - offset - 32);
+        endl(size);
+
+        std::string txt(m_buf);
+        size_t i;
+        while ((i = txt.find(CSI)) != std::string::npos) {
+            txt.erase(i, txt.find('m', i) - i + 1);
+        }
+
+        if (!m_backends.empty()) {
+            for (ILogBackend *backend : m_backends) {
+                backend->print(level, m_buf, offset, size, true);
+                backend->print(level, txt.c_str(), offset, txt.size(), false);
+            }
+        }
+        else {
+            fputs(txt.c_str(), stdout);
+            fflush(stdout);
+        }
+
+        unlock();
+    }
+
+
+private:
+    inline void lock()   { uv_mutex_lock(&m_mutex); }
+    inline void unlock() { uv_mutex_unlock(&m_mutex); }
+
+
+    inline void timestamp(Log::Level level, size_t &size, size_t &offset)
+    {
+        if (level == Log::NONE) {
+            return;
+        }
+
+        const uint64_t ms = Chrono::currentMSecsSinceEpoch();
+        time_t now        = ms / 1000;
+        tm stime;
+
+#       ifdef _WIN32
+        localtime_s(&stime, &now);
+#       else
+        localtime_r(&now, &stime);
+#       endif
+
+        const int rc = snprintf(m_buf, sizeof(m_buf) - 1, "[%d-%02d-%02d %02d:%02d:%02d" BLACK_BOLD(".%03d") "] ",
+                                stime.tm_year + 1900,
+                                stime.tm_mon + 1,
+                                stime.tm_mday,
+                                stime.tm_hour,
+                                stime.tm_min,
+                                stime.tm_sec,
+                                static_cast<int>(ms % 1000)
+                                );
+
+        if (rc > 0) {
+            size = offset = static_cast<size_t>(rc);
+        }
+    }
+
+
+    inline void color(Log::Level level, size_t &size)
+    {
+        if (level == Log::NONE) {
+            return;
+        }
+
+        const char *color = colors_map[level];
+        if (color == nullptr) {
+            return;
+        }
+
+        const size_t s = strlen(color);
+        memcpy(m_buf + size, color, s);
+
+        size += s;
+    }
+
+
+    inline void endl(size_t &size)
+    {
+#       ifdef _WIN32
+        memcpy(m_buf + size, CLEAR "\r\n", 7);
+        size += 6;
+#       else
+        memcpy(m_buf + size, CLEAR "\n", 6);
+        size += 5;
+#       endif
+    }
+
+
+    char m_buf[4096];
+    std::vector<ILogBackend*> m_backends;
+    uv_mutex_t m_mutex;
+};
+
+
+bool Log::colors   = true;
+LogPrivate *Log::d = new LogPrivate();
+
+
+} /* namespace xmrig */
+
+
+
+void xmrig::Log::add(ILogBackend *backend)
+{
+    if (d) {
+        d->add(backend);
+    }
+}
+
+
+void xmrig::Log::destroy()
+{
+    delete d;
+    d = nullptr;
+}
+
+
+void xmrig::Log::print(const char *fmt, ...)
+{
+    if (!d) {
+        return;
+    }
+
+    va_list args;
+    va_start(args, fmt);
+
+    d->print(NONE, fmt, args);
+
+    va_end(args);
+}
+
+
+void xmrig::Log::print(Level level, const char *fmt, ...)
+{
+    if (!d) {
+        return;
+    }
+
+    va_list args;
+    va_start(args, fmt);
+
+    d->print(level, fmt, args);
+
+    va_end(args);
+}

src/base/io/log/Log.h

@@ -0,0 +1,129 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_LOG_H
+#define XMRIG_LOG_H
+
+
+namespace xmrig {
+
+
+class ILogBackend;
+class LogPrivate;
+
+
+class Log
+{
+public:
+    enum Level : int {
+        NONE = -1,
+        EMERG,   // system is unusable
+        ALERT,   // action must be taken immediately
+        CRIT,    // critical conditions
+        ERR,     // error conditions
+        WARNING, // warning conditions
+        NOTICE,  // normal but significant condition
+        INFO,    // informational
+        DEBUG,   // debug-level messages
+    };
+
+    static void add(ILogBackend *backend);
+    static void destroy();
+    static void print(const char *fmt, ...);
+    static void print(Level level, const char *fmt, ...);
+
+    static bool colors;
+
+private:
+    static LogPrivate *d;
+};
+
+
+#define CSI            "\x1B["     // Control Sequence Introducer (ANSI spec name)
+#define CLEAR          CSI "0m"    // all attributes off
+#define BRIGHT_BLACK_S CSI "0;90m" // somewhat MD.GRAY
+#define BLACK_S        CSI "0;30m"
+#define BLACK_BOLD_S   CSI "1;30m" // another name for GRAY
+#define RED_S          CSI "0;31m"
+#define RED_BOLD_S     CSI "1;31m"
+#define GREEN_S        CSI "0;32m"
+#define GREEN_BOLD_S   CSI "1;32m"
+#define YELLOW_S       CSI "0;33m"
+#define YELLOW_BOLD_S  CSI "1;33m"
+#define BLUE_S         CSI "0;34m"
+#define BLUE_BOLD_S    CSI "1;34m"
+#define MAGENTA_S      CSI "0;35m"
+#define MAGENTA_BOLD_S CSI "1;35m"
+#define CYAN_S         CSI "0;36m"
+#define CYAN_BOLD_S    CSI "1;36m"
+#define WHITE_S        CSI "0;37m" // another name for LT.GRAY
+#define WHITE_BOLD_S   CSI "1;37m" // actually white
+
+//color wrappings
+#define BLACK(x)        BLACK_S x CLEAR
+#define BLACK_BOLD(x)   BLACK_BOLD_S x CLEAR
+#define RED(x)          RED_S x CLEAR
+#define RED_BOLD(x)     RED_BOLD_S x CLEAR
+#define GREEN(x)        GREEN_S x CLEAR
+#define GREEN_BOLD(x)   GREEN_BOLD_S x CLEAR
+#define YELLOW(x)       YELLOW_S x CLEAR
+#define YELLOW_BOLD(x)  YELLOW_BOLD_S x CLEAR
+#define BLUE(x)         BLUE_S x CLEAR
+#define BLUE_BOLD(x)    BLUE_BOLD_S x CLEAR
+#define MAGENTA(x)      MAGENTA_S x CLEAR
+#define MAGENTA_BOLD(x) MAGENTA_BOLD_S x CLEAR
+#define CYAN(x)         CYAN_S x CLEAR
+#define CYAN_BOLD(x)    CYAN_BOLD_S x CLEAR
+#define WHITE(x)        WHITE_S x CLEAR
+#define WHITE_BOLD(x)   WHITE_BOLD_S x CLEAR
+
+
+#define LOG_EMERG(x, ...)  xmrig::Log::print(xmrig::Log::EMERG,   x, ##__VA_ARGS__)
+#define LOG_ALERT(x, ...)  xmrig::Log::print(xmrig::Log::ALERT,   x, ##__VA_ARGS__)
+#define LOG_CRIT(x, ...)   xmrig::Log::print(xmrig::Log::CRIT,    x, ##__VA_ARGS__)
+#define LOG_ERR(x, ...)    xmrig::Log::print(xmrig::Log::ERR,     x, ##__VA_ARGS__)
+#define LOG_WARN(x, ...)   xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__)
+#define LOG_NOTICE(x, ...) xmrig::Log::print(xmrig::Log::NOTICE,  x, ##__VA_ARGS__)
+#define LOG_INFO(x, ...)   xmrig::Log::print(xmrig::Log::INFO,    x, ##__VA_ARGS__)
+
+#ifdef APP_DEBUG
+#   define LOG_DEBUG(x, ...) xmrig::Log::print(xmrig::Log::DEBUG, x, ##__VA_ARGS__)
+#else
+#   define LOG_DEBUG(x, ...)
+#endif
+
+#if defined(APP_DEBUG) || defined(APP_DEVEL)
+#   define LOG_DEBUG_ERR(x, ...)  xmrig::Log::print(xmrig::Log::ERR,     x, ##__VA_ARGS__)
+#   define LOG_DEBUG_WARN(x, ...) xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__)
+#else
+#   define LOG_DEBUG_ERR(x, ...)
+#   define LOG_DEBUG_WARN(x, ...)
+#endif
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_LOG_H */

src/base/io/log/backends/ConsoleLog.cpp

@@ -0,0 +1,97 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+
+
+#include "base/tools/Handle.h"
+#include "base/io/log/backends/ConsoleLog.h"
+#include "base/io/log/Log.h"
+
+
+xmrig::ConsoleLog::ConsoleLog() :
+    m_stream(nullptr)
+{
+    m_tty = new uv_tty_t;
+
+    if (uv_tty_init(uv_default_loop(), m_tty, 1, 0) < 0) {
+        Log::colors = false;
+        return;
+    }
+
+    uv_tty_set_mode(m_tty, UV_TTY_MODE_NORMAL);
+    m_stream = reinterpret_cast<uv_stream_t*>(m_tty);
+
+#   ifdef WIN32
+    HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
+    if (handle != INVALID_HANDLE_VALUE) {
+        DWORD mode = 0;
+        if (GetConsoleMode(handle, &mode)) {
+           mode &= ~ENABLE_QUICK_EDIT_MODE;
+           SetConsoleMode(handle, mode | ENABLE_EXTENDED_FLAGS);
+        }
+    }
+#   endif
+}
+
+
+xmrig::ConsoleLog::~ConsoleLog()
+{
+    Handle::close(m_tty);
+}
+
+
+void xmrig::ConsoleLog::print(int, const char *line, size_t, size_t size, bool colors)
+{
+    if (Log::colors != colors) {
+        return;
+    }
+
+#   ifdef _WIN32
+    uv_buf_t buf = uv_buf_init(const_cast<char *>(line), static_cast<unsigned int>(size));
+#   else
+    uv_buf_t buf = uv_buf_init(const_cast<char *>(line), size);
+#   endif
+
+    if (!isWritable()) {
+        fputs(line, stdout);
+        fflush(stdout);
+    }
+    else {
+        uv_try_write(m_stream, &buf, 1);
+    }
+}
+
+
+bool xmrig::ConsoleLog::isWritable() const
+{
+    if (!m_stream || uv_is_writable(m_stream) != 1) {
+        return false;
+    }
+
+    const uv_handle_type type = uv_guess_handle(1);
+    return type == UV_TTY || type == UV_NAMED_PIPE;
+}

src/base/io/log/backends/ConsoleLog.h

@@ -0,0 +1,60 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_CONSOLELOG_H
+#define XMRIG_CONSOLELOG_H
+
+
+typedef struct uv_stream_s uv_stream_t;
+typedef struct uv_tty_s uv_tty_t;
+
+
+#include "base/kernel/interfaces/ILogBackend.h"
+
+
+namespace xmrig {
+
+
+class ConsoleLog : public ILogBackend
+{
+public:
+    ConsoleLog();
+    ~ConsoleLog() override;
+
+protected:
+    void print(int level, const char *line, size_t offset, size_t size, bool colors) override;
+
+private:
+    bool isWritable() const;
+
+    uv_stream_t *m_stream;
+    uv_tty_t *m_tty;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_CONSOLELOG_H */

src/base/io/log/backends/FileLog.cpp

@@ -4,8 +4,10 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -22,17 +24,14 @@
  */
 
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include <uv.h>
 
 
-#include "log/FileLog.h"
+#include "base/io/log/backends/FileLog.h"
 
 
-FileLog::FileLog(const char *fileName)
+xmrig::FileLog::FileLog(const char *fileName)
 {
     uv_fs_t req;
     m_file = uv_fs_open(uv_default_loop(), &req, fileName, O_CREAT | O_APPEND | O_WRONLY, 0644, nullptr);
@@ -40,58 +39,29 @@ FileLog::FileLog(const char *fileName)
 }
 
 
-void FileLog::message(int level, const char* fmt, va_list args)
+void xmrig::FileLog::print(int, const char *line, size_t, size_t size, bool colors)
 {
-    if (m_file < 0) {
+    if (m_file < 0 || colors) {
         return;
     }
 
-    time_t now = time(nullptr);
-    tm stime;
-
 #   ifdef _WIN32
-    localtime_s(&stime, &now);
+    uv_buf_t buf = uv_buf_init(strdup(line), static_cast<unsigned int>(size));
 #   else
-    localtime_r(&now, &stime);
+    uv_buf_t buf = uv_buf_init(strdup(line), size);
 #   endif
 
-    char *buf = new char[512];
-    int size = snprintf(buf, 23, "[%d-%02d-%02d %02d:%02d:%02d] ",
-                        stime.tm_year + 1900,
-                        stime.tm_mon + 1,
-                        stime.tm_mday,
-                        stime.tm_hour,
-                        stime.tm_min,
-                        stime.tm_sec);
+    uv_fs_t *req = new uv_fs_t;
+    req->data = buf.base;
 
-    size = vsnprintf(buf + size, 512 - size - 1, fmt, args) + size;
-    buf[size] = '\n';
-
-    write(buf, size + 1);
+    uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, -1, FileLog::onWrite);
 }
 
 
-void FileLog::text(const char* fmt, va_list args)
-{
-    message(0, fmt, args);
-}
-
-
-
-void FileLog::onWrite(uv_fs_t *req)
+void xmrig::FileLog::onWrite(uv_fs_t *req)
 {
     delete [] static_cast<char *>(req->data);
 
     uv_fs_req_cleanup(req);
     delete req;
 }
-
-
-void FileLog::write(char *data, size_t size)
-{
-    uv_buf_t buf = uv_buf_init(data, (unsigned int) size);
-    uv_fs_t *req = new uv_fs_t;
-    req->data = buf.base;
-
-    uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, 0, FileLog::onWrite);
-}

src/base/io/log/backends/FileLog.h

@@ -0,0 +1,58 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_FILELOG_H
+#define XMRIG_FILELOG_H
+
+
+typedef struct uv_fs_s uv_fs_t;
+
+
+#include "base/kernel/interfaces/ILogBackend.h"
+
+
+namespace xmrig {
+
+
+class FileLog : public ILogBackend
+{
+public:
+    FileLog(const char *fileName);
+
+
+protected:
+    void print(int level, const char *line, size_t offset, size_t size, bool colors) override;
+
+private:
+    static void onWrite(uv_fs_t *req);
+
+    int m_file;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_FILELOG_H */

src/base/io/log/backends/SysLog.cpp

@@ -0,0 +1,53 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <syslog.h>
+
+
+#include "base/io/log/backends/SysLog.h"
+#include "version.h"
+
+
+xmrig::SysLog::SysLog()
+{
+    openlog(APP_ID, LOG_PID, LOG_USER);
+}
+
+
+xmrig::SysLog::~SysLog()
+{
+    closelog();
+}
+
+
+void xmrig::SysLog::print(int level, const char *line, size_t offset, size_t, bool colors)
+{
+    if (colors) {
+        return;
+    }
+
+    syslog(level == -1 ? LOG_INFO : level, "%s", line + offset);
+}

src/base/io/log/backends/SysLog.h

@@ -0,0 +1,50 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2019      Spudz76     <https://github.com/Spudz76>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_SYSLOG_H
+#define XMRIG_SYSLOG_H
+
+
+#include "base/kernel/interfaces/ILogBackend.h"
+
+
+namespace xmrig {
+
+
+class SysLog : public ILogBackend
+{
+public:
+    SysLog();
+    ~SysLog();
+
+protected:
+    void print(int level, const char *line, size_t offset, size_t size, bool colors) override;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_SYSLOG_H */

src/base/kernel/Base.cpp

@@ -0,0 +1,290 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <assert.h>
+#include <memory>
+
+
+#include "base/io/json/Json.h"
+#include "base/io/json/JsonChain.h"
+#include "base/io/log/backends/ConsoleLog.h"
+#include "base/io/log/backends/FileLog.h"
+#include "base/io/log/Log.h"
+#include "base/io/Watcher.h"
+#include "base/kernel/Base.h"
+#include "base/kernel/interfaces/IBaseListener.h"
+#include "base/kernel/Process.h"
+#include "common/Platform.h"
+#include "core/config/Config.h"
+#include "core/config/ConfigTransform.h"
+
+
+#ifdef HAVE_SYSLOG_H
+#   include "base/io/log/backends/SysLog.h"
+#endif
+
+
+#ifdef XMRIG_FEATURE_API
+#   include "api/Api.h"
+#endif
+
+
+#ifdef XMRIG_FEATURE_EMBEDDED_CONFIG
+#   include "core/config/Config_default.h"
+#endif
+
+
+class xmrig::BasePrivate
+{
+public:
+    inline BasePrivate(Process *process) :
+        api(nullptr),
+        config(nullptr),
+        process(process),
+        watcher(nullptr)
+    {}
+
+
+    inline ~BasePrivate()
+    {
+#       ifdef XMRIG_FEATURE_API
+        delete api;
+#       endif
+
+        delete config;
+        delete watcher;
+    }
+
+
+    inline bool read(const JsonChain &chain, std::unique_ptr<Config> &config)
+    {
+        config = std::unique_ptr<Config>(new Config());
+
+        return config->read(chain, chain.fileName());
+    }
+
+
+    inline Config *load()
+    {
+        JsonChain chain;
+        ConfigTransform transform;
+        std::unique_ptr<Config> config;
+
+        transform.load(chain, process, transform);
+
+        if (read(chain, config)) {
+            return config.release();
+        }
+
+        chain.addFile(process->location(Process::ExeLocation, "config.json"));
+
+        if (read(chain, config)) {
+            return config.release();
+        }
+
+#       ifdef XMRIG_FEATURE_EMBEDDED_CONFIG
+        chain.addRaw(default_config);
+
+        if (read(chain, config)) {
+            return config.release();
+        }
+#       endif
+
+        return nullptr;
+    }
+
+
+    inline void replace(Config *newConfig)
+    {
+        Config *previousConfig = config;
+        config = newConfig;
+
+        for (IBaseListener *listener : listeners) {
+            listener->onConfigChanged(config, previousConfig);
+        }
+
+        delete previousConfig;
+    }
+
+
+    Api *api;
+    Config *config;
+    Process *process;
+    std::vector<IBaseListener *> listeners;
+    Watcher *watcher;
+};
+
+
+xmrig::Base::Base(Process *process)
+    : d_ptr(new BasePrivate(process))
+{
+}
+
+
+xmrig::Base::~Base()
+{
+    delete d_ptr;
+}
+
+
+bool xmrig::Base::isReady() const
+{
+    return d_ptr->config != nullptr;
+}
+
+
+int xmrig::Base::init()
+{
+    d_ptr->config = d_ptr->load();
+
+    if (!d_ptr->config) {
+        LOG_EMERG("No valid configuration found. Exiting.");
+
+        return 1;
+    }
+
+#   ifdef XMRIG_FEATURE_API
+    d_ptr->api = new Api(this);
+#   endif
+
+    Platform::init(config()->userAgent());
+
+#   ifndef XMRIG_PROXY_PROJECT
+    Platform::setProcessPriority(config()->priority());
+#   endif
+
+    if (!config()->isBackground()) {
+        Log::add(new ConsoleLog());
+    }
+
+    if (config()->logFile()) {
+        Log::add(new FileLog(config()->logFile()));
+    }
+
+#   ifdef HAVE_SYSLOG_H
+    if (config()->isSyslog()) {
+        Log::add(new SysLog());
+    }
+#   endif
+
+    return 0;
+}
+
+
+void xmrig::Base::start()
+{
+#   ifdef XMRIG_FEATURE_API
+    api()->start();
+#   endif
+
+    if (config()->isShouldSave()) {
+        config()->save();
+    }
+
+    if (config()->isWatch()) {
+        d_ptr->watcher = new Watcher(config()->fileName(), this);
+    }
+}
+
+
+void xmrig::Base::stop()
+{
+#   ifdef XMRIG_FEATURE_API
+    api()->stop();
+#   endif
+
+    delete d_ptr->watcher;
+    d_ptr->watcher = nullptr;
+}
+
+
+xmrig::Api *xmrig::Base::api() const
+{
+    assert(d_ptr->api != nullptr);
+
+    return d_ptr->api;
+}
+
+
+bool xmrig::Base::reload(const rapidjson::Value &json)
+{
+    JsonReader reader(json);
+    if (reader.isEmpty()) {
+        return false;
+    }
+
+    Config *config = new Config();
+    if (!config->read(reader, d_ptr->config->fileName())) {
+        delete config;
+
+        return false;
+    }
+
+    const bool saved = config->save();
+
+    if (config->isWatch() && d_ptr->watcher && saved) {
+        delete config;
+
+        return true;
+    }
+
+    d_ptr->replace(config);
+
+    return true;
+}
+
+
+xmrig::Config *xmrig::Base::config() const
+{
+    assert(d_ptr->config != nullptr);
+
+    return d_ptr->config;
+}
+
+
+void xmrig::Base::addListener(IBaseListener *listener)
+{
+    d_ptr->listeners.push_back(listener);
+}
+
+
+void xmrig::Base::onFileChanged(const String &fileName)
+{
+    LOG_WARN("\"%s\" was changed, reloading configuration", fileName.data());
+
+    JsonChain chain;
+    chain.addFile(fileName);
+
+    Config *config = new Config();
+
+    if (!config->read(chain, chain.fileName())) {
+        LOG_ERR("reloading failed");
+
+        delete config;
+        return;
+    }
+
+    d_ptr->replace(config);
+}

src/base/kernel/Base.h

@@ -0,0 +1,71 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_BASE_H
+#define XMRIG_BASE_H
+
+
+#include "base/kernel/interfaces/IConfigListener.h"
+#include "base/kernel/interfaces/IWatcherListener.h"
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class Api;
+class Config;
+class BasePrivate;
+class IBaseListener;
+class Process;
+
+
+class Base : public IWatcherListener
+{
+public:
+    Base(Process *process);
+    ~Base() override;
+
+    virtual bool isReady() const;
+    virtual int init();
+    virtual void start();
+    virtual void stop();
+
+    Api *api() const;
+    bool reload(const rapidjson::Value &json);
+    Config *config() const;
+    void addListener(IBaseListener *listener);
+
+protected:
+    void onFileChanged(const String &fileName) override;
+
+private:
+    BasePrivate *d_ptr;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_BASE_H */

src/base/kernel/Entry.cpp

@@ -0,0 +1,112 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+#include <uv.h>
+
+
+#ifdef XMRIG_FEATURE_TLS
+#   include <openssl/opensslv.h>
+#endif
+
+
+#include "base/kernel/Entry.h"
+#include "base/kernel/Process.h"
+#include "core/config/usage.h"
+#include "version.h"
+
+
+static int showVersion()
+{
+    printf(APP_NAME " " APP_VERSION "\n built on " __DATE__
+
+#   if defined(__clang__)
+    " with clang " __clang_version__);
+#   elif defined(__GNUC__)
+    " with GCC");
+    printf(" %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+#   elif defined(_MSC_VER)
+    " with MSVC");
+    printf(" %d", MSVC_VERSION);
+#   else
+    );
+#   endif
+
+    printf("\n features:"
+#   if defined(__i386__) || defined(_M_IX86)
+    " 32-bit"
+#   elif defined(__x86_64__) || defined(_M_AMD64)
+    " 64-bit"
+#   endif
+
+#   if defined(__AES__) || defined(_MSC_VER)
+    " AES"
+#   endif
+    "\n");
+
+    printf("\nlibuv/%s\n", uv_version_string());
+
+#   if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
+    {
+        constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
+        printf("OpenSSL/%.*s\n", static_cast<int>(strchr(v, ' ') - v), v);
+    }
+#   endif
+
+    return 0;
+}
+
+
+xmrig::Entry::Id xmrig::Entry::get(const Process &process)
+{
+    const Arguments &args = process.arguments();
+    if (args.hasArg("-h") || args.hasArg("--help")) {
+         return Usage;
+    }
+
+    if (args.hasArg("-V") || args.hasArg("--version")) {
+         return Version;
+    }
+
+    return Default;
+}
+
+
+int xmrig::Entry::exec(const Process &, Id id)
+{
+    switch (id) {
+    case Usage:
+        printf(usage);
+        return 0;
+
+    case Version:
+        return showVersion();
+
+    default:
+        break;
+    }
+
+    return 1;
+}

src/base/kernel/Entry.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,38 +22,31 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DOUBLEWORKER_H__
-#define __DOUBLEWORKER_H__
+#ifndef XMRIG_ENTRY_H
+#define XMRIG_ENTRY_H
 
 
-#include "align.h"
-#include "net/Job.h"
-#include "net/JobResult.h"
-#include "workers/Worker.h"
+namespace xmrig {
 
 
-class Handle;
+class Process;
 
 
-class DoubleWorker : public Worker
+class Entry
 {
 public:
-    DoubleWorker(Handle *handle);
-    ~DoubleWorker();
+    enum Id {
+        Default,
+        Usage,
+        Version
+    };
 
-    void start() override;
-
-private:
-    bool resume(const Job &job);
-    void consumeJob();
-    void save(const Job &job);
-
-    class State;
-
-    uint8_t m_hash[64];
-    State *m_state;
-    State *m_pausedState;
+    static Id get(const Process &process);
+    static int exec(const Process &process, Id id);
 };
 
 
-#endif /* __SINGLEWORKER_H__ */
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_ENTRY_H */

src/base/kernel/Process.cpp

@@ -0,0 +1,102 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+#include <time.h>
+
+
+#include "base/kernel/Process.h"
+#include "base/tools/Chrono.h"
+
+
+static size_t location(xmrig::Process::Location location, char *buf, size_t max)
+{
+    using namespace xmrig;
+
+    size_t size = max;
+    if (location == Process::ExeLocation) {
+        return uv_exepath(buf, &size) < 0 ? 0 : size;
+    }
+
+    if (location == Process::CwdLocation) {
+        return uv_cwd(buf, &size) < 0 ? 0 : size;
+    }
+
+    return 0;
+}
+
+
+xmrig::Process::Process(int argc, char **argv) :
+    m_arguments(argc, argv)
+{
+    srand(static_cast<unsigned int>(Chrono::currentMSecsSinceEpoch() ^ reinterpret_cast<uintptr_t>(this)));
+}
+
+
+xmrig::Process::~Process()
+{
+}
+
+
+xmrig::String xmrig::Process::location(Location location, const char *fileName) const
+{
+    constexpr const size_t max = 520;
+
+    char *buf   = new char[max]();
+    size_t size = ::location(location, buf, max);
+
+    if (size == 0) {
+        delete [] buf;
+
+        return String();
+    }
+
+    if (fileName == nullptr) {
+        return buf;
+    }
+
+    if (location == ExeLocation) {
+        char *p = strrchr(buf, kDirSeparator);
+
+        if (p == nullptr) {
+            delete [] buf;
+
+            return String();
+        }
+
+        size = static_cast<size_t>(p - buf);
+    }
+
+    if ((size + strlen(fileName) + 2) >= max) {
+        delete [] buf;
+
+        return String();
+    }
+
+    buf[size] = kDirSeparator;
+    strcpy(buf + size + 1, fileName);
+
+    return buf;
+}

src/base/kernel/Process.h

@@ -0,0 +1,64 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_PROCESS_H
+#define XMRIG_PROCESS_H
+
+
+#include "base/tools/Arguments.h"
+
+
+namespace xmrig {
+
+
+class Process
+{
+public:
+    enum Location {
+        ExeLocation,
+        CwdLocation
+    };
+
+#   ifdef WIN32
+    constexpr const static char kDirSeparator = '\\';
+#   else
+    constexpr const static char kDirSeparator = '/';
+#   endif
+
+    Process(int argc, char **argv);
+    ~Process();
+
+    String location(Location location, const char *fileName = nullptr) const;
+
+    inline const Arguments &arguments() const { return m_arguments; }
+
+private:
+    Arguments m_arguments;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_PROCESS_H */

src/base/kernel/Signals.cpp

@@ -0,0 +1,74 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+
+
+#include "base/kernel/interfaces/ISignalListener.h"
+#include "base/kernel/Signals.h"
+#include "base/tools/Handle.h"
+
+
+static const int signums[xmrig::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM };
+
+
+xmrig::Signals::Signals(ISignalListener *listener)
+    : m_listener(listener)
+{
+    for (size_t i = 0; i < kSignalsCount; ++i) {
+        uv_signal_t *signal = new uv_signal_t;
+        signal->data        = this;
+
+        m_signals[i] = signal;
+
+        uv_signal_init(uv_default_loop(), signal);
+        uv_signal_start(signal, Signals::onSignal, signums[i]);
+    }
+}
+
+
+xmrig::Signals::~Signals()
+{
+    stop();
+}
+
+
+void xmrig::Signals::stop()
+{
+    if (!m_signals[0]) {
+        return;
+    }
+
+    for (size_t i = 0; i < kSignalsCount; ++i) {
+        Handle::close(m_signals[i]);
+        m_signals[i] = nullptr;
+    }
+}
+
+
+void xmrig::Signals::onSignal(uv_signal_t *handle, int signum)
+{
+    static_cast<Signals *>(handle->data)->m_listener->onSignal(signum);
+}

src/base/kernel/Signals.h

@@ -0,0 +1,64 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_SIGNALS_H
+#define XMRIG_SIGNALS_H
+
+
+#include <stddef.h>
+
+
+typedef struct uv_signal_s uv_signal_t;
+
+
+namespace xmrig {
+
+
+class ISignalListener;
+
+
+class Signals
+{
+public:
+    constexpr static const size_t kSignalsCount = 3;
+
+    Signals(ISignalListener *listener);
+    ~Signals();
+
+    void stop();
+
+private:
+    void close(int signum);
+
+    static void onSignal(uv_signal_t *handle, int signum);
+
+    ISignalListener *m_listener;
+    uv_signal_t *m_signals[kSignalsCount];
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_SIGNALS_H */

src/base/kernel/config/BaseConfig.cpp

@@ -0,0 +1,196 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <uv.h>
+
+
+#ifdef XMRIG_FEATURE_TLS
+#   include <openssl/opensslv.h>
+#endif
+
+
+#ifdef XMRIG_AMD_PROJECT
+#   if defined(__APPLE__)
+#       include <OpenCL/cl.h>
+#   else
+#       include "3rdparty/CL/cl.h"
+#   endif
+#endif
+
+
+#ifdef XMRIG_NVIDIA_PROJECT
+#   include "nvidia/cryptonight.h"
+#endif
+
+
+#include "base/io/json/Json.h"
+#include "base/io/log/Log.h"
+#include "base/kernel/config/BaseConfig.h"
+#include "base/kernel/interfaces/IJsonReader.h"
+#include "donate.h"
+#include "rapidjson/document.h"
+#include "rapidjson/filewritestream.h"
+#include "rapidjson/prettywriter.h"
+#include "version.h"
+
+
+xmrig::BaseConfig::BaseConfig() :
+    m_algorithm(CRYPTONIGHT, VARIANT_AUTO),
+    m_autoSave(true),
+    m_background(false),
+    m_dryRun(false),
+    m_syslog(false),
+    m_upgrade(false),
+    m_watch(true)
+{
+}
+
+
+void xmrig::BaseConfig::printVersions()
+{
+    char buf[256] = { 0 };
+
+#   if defined(__clang__)
+    snprintf(buf, sizeof buf, "clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
+#   elif defined(__GNUC__)
+    snprintf(buf, sizeof buf, "gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+#   elif defined(_MSC_VER)
+    snprintf(buf, sizeof buf, "MSVC/%d", MSVC_VERSION);
+#   endif
+
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s"), "ABOUT", APP_NAME, APP_VERSION, buf);
+
+#   if defined(XMRIG_AMD_PROJECT)
+#   if CL_VERSION_2_0
+    const char *ocl = "2.0";
+#   elif CL_VERSION_1_2
+    const char *ocl = "1.2";
+#   elif CL_VERSION_1_1
+    const char *ocl = "1.1";
+#   elif CL_VERSION_1_0
+    const char *ocl = "1.0";
+#   else
+    const char *ocl = "0.0";
+#   endif
+    int length = snprintf(buf, sizeof buf, "OpenCL/%s ", ocl);
+#   elif defined(XMRIG_NVIDIA_PROJECT)
+    const int cudaVersion = cuda_get_runtime_version();
+    int length = snprintf(buf, sizeof buf, "CUDA/%d.%d ", cudaVersion / 1000, cudaVersion % 100);
+#   else
+    memset(buf, 0, 16);
+
+#   if defined(XMRIG_FEATURE_HTTP) || defined(XMRIG_FEATURE_TLS)
+    int length = 0;
+#   endif
+#   endif
+
+#   if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
+    {
+        constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
+        length += snprintf(buf + length, (sizeof buf) - length, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
+    }
+#   endif
+
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s"), "LIBS", uv_version_string(), buf);
+}
+
+
+bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
+{
+    m_fileName = fileName;
+
+    if (reader.isEmpty()) {
+        return false;
+    }
+
+    m_autoSave     = reader.getBool("autosave", m_autoSave);
+    m_background   = reader.getBool("background", m_background);
+    m_dryRun       = reader.getBool("dry-run", m_dryRun);
+    m_syslog       = reader.getBool("syslog", m_syslog);
+    m_watch        = reader.getBool("watch", m_watch);
+    Log::colors    = reader.getBool("colors", Log::colors);
+    m_logFile      = reader.getString("log-file");
+    m_userAgent    = reader.getString("user-agent");
+
+    setPrintTime(reader.getUint("print-time", 60));
+
+    const rapidjson::Value &api = reader.getObject("api");
+    if (api.IsObject()) {
+        m_apiId       = Json::getString(api, "id");
+        m_apiWorkerId = Json::getString(api, "worker-id");
+    }
+
+#   ifdef XMRIG_DEPRECATED
+    if (api.IsObject() && api.HasMember("port")) {
+        m_upgrade = true;
+        m_http.load(api);
+        m_http.setEnabled(Json::getUint(api, "port") > 0);
+        m_http.setHost("0.0.0.0");
+    }
+    else {
+        m_http.load(reader.getObject("http"));
+    }
+#   else
+    m_http.load(chain.getObject("http"));
+#   endif
+
+    m_algorithm.parseAlgorithm(reader.getString("algo", "cn"));
+
+    m_pools.load(reader.getArray("pools"));
+    m_pools.setDonateLevel(reader.getInt("donate-level", kDefaultDonateLevel));
+    m_pools.setProxyDonate(reader.getInt("donate-over-proxy", Pools::PROXY_DONATE_AUTO));
+    m_pools.setRetries(reader.getInt("retries"));
+    m_pools.setRetryPause(reader.getInt("retry-pause"));
+
+    if (!m_algorithm.isValid()) {
+        return false;
+    }
+
+    m_pools.adjust(m_algorithm);
+
+    return m_pools.active() > 0;
+}
+
+
+bool xmrig::BaseConfig::save()
+{
+    if (m_fileName.isNull()) {
+        return false;
+    }
+
+    rapidjson::Document doc;
+    getJSON(doc);
+
+    if (Json::save(m_fileName, doc)) {
+        LOG_NOTICE("configuration saved to: \"%s\"", m_fileName.data());
+        return true;
+    }
+
+    return false;
+}

src/base/kernel/config/BaseConfig.h

@@ -0,0 +1,96 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_BASECONFIG_H
+#define XMRIG_BASECONFIG_H
+
+
+#include "base/kernel/interfaces/IConfig.h"
+#include "base/net/http/Http.h"
+#include "base/net/stratum/Pools.h"
+#include "common/xmrig.h"
+
+
+struct option;
+
+
+namespace xmrig {
+
+
+class IJsonReader;
+
+
+class BaseConfig : public IConfig
+{
+public:
+    BaseConfig();
+
+    inline bool isAutoSave() const                 { return m_autoSave; }
+    inline bool isBackground() const               { return m_background; }
+    inline bool isDryRun() const                   { return m_dryRun; }
+    inline bool isSyslog() const                   { return m_syslog; }
+    inline const char *logFile() const             { return m_logFile.data(); }
+    inline const char *userAgent() const           { return m_userAgent.data(); }
+    inline const Http &http() const                { return m_http; }
+    inline const Pools &pools() const              { return m_pools; }
+    inline const String &apiId() const             { return m_apiId; }
+    inline const String &apiWorkerId() const       { return m_apiWorkerId; }
+    inline uint32_t printTime() const              { return m_printTime; }
+
+    inline bool isWatch() const override                   { return m_watch && !m_fileName.isNull(); }
+    inline const Algorithm &algorithm() const override     { return m_algorithm; }
+    inline const String &fileName() const override         { return m_fileName; }
+    inline void setFileName(const char *fileName) override { m_fileName = fileName; }
+
+    bool read(const IJsonReader &reader, const char *fileName) override;
+    bool save() override;
+
+    void printVersions();
+
+protected:
+    Algorithm m_algorithm;
+    bool m_autoSave;
+    bool m_background;
+    bool m_dryRun;
+    bool m_syslog;
+    bool m_upgrade;
+    bool m_watch;
+    Http m_http;
+    Pools m_pools;
+    String m_apiId;
+    String m_apiWorkerId;
+    String m_fileName;
+    String m_logFile;
+    String m_userAgent;
+    uint32_t m_printTime;
+
+private:
+    inline void setPrintTime(uint32_t printTime) { if (printTime <= 3600) { m_printTime = printTime; } }
+};
+
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_BASECONFIG_H */

src/base/kernel/config/BaseTransform.cpp

@@ -0,0 +1,279 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+
+
+#ifdef _MSC_VER
+#   include "getopt/getopt.h"
+#else
+#   include <getopt.h>
+#endif
+
+
+#include "base/kernel/config/BaseTransform.h"
+#include "base/kernel/Process.h"
+#include "base/io/log/Log.h"
+#include "base/kernel/interfaces/IConfig.h"
+#include "base/io/json/JsonChain.h"
+#include "core/config/Config_platform.h"
+
+
+namespace xmrig
+{
+
+static const char *kApi   = "api";
+static const char *kHttp  = "http";
+static const char *kPools = "pools";
+
+}
+
+
+xmrig::BaseTransform::BaseTransform()
+{
+}
+
+
+void xmrig::BaseTransform::load(JsonChain &chain, Process *process, IConfigTransform &transform)
+{
+    using namespace rapidjson;
+
+    int key;
+    int argc    = process->arguments().argc();
+    char **argv = process->arguments().argv();
+
+    Document doc(kObjectType);
+
+    while (1) {
+        key = getopt_long(argc, argv, short_options, options, nullptr);
+        if (key < 0) {
+            break;
+        }
+
+        if (key == IConfig::ConfigKey) {
+            chain.add(std::move(doc));
+            chain.addFile(optarg);
+
+            doc = Document(kObjectType);
+        }
+        else {
+            transform.transform(doc, key, optarg);
+        }
+    }
+
+    if (optind < argc) {
+        LOG_WARN("%s: unsupported non-option argument '%s'", argv[0], argv[optind]);
+    }
+
+    chain.add(std::move(doc));
+}
+
+
+void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const char *arg)
+{
+    switch (key) {
+    case IConfig::AlgorithmKey: /* --algo */
+        return set(doc, "algo", arg);
+
+    case IConfig::UserpassKey: /* --userpass */
+        {
+            const char *p = strrchr(arg, ':');
+            if (!p) {
+                return;
+            }
+
+            char *user = new char[p - arg + 1]();
+            strncpy(user, arg, static_cast<size_t>(p - arg));
+
+            add<const char *>(doc, kPools, "user", user);
+            add(doc, kPools, "pass", p + 1);
+            delete [] user;
+        }
+        break;
+
+    case IConfig::UrlKey: /* --url */
+        return add(doc, kPools, "url", arg, true);
+
+    case IConfig::UserKey: /* --user */
+        return add(doc, kPools, "user", arg);
+
+    case IConfig::PasswordKey: /* --pass */
+        return add(doc, kPools, "pass", arg);
+
+    case IConfig::RigIdKey: /* --rig-id */
+        return add(doc, kPools, "rig-id", arg);
+
+    case IConfig::FingerprintKey: /* --tls-fingerprint */
+        return add(doc, kPools, "tls-fingerprint", arg);
+
+    case IConfig::VariantKey: /* --variant */
+        return add(doc, kPools, "variant", arg);
+
+    case IConfig::LogFileKey: /* --log-file */
+        return set(doc, "log-file", arg);
+
+#   ifdef XMRIG_DEPRECATED
+    case IConfig::ApiAccessTokenKey: /* --api-access-token */
+        fputs("option \"--api-access-token\" deprecated, use \"--http-access-token\" instead.\n", stderr);
+        fflush(stdout);
+        return set(doc, kHttp, "access-token", arg);
+#   endif
+
+    case IConfig::HttpAccessTokenKey: /* --http-access-token */
+        return set(doc, kHttp, "access-token", arg);
+
+    case IConfig::HttpHostKey: /* --http-host */
+        return set(doc, kHttp, "host", arg);
+
+    case IConfig::ApiWorkerIdKey: /* --api-worker-id */
+        return set(doc, kApi, "worker-id", arg);
+
+    case IConfig::ApiIdKey: /* --api-id */
+        return set(doc, kApi, "id", arg);
+
+    case IConfig::UserAgentKey: /* --user-agent */
+        return set(doc, "user-agent", arg);
+
+    case IConfig::RetriesKey:     /* --retries */
+    case IConfig::RetryPauseKey:  /* --retry-pause */
+    case IConfig::PrintTimeKey:   /* --print-time */
+    case IConfig::HttpPort:       /* --http-port */
+    case IConfig::DonateLevelKey: /* --donate-level */
+    case IConfig::DaemonPollKey:  /* --daemon-poll-interval */
+#   ifdef XMRIG_DEPRECATED
+    case IConfig::ApiPort:       /* --api-port */
+#   endif
+        return transformUint64(doc, key, static_cast<uint64_t>(strtol(arg, nullptr, 10)));
+
+    case IConfig::BackgroundKey:  /* --background */
+    case IConfig::SyslogKey:      /* --syslog */
+    case IConfig::KeepAliveKey:   /* --keepalive */
+    case IConfig::NicehashKey:    /* --nicehash */
+    case IConfig::TlsKey:         /* --tls */
+    case IConfig::DryRunKey:      /* --dry-run */
+    case IConfig::HttpEnabledKey: /* --http-enabled */
+    case IConfig::DaemonKey:      /* --daemon */
+        return transformBoolean(doc, key, true);
+
+    case IConfig::ColorKey:          /* --no-color */
+    case IConfig::HttpRestrictedKey: /* --http-no-restricted */
+#   ifdef XMRIG_DEPRECATED
+    case IConfig::ApiRestrictedKey: /* --api-no-restricted */
+    case IConfig::ApiIPv6Key:       /* --api-ipv6 */
+#   endif
+        return transformBoolean(doc, key, false);
+
+    default:
+        break;
+    }
+}
+
+
+void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, bool enable)
+{
+    switch (key) {
+    case IConfig::BackgroundKey: /* --background */
+        return set(doc, "background", enable);
+
+    case IConfig::SyslogKey: /* --syslog */
+        return set(doc, "syslog", enable);
+
+    case IConfig::KeepAliveKey: /* --keepalive */
+        return add(doc, kPools, "keepalive", enable);
+
+    case IConfig::TlsKey: /* --tls */
+        return add(doc, kPools, "tls", enable);
+
+    case IConfig::DaemonKey: /* --daemon */
+        return add(doc, kPools, "daemon", enable);
+
+#   ifndef XMRIG_PROXY_PROJECT
+    case IConfig::NicehashKey: /* --nicehash */
+        return add<bool>(doc, kPools, "nicehash", enable);
+#   endif
+
+    case IConfig::ColorKey: /* --no-color */
+        return set(doc, "colors", enable);
+
+#   ifdef XMRIG_DEPRECATED
+    case IConfig::ApiIPv6Key: /* --api-ipv6 */
+        break;
+
+    case IConfig::ApiRestrictedKey: /* --api-no-restricted */
+        fputs("option \"--api-no-restricted\" deprecated, use \"--http-no-restricted\" instead.\n", stderr);
+        fflush(stdout);
+        return set(doc, kHttp, "restricted", enable);
+#   endif
+
+    case IConfig::HttpRestrictedKey: /* --http-no-restricted */
+        return set(doc, kHttp, "restricted", enable);
+
+    case IConfig::HttpEnabledKey: /* --http-enabled */
+        return set(doc, kHttp, "enabled", enable);
+
+    case IConfig::DryRunKey: /* --dry-run */
+        return set(doc, "dry-run", enable);
+
+    default:
+        break;
+    }
+}
+
+
+void xmrig::BaseTransform::transformUint64(rapidjson::Document &doc, int key, uint64_t arg)
+{
+    switch (key) {
+    case IConfig::RetriesKey: /* --retries */
+        return set(doc, "retries", arg);
+
+    case IConfig::RetryPauseKey: /* --retry-pause */
+        return set(doc, "retry-pause", arg);
+
+    case IConfig::DonateLevelKey: /* --donate-level */
+        return set(doc, "donate-level", arg);
+
+    case IConfig::ProxyDonateKey: /* --donate-over-proxy */
+        return set(doc, "donate-over-proxy", arg);
+
+#   ifdef XMRIG_DEPRECATED
+    case IConfig::ApiPort: /* --api-port */
+        fputs("option \"--api-port\" deprecated, use \"--http-port\" instead.\n", stderr);
+        fflush(stdout);
+        return set(doc, kHttp, "port", arg);
+#   endif
+
+    case IConfig::HttpPort: /* --http-port */
+        return set(doc, kHttp, "port", arg);
+
+    case IConfig::PrintTimeKey: /* --print-time */
+        return set(doc, "print-time", arg);
+
+    case IConfig::DaemonPollKey:  /* --daemon-poll-interval */
+        return add(doc, kPools, "daemon-poll-interval", arg);
+
+    default:
+        break;
+    }
+}

src/base/kernel/config/BaseTransform.h

@@ -0,0 +1,123 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_BASETRANSFORM_H
+#define XMRIG_BASETRANSFORM_H
+
+
+#include "base/kernel/interfaces/IConfigTransform.h"
+#include "rapidjson/document.h"
+
+
+struct option;
+
+
+namespace xmrig {
+
+
+class IConfigTransform;
+class JsonChain;
+class Process;
+
+
+class BaseTransform : public IConfigTransform
+{
+public:
+    BaseTransform();
+
+    static void load(JsonChain &chain, Process *process, IConfigTransform &transform);
+
+protected:
+    void transform(rapidjson::Document &doc, int key, const char *arg) override;
+
+
+    template<typename T>
+    inline void set(rapidjson::Document &doc, const char *key, T value) { set<T>(doc, doc, key, value); }
+
+
+    template<typename T>
+    inline void set(rapidjson::Document &doc, const char *objKey, const char *key, T value)
+    {
+        if (!doc.HasMember(objKey)) {
+            doc.AddMember(rapidjson::StringRef(objKey), rapidjson::kObjectType, doc.GetAllocator());
+        }
+
+        set<T>(doc, doc[objKey], key, value);
+    }
+
+
+    template<typename T>
+    inline void add(rapidjson::Document &doc, const char *arrayKey, const char *key, T value, bool force = false)
+    {
+        auto &allocator = doc.GetAllocator();
+
+        if (!doc.HasMember(arrayKey)) {
+            doc.AddMember(rapidjson::StringRef(arrayKey), rapidjson::kArrayType, allocator);
+        }
+
+        rapidjson::Value &array = doc[arrayKey];
+        if (force || array.Size() == 0) {
+            array.PushBack(rapidjson::kObjectType, allocator);
+        }
+
+        set<T>(doc, array[array.Size() - 1], key, value);
+    }
+
+
+    template<typename T>
+    inline void set(rapidjson::Document &doc, rapidjson::Value &obj, const char *key, T value)
+    {
+        if (obj.HasMember(key)) {
+            obj[key] = value;
+        }
+        else {
+            obj.AddMember(rapidjson::StringRef(key), value, doc.GetAllocator());
+        }
+    }
+
+
+private:
+    void transformBoolean(rapidjson::Document &doc, int key, bool enable);
+    void transformUint64(rapidjson::Document &doc, int key, uint64_t arg);
+};
+
+
+template<>
+inline void BaseTransform::set(rapidjson::Document &doc, rapidjson::Value &obj, const char *key, const char *value)
+{
+    auto &allocator = doc.GetAllocator();
+
+    if (obj.HasMember(key)) {
+        obj[key] = rapidjson::Value(value, allocator);
+    }
+    else {
+        obj.AddMember(rapidjson::StringRef(key), rapidjson::Value(value, allocator), allocator);
+    }
+}
+
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_BASETRANSFORM_H */

src/base/kernel/interfaces/IBaseListener.h

@@ -0,0 +1,47 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_IBASELISTENER_H
+#define XMRIG_IBASELISTENER_H
+
+
+namespace xmrig {
+
+
+class Config;
+
+
+class IBaseListener
+{
+public:
+    virtual ~IBaseListener() = default;
+
+    virtual void onConfigChanged(Config *config, Config *previousConfig) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_IBASELISTENER_H

src/base/kernel/interfaces/IClient.h

@@ -0,0 +1,85 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ICLIENT_H
+#define XMRIG_ICLIENT_H
+
+
+#include <stdint.h>
+
+
+namespace xmrig {
+
+
+class Algorithm;
+class Job;
+class JobResult;
+class Pool;
+class String;
+
+
+class IClient
+{
+public:
+    enum Extension {
+        EXT_ALGO,
+        EXT_NICEHASH,
+        EXT_CONNECT,
+        EXT_TLS,
+        EXT_KEEPALIVE,
+        EXT_MAX
+    };
+
+    virtual ~IClient() = default;
+
+    virtual bool disconnect()                                      = 0;
+    virtual bool hasExtension(Extension extension) const noexcept  = 0;
+    virtual bool isEnabled() const                                 = 0;
+    virtual bool isTLS() const                                     = 0;
+    virtual const char *mode() const                               = 0;
+    virtual const char *tlsFingerprint() const                     = 0;
+    virtual const char *tlsVersion() const                         = 0;
+    virtual const Job &job() const                                 = 0;
+    virtual const Pool &pool() const                               = 0;
+    virtual const String &ip() const                               = 0;
+    virtual int id() const                                         = 0;
+    virtual int64_t submit(const JobResult &result)                = 0;
+    virtual void connect()                                         = 0;
+    virtual void connect(const Pool &pool)                         = 0;
+    virtual void deleteLater()                                     = 0;
+    virtual void setAlgo(const Algorithm &algo)                    = 0;
+    virtual void setEnabled(bool enabled)                          = 0;
+    virtual void setPool(const Pool &pool)                         = 0;
+    virtual void setQuiet(bool quiet)                              = 0;
+    virtual void setRetries(int retries)                           = 0;
+    virtual void setRetryPause(uint64_t ms)                        = 0;
+    virtual void tick(uint64_t now)                                = 0;
+
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICLIENT_H

src/base/kernel/interfaces/IClientListener.h

@@ -0,0 +1,59 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ICLIENTLISTENER_H
+#define XMRIG_ICLIENTLISTENER_H
+
+
+#include <stdint.h>
+
+
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class IClient;
+class Job;
+class SubmitResult;
+
+
+class IClientListener
+{
+public:
+    virtual ~IClientListener() = default;
+
+    virtual void onClose(IClient *client, int failures)                                           = 0;
+    virtual void onJobReceived(IClient *client, const Job &job, const rapidjson::Value &params)   = 0;
+    virtual void onLogin(IClient *client, rapidjson::Document &doc, rapidjson::Value &params)     = 0;
+    virtual void onLoginSuccess(IClient *client)                                                  = 0;
+    virtual void onResultAccepted(IClient *client, const SubmitResult &result, const char *error) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICLIENTLISTENER_H

src/base/kernel/interfaces/IConfig.h

@@ -0,0 +1,157 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ICONFIG_H
+#define XMRIG_ICONFIG_H
+
+
+#include "common/crypto/Algorithm.h"
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class IJsonReader;
+class String;
+
+
+class IConfig
+{
+public:
+    enum Keys {
+        // common
+        AlgorithmKey         = 'a',
+        ApiWorkerIdKey       = 4002,
+        ApiIdKey             = 4005,
+        HttpPort             = 4100,
+        HttpAccessTokenKey   = 4101,
+        HttpRestrictedKey    = 4104,
+        HttpEnabledKey       = 4106,
+        HttpHostKey          = 4107,
+        BackgroundKey        = 'B',
+        ColorKey             = 1002,
+        ConfigKey            = 'c',
+        DonateLevelKey       = 1003,
+        KeepAliveKey         = 'k',
+        LogFileKey           = 'l',
+        PasswordKey          = 'p',
+        RetriesKey           = 'r',
+        RetryPauseKey        = 'R',
+        RigIdKey             = 1012,
+        SyslogKey            = 'S',
+        UrlKey               = 'o',
+        UserAgentKey         = 1008,
+        UserKey              = 'u',
+        UserpassKey          = 'O',
+        VariantKey           = 1010,
+        VerboseKey           = 1100,
+        TlsKey               = 1013,
+        FingerprintKey       = 1014,
+        ProxyDonateKey       = 1017,
+        DaemonKey            = 1018,
+        DaemonPollKey        = 1019,
+
+#       ifdef XMRIG_DEPRECATED
+        ApiPort              = 4000,
+        ApiAccessTokenKey    = 4001,
+        ApiIPv6Key           = 4003,
+        ApiRestrictedKey     = 4004,
+#       endif
+
+        // xmrig common
+        CPUPriorityKey       = 1021,
+        NicehashKey          = 1006,
+        PrintTimeKey         = 1007,
+
+        // xmrig cpu
+        AVKey                = 'v',
+        CPUAffinityKey       = 1020,
+        DryRunKey            = 5000,
+        HugePagesKey         = 1009,
+        MaxCPUUsageKey       = 1004,
+        SafeKey              = 1005,
+        ThreadsKey           = 't',
+//        HardwareAESKey       = 1011,
+        AssemblyKey          = 1015,
+
+        // xmrig amd
+        OclPlatformKey       = 1400,
+        OclAffinityKey       = 1401,
+        OclDevicesKey        = 1402,
+        OclLaunchKey         = 1403,
+        OclCacheKey          = 1404,
+        OclPrintKey          = 1405,
+        OclLoaderKey         = 1406,
+        OclSridedIndexKey    = 1407,
+        OclMemChunkKey       = 1408,
+        OclUnrollKey         = 1409,
+        OclCompModeKey       = 1410,
+
+        // xmrig-proxy
+        AccessLogFileKey     = 'A',
+        BindKey              = 'b',
+        CustomDiffKey        = 1102,
+        DebugKey             = 1101,
+        ModeKey              = 'm',
+        PoolCoinKey          = 'C',
+        ReuseTimeoutKey      = 1106,
+        WorkersKey           = 1103,
+        WorkersAdvKey        = 1107,
+        TlsBindKey           = 1108,
+        TlsCertKey           = 1109,
+        TlsCertKeyKey        = 1110,
+        TlsDHparamKey        = 1111,
+        TlsCiphersKey        = 1112,
+        TlsCipherSuitesKey   = 1113,
+        TlsProtocolsKey      = 1114,
+        AlgoExtKey           = 1115,
+        ProxyPasswordKey     = 1116,
+
+        // xmrig nvidia
+        CudaMaxThreadsKey    = 1200,
+        CudaBFactorKey       = 1201,
+        CudaBSleepKey        = 1202,
+        CudaDevicesKey       = 1203,
+        CudaLaunchKey        = 1204,
+        CudaAffinityKey      = 1205,
+        CudaMaxUsageKey      = 1206,
+    };
+
+    virtual ~IConfig() = default;
+
+    virtual bool isWatch() const                                       = 0;
+    virtual bool read(const IJsonReader &reader, const char *fileName) = 0;
+    virtual bool save()                                                = 0;
+    virtual const Algorithm &algorithm() const                         = 0;
+    virtual const String &fileName() const                             = 0;
+    virtual void getJSON(rapidjson::Document &doc) const               = 0;
+    virtual void setFileName(const char *fileName)                     = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICONFIG_H

src/base/kernel/interfaces/IConfigListener.h

@@ -0,0 +1,47 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ICONFIGLISTENER_H
+#define XMRIG_ICONFIGLISTENER_H
+
+
+namespace xmrig {
+
+
+class IConfig;
+
+
+class IConfigListener
+{
+public:
+    virtual ~IConfigListener() = default;
+
+    virtual void onNewConfig(IConfig *config) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICONFIGLISTENER_H

src/base/kernel/interfaces/IConfigTransform.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,34 +22,31 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CONSOLELOG_H__
-#define __CONSOLELOG_H__
+#ifndef XMRIG_ICONFIGTRANSFORM_H
+#define XMRIG_ICONFIGTRANSFORM_H
 
 
-#include <uv.h>
+#include "common/crypto/Algorithm.h"
+#include "rapidjson/fwd.h"
 
 
-#include "interfaces/ILogBackend.h"
+namespace xmrig {
 
 
-class ConsoleLog : public ILogBackend
+class IJsonReader;
+class String;
+
+
+class IConfigTransform
 {
 public:
-    ConsoleLog(bool colors);
+    virtual ~IConfigTransform() = default;
 
-    void message(int level, const char *fmt, va_list args) override;
-    void text(const char *fmt, va_list args) override;
-
-private:
-    bool isWritable() const;
-    void print(va_list args);
-
-    bool m_colors;
-    char m_buf[512];
-    char m_fmt[256];
-    uv_buf_t m_uvBuf;
-    uv_stream_t *m_stream;
-    uv_tty_t m_tty;
+    virtual void transform(rapidjson::Document &doc, int key, const char *arg) = 0;
 };
 
-#endif /* __CONSOLELOG_H__ */
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICONFIGTRANSFORM_H

src/base/kernel/interfaces/IConsoleListener.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,28 +22,23 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SUBMITRESULT_H__
-#define __SUBMITRESULT_H__
+#ifndef XMRIG_ICONSOLELISTENER_H
+#define XMRIG_ICONSOLELISTENER_H
 
 
-#include <uv.h>
+namespace xmrig {
 
 
-class SubmitResult
+class IConsoleListener
 {
 public:
-    inline SubmitResult() : seq(0), diff(0), actualDiff(0), elapsed(0), start(0) {}
-    SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff);
+    virtual ~IConsoleListener() = default;
 
-    void done();
-
-    int64_t seq;
-    uint32_t diff;
-    uint64_t actualDiff;
-    uint64_t elapsed;
-
-private:
-    uint64_t start;
+    virtual void onConsoleCommand(char command) = 0;
 };
 
-#endif /* __SUBMITRESULT_H__ */
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICONSOLELISTENER_H

src/base/kernel/interfaces/IDnsListener.h

@@ -4,8 +4,9 @@
  * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,30 +22,26 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __FILELOG_H__
-#define __FILELOG_H__
+#ifndef XMRIG_IDNSLISTENER_H
+#define XMRIG_IDNSLISTENER_H
 
 
-#include <uv.h>
+namespace xmrig {
 
 
-#include "interfaces/ILogBackend.h"
+class Dns;
 
 
-class FileLog : public ILogBackend
+class IDnsListener
 {
 public:
-    FileLog(const char *fileName);
+    virtual ~IDnsListener() = default;
 
-    void message(int level, const char* fmt, va_list args) override;
-    void text(const char* fmt, va_list args) override;
-
-private:
-    static void onWrite(uv_fs_t *req);
-
-    void write(char *data, size_t size);
-
-    int m_file;
+    virtual void onResolved(const Dns &dns, int status) = 0;
 };
 
-#endif /* __FILELOG_H__ */
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_IDNSLISTENER_H