diff --git a/CHANGELOG.md b/CHANGELOG.md index ee596c3b..ffd011cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,48 +1,48 @@ # v6.8.2 -- [#2080](https://github.com/xmrig/xmrig/pull/2080) Fixed compile error in Termux. -- [#2089](https://github.com/xmrig/xmrig/pull/2089) Optimized CryptoNight-Heavy for Zen3, 7-8% speedup. +- [#2080](https://github.com/xmlcore/xmlcore/pull/2080) Fixed compile error in Termux. +- [#2089](https://github.com/xmlcore/xmlcore/pull/2089) Optimized CryptoNight-Heavy for Zen3, 7-8% speedup. # v6.8.1 -- [#2064](https://github.com/xmrig/xmrig/pull/2064) Added documentation for config.json CPU options. -- [#2066](https://github.com/xmrig/xmrig/issues/2066) Fixed AMD GPUs health data readings on Linux. -- [#2067](https://github.com/xmrig/xmrig/pull/2067) Fixed compilation error when RandomX and Argon2 are disabled. -- [#2076](https://github.com/xmrig/xmrig/pull/2076) Added support for flexible huge page sizes on Linux. -- [#2077](https://github.com/xmrig/xmrig/pull/2077) Fixed `illegal instruction` crash on ARM. +- [#2064](https://github.com/xmlcore/xmlcore/pull/2064) Added documentation for config.json CPU options. +- [#2066](https://github.com/xmlcore/xmlcore/issues/2066) Fixed AMD GPUs health data readings on Linux. +- [#2067](https://github.com/xmlcore/xmlcore/pull/2067) Fixed compilation error when RandomX and Argon2 are disabled. +- [#2076](https://github.com/xmlcore/xmlcore/pull/2076) Added support for flexible huge page sizes on Linux. +- [#2077](https://github.com/xmlcore/xmlcore/pull/2077) Fixed `illegal instruction` crash on ARM. # v6.8.0 -- [#2052](https://github.com/xmrig/xmrig/pull/2052) Added DMI/SMBIOS reader. +- [#2052](https://github.com/xmlcore/xmlcore/pull/2052) Added DMI/SMBIOS reader. - Added information about memory modules on the miner startup and for online benchmark. - Added new HTTP API endpoint: `GET /2/dmi`. - Added new command line option `--no-dmi` or config option `"dmi"`. - Added new CMake option `-DWITH_DMI=OFF`. -- [#2057](https://github.com/xmrig/xmrig/pull/2057) Improved MSR subsystem code quality. -- [#2058](https://github.com/xmrig/xmrig/pull/2058) RandomX JIT x86: removed unnecessary instructions. +- [#2057](https://github.com/xmlcore/xmlcore/pull/2057) Improved MSR subsystem code quality. +- [#2058](https://github.com/xmlcore/xmlcore/pull/2058) RandomX JIT x86: removed unnecessary instructions. # v6.7.2 -- [#2039](https://github.com/xmrig/xmrig/pull/2039) Fixed solo mining. +- [#2039](https://github.com/xmlcore/xmlcore/pull/2039) Fixed solo mining. # v6.7.1 -- [#1995](https://github.com/xmrig/xmrig/issues/1995) Fixed log initialization. -- [#1998](https://github.com/xmrig/xmrig/pull/1998) Added hashrate in the benchmark finished message. -- [#2009](https://github.com/xmrig/xmrig/pull/2009) AstroBWT OpenCL fixes. -- [#2028](https://github.com/xmrig/xmrig/pull/2028) RandomX x86 JIT: removed redundant `CFROUND`. +- [#1995](https://github.com/xmlcore/xmlcore/issues/1995) Fixed log initialization. +- [#1998](https://github.com/xmlcore/xmlcore/pull/1998) Added hashrate in the benchmark finished message. +- [#2009](https://github.com/xmlcore/xmlcore/pull/2009) AstroBWT OpenCL fixes. +- [#2028](https://github.com/xmlcore/xmlcore/pull/2028) RandomX x86 JIT: removed redundant `CFROUND`. # v6.7.0 -- **[#1991](https://github.com/xmrig/xmrig/issues/1991) Added Apple M1 processor support.** -- **[#1986](https://github.com/xmrig/xmrig/pull/1986) Up to 20-30% faster RandomX dataset initialization with AVX2 on some CPUs.** -- [#1964](https://github.com/xmrig/xmrig/pull/1964) Cleanup and refactoring. -- [#1966](https://github.com/xmrig/xmrig/pull/1966) Removed libcpuid support. -- [#1968](https://github.com/xmrig/xmrig/pull/1968) Added virtual machine detection. -- [#1969](https://github.com/xmrig/xmrig/pull/1969) [#1970](https://github.com/xmrig/xmrig/pull/1970) Fixed errors found by static analysis. -- [#1977](https://github.com/xmrig/xmrig/pull/1977) Fixed: secure JIT and huge pages are incompatible on Windows. -- [#1979](https://github.com/xmrig/xmrig/pull/1979) Term `x64` replaced to `64-bit`. -- [#1980](https://github.com/xmrig/xmrig/pull/1980) Fixed build on gcc 11. -- [#1989](https://github.com/xmrig/xmrig/pull/1989) Fixed broken Dero solo mining. +- **[#1991](https://github.com/xmlcore/xmlcore/issues/1991) Added Apple M1 processor support.** +- **[#1986](https://github.com/xmlcore/xmlcore/pull/1986) Up to 20-30% faster RandomX dataset initialization with AVX2 on some CPUs.** +- [#1964](https://github.com/xmlcore/xmlcore/pull/1964) Cleanup and refactoring. +- [#1966](https://github.com/xmlcore/xmlcore/pull/1966) Removed libcpuid support. +- [#1968](https://github.com/xmlcore/xmlcore/pull/1968) Added virtual machine detection. +- [#1969](https://github.com/xmlcore/xmlcore/pull/1969) [#1970](https://github.com/xmlcore/xmlcore/pull/1970) Fixed errors found by static analysis. +- [#1977](https://github.com/xmlcore/xmlcore/pull/1977) Fixed: secure JIT and huge pages are incompatible on Windows. +- [#1979](https://github.com/xmlcore/xmlcore/pull/1979) Term `x64` replaced to `64-bit`. +- [#1980](https://github.com/xmlcore/xmlcore/pull/1980) Fixed build on gcc 11. +- [#1989](https://github.com/xmlcore/xmlcore/pull/1989) Fixed broken Dero solo mining. # v6.6.2 -- [#1958](https://github.com/xmrig/xmrig/pull/1958) Added example mining scripts to help new miners. -- [#1959](https://github.com/xmrig/xmrig/pull/1959) Optimized JIT compiler. -- [#1960](https://github.com/xmrig/xmrig/pull/1960) Fixed RandomX init when switching to other algo and back. +- [#1958](https://github.com/xmlcore/xmlcore/pull/1958) Added example mining scripts to help new miners. +- [#1959](https://github.com/xmlcore/xmlcore/pull/1959) Optimized JIT compiler. +- [#1960](https://github.com/xmlcore/xmlcore/pull/1960) Fixed RandomX init when switching to other algo and back. # v6.6.1 - Fixed, benchmark validation on NUMA hardware produced incorrect results in some conditions. @@ -55,66 +55,66 @@ - DNS cache for online benchmark to prevent unexpected delays. # v6.5.3 -- [#1946](https://github.com/xmrig/xmrig/pull/1946) Fixed MSR mod names in JSON API (v6.5.2 affected). +- [#1946](https://github.com/xmlcore/xmlcore/pull/1946) Fixed MSR mod names in JSON API (v6.5.2 affected). # v6.5.2 -- [#1935](https://github.com/xmrig/xmrig/pull/1935) Separate MSR mod for Zen/Zen2 and Zen3. -- [#1937](https://github.com/xmrig/xmrig/issues/1937) Print path to existing WinRing0 service without verbose option. -- [#1939](https://github.com/xmrig/xmrig/pull/1939) Fixed build with gcc 4.8. -- [#1941](https://github.com/xmrig/xmrig/pull/1941) Added CPUID info to JSON report. -- [#1941](https://github.com/xmrig/xmrig/pull/1942) Fixed alignment modification in memory pool. -- [#1944](https://github.com/xmrig/xmrig/pull/1944) Updated `randomx_boost.sh` with new MSR mod. +- [#1935](https://github.com/xmlcore/xmlcore/pull/1935) Separate MSR mod for Zen/Zen2 and Zen3. +- [#1937](https://github.com/xmlcore/xmlcore/issues/1937) Print path to existing WinRing0 service without verbose option. +- [#1939](https://github.com/xmlcore/xmlcore/pull/1939) Fixed build with gcc 4.8. +- [#1941](https://github.com/xmlcore/xmlcore/pull/1941) Added CPUID info to JSON report. +- [#1941](https://github.com/xmlcore/xmlcore/pull/1942) Fixed alignment modification in memory pool. +- [#1944](https://github.com/xmlcore/xmlcore/pull/1944) Updated `randomx_boost.sh` with new MSR mod. - Added `250K` and `500K` offline benchmarks. # v6.5.1 -- [#1932](https://github.com/xmrig/xmrig/pull/1932) New MSR mod for Ryzen, up to +3.5% on Zen2 and +1-2% on Zen3. -- [#1918](https://github.com/xmrig/xmrig/issues/1918) Fixed 1GB huge pages support on ARMv8. -- [#1926](https://github.com/xmrig/xmrig/pull/1926) Fixed compilation on ARMv8 with GCC 9.3.0. -- [#1929](https://github.com/xmrig/xmrig/issues/1929) Fixed build without HTTP. +- [#1932](https://github.com/xmlcore/xmlcore/pull/1932) New MSR mod for Ryzen, up to +3.5% on Zen2 and +1-2% on Zen3. +- [#1918](https://github.com/xmlcore/xmlcore/issues/1918) Fixed 1GB huge pages support on ARMv8. +- [#1926](https://github.com/xmlcore/xmlcore/pull/1926) Fixed compilation on ARMv8 with GCC 9.3.0. +- [#1929](https://github.com/xmlcore/xmlcore/issues/1929) Fixed build without HTTP. # v6.5.0 -- **Added [online benchmark](https://xmrig.com/benchmark) mode for sharing results.** +- **Added [online benchmark](https://xmlcore.com/benchmark) mode for sharing results.** - Added new command line options: `--submit`, ` --verify=ID`, ` --seed=SEED`, `--hash=HASH`. -- [#1912](https://github.com/xmrig/xmrig/pull/1912) Fixed MSR kernel module warning with new Linux kernels. -- [#1925](https://github.com/xmrig/xmrig/pull/1925) Add checking for config files in user home directory. +- [#1912](https://github.com/xmlcore/xmlcore/pull/1912) Fixed MSR kernel module warning with new Linux kernels. +- [#1925](https://github.com/xmlcore/xmlcore/pull/1925) Add checking for config files in user home directory. - Added vendor to ARM CPUs name and added `"arch"` field to API. - Removed legacy CUDA plugin API. # v6.4.0 -- [#1862](https://github.com/xmrig/xmrig/pull/1862) **RandomX: removed `rx/loki` algorithm.** -- [#1890](https://github.com/xmrig/xmrig/pull/1890) **Added `argon2/chukwav2` algorithm.** -- [#1895](https://github.com/xmrig/xmrig/pull/1895) [#1897](https://github.com/xmrig/xmrig/pull/1897) **Added [benchmark and stress test](https://github.com/xmrig/xmrig/blob/dev/doc/BENCHMARK.md).** -- [#1864](https://github.com/xmrig/xmrig/pull/1864) RandomX: improved software AES performance. -- [#1870](https://github.com/xmrig/xmrig/pull/1870) RandomX: fixed unexpected resume due to disconnect during dataset init. -- [#1872](https://github.com/xmrig/xmrig/pull/1872) RandomX: fixed `randomx_create_vm` call. -- [#1875](https://github.com/xmrig/xmrig/pull/1875) RandomX: fixed crash on x86. -- [#1876](https://github.com/xmrig/xmrig/pull/1876) RandomX: added `huge-pages-jit` config parameter. -- [#1881](https://github.com/xmrig/xmrig/pull/1881) Fixed possible race condition in hashrate counting code. -- [#1882](https://github.com/xmrig/xmrig/pull/1882) [#1886](https://github.com/xmrig/xmrig/pull/1886) [#1887](https://github.com/xmrig/xmrig/pull/1887) [#1893](https://github.com/xmrig/xmrig/pull/1893) General code improvements. -- [#1885](https://github.com/xmrig/xmrig/pull/1885) Added more precise hashrate calculation. -- [#1889](https://github.com/xmrig/xmrig/pull/1889) Fixed libuv performance issue on Linux. +- [#1862](https://github.com/xmlcore/xmlcore/pull/1862) **RandomX: removed `rx/loki` algorithm.** +- [#1890](https://github.com/xmlcore/xmlcore/pull/1890) **Added `argon2/chukwav2` algorithm.** +- [#1895](https://github.com/xmlcore/xmlcore/pull/1895) [#1897](https://github.com/xmlcore/xmlcore/pull/1897) **Added [benchmark and stress test](https://github.com/xmlcore/xmlcore/blob/dev/doc/BENCHMARK.md).** +- [#1864](https://github.com/xmlcore/xmlcore/pull/1864) RandomX: improved software AES performance. +- [#1870](https://github.com/xmlcore/xmlcore/pull/1870) RandomX: fixed unexpected resume due to disconnect during dataset init. +- [#1872](https://github.com/xmlcore/xmlcore/pull/1872) RandomX: fixed `randomx_create_vm` call. +- [#1875](https://github.com/xmlcore/xmlcore/pull/1875) RandomX: fixed crash on x86. +- [#1876](https://github.com/xmlcore/xmlcore/pull/1876) RandomX: added `huge-pages-jit` config parameter. +- [#1881](https://github.com/xmlcore/xmlcore/pull/1881) Fixed possible race condition in hashrate counting code. +- [#1882](https://github.com/xmlcore/xmlcore/pull/1882) [#1886](https://github.com/xmlcore/xmlcore/pull/1886) [#1887](https://github.com/xmlcore/xmlcore/pull/1887) [#1893](https://github.com/xmlcore/xmlcore/pull/1893) General code improvements. +- [#1885](https://github.com/xmlcore/xmlcore/pull/1885) Added more precise hashrate calculation. +- [#1889](https://github.com/xmlcore/xmlcore/pull/1889) Fixed libuv performance issue on Linux. # v6.3.5 -- [#1845](https://github.com/xmrig/xmrig/pull/1845) [#1861](https://github.com/xmrig/xmrig/pull/1861) Fixed ARM build and added CMake option `WITH_SSE4_1`. -- [#1846](https://github.com/xmrig/xmrig/pull/1846) KawPow: fixed OpenCL memory leak. -- [#1849](https://github.com/xmrig/xmrig/pull/1849) [#1859](https://github.com/xmrig/xmrig/pull/1859) RandomX: optimized soft AES code. -- [#1850](https://github.com/xmrig/xmrig/pull/1850) [#1852](https://github.com/xmrig/xmrig/pull/1852) General code improvements. -- [#1853](https://github.com/xmrig/xmrig/issues/1853) [#1856](https://github.com/xmrig/xmrig/pull/1856) [#1857](https://github.com/xmrig/xmrig/pull/1857) Fixed crash on old CPUs. +- [#1845](https://github.com/xmlcore/xmlcore/pull/1845) [#1861](https://github.com/xmlcore/xmlcore/pull/1861) Fixed ARM build and added CMake option `WITH_SSE4_1`. +- [#1846](https://github.com/xmlcore/xmlcore/pull/1846) KawPow: fixed OpenCL memory leak. +- [#1849](https://github.com/xmlcore/xmlcore/pull/1849) [#1859](https://github.com/xmlcore/xmlcore/pull/1859) RandomX: optimized soft AES code. +- [#1850](https://github.com/xmlcore/xmlcore/pull/1850) [#1852](https://github.com/xmlcore/xmlcore/pull/1852) General code improvements. +- [#1853](https://github.com/xmlcore/xmlcore/issues/1853) [#1856](https://github.com/xmlcore/xmlcore/pull/1856) [#1857](https://github.com/xmlcore/xmlcore/pull/1857) Fixed crash on old CPUs. # v6.3.4 -- [#1823](https://github.com/xmrig/xmrig/pull/1823) RandomX: added new option `scratchpad_prefetch_mode`. -- [#1827](https://github.com/xmrig/xmrig/pull/1827) [#1831](https://github.com/xmrig/xmrig/pull/1831) Improved nonce iteration performance. -- [#1828](https://github.com/xmrig/xmrig/pull/1828) RandomX: added SSE4.1-optimized Blake2b. -- [#1830](https://github.com/xmrig/xmrig/pull/1830) RandomX: added performance profiler (for developers). -- [#1835](https://github.com/xmrig/xmrig/pull/1835) RandomX: returned old soft AES implementation and added auto-select between the two. -- [#1840](https://github.com/xmrig/xmrig/pull/1840) RandomX: moved more stuff to compile time, small x86 JIT compiler speedup. -- [#1841](https://github.com/xmrig/xmrig/pull/1841) Fixed Cryptonight OpenCL for AMD 20.7.2 drivers. -- [#1842](https://github.com/xmrig/xmrig/pull/1842) RandomX: AES improvements, a bit faster hardware AES code when compiled with MSVC. -- [#1843](https://github.com/xmrig/xmrig/pull/1843) RandomX: improved performance of GCC compiled binaries. +- [#1823](https://github.com/xmlcore/xmlcore/pull/1823) RandomX: added new option `scratchpad_prefetch_mode`. +- [#1827](https://github.com/xmlcore/xmlcore/pull/1827) [#1831](https://github.com/xmlcore/xmlcore/pull/1831) Improved nonce iteration performance. +- [#1828](https://github.com/xmlcore/xmlcore/pull/1828) RandomX: added SSE4.1-optimized Blake2b. +- [#1830](https://github.com/xmlcore/xmlcore/pull/1830) RandomX: added performance profiler (for developers). +- [#1835](https://github.com/xmlcore/xmlcore/pull/1835) RandomX: returned old soft AES implementation and added auto-select between the two. +- [#1840](https://github.com/xmlcore/xmlcore/pull/1840) RandomX: moved more stuff to compile time, small x86 JIT compiler speedup. +- [#1841](https://github.com/xmlcore/xmlcore/pull/1841) Fixed Cryptonight OpenCL for AMD 20.7.2 drivers. +- [#1842](https://github.com/xmlcore/xmlcore/pull/1842) RandomX: AES improvements, a bit faster hardware AES code when compiled with MSVC. +- [#1843](https://github.com/xmlcore/xmlcore/pull/1843) RandomX: improved performance of GCC compiled binaries. # v6.3.3 -- [#1817](https://github.com/xmrig/xmrig/pull/1817) Fixed self-select login sequence. -- Added brand new [build from source](https://xmrig.com/docs/miner/build) documentation. +- [#1817](https://github.com/xmlcore/xmlcore/pull/1817) Fixed self-select login sequence. +- Added brand new [build from source](https://xmlcore.com/docs/miner/build) documentation. - New binary downloads for macOS (`macos-x64`), FreeBSD (`freebsd-static-x64`), Linux (`linux-static-x64`), Ubuntu 18.04 (`bionic-x64`), Ubuntu 20.04 (`focal-x64`). - Generic Linux download `xenial-x64` renamed to `linux-x64`. - Builds without SSL/TLS support are no longer provided. @@ -123,227 +123,227 @@ - Fixed colors on macOS. # v6.3.2 -- [#1794](https://github.com/xmrig/xmrig/pull/1794) More robust 1 GB pages handling. +- [#1794](https://github.com/xmlcore/xmlcore/pull/1794) More robust 1 GB pages handling. - Don't allocate 1 GB per thread if 1 GB is the default huge page size. - Try to allocate scratchpad from dataset's 1 GB huge pages, if normal huge pages are not available. - Correctly initialize RandomX cache if 1 GB pages fail to allocate on a first NUMA node. -- [#1806](https://github.com/xmrig/xmrig/pull/1806) Fixed macOS battery detection. -- [#1809](https://github.com/xmrig/xmrig/issues/1809) Improved auto configuration on ARM CPUs. +- [#1806](https://github.com/xmlcore/xmlcore/pull/1806) Fixed macOS battery detection. +- [#1809](https://github.com/xmlcore/xmlcore/issues/1809) Improved auto configuration on ARM CPUs. - Added retrieving ARM CPU names, based on lscpu code and database. # v6.3.1 -- [#1786](https://github.com/xmrig/xmrig/pull/1786) Added `pause-on-battery` option, supported on Windows and Linux. +- [#1786](https://github.com/xmlcore/xmlcore/pull/1786) Added `pause-on-battery` option, supported on Windows and Linux. - Added command line options `--randomx-cache-qos` and `--argon2-impl`. # v6.3.0 -- [#1771](https://github.com/xmrig/xmrig/pull/1771) Adopted new SSE2NEON and reduced ARM-specific changes. -- [#1774](https://github.com/xmrig/xmrig/pull/1774) RandomX: Added new option `cache_qos` in `randomx` object for cache QoS support. -- [#1777](https://github.com/xmrig/xmrig/pull/1777) Added support for upcoming Haven offshore fork. - - [#1780](https://github.com/xmrig/xmrig/pull/1780) CryptoNight OpenCL: fix for long input data. +- [#1771](https://github.com/xmlcore/xmlcore/pull/1771) Adopted new SSE2NEON and reduced ARM-specific changes. +- [#1774](https://github.com/xmlcore/xmlcore/pull/1774) RandomX: Added new option `cache_qos` in `randomx` object for cache QoS support. +- [#1777](https://github.com/xmlcore/xmlcore/pull/1777) Added support for upcoming Haven offshore fork. + - [#1780](https://github.com/xmlcore/xmlcore/pull/1780) CryptoNight OpenCL: fix for long input data. # v6.2.3 -- [#1745](https://github.com/xmrig/xmrig/pull/1745) AstroBWT: fixed OpenCL compilation on some systems. -- [#1749](https://github.com/xmrig/xmrig/pull/1749) KawPow: optimized CPU share verification. -- [#1752](https://github.com/xmrig/xmrig/pull/1752) RandomX: added error message when MSR mod fails. -- [#1754](https://github.com/xmrig/xmrig/issues/1754) Fixed GPU health readings for pre Vega GPUs on Linux. -- [#1756](https://github.com/xmrig/xmrig/issues/1756) Added results and connection reports. -- [#1759](https://github.com/xmrig/xmrig/pull/1759) KawPow: fixed DAG initialization on slower AMD GPUs. -- [#1763](https://github.com/xmrig/xmrig/pull/1763) KawPow: fixed rare duplicate share errors. -- [#1766](https://github.com/xmrig/xmrig/pull/1766) RandomX: small speedup on Ryzen CPUs. +- [#1745](https://github.com/xmlcore/xmlcore/pull/1745) AstroBWT: fixed OpenCL compilation on some systems. +- [#1749](https://github.com/xmlcore/xmlcore/pull/1749) KawPow: optimized CPU share verification. +- [#1752](https://github.com/xmlcore/xmlcore/pull/1752) RandomX: added error message when MSR mod fails. +- [#1754](https://github.com/xmlcore/xmlcore/issues/1754) Fixed GPU health readings for pre Vega GPUs on Linux. +- [#1756](https://github.com/xmlcore/xmlcore/issues/1756) Added results and connection reports. +- [#1759](https://github.com/xmlcore/xmlcore/pull/1759) KawPow: fixed DAG initialization on slower AMD GPUs. +- [#1763](https://github.com/xmlcore/xmlcore/pull/1763) KawPow: fixed rare duplicate share errors. +- [#1766](https://github.com/xmlcore/xmlcore/pull/1766) RandomX: small speedup on Ryzen CPUs. # v6.2.2 -- [#1742](https://github.com/xmrig/xmrig/issues/1742) Fixed crash when use HTTP API. +- [#1742](https://github.com/xmlcore/xmlcore/issues/1742) Fixed crash when use HTTP API. # v6.2.1 -- [#1726](https://github.com/xmrig/xmrig/issues/1726) Fixed detection of AVX2/AVX512. -- [#1728](https://github.com/xmrig/xmrig/issues/1728) Fixed, 32 bit Windows builds was crash on start. -- [#1729](https://github.com/xmrig/xmrig/pull/1729) Fixed KawPow crash on old CPUs. -- [#1730](https://github.com/xmrig/xmrig/pull/1730) Improved displaying information for compute errors on GPUs. -- [#1732](https://github.com/xmrig/xmrig/pull/1732) Fixed NiceHash disconnects for KawPow. +- [#1726](https://github.com/xmlcore/xmlcore/issues/1726) Fixed detection of AVX2/AVX512. +- [#1728](https://github.com/xmlcore/xmlcore/issues/1728) Fixed, 32 bit Windows builds was crash on start. +- [#1729](https://github.com/xmlcore/xmlcore/pull/1729) Fixed KawPow crash on old CPUs. +- [#1730](https://github.com/xmlcore/xmlcore/pull/1730) Improved displaying information for compute errors on GPUs. +- [#1732](https://github.com/xmlcore/xmlcore/pull/1732) Fixed NiceHash disconnects for KawPow. - Fixed AMD GPU health (temperatures/power/clocks/fans) readings on Linux. # v6.2.0-beta -- [#1717](https://github.com/xmrig/xmrig/pull/1717) Added new algorithm `cn/ccx` for Conceal. -- [#1718](https://github.com/xmrig/xmrig/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack. -- [#1720](https://github.com/xmrig/xmrig/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1. +- [#1717](https://github.com/xmlcore/xmlcore/pull/1717) Added new algorithm `cn/ccx` for Conceal. +- [#1718](https://github.com/xmlcore/xmlcore/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack. +- [#1720](https://github.com/xmlcore/xmlcore/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1. # v6.0.1-beta -- [#1708](https://github.com/xmrig/xmrig/issues/1708) Added `title` option. -- [#1711](https://github.com/xmrig/xmrig/pull/1711) [cuda] Print errors from KawPow DAG initialization. -- [#1713](https://github.com/xmrig/xmrig/pull/1713) [cuda] Reduced memory usage for KawPow, minimum CUDA plugin version now is 6.1.0. +- [#1708](https://github.com/xmlcore/xmlcore/issues/1708) Added `title` option. +- [#1711](https://github.com/xmlcore/xmlcore/pull/1711) [cuda] Print errors from KawPow DAG initialization. +- [#1713](https://github.com/xmlcore/xmlcore/pull/1713) [cuda] Reduced memory usage for KawPow, minimum CUDA plugin version now is 6.1.0. # v6.0.0-beta -- [#1694](https://github.com/xmrig/xmrig/pull/1694) Added support for KawPow algorithm (Ravencoin) on AMD/NVIDIA. +- [#1694](https://github.com/xmlcore/xmlcore/pull/1694) Added support for KawPow algorithm (Ravencoin) on AMD/NVIDIA. - Removed previously deprecated `cn/gpu` algorithm. - Default donation level reduced to 1% but you still can increase it if you like. # v5.11.3 -- [#1718](https://github.com/xmrig/xmrig/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack. -- [#1720](https://github.com/xmrig/xmrig/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1. +- [#1718](https://github.com/xmlcore/xmlcore/pull/1718) Fixed, linker on Linux was marking entire executable as having an executable stack. +- [#1720](https://github.com/xmlcore/xmlcore/pull/1720) Fixed broken CryptoNight algorithms family with gcc 10.1. # v5.11.2 -- [#1664](https://github.com/xmrig/xmrig/pull/1664) Improved JSON config error reporting. -- [#1668](https://github.com/xmrig/xmrig/pull/1668) Optimized RandomX dataset initialization. -- [#1675](https://github.com/xmrig/xmrig/pull/1675) Fixed cross-compiling on Linux. +- [#1664](https://github.com/xmlcore/xmlcore/pull/1664) Improved JSON config error reporting. +- [#1668](https://github.com/xmlcore/xmlcore/pull/1668) Optimized RandomX dataset initialization. +- [#1675](https://github.com/xmlcore/xmlcore/pull/1675) Fixed cross-compiling on Linux. - Fixed memory leak in HTTP client. -- Build [dependencies](https://github.com/xmrig/xmrig-deps/releases/tag/v4.1) updated to recent versions. +- Build [dependencies](https://github.com/xmlcore/xmlcore-deps/releases/tag/v4.1) updated to recent versions. - Compiler for Windows gcc builds updated to v10.1. # v5.11.1 -- [#1652](https://github.com/xmrig/xmrig/pull/1652) Up to 1% RandomX perfomance improvement on recent AMD CPUs. -- [#1306](https://github.com/xmrig/xmrig/issues/1306) Fixed possible double connection to a pool. -- [#1654](https://github.com/xmrig/xmrig/issues/1654) Fixed build with LibreSSL. +- [#1652](https://github.com/xmlcore/xmlcore/pull/1652) Up to 1% RandomX perfomance improvement on recent AMD CPUs. +- [#1306](https://github.com/xmlcore/xmlcore/issues/1306) Fixed possible double connection to a pool. +- [#1654](https://github.com/xmlcore/xmlcore/issues/1654) Fixed build with LibreSSL. # v5.11.0 -- **[#1632](https://github.com/xmrig/xmrig/pull/1632) Added AstroBWT CUDA support ([CUDA plugin](https://github.com/xmrig/xmrig-cuda) v3.0.0 or newer required).** -- [#1605](https://github.com/xmrig/xmrig/pull/1605) Fixed AstroBWT OpenCL for NVIDIA GPUs. -- [#1635](https://github.com/xmrig/xmrig/pull/1635) Added pooled memory allocation of RandomX VMs (+0.5% speedup on Zen2). -- [#1641](https://github.com/xmrig/xmrig/pull/1641) RandomX JIT refactoring, smaller memory footprint and a bit faster overall. -- [#1643](https://github.com/xmrig/xmrig/issues/1643) Fixed build on CentOS 7. +- **[#1632](https://github.com/xmlcore/xmlcore/pull/1632) Added AstroBWT CUDA support ([CUDA plugin](https://github.com/xmlcore/xmlcore-cuda) v3.0.0 or newer required).** +- [#1605](https://github.com/xmlcore/xmlcore/pull/1605) Fixed AstroBWT OpenCL for NVIDIA GPUs. +- [#1635](https://github.com/xmlcore/xmlcore/pull/1635) Added pooled memory allocation of RandomX VMs (+0.5% speedup on Zen2). +- [#1641](https://github.com/xmlcore/xmlcore/pull/1641) RandomX JIT refactoring, smaller memory footprint and a bit faster overall. +- [#1643](https://github.com/xmlcore/xmlcore/issues/1643) Fixed build on CentOS 7. # v5.10.0 -- [#1602](https://github.com/xmrig/xmrig/pull/1602) Added AMD GPUs support for AstroBWT algorithm. -- [#1590](https://github.com/xmrig/xmrig/pull/1590) MSR mod automatically deactivated after switching from RandomX algorithms. -- [#1592](https://github.com/xmrig/xmrig/pull/1592) Added AVX2 optimized code for AstroBWT algorithm. +- [#1602](https://github.com/xmlcore/xmlcore/pull/1602) Added AMD GPUs support for AstroBWT algorithm. +- [#1590](https://github.com/xmlcore/xmlcore/pull/1590) MSR mod automatically deactivated after switching from RandomX algorithms. +- [#1592](https://github.com/xmlcore/xmlcore/pull/1592) Added AVX2 optimized code for AstroBWT algorithm. - Added new config option `astrobwt-avx2` in `cpu` object and command line option `--astrobwt-avx2`. -- [#1596](https://github.com/xmrig/xmrig/issues/1596) Major TLS (Transport Layer Security) subsystem update. - - Added new TLS options, please check [xmrig-proxy documentation](https://xmrig.com/docs/proxy/tls) for details. +- [#1596](https://github.com/xmlcore/xmlcore/issues/1596) Major TLS (Transport Layer Security) subsystem update. + - Added new TLS options, please check [xmlcore-proxy documentation](https://xmlcore.com/docs/proxy/tls) for details. - `cn/gpu` algorithm now disabled by default and will be removed in next major (v6.x.x) release, no ETA for it right now. - Added command line option `--data-dir`. # v5.9.0 -- [#1578](https://github.com/xmrig/xmrig/pull/1578) Added new RandomKEVA algorithm for upcoming Kevacoin fork, as `"algo": "rx/keva"` or `"coin": "keva"`. -- [#1584](https://github.com/xmrig/xmrig/pull/1584) Fixed invalid AstroBWT hashes after algorithm switching. -- [#1585](https://github.com/xmrig/xmrig/issues/1585) Fixed build without HTTP support. +- [#1578](https://github.com/xmlcore/xmlcore/pull/1578) Added new RandomKEVA algorithm for upcoming Kevacoin fork, as `"algo": "rx/keva"` or `"coin": "keva"`. +- [#1584](https://github.com/xmlcore/xmlcore/pull/1584) Fixed invalid AstroBWT hashes after algorithm switching. +- [#1585](https://github.com/xmlcore/xmlcore/issues/1585) Fixed build without HTTP support. - Added command line option `--astrobwt-max-size`. # v5.8.2 -- [#1580](https://github.com/xmrig/xmrig/pull/1580) AstroBWT algorithm 20-50% speedup. +- [#1580](https://github.com/xmlcore/xmlcore/pull/1580) AstroBWT algorithm 20-50% speedup. - Added new option `astrobwt-max-size`. -- [#1581](https://github.com/xmrig/xmrig/issues/1581) Fixed macOS build. +- [#1581](https://github.com/xmlcore/xmlcore/issues/1581) Fixed macOS build. # v5.8.1 -- [#1575](https://github.com/xmrig/xmrig/pull/1575) Fixed new block detection for DERO solo mining. +- [#1575](https://github.com/xmlcore/xmlcore/pull/1575) Fixed new block detection for DERO solo mining. # v5.8.0 -- [#1573](https://github.com/xmrig/xmrig/pull/1573) Added new AstroBWT algorithm for upcoming DERO fork, as `"algo": "astrobwt"` or `"coin": "dero"`. +- [#1573](https://github.com/xmlcore/xmlcore/pull/1573) Added new AstroBWT algorithm for upcoming DERO fork, as `"algo": "astrobwt"` or `"coin": "dero"`. # v5.7.0 -- **Added SOCKS5 proxies support for Tor https://xmrig.com/docs/miner/tor.** -- [#377](https://github.com/xmrig/xmrig-proxy/issues/377) Fixed duplicate jobs in daemon (solo) mining client. -- [#1560](https://github.com/xmrig/xmrig/pull/1560) RandomX 0.3-0.4% speedup depending on CPU. +- **Added SOCKS5 proxies support for Tor https://xmlcore.com/docs/miner/tor.** +- [#377](https://github.com/xmlcore/xmlcore-proxy/issues/377) Fixed duplicate jobs in daemon (solo) mining client. +- [#1560](https://github.com/xmlcore/xmlcore/pull/1560) RandomX 0.3-0.4% speedup depending on CPU. - Fixed possible crashes in HTTP client. # v5.6.0 -- [#1536](https://github.com/xmrig/xmrig/pull/1536) Added workaround for new AMD GPU drivers. -- [#1546](https://github.com/xmrig/xmrig/pull/1546) Fixed generic OpenCL code for AMD Navi GPUs. -- [#1551](https://github.com/xmrig/xmrig/pull/1551) Added RandomX JIT for AMD Navi GPUs. +- [#1536](https://github.com/xmlcore/xmlcore/pull/1536) Added workaround for new AMD GPU drivers. +- [#1546](https://github.com/xmlcore/xmlcore/pull/1546) Fixed generic OpenCL code for AMD Navi GPUs. +- [#1551](https://github.com/xmlcore/xmlcore/pull/1551) Added RandomX JIT for AMD Navi GPUs. - Added health information for AMD GPUs (clocks/power/fan/temperature) via ADL (Windows) and sysfs (Linux). - Fixed possible nicehash nonce overflow in some conditions. - Fixed wrong OpenCL platform on macOS, option `platform` now ignored on this OS. # v5.5.3 -- [#1529](https://github.com/xmrig/xmrig/pull/1529) Fixed crash on Bulldozer CPUs. +- [#1529](https://github.com/xmlcore/xmlcore/pull/1529) Fixed crash on Bulldozer CPUs. # v5.5.2 -- [#1500](https://github.com/xmrig/xmrig/pull/1500) Removed unnecessary code from RandomX JIT compiler. -- [#1502](https://github.com/xmrig/xmrig/pull/1502) Optimizations for AMD Bulldozer. -- [#1508](https://github.com/xmrig/xmrig/pull/1508) Added support for BMI2 instructions. -- [#1510](https://github.com/xmrig/xmrig/pull/1510) Optimized `CFROUND` instruction for RandomX. -- [#1520](https://github.com/xmrig/xmrig/pull/1520) Fixed thread affinity. +- [#1500](https://github.com/xmlcore/xmlcore/pull/1500) Removed unnecessary code from RandomX JIT compiler. +- [#1502](https://github.com/xmlcore/xmlcore/pull/1502) Optimizations for AMD Bulldozer. +- [#1508](https://github.com/xmlcore/xmlcore/pull/1508) Added support for BMI2 instructions. +- [#1510](https://github.com/xmlcore/xmlcore/pull/1510) Optimized `CFROUND` instruction for RandomX. +- [#1520](https://github.com/xmlcore/xmlcore/pull/1520) Fixed thread affinity. # v5.5.1 -- [#1469](https://github.com/xmrig/xmrig/issues/1469) Fixed build with gcc 4.8. -- [#1473](https://github.com/xmrig/xmrig/pull/1473) Added RandomX auto-config for mobile Ryzen APUs. -- [#1477](https://github.com/xmrig/xmrig/pull/1477) Fixed build with Clang. -- [#1489](https://github.com/xmrig/xmrig/pull/1489) RandomX JIT compiler tweaks. -- [#1493](https://github.com/xmrig/xmrig/pull/1493) Default value for Intel MSR preset changed to `15`. +- [#1469](https://github.com/xmlcore/xmlcore/issues/1469) Fixed build with gcc 4.8. +- [#1473](https://github.com/xmlcore/xmlcore/pull/1473) Added RandomX auto-config for mobile Ryzen APUs. +- [#1477](https://github.com/xmlcore/xmlcore/pull/1477) Fixed build with Clang. +- [#1489](https://github.com/xmlcore/xmlcore/pull/1489) RandomX JIT compiler tweaks. +- [#1493](https://github.com/xmlcore/xmlcore/pull/1493) Default value for Intel MSR preset changed to `15`. - Fixed unwanted resume after RandomX dataset change. # v5.5.0 -- [#179](https://github.com/xmrig/xmrig/issues/179) Added support for [environment variables](https://xmrig.com/docs/miner/environment-variables) in config file. -- [#1445](https://github.com/xmrig/xmrig/pull/1445) Removed `rx/v` algorithm. -- [#1453](https://github.com/xmrig/xmrig/issues/1453) Fixed crash on 32bit systems. -- [#1459](https://github.com/xmrig/xmrig/issues/1459) Fixed crash on very low memory systems. -- [#1465](https://github.com/xmrig/xmrig/pull/1465) Added fix for 1st-gen Ryzen crashes. -- [#1466](https://github.com/xmrig/xmrig/pull/1466) Added `cn-pico/tlo` algorithm. +- [#179](https://github.com/xmlcore/xmlcore/issues/179) Added support for [environment variables](https://xmlcore.com/docs/miner/environment-variables) in config file. +- [#1445](https://github.com/xmlcore/xmlcore/pull/1445) Removed `rx/v` algorithm. +- [#1453](https://github.com/xmlcore/xmlcore/issues/1453) Fixed crash on 32bit systems. +- [#1459](https://github.com/xmlcore/xmlcore/issues/1459) Fixed crash on very low memory systems. +- [#1465](https://github.com/xmlcore/xmlcore/pull/1465) Added fix for 1st-gen Ryzen crashes. +- [#1466](https://github.com/xmlcore/xmlcore/pull/1466) Added `cn-pico/tlo` algorithm. - Added `--randomx-no-rdmsr` command line option. - Added console title for Windows with miner name and version. - On Windows `priority` option now also change base priority. # v5.4.0 -- [#1434](https://github.com/xmrig/xmrig/pull/1434) Added RandomSFX (`rx/sfx`) algorithm for Safex Cash. -- [#1445](https://github.com/xmrig/xmrig/pull/1445) Added RandomV (`rx/v`) algorithm for *new* MoneroV. -- [#1419](https://github.com/xmrig/xmrig/issues/1419) Added reverting MSR changes on miner exit, use `"rdmsr": false,` in `"randomx"` object to disable this feature. -- [#1423](https://github.com/xmrig/xmrig/issues/1423) Fixed conflicts with exists WinRing0 driver service. -- [#1425](https://github.com/xmrig/xmrig/issues/1425) Fixed crash on first generation Zen CPUs (MSR mod accidentally enable Opcache), additionally now you can disable Opcache and enable MSR mod via config `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x60", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],`. +- [#1434](https://github.com/xmlcore/xmlcore/pull/1434) Added RandomSFX (`rx/sfx`) algorithm for Safex Cash. +- [#1445](https://github.com/xmlcore/xmlcore/pull/1445) Added RandomV (`rx/v`) algorithm for *new* MoneroV. +- [#1419](https://github.com/xmlcore/xmlcore/issues/1419) Added reverting MSR changes on miner exit, use `"rdmsr": false,` in `"randomx"` object to disable this feature. +- [#1423](https://github.com/xmlcore/xmlcore/issues/1423) Fixed conflicts with exists WinRing0 driver service. +- [#1425](https://github.com/xmlcore/xmlcore/issues/1425) Fixed crash on first generation Zen CPUs (MSR mod accidentally enable Opcache), additionally now you can disable Opcache and enable MSR mod via config `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x60", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],`. - Added advanced usage for `wrmsr` option, for example: `"wrmsr": ["0x1a4:0x6"],` (Intel) and `"wrmsr": ["0xc0011020:0x0", "0xc0011021:0x40:0xffffffffffffffdf", "0xc0011022:0x510000", "0xc001102b:0x1808cc16"],` (Ryzen). - Added new config option `"verbose"` and command line option `--verbose`. # v5.3.0 -- [#1414](https://github.com/xmrig/xmrig/pull/1414) Added native MSR support for Windows, by using signed **WinRing0 driver** (© 2007-2009 OpenLibSys.org). -- Added new [MSR documentation](https://xmrig.com/docs/miner/randomx-optimization-guide/msr). -- [#1418](https://github.com/xmrig/xmrig/pull/1418) Increased stratum send buffer size. +- [#1414](https://github.com/xmlcore/xmlcore/pull/1414) Added native MSR support for Windows, by using signed **WinRing0 driver** (© 2007-2009 OpenLibSys.org). +- Added new [MSR documentation](https://xmlcore.com/docs/miner/randomx-optimization-guide/msr). +- [#1418](https://github.com/xmlcore/xmlcore/pull/1418) Increased stratum send buffer size. # v5.2.1 -- [#1408](https://github.com/xmrig/xmrig/pull/1408) Added RandomX boost script for Linux (if you don't like run miner with root privileges). -- Added support for [AMD Ryzen MSR registers](https://www.reddit.com/r/MoneroMining/comments/e962fu/9526_hs_on_ryzen_7_3700x_xmrig_520_1gb_pages_msr/) (Linux only). +- [#1408](https://github.com/xmlcore/xmlcore/pull/1408) Added RandomX boost script for Linux (if you don't like run miner with root privileges). +- Added support for [AMD Ryzen MSR registers](https://www.reddit.com/r/MoneroMining/comments/e962fu/9526_hs_on_ryzen_7_3700x_xmlcore_520_1gb_pages_msr/) (Linux only). - Fixed command line option `--randomx-wrmsr` option without parameters. # v5.2.0 -- **[#1388](https://github.com/xmrig/xmrig/pull/1388) Added [1GB huge pages support](https://xmrig.com/docs/miner/hugepages#onegb-huge-pages) for Linux.** +- **[#1388](https://github.com/xmlcore/xmlcore/pull/1388) Added [1GB huge pages support](https://xmlcore.com/docs/miner/hugepages#onegb-huge-pages) for Linux.** - Added new option `1gb-pages` in `randomx` object with command line equivalent `--randomx-1gb-pages`. - Added automatic huge pages configuration on Linux if use the miner with root privileges. -- **Added [automatic Intel prefetchers configuration](https://xmrig.com/docs/miner/randomx-optimization-guide#intel-specific-optimizations) on Linux.** +- **Added [automatic Intel prefetchers configuration](https://xmlcore.com/docs/miner/randomx-optimization-guide#intel-specific-optimizations) on Linux.** - Added new option `wrmsr` in `randomx` object with command line equivalent `--randomx-wrmsr=6`. -- [#1396](https://github.com/xmrig/xmrig/pull/1396) [#1401](https://github.com/xmrig/xmrig/pull/1401) New performance optimizations for Ryzen CPUs. -- [#1385](https://github.com/xmrig/xmrig/issues/1385) Added `max-threads-hint` option support for RandomX dataset initialization threads. -- [#1386](https://github.com/xmrig/xmrig/issues/1386) Added `priority` option support for RandomX dataset initialization threads. +- [#1396](https://github.com/xmlcore/xmlcore/pull/1396) [#1401](https://github.com/xmlcore/xmlcore/pull/1401) New performance optimizations for Ryzen CPUs. +- [#1385](https://github.com/xmlcore/xmlcore/issues/1385) Added `max-threads-hint` option support for RandomX dataset initialization threads. +- [#1386](https://github.com/xmlcore/xmlcore/issues/1386) Added `priority` option support for RandomX dataset initialization threads. - For official builds all dependencies (libuv, hwloc, openssl) updated to recent versions. - Windows `msvc` builds now use Visual Studio 2019 instead of 2017. # v5.1.1 -- [#1365](https://github.com/xmrig/xmrig/issues/1365) Fixed various system response/stability issues. +- [#1365](https://github.com/xmlcore/xmlcore/issues/1365) Fixed various system response/stability issues. - Added new CPU option `yield` and command line equivalent `--cpu-no-yield`. -- [#1363](https://github.com/xmrig/xmrig/issues/1363) Fixed wrong priority of main miner thread. +- [#1363](https://github.com/xmlcore/xmlcore/issues/1363) Fixed wrong priority of main miner thread. # v5.1.0 -- [#1351](https://github.com/xmrig/xmrig/pull/1351) RandomX optimizations and fixes. +- [#1351](https://github.com/xmlcore/xmlcore/pull/1351) RandomX optimizations and fixes. - Improved RandomX performance (up to +6-7% on Intel CPUs, +2-3% on Ryzen CPUs) - Added workaround for Intel JCC erratum bug see https://www.phoronix.com/scan.php?page=article&item=intel-jcc-microcode&num=1 for details. - Note! Always disable "Hardware prefetcher" and "Adjacent cacheline prefetch" in BIOS for Intel CPUs to get the optimal RandomX performance. -- [#1307](https://github.com/xmrig/xmrig/issues/1307) Fixed mining resume after donation round for pools with `self-select` feature. -- [#1318](https://github.com/xmrig/xmrig/issues/1318#issuecomment-559676080) Added option `"mode"` (or `--randomx-mode`) for RandomX. +- [#1307](https://github.com/xmlcore/xmlcore/issues/1307) Fixed mining resume after donation round for pools with `self-select` feature. +- [#1318](https://github.com/xmlcore/xmlcore/issues/1318#issuecomment-559676080) Added option `"mode"` (or `--randomx-mode`) for RandomX. - Added memory information on miner startup. - Added `resources` field to summary API with memory information and load average. # v5.0.1 -- [#1234](https://github.com/xmrig/xmrig/issues/1234) Fixed compatibility with some AMD GPUs. -- [#1284](https://github.com/xmrig/xmrig/issues/1284) Fixed build without RandomX. -- [#1285](https://github.com/xmrig/xmrig/issues/1285) Added command line options `--cuda-bfactor-hint` and `--cuda-bsleep-hint`. -- [#1290](https://github.com/xmrig/xmrig/pull/1290) Fixed 32-bit ARM compilation. +- [#1234](https://github.com/xmlcore/xmlcore/issues/1234) Fixed compatibility with some AMD GPUs. +- [#1284](https://github.com/xmlcore/xmlcore/issues/1284) Fixed build without RandomX. +- [#1285](https://github.com/xmlcore/xmlcore/issues/1285) Added command line options `--cuda-bfactor-hint` and `--cuda-bsleep-hint`. +- [#1290](https://github.com/xmlcore/xmlcore/pull/1290) Fixed 32-bit ARM compilation. # v5.0.0 -This version is first stable unified 3 in 1 GPU+CPU release, OpenCL support built in in miner and not require additional external dependencies on compile time, NVIDIA CUDA available as external [CUDA plugin](https://github.com/xmrig/xmrig-cuda), for convenient, 3 in 1 downloads with recent CUDA version also provided. +This version is first stable unified 3 in 1 GPU+CPU release, OpenCL support built in in miner and not require additional external dependencies on compile time, NVIDIA CUDA available as external [CUDA plugin](https://github.com/xmlcore/xmlcore-cuda), for convenient, 3 in 1 downloads with recent CUDA version also provided. This release based on 4.x.x series and include all features from v4.6.2-beta, changelog below include only the most important changes, [full changelog](doc/CHANGELOG_OLD.md) available separately. -- [#1272](https://github.com/xmrig/xmrig/pull/1272) Optimized hashrate calculation. -- [#1263](https://github.com/xmrig/xmrig/pull/1263) Added new option `dataset_host` for NVIDIA GPUs with less than 4 GB memory (RandomX only). -- [#1068](https://github.com/xmrig/xmrig/pull/1068) Added support for `self-select` stratum protocol extension. -- [#1227](https://github.com/xmrig/xmrig/pull/1227) Added new algorithm `rx/arq`, RandomX variant for upcoming ArQmA fork. -- [#808](https://github.com/xmrig/xmrig/issues/808#issuecomment-539297156) Added experimental support for persistent memory for CPU mining threads. -- [#1221](https://github.com/xmrig/xmrig/issues/1221) Improved RandomX dataset memory usage and initialization speed for NUMA machines. -- [#1175](https://github.com/xmrig/xmrig/issues/1175) Fixed support for systems where total count of NUMA nodes not equal usable nodes count. +- [#1272](https://github.com/xmlcore/xmlcore/pull/1272) Optimized hashrate calculation. +- [#1263](https://github.com/xmlcore/xmlcore/pull/1263) Added new option `dataset_host` for NVIDIA GPUs with less than 4 GB memory (RandomX only). +- [#1068](https://github.com/xmlcore/xmlcore/pull/1068) Added support for `self-select` stratum protocol extension. +- [#1227](https://github.com/xmlcore/xmlcore/pull/1227) Added new algorithm `rx/arq`, RandomX variant for upcoming ArQmA fork. +- [#808](https://github.com/xmlcore/xmlcore/issues/808#issuecomment-539297156) Added experimental support for persistent memory for CPU mining threads. +- [#1221](https://github.com/xmlcore/xmlcore/issues/1221) Improved RandomX dataset memory usage and initialization speed for NUMA machines. +- [#1175](https://github.com/xmlcore/xmlcore/issues/1175) Fixed support for systems where total count of NUMA nodes not equal usable nodes count. - Added config option `cpu/max-threads-hint` and command line option `--cpu-max-threads-hint`. -- [#1185](https://github.com/xmrig/xmrig/pull/1185) Added JIT compiler for RandomX on ARMv8. -- Improved API endpoint `GET /2/backends` and added support for this endpoint to [workers.xmrig.info](http://workers.xmrig.info). +- [#1185](https://github.com/xmlcore/xmlcore/pull/1185) Added JIT compiler for RandomX on ARMv8. +- Improved API endpoint `GET /2/backends` and added support for this endpoint to [workers.xmlcore.info](http://workers.xmlcore.info). - Added command line option `--no-cpu` to disable CPU backend. - Added OpenCL specific command line options: `--opencl`, `--opencl-devices`, `--opencl-platform`, `--opencl-loader` and `--opencl-no-cache`. - Added CUDA specific command line options: `--cuda`, `--cuda-loader` and `--no-nvml`. - Removed command line option `--http-enabled`, HTTP API enabled automatically if any other `--http-*` option provided. -- [#1172](https://github.com/xmrig/xmrig/issues/1172) **Added OpenCL mining backend.** - - [#268](https://github.com/xmrig/xmrig-amd/pull/268) [#270](https://github.com/xmrig/xmrig-amd/pull/270) [#271](https://github.com/xmrig/xmrig-amd/pull/271) [#273](https://github.com/xmrig/xmrig-amd/pull/273) [#274](https://github.com/xmrig/xmrig-amd/pull/274) [#1171](https://github.com/xmrig/xmrig/pull/1171) Added RandomX support for OpenCL, thanks [@SChernykh](https://github.com/SChernykh). +- [#1172](https://github.com/xmlcore/xmlcore/issues/1172) **Added OpenCL mining backend.** + - [#268](https://github.com/xmlcore/xmlcore-amd/pull/268) [#270](https://github.com/xmlcore/xmlcore-amd/pull/270) [#271](https://github.com/xmlcore/xmlcore-amd/pull/271) [#273](https://github.com/xmlcore/xmlcore-amd/pull/273) [#274](https://github.com/xmlcore/xmlcore-amd/pull/274) [#1171](https://github.com/xmlcore/xmlcore/pull/1171) Added RandomX support for OpenCL, thanks [@SChernykh](https://github.com/SChernykh). - Algorithm `cn/wow` removed, as no longer alive. # Previous versions diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a927ab7..7aa6ca46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.8.12) -project(xmrig) +SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE STRING "" FORCE) +project(xmlcore) option(WITH_HWLOC "Enable hwloc support" ON) option(WITH_CN_LITE "Enable CryptoNight-Lite algorithms family" ON) @@ -88,7 +89,7 @@ set(HEADERS_CRYPTO src/crypto/common/VirtualMemory.h ) -if (XMRIG_ARM) +if (xmlcore_ARM) set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_arm.h) else() set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_x86.h) @@ -107,7 +108,7 @@ set(SOURCES src/net/Network.cpp src/net/strategies/DonateStrategy.cpp src/Summary.cpp - src/xmrig.cpp + src/xmlcore.cpp ) set(SOURCES_CRYPTO @@ -134,7 +135,7 @@ if (WITH_HWLOC) ) endif() -if (XMRIG_OS_WIN) +if (xmlcore_OS_WIN) list(APPEND SOURCES_OS res/app.rc src/App_win.cpp @@ -142,7 +143,7 @@ if (XMRIG_OS_WIN) ) set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv) -elseif (XMRIG_OS_APPLE) +elseif (xmlcore_OS_APPLE) list(APPEND SOURCES_OS src/App_unix.cpp src/crypto/common/VirtualMemory_unix.cpp @@ -155,21 +156,21 @@ else() src/crypto/common/VirtualMemory_unix.cpp ) - if (XMRIG_OS_ANDROID) + if (xmlcore_OS_ANDROID) set(EXTRA_LIBS pthread rt dl log) - elseif (XMRIG_OS_LINUX) + elseif (xmlcore_OS_LINUX) list(APPEND SOURCES_OS src/crypto/common/LinuxMemory.h src/crypto/common/LinuxMemory.cpp ) set(EXTRA_LIBS pthread rt dl) - elseif (XMRIG_OS_FREEBSD) + elseif (xmlcore_OS_FREEBSD) set(EXTRA_LIBS kvm pthread) endif() endif() -add_definitions(-DXMRIG_MINER_PROJECT -DXMRIG_JSON_SINGLE_LINE_ARRAY) +add_definitions(-Dxmlcore_MINER_PROJECT -Dxmlcore_JSON_SINGLE_LINE_ARRAY) add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64) find_package(UV REQUIRED) @@ -183,19 +184,19 @@ include(cmake/OpenSSL.cmake) include(cmake/asm.cmake) if (WITH_CN_LITE) - add_definitions(/DXMRIG_ALGO_CN_LITE) + add_definitions(/Dxmlcore_ALGO_CN_LITE) endif() if (WITH_CN_HEAVY) - add_definitions(/DXMRIG_ALGO_CN_HEAVY) + add_definitions(/Dxmlcore_ALGO_CN_HEAVY) endif() if (WITH_CN_PICO) - add_definitions(/DXMRIG_ALGO_CN_PICO) + add_definitions(/Dxmlcore_ALGO_CN_PICO) endif() if (WITH_EMBEDDED_CONFIG) - add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG) + add_definitions(/Dxmlcore_FEATURE_EMBEDDED_CONFIG) endif() include(src/hw/api/api.cmake) @@ -209,8 +210,8 @@ if (WITH_DEBUG_LOG) add_definitions(/DAPP_DEBUG) endif() -add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES}) -target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY}) +add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${xmlcore_ASM_SOURCES}) +target_link_libraries(${CMAKE_PROJECT_NAME} ${xmlcore_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY}) if (WIN32) add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $) diff --git a/README.md b/README.md index 6596983e..438e01df 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,38 @@ -# XMRig +# xmlcore -[![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/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) +[![Github All Releases](https://img.shields.io/github/downloads/xmlcore/xmlcore/total.svg)](https://github.com/xmlcore/xmlcore/releases) +[![GitHub release](https://img.shields.io/github/release/xmlcore/xmlcore/all.svg)](https://github.com/xmlcore/xmlcore/releases) +[![GitHub Release Date](https://img.shields.io/github/release-date/xmlcore/xmlcore.svg)](https://github.com/xmlcore/xmlcore/releases) +[![GitHub license](https://img.shields.io/github/license/xmlcore/xmlcore.svg)](https://github.com/xmlcore/xmlcore/blob/master/LICENSE) +[![GitHub stars](https://img.shields.io/github/stars/xmlcore/xmlcore.svg)](https://github.com/xmlcore/xmlcore/stargazers) +[![GitHub forks](https://img.shields.io/github/forks/xmlcore/xmlcore.svg)](https://github.com/xmlcore/xmlcore/network) -XMRig is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and [RandomX benchmark](https://xmrig.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD. +xmlcore is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and [RandomX benchmark](https://xmlcore.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD. ## Mining backends - **CPU** (x64/ARMv8) - **OpenCL** for AMD GPUs. -- **CUDA** for NVIDIA GPUs via external [CUDA plugin](https://github.com/xmrig/xmrig-cuda). +- **CUDA** for NVIDIA GPUs via external [CUDA plugin](https://github.com/xmlcore/xmlcore-cuda). ## Download -* **[Binary releases](https://github.com/xmrig/xmrig/releases)** -* **[Build from source](https://xmrig.com/docs/miner/build)** +* **[Binary releases](https://github.com/xmlcore/xmlcore/releases)** +* **[Build from source](https://xmlcore.com/docs/miner/build)** ## Usage -The preferred way to configure the miner is the [JSON config file](src/config.json) as it is more flexible and human friendly. The [command line interface](https://xmrig.com/docs/miner/command-line-options) does not cover all features, such as mining profiles for different algorithms. Important options can be changed during runtime without miner restart by editing the config file or executing API calls. +The preferred way to configure the miner is the [JSON config file](src/config.json) as it is more flexible and human friendly. The [command line interface](https://xmlcore.com/docs/miner/command-line-options) does not cover all features, such as mining profiles for different algorithms. Important options can be changed during runtime without miner restart by editing the config file or executing API calls. -* **[Wizard](https://xmrig.com/wizard)** helps you create initial configuration for the miner. -* **[Workers](http://workers.xmrig.info)** helps manage your miners via HTTP API. +* **[Wizard](https://xmlcore.com/wizard)** helps you create initial configuration for the miner. +* **[Workers](http://workers.xmlcore.info)** helps manage your miners via HTTP API. ## Donations * Default donation 1% (1 minute in 100 minutes) can be increased via option `donate-level` or disabled in source code. * XMR: `48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD` ## Developers -* **[xmrig](https://github.com/xmrig)** +* **[xmlcore](https://github.com/xmlcore)** * **[sech1](https://github.com/SChernykh)** ## Contacts -* support@xmrig.com -* [reddit](https://www.reddit.com/user/XMRig/) -* [twitter](https://twitter.com/xmrig_dev) +* support@xmlcore.com +* [reddit](https://www.reddit.com/user/xmlcore/) +* [twitter](https://twitter.com/xmlcore_dev) diff --git a/cmake/FindHWLOC.cmake b/cmake/FindHWLOC.cmake index 55309d3e..62a2b601 100644 --- a/cmake/FindHWLOC.cmake +++ b/cmake/FindHWLOC.cmake @@ -1,7 +1,7 @@ find_path( HWLOC_INCLUDE_DIR NAMES hwloc.h - PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS" + PATHS "${xmlcore_DEPS}" ENV "xmlcore_DEPS" PATH_SUFFIXES "include" NO_DEFAULT_PATH ) @@ -11,7 +11,7 @@ find_path(HWLOC_INCLUDE_DIR NAMES hwloc.h) find_library( HWLOC_LIBRARY NAMES hwloc.a hwloc libhwloc - PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS" + PATHS "${xmlcore_DEPS}" ENV "xmlcore_DEPS" PATH_SUFFIXES "lib" NO_DEFAULT_PATH ) diff --git a/cmake/FindUV.cmake b/cmake/FindUV.cmake index ba59d1d3..0d25d448 100644 --- a/cmake/FindUV.cmake +++ b/cmake/FindUV.cmake @@ -1,7 +1,7 @@ find_path( UV_INCLUDE_DIR NAMES uv.h - PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS" + PATHS "${xmlcore_DEPS}" ENV "xmlcore_DEPS" PATH_SUFFIXES "include" NO_DEFAULT_PATH ) @@ -11,7 +11,7 @@ find_path(UV_INCLUDE_DIR NAMES uv.h) find_library( UV_LIBRARY NAMES libuv.a uv libuv - PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS" + PATHS "${xmlcore_DEPS}" ENV "xmlcore_DEPS" PATH_SUFFIXES "lib" NO_DEFAULT_PATH ) diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake index 84f97d54..9e57da6d 100644 --- a/cmake/OpenSSL.cmake +++ b/cmake/OpenSSL.cmake @@ -1,5 +1,5 @@ if (WITH_TLS) - set(OPENSSL_ROOT_DIR ${XMRIG_DEPS}) + set(OPENSSL_ROOT_DIR ${xmlcore_DEPS}) if (WIN32) set(OPENSSL_USE_STATIC_LIBS TRUE) @@ -47,11 +47,11 @@ if (WITH_TLS) message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support") endif() - add_definitions(/DXMRIG_FEATURE_TLS) + add_definitions(/Dxmlcore_FEATURE_TLS) else() set(TLS_SOURCES "") set(OPENSSL_LIBRARIES "") - remove_definitions(/DXMRIG_FEATURE_TLS) + remove_definitions(/Dxmlcore_FEATURE_TLS) if (WITH_HTTP) set(TLS_SOURCES ${TLS_SOURCES} diff --git a/cmake/argon2.cmake b/cmake/argon2.cmake index e82cd389..7eee73ca 100644 --- a/cmake/argon2.cmake +++ b/cmake/argon2.cmake @@ -1,5 +1,5 @@ if (WITH_ARGON2) - add_definitions(/DXMRIG_ALGO_ARGON2) + add_definitions(/Dxmlcore_ALGO_ARGON2) list(APPEND HEADERS_CRYPTO src/crypto/argon2/Hash.h @@ -13,6 +13,6 @@ if (WITH_ARGON2) add_subdirectory(src/3rdparty/argon2) set(ARGON2_LIBRARY argon2) else() - remove_definitions(/DXMRIG_ALGO_ARGON2) + remove_definitions(/Dxmlcore_ALGO_ARGON2) set(ARGON2_LIBRARY "") endif() diff --git a/cmake/asm.cmake b/cmake/asm.cmake index e445defd..c347591d 100644 --- a/cmake/asm.cmake +++ b/cmake/asm.cmake @@ -1,52 +1,52 @@ -if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) - set(XMRIG_ASM_LIBRARY "xmrig-asm") +if (WITH_ASM AND NOT xmlcore_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) + set(xmlcore_ASM_LIBRARY "xmlcore-asm") if (CMAKE_C_COMPILER_ID MATCHES MSVC) enable_language(ASM_MASM) if (MSVC_TOOLSET_VERSION GREATER_EQUAL 141) - set(XMRIG_ASM_FILES + set(xmlcore_ASM_FILES "src/crypto/cn/asm/cn_main_loop.asm" "src/crypto/cn/asm/CryptonightR_template.asm" ) else() - set(XMRIG_ASM_FILES + set(xmlcore_ASM_FILES "src/crypto/cn/asm/win64/cn_main_loop.asm" "src/crypto/cn/asm/win64/CryptonightR_template.asm" ) endif() - set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY ASM_MASM) + set_property(SOURCE ${xmlcore_ASM_FILES} PROPERTY ASM_MASM) else() enable_language(ASM) if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU) - set(XMRIG_ASM_FILES + set(xmlcore_ASM_FILES "src/crypto/cn/asm/win64/cn_main_loop.S" "src/crypto/cn/asm/CryptonightR_template.S" ) else() - set(XMRIG_ASM_FILES + set(xmlcore_ASM_FILES "src/crypto/cn/asm/cn_main_loop.S" "src/crypto/cn/asm/CryptonightR_template.S" ) endif() - set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY C) + set_property(SOURCE ${xmlcore_ASM_FILES} PROPERTY C) endif() - add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES}) - set(XMRIG_ASM_SOURCES + add_library(${xmlcore_ASM_LIBRARY} STATIC ${xmlcore_ASM_FILES}) + set(xmlcore_ASM_SOURCES src/crypto/common/Assembly.h src/crypto/common/Assembly.cpp src/crypto/cn/r/CryptonightR_gen.cpp ) - set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C) + set_property(TARGET ${xmlcore_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C) - add_definitions(/DXMRIG_FEATURE_ASM) + add_definitions(/Dxmlcore_FEATURE_ASM) else() - set(XMRIG_ASM_SOURCES "") - set(XMRIG_ASM_LIBRARY "") + set(xmlcore_ASM_SOURCES "") + set(xmlcore_ASM_LIBRARY "") - remove_definitions(/DXMRIG_FEATURE_ASM) + remove_definitions(/Dxmlcore_FEATURE_ASM) endif() diff --git a/cmake/astrobwt.cmake b/cmake/astrobwt.cmake index 06485779..550ae27e 100644 --- a/cmake/astrobwt.cmake +++ b/cmake/astrobwt.cmake @@ -1,5 +1,5 @@ if (WITH_ASTROBWT) - add_definitions(/DXMRIG_ALGO_ASTROBWT) + add_definitions(/Dxmlcore_ALGO_ASTROBWT) list(APPEND HEADERS_CRYPTO src/crypto/astrobwt/AstroBWT.h @@ -9,7 +9,7 @@ if (WITH_ASTROBWT) src/crypto/astrobwt/AstroBWT.cpp ) - if (XMRIG_ARM) + if (xmlcore_ARM) list(APPEND HEADERS_CRYPTO src/crypto/astrobwt/salsa20_ref/ecrypt-config.h src/crypto/astrobwt/salsa20_ref/ecrypt-machine.h @@ -41,5 +41,5 @@ if (WITH_ASTROBWT) ) endif() else() - remove_definitions(/DXMRIG_ALGO_ASTROBWT) + remove_definitions(/Dxmlcore_ALGO_ASTROBWT) endif() diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake index a37f1066..8ddee88a 100644 --- a/cmake/cpu.cmake +++ b/cmake/cpu.cmake @@ -17,31 +17,31 @@ if (NOT ARM_TARGET) endif() if (ARM_TARGET AND ARM_TARGET GREATER 6) - set(XMRIG_ARM ON) - add_definitions(/DXMRIG_ARM) + set(xmlcore_ARM ON) + add_definitions(/Dxmlcore_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) + set(xmlcore_ARMv8 ON) + add_definitions(/Dxmlcore_ARMv8) - CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto XMRIG_ARM_CRYPTO) + CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto xmlcore_ARM_CRYPTO) - if (XMRIG_ARM_CRYPTO) - add_definitions(/DXMRIG_ARM_CRYPTO) + if (xmlcore_ARM_CRYPTO) + add_definitions(/Dxmlcore_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) + set(xmlcore_ARMv7 ON) + add_definitions(/Dxmlcore_ARMv7) endif() endif() if (WITH_SSE4_1) - add_definitions(/DXMRIG_FEATURE_SSE4_1) + add_definitions(/Dxmlcore_FEATURE_SSE4_1) endif() diff --git a/cmake/flags.cmake b/cmake/flags.cmake index cb4e0610..57dbe101 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -22,10 +22,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-strict-aliasing -Wno-class-memaccess") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s") - if (XMRIG_ARMv8) + if (xmlcore_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) + elseif (xmlcore_ARMv7) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions") else() @@ -80,10 +80,10 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-missing-braces") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants") - if (XMRIG_ARMv8) + if (xmlcore_ARMv8) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS}") - elseif (XMRIG_ARMv7) + elseif (xmlcore_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() diff --git a/cmake/kawpow.cmake b/cmake/kawpow.cmake index 3c160266..95dd8682 100644 --- a/cmake/kawpow.cmake +++ b/cmake/kawpow.cmake @@ -1,5 +1,5 @@ if (WITH_KAWPOW) - add_definitions(/DXMRIG_ALGO_KAWPOW) + add_definitions(/Dxmlcore_ALGO_KAWPOW) list(APPEND HEADERS_CRYPTO src/crypto/kawpow/KPCache.h @@ -14,6 +14,6 @@ if (WITH_KAWPOW) add_subdirectory(src/3rdparty/libethash) set(ETHASH_LIBRARY ethash) else() - remove_definitions(/DXMRIG_ALGO_KAWPOW) + remove_definitions(/Dxmlcore_ALGO_KAWPOW) set(ETHASH_LIBRARY "") endif() diff --git a/cmake/os.cmake b/cmake/os.cmake index 09931103..d42c95e1 100644 --- a/cmake/os.cmake +++ b/cmake/os.cmake @@ -1,53 +1,53 @@ if (WIN32) - set(XMRIG_OS_WIN ON) + set(xmlcore_OS_WIN ON) elseif (APPLE) - set(XMRIG_OS_APPLE ON) + set(xmlcore_OS_APPLE ON) if (IOS OR CMAKE_SYSTEM_NAME STREQUAL iOS) - set(XMRIG_OS_IOS ON) + set(xmlcore_OS_IOS ON) else() - set(XMRIG_OS_MACOS ON) + set(xmlcore_OS_MACOS ON) endif() else() - set(XMRIG_OS_UNIX ON) + set(xmlcore_OS_UNIX ON) if (ANDROID OR CMAKE_SYSTEM_NAME MATCHES "Android") - set(XMRIG_OS_ANDROID ON) + set(xmlcore_OS_ANDROID ON) elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") - set(XMRIG_OS_LINUX ON) + set(xmlcore_OS_LINUX ON) elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - set(XMRIG_OS_FREEBSD ON) + set(xmlcore_OS_FREEBSD ON) endif() endif() -if (XMRIG_OS_WIN) +if (xmlcore_OS_WIN) add_definitions(/DWIN32) - add_definitions(/DXMRIG_OS_WIN) -elseif(XMRIG_OS_APPLE) - add_definitions(/DXMRIG_OS_APPLE) + add_definitions(/Dxmlcore_OS_WIN) +elseif(xmlcore_OS_APPLE) + add_definitions(/Dxmlcore_OS_APPLE) - if (XMRIG_OS_IOS) - add_definitions(/DXMRIG_OS_IOS) + if (xmlcore_OS_IOS) + add_definitions(/Dxmlcore_OS_IOS) else() - add_definitions(/DXMRIG_OS_MACOS) + add_definitions(/Dxmlcore_OS_MACOS) endif() - if (XMRIG_ARM) + if (xmlcore_ARM) set(WITH_SECURE_JIT ON) endif() -elseif(XMRIG_OS_UNIX) - add_definitions(/DXMRIG_OS_UNIX) +elseif(xmlcore_OS_UNIX) + add_definitions(/Dxmlcore_OS_UNIX) - if (XMRIG_OS_ANDROID) - add_definitions(/DXMRIG_OS_ANDROID) - elseif (XMRIG_OS_LINUX) - add_definitions(/DXMRIG_OS_LINUX) - elseif (XMRIG_OS_FREEBSD) - add_definitions(/DXMRIG_OS_FREEBSD) + if (xmlcore_OS_ANDROID) + add_definitions(/Dxmlcore_OS_ANDROID) + elseif (xmlcore_OS_LINUX) + add_definitions(/Dxmlcore_OS_LINUX) + elseif (xmlcore_OS_FREEBSD) + add_definitions(/Dxmlcore_OS_FREEBSD) endif() endif() if (WITH_SECURE_JIT) - add_definitions(/DXMRIG_SECURE_JIT) + add_definitions(/Dxmlcore_SECURE_JIT) endif() diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake index 976f1186..c2409d5d 100644 --- a/cmake/randomx.cmake +++ b/cmake/randomx.cmake @@ -1,5 +1,5 @@ if (WITH_RANDOMX) - add_definitions(/DXMRIG_ALGO_RANDOMX) + add_definitions(/Dxmlcore_ALGO_RANDOMX) set(WITH_ARGON2 ON) list(APPEND HEADERS_CRYPTO @@ -48,14 +48,14 @@ if (WITH_RANDOMX) src/crypto/randomx/jit_compiler_x86_static.asm src/crypto/randomx/jit_compiler_x86.cpp ) - elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) + elseif (NOT xmlcore_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) list(APPEND SOURCES_CRYPTO src/crypto/randomx/jit_compiler_x86_static.S src/crypto/randomx/jit_compiler_x86.cpp ) # cheat because cmake and ccache hate each other set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C) - elseif (XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) + elseif (xmlcore_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) list(APPEND SOURCES_CRYPTO src/crypto/randomx/jit_compiler_a64_static.S src/crypto/randomx/jit_compiler_a64.cpp @@ -94,17 +94,17 @@ if (WITH_RANDOMX) ) endif() - if (WITH_MSR AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX)) - add_definitions(/DXMRIG_FEATURE_MSR) - add_definitions(/DXMRIG_FIX_RYZEN) + if (WITH_MSR AND NOT xmlcore_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (xmlcore_OS_WIN OR xmlcore_OS_LINUX)) + add_definitions(/Dxmlcore_FEATURE_MSR) + add_definitions(/Dxmlcore_FIX_RYZEN) message("-- WITH_MSR=ON") - if (XMRIG_OS_WIN) + if (xmlcore_OS_WIN) list(APPEND SOURCES_CRYPTO src/crypto/rx/RxFix_win.cpp src/hw/msr/Msr_win.cpp ) - elseif (XMRIG_OS_LINUX) + elseif (xmlcore_OS_LINUX) list(APPEND SOURCES_CRYPTO src/crypto/rx/RxFix_linux.cpp src/hw/msr/Msr_linux.cpp @@ -124,17 +124,17 @@ if (WITH_RANDOMX) src/hw/msr/MsrItem.cpp ) else() - remove_definitions(/DXMRIG_FEATURE_MSR) - remove_definitions(/DXMRIG_FIX_RYZEN) + remove_definitions(/Dxmlcore_FEATURE_MSR) + remove_definitions(/Dxmlcore_FIX_RYZEN) message("-- WITH_MSR=OFF") endif() if (WITH_PROFILING) - add_definitions(/DXMRIG_FEATURE_PROFILING) + add_definitions(/Dxmlcore_FEATURE_PROFILING) list(APPEND HEADERS_CRYPTO src/crypto/rx/Profiler.h) list(APPEND SOURCES_CRYPTO src/crypto/rx/Profiler.cpp) endif() else() - remove_definitions(/DXMRIG_ALGO_RANDOMX) + remove_definitions(/Dxmlcore_ALGO_RANDOMX) endif() diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md index 509f6ef5..a31faf3e 100644 --- a/doc/ALGORITHMS.md +++ b/doc/ALGORITHMS.md @@ -6,7 +6,7 @@ Algorithm can be defined in 3 ways: 2. Per pool `coin` option, currently only usable values for this option is `monero` and `arqma`. 3. Per pool `algo` option. -Option `coin` useful for pools without [algorithm negotiation](https://xmrig.com/docs/extensions/algorithm-negotiation) support or daemon to allow automatically switch algorithm in next hard fork. If you use xmrig-proxy don't need specify algorithm on miner side. +Option `coin` useful for pools without [algorithm negotiation](https://xmlcore.com/docs/extensions/algorithm-negotiation) support or daemon to allow automatically switch algorithm in next hard fork. If you use xmlcore-proxy don't need specify algorithm on miner side. ## Algorithm names @@ -42,7 +42,7 @@ Option `coin` useful for pools without [algorithm negotiation](https://xmrig.com | `cn/0` | 2 MB | 0.5.0+ | CryptoNight (original). | | ## Migration to v3 -Since version 3 mining [algorithm](#algorithm-names) should specified for each pool separately (`algo` option), earlier versions was use one global `algo` option and per pool `variant` option (this option was removed in v3). If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) you may not specify this option at all. +Since version 3 mining [algorithm](#algorithm-names) should specified for each pool separately (`algo` option), earlier versions was use one global `algo` option and per pool `variant` option (this option was removed in v3). If your pool support [mining algorithm negotiation](https://github.com/xmlcore/xmlcore-proxy/issues/168) you may not specify this option at all. #### Example ```json diff --git a/doc/API.md b/doc/API.md index 2cd0fbbe..3edc42f3 100644 --- a/doc/API.md +++ b/doc/API.md @@ -2,7 +2,7 @@ If you want use HTTP API you need enable it (`"enabled": true,`) then choice `port` and optionaly `host`. API not available if miner built without HTTP support (`-DWITH_HTTP=OFF`). -Offical HTTP client for API: http://workers.xmrig.info/ +Offical HTTP client for API: http://workers.xmlcore.info/ Example configuration: @@ -28,12 +28,12 @@ Example configuration: * **enabled** Enable (`true`) or disable (`false`) HTTP API. * **host** Host for incoming connections `http://:`, to allow connections from all interfaces use `0.0.0.0` (IPv4) or `::` (IPv4+IPv6). * **port** Port for incoming connections `http://:`, zero port is valid option and means random port. -* **access-token** [Bearer](https://gist.github.com/xmrig/c75fdd1f8e0f3bac05500be2ab718f8e#file-api-html-L54) access token to secure access to API. Miner support this token only via `Authorization` header. +* **access-token** [Bearer](https://gist.github.com/xmlcore/c75fdd1f8e0f3bac05500be2ab718f8e#file-api-html-L54) access token to secure access to API. Miner support this token only via `Authorization` header. * **restricted** Use `false` to allow remote configuration. If you prefer use command line options instead of config file, you can use options: `--api-id`, `--api-worker-id`, `--http-enabled`, `--http-host`, `--http-access-token`, `--http-port`, `--http-no-restricted`. -Versions before 2.15 was use another options for API https://github.com/xmrig/xmrig/issues/1007 +Versions before 2.15 was use another options for API https://github.com/xmlcore/xmlcore/issues/1007 ## Endpoints diff --git a/doc/BENCHMARK.md b/doc/BENCHMARK.md index 63b67926..b5285381 100644 --- a/doc/BENCHMARK.md +++ b/doc/BENCHMARK.md @@ -1,11 +1,11 @@ # Embedded benchmark -You can run with XMRig with the following commands: +You can run with xmlcore with the following commands: ``` -xmrig --bench=1M -xmrig --bench=10M -xmrig --bench=1M -a rx/wow -xmrig --bench=10M -a rx/wow +xmlcore --bench=1M +xmlcore --bench=10M +xmlcore --bench=1M -a rx/wow +xmlcore --bench=10M -a rx/wow ``` This will run between 1 and 10 million RandomX hashes, depending on `bench` parameter, and print the time it took. First two commands use Monero variant (2 MB per thread, best for Zen2/Zen3 CPUs), second two commands use Wownero variant (1 MB per thread, useful for Intel and 1st gen Zen/Zen+ CPUs). @@ -23,7 +23,7 @@ You can run benchmark with any configuration you want. Just start without comman You can also run continuous stress-test that is as close to the real RandomX mining as possible and doesn't require any configuration: ``` -xmrig --stress -xmrig --stress -a rx/wow +xmlcore --stress +xmlcore --stress -a rx/wow ``` This will require Internet connection and will run indefinitely. \ No newline at end of file diff --git a/doc/CHANGELOG_OLD.md b/doc/CHANGELOG_OLD.md index 70059190..b41bc518 100644 --- a/doc/CHANGELOG_OLD.md +++ b/doc/CHANGELOG_OLD.md @@ -1,106 +1,106 @@ # v4.6.2-beta -- [#1274](https://github.com/xmrig/xmrig/issues/1274) Added `--cuda-devices` command line option. -- [#1277](https://github.com/xmrig/xmrig/pull/1277) Fixed function names for clang on Apple. +- [#1274](https://github.com/xmlcore/xmlcore/issues/1274) Added `--cuda-devices` command line option. +- [#1277](https://github.com/xmlcore/xmlcore/pull/1277) Fixed function names for clang on Apple. # v4.6.1-beta -- [#1272](https://github.com/xmrig/xmrig/pull/1272) Optimized hashrate calculation. -- [#1273](https://github.com/xmrig/xmrig/issues/1273) Fixed crash when use `GET /2/backends` API endpoint with disabled CUDA. +- [#1272](https://github.com/xmlcore/xmlcore/pull/1272) Optimized hashrate calculation. +- [#1273](https://github.com/xmlcore/xmlcore/issues/1273) Fixed crash when use `GET /2/backends` API endpoint with disabled CUDA. # v4.6.0-beta -- [#1263](https://github.com/xmrig/xmrig/pull/1263) Added new option `dataset_host` for NVIDIA GPUs with less than 4 GB memory (RandomX only). +- [#1263](https://github.com/xmlcore/xmlcore/pull/1263) Added new option `dataset_host` for NVIDIA GPUs with less than 4 GB memory (RandomX only). # v4.5.0-beta -- Added NVIDIA CUDA support via external [CUDA plugun](https://github.com/xmrig/xmrig-cuda). XMRig now is unified 3 in 1 miner. +- Added NVIDIA CUDA support via external [CUDA plugun](https://github.com/xmlcore/xmlcore-cuda). xmlcore now is unified 3 in 1 miner. # v4.4.0-beta -- [#1068](https://github.com/xmrig/xmrig/pull/1068) Added support for `self-select` stratum protocol extension. -- [#1240](https://github.com/xmrig/xmrig/pull/1240) Sync with the latest RandomX code. -- [#1241](https://github.com/xmrig/xmrig/issues/1241) Fixed regression with colors on old Windows systems. -- [#1243](https://github.com/xmrig/xmrig/pull/1243) Fixed incorrect OpenCL memory size detection in some cases. -- [#1247](https://github.com/xmrig/xmrig/pull/1247) Fixed ARM64 RandomX code alignment. -- [#1248](https://github.com/xmrig/xmrig/pull/1248) Fixed RandomX code cache cleanup on iOS/Darwin. +- [#1068](https://github.com/xmlcore/xmlcore/pull/1068) Added support for `self-select` stratum protocol extension. +- [#1240](https://github.com/xmlcore/xmlcore/pull/1240) Sync with the latest RandomX code. +- [#1241](https://github.com/xmlcore/xmlcore/issues/1241) Fixed regression with colors on old Windows systems. +- [#1243](https://github.com/xmlcore/xmlcore/pull/1243) Fixed incorrect OpenCL memory size detection in some cases. +- [#1247](https://github.com/xmlcore/xmlcore/pull/1247) Fixed ARM64 RandomX code alignment. +- [#1248](https://github.com/xmlcore/xmlcore/pull/1248) Fixed RandomX code cache cleanup on iOS/Darwin. # v4.3.1-beta - Fixed regression in v4.3.0, miner didn't create `cn` mining profile with default config example. # v4.3.0-beta -- [#1227](https://github.com/xmrig/xmrig/pull/1227) Added new algorithm `rx/arq`, RandomX variant for upcoming ArQmA fork. -- [#808](https://github.com/xmrig/xmrig/issues/808#issuecomment-539297156) Added experimental support for persistent memory for CPU mining threads. -- [#1221](https://github.com/xmrig/xmrig/issues/1221) Improved RandomX dataset memory usage and initialization speed for NUMA machines. +- [#1227](https://github.com/xmlcore/xmlcore/pull/1227) Added new algorithm `rx/arq`, RandomX variant for upcoming ArQmA fork. +- [#808](https://github.com/xmlcore/xmlcore/issues/808#issuecomment-539297156) Added experimental support for persistent memory for CPU mining threads. +- [#1221](https://github.com/xmlcore/xmlcore/issues/1221) Improved RandomX dataset memory usage and initialization speed for NUMA machines. # v4.2.1-beta -- [#1150](https://github.com/xmrig/xmrig/issues/1150) Fixed build on FreeBSD. -- [#1175](https://github.com/xmrig/xmrig/issues/1175) Fixed support for systems where total count of NUMA nodes not equal usable nodes count. -- [#1199](https://github.com/xmrig/xmrig/issues/1199) Fixed excessive memory allocation for OpenCL threads with low intensity. -- [#1212](https://github.com/xmrig/xmrig/issues/1212) Fixed low RandomX performance after fast algorithm switching. +- [#1150](https://github.com/xmlcore/xmlcore/issues/1150) Fixed build on FreeBSD. +- [#1175](https://github.com/xmlcore/xmlcore/issues/1175) Fixed support for systems where total count of NUMA nodes not equal usable nodes count. +- [#1199](https://github.com/xmlcore/xmlcore/issues/1199) Fixed excessive memory allocation for OpenCL threads with low intensity. +- [#1212](https://github.com/xmlcore/xmlcore/issues/1212) Fixed low RandomX performance after fast algorithm switching. # v4.2.0-beta -- [#1202](https://github.com/xmrig/xmrig/issues/1202) Fixed algorithm verification in donate strategy. +- [#1202](https://github.com/xmlcore/xmlcore/issues/1202) Fixed algorithm verification in donate strategy. - Added per pool option `coin` with single possible value `monero` for pools without algorithm negotiation, for upcoming Monero fork. - Added config option `cpu/max-threads-hint` and command line option `--cpu-max-threads-hint`. # v4.1.0-beta - **OpenCL backend disabled by default.**. -- [#1183](https://github.com/xmrig/xmrig/issues/1183) Fixed compatibility with systemd. -- [#1185](https://github.com/xmrig/xmrig/pull/1185) Added JIT compiler for RandomX on ARMv8. -- Improved API endpoint `GET /2/backends` and added support for this endpoint to [workers.xmrig.info](http://workers.xmrig.info). +- [#1183](https://github.com/xmlcore/xmlcore/issues/1183) Fixed compatibility with systemd. +- [#1185](https://github.com/xmlcore/xmlcore/pull/1185) Added JIT compiler for RandomX on ARMv8. +- Improved API endpoint `GET /2/backends` and added support for this endpoint to [workers.xmlcore.info](http://workers.xmlcore.info). - Added command line option `--no-cpu` to disable CPU backend. - Added OpenCL specific command line options: `--opencl`, `--opencl-devices`, `--opencl-platform`, `--opencl-loader` and `--opencl-no-cache`. - Removed command line option `--http-enabled`, HTTP API enabled automatically if any other `--http-*` option provided. # v4.0.1-beta -- [#1177](https://github.com/xmrig/xmrig/issues/1177) Fixed compatibility with old AMD drivers. -- [#1180](https://github.com/xmrig/xmrig/issues/1180) Fixed possible duplicated shares after algorithm switching. +- [#1177](https://github.com/xmlcore/xmlcore/issues/1177) Fixed compatibility with old AMD drivers. +- [#1180](https://github.com/xmlcore/xmlcore/issues/1180) Fixed possible duplicated shares after algorithm switching. - Added support for case if not all backend threads successfully started. - Fixed wrong config file permissions after write (only gcc builds on recent Windows 10 affected). # v4.0.0-beta -- [#1172](https://github.com/xmrig/xmrig/issues/1172) **Added OpenCL mining backend.** - - [#268](https://github.com/xmrig/xmrig-amd/pull/268) [#270](https://github.com/xmrig/xmrig-amd/pull/270) [#271](https://github.com/xmrig/xmrig-amd/pull/271) [#273](https://github.com/xmrig/xmrig-amd/pull/273) [#274](https://github.com/xmrig/xmrig-amd/pull/274) [#1171](https://github.com/xmrig/xmrig/pull/1171) Added RandomX support for OpenCL, thanks [@SChernykh](https://github.com/SChernykh). +- [#1172](https://github.com/xmlcore/xmlcore/issues/1172) **Added OpenCL mining backend.** + - [#268](https://github.com/xmlcore/xmlcore-amd/pull/268) [#270](https://github.com/xmlcore/xmlcore-amd/pull/270) [#271](https://github.com/xmlcore/xmlcore-amd/pull/271) [#273](https://github.com/xmlcore/xmlcore-amd/pull/273) [#274](https://github.com/xmlcore/xmlcore-amd/pull/274) [#1171](https://github.com/xmlcore/xmlcore/pull/1171) Added RandomX support for OpenCL, thanks [@SChernykh](https://github.com/SChernykh). - Algorithm `cn/wow` removed, as no longer alive. # v3.2.0 - Added per pool option `coin` with single possible value `monero` for pools without algorithm negotiation, for upcoming Monero fork. -- [#1183](https://github.com/xmrig/xmrig/issues/1183) Fixed compatibility with systemd. +- [#1183](https://github.com/xmlcore/xmlcore/issues/1183) Fixed compatibility with systemd. # v3.1.3 -- [#1180](https://github.com/xmrig/xmrig/issues/1180) Fixed possible duplicated shares after algorithm switching. +- [#1180](https://github.com/xmlcore/xmlcore/issues/1180) Fixed possible duplicated shares after algorithm switching. - Fixed wrong config file permissions after write (only gcc builds on recent Windows 10 affected). # v3.1.2 - Many RandomX optimizations and fixes. - - [#1132](https://github.com/xmrig/xmrig/issues/1132) Fixed build on CentOS 7. - - [#1163](https://github.com/xmrig/xmrig/pull/1163) Optimized soft AES code, up to +30% hashrate on CPU without AES support and other optimizations. - - [#1166](https://github.com/xmrig/xmrig/pull/1166) Fixed crash when initialize dataset with big threads count (eg 272). - - [#1168](https://github.com/xmrig/xmrig/pull/1168) Optimized loading from scratchpad. -- [#1128](https://github.com/xmrig/xmrig/issues/1128) Fixed CMake 2.8 compatibility. + - [#1132](https://github.com/xmlcore/xmlcore/issues/1132) Fixed build on CentOS 7. + - [#1163](https://github.com/xmlcore/xmlcore/pull/1163) Optimized soft AES code, up to +30% hashrate on CPU without AES support and other optimizations. + - [#1166](https://github.com/xmlcore/xmlcore/pull/1166) Fixed crash when initialize dataset with big threads count (eg 272). + - [#1168](https://github.com/xmlcore/xmlcore/pull/1168) Optimized loading from scratchpad. +- [#1128](https://github.com/xmlcore/xmlcore/issues/1128) Fixed CMake 2.8 compatibility. # v3.1.1 -- [#1133](https://github.com/xmrig/xmrig/issues/1133) Fixed syslog regression. -- [#1138](https://github.com/xmrig/xmrig/issues/1138) Fixed multiple network bugs. -- [#1141](https://github.com/xmrig/xmrig/issues/1141) Fixed log in background mode. -- [#1142](https://github.com/xmrig/xmrig/pull/1142) RandomX hashrate improved by 0.5-1.5% depending on variant and CPU. -- [#1146](https://github.com/xmrig/xmrig/pull/1146) Fixed race condition in RandomX thread init. -- [#1148](https://github.com/xmrig/xmrig/pull/1148) Fixed, on Linux linker marking entire executable as having an executable stack. +- [#1133](https://github.com/xmlcore/xmlcore/issues/1133) Fixed syslog regression. +- [#1138](https://github.com/xmlcore/xmlcore/issues/1138) Fixed multiple network bugs. +- [#1141](https://github.com/xmlcore/xmlcore/issues/1141) Fixed log in background mode. +- [#1142](https://github.com/xmlcore/xmlcore/pull/1142) RandomX hashrate improved by 0.5-1.5% depending on variant and CPU. +- [#1146](https://github.com/xmlcore/xmlcore/pull/1146) Fixed race condition in RandomX thread init. +- [#1148](https://github.com/xmlcore/xmlcore/pull/1148) Fixed, on Linux linker marking entire executable as having an executable stack. - Fixed, for Argon2 algorithms command line options like `--threads` was ignored. - Fixed command line options for single pool, free order allowed again. # v3.1.0 -- [#1107](https://github.com/xmrig/xmrig/issues/1107#issuecomment-522235892) Added Argon2 algorithm family: `argon2/chukwa` and `argon2/wrkz`. +- [#1107](https://github.com/xmlcore/xmlcore/issues/1107#issuecomment-522235892) Added Argon2 algorithm family: `argon2/chukwa` and `argon2/wrkz`. # v3.0.0 -- **[#1111](https://github.com/xmrig/xmrig/pull/1111) Added RandomX (`rx/test`) algorithm for testing and benchmarking.** -- **[#1036](https://github.com/xmrig/xmrig/pull/1036) Added RandomWOW (`rx/wow`) algorithm for [Wownero](http://wownero.org/).** -- **[#1050](https://github.com/xmrig/xmrig/pull/1050) Added RandomXL (`rx/loki`) algorithm for [Loki](https://loki.network/).** -- **[#1077](https://github.com/xmrig/xmrig/issues/1077) Added NUMA support via hwloc**. +- **[#1111](https://github.com/xmlcore/xmlcore/pull/1111) Added RandomX (`rx/test`) algorithm for testing and benchmarking.** +- **[#1036](https://github.com/xmlcore/xmlcore/pull/1036) Added RandomWOW (`rx/wow`) algorithm for [Wownero](http://wownero.org/).** +- **[#1050](https://github.com/xmlcore/xmlcore/pull/1050) Added RandomXL (`rx/loki`) algorithm for [Loki](https://loki.network/).** +- **[#1077](https://github.com/xmlcore/xmlcore/issues/1077) Added NUMA support via hwloc**. - **Added flexible [multi algorithm](doc/CPU.md) configuration.** - **Added unlimited switching between incompatible algorithms, all mining options can be changed in runtime.** -- [#257](https://github.com/xmrig/xmrig-nvidia/pull/257) New logging subsystem, file and syslog now always without colors. -- [#314](https://github.com/xmrig/xmrig-proxy/issues/314) Added donate over proxy feature. -- [#1007](https://github.com/xmrig/xmrig/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser). -- [#1010](https://github.com/xmrig/xmrig/pull/1010#issuecomment-482632107) Added daemon support (solo mining). -- [#1066](https://github.com/xmrig/xmrig/issues/1066#issuecomment-518080529) Added error message if pool not ready for RandomX. -- [#1105](https://github.com/xmrig/xmrig/issues/1105) Improved auto configuration for `cn-pico` algorithm. +- [#257](https://github.com/xmlcore/xmlcore-nvidia/pull/257) New logging subsystem, file and syslog now always without colors. +- [#314](https://github.com/xmlcore/xmlcore-proxy/issues/314) Added donate over proxy feature. +- [#1007](https://github.com/xmlcore/xmlcore/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser). +- [#1010](https://github.com/xmlcore/xmlcore/pull/1010#issuecomment-482632107) Added daemon support (solo mining). +- [#1066](https://github.com/xmlcore/xmlcore/issues/1066#issuecomment-518080529) Added error message if pool not ready for RandomX. +- [#1105](https://github.com/xmlcore/xmlcore/issues/1105) Improved auto configuration for `cn-pico` algorithm. - Added commands `pause` and `resume` via JSON RPC 2.0 API (`POST /json_rpc`). - Added command line option `--export-topology` for export hwloc topology to a XML file. - Breaked backward compatibility with previous configs and command line, `variant` option replaced to `algo`, global option `algo` removed, all CPU related settings moved to `cpu` object. @@ -118,37 +118,37 @@ - Information about AVX2 CPU feature how hidden in miner summary. # v2.99.5-beta -- [#1066](https://github.com/xmrig/xmrig/issues/1066#issuecomment-518080529) Fixed crash and added error message if pool not ready for RandomX. -- [#1092](https://github.com/xmrig/xmrig/issues/1092) Fixed crash if wrong CPU affinity used. -- [#1103](https://github.com/xmrig/xmrig/issues/1103) Improved auto configuration for RandomX for CPUs where L2 cache is limiting factor. -- [#1105](https://github.com/xmrig/xmrig/issues/1105) Improved auto configuration for `cn-pico` algorithm. -- [#1106](https://github.com/xmrig/xmrig/issues/1106) Fixed `hugepages` field in summary API. +- [#1066](https://github.com/xmlcore/xmlcore/issues/1066#issuecomment-518080529) Fixed crash and added error message if pool not ready for RandomX. +- [#1092](https://github.com/xmlcore/xmlcore/issues/1092) Fixed crash if wrong CPU affinity used. +- [#1103](https://github.com/xmlcore/xmlcore/issues/1103) Improved auto configuration for RandomX for CPUs where L2 cache is limiting factor. +- [#1105](https://github.com/xmlcore/xmlcore/issues/1105) Improved auto configuration for `cn-pico` algorithm. +- [#1106](https://github.com/xmlcore/xmlcore/issues/1106) Fixed `hugepages` field in summary API. - Added alternative short format for CPU threads. - Changed format for CPU threads with intensity above 1. - Name for reference RandomX configuration changed to `rx/test` to avoid potential conflicts in future. # v2.99.4-beta -- [#1062](https://github.com/xmrig/xmrig/issues/1062) Fixed 32 bit support. **32 bit is slow and deprecated**. -- [#1088](https://github.com/xmrig/xmrig/pull/1088) Fixed macOS compilation. -- [#1095](https://github.com/xmrig/xmrig/pull/1095) Fixed compatibility with hwloc 1.10.x. +- [#1062](https://github.com/xmlcore/xmlcore/issues/1062) Fixed 32 bit support. **32 bit is slow and deprecated**. +- [#1088](https://github.com/xmlcore/xmlcore/pull/1088) Fixed macOS compilation. +- [#1095](https://github.com/xmlcore/xmlcore/pull/1095) Fixed compatibility with hwloc 1.10.x. - Optimized RandomX initialization and switching, fixed rare crash when re-initialize dataset. - Fixed ARM build with hwloc. # v2.99.3-beta -- [#1082](https://github.com/xmrig/xmrig/issues/1082) Fixed hwloc auto configuration on AMD FX CPUs. +- [#1082](https://github.com/xmlcore/xmlcore/issues/1082) Fixed hwloc auto configuration on AMD FX CPUs. - Added command line option `--export-topology` for export hwloc topology to a XML file. # v2.99.2-beta -- [#1077](https://github.com/xmrig/xmrig/issues/1077) Added NUMA support via **hwloc**. +- [#1077](https://github.com/xmlcore/xmlcore/issues/1077) Added NUMA support via **hwloc**. - Fixed miner freeze when switch between RandomX variants. - Fixed dataset initialization speed on Linux if thread affinity was used. # v2.99.1-beta -- [#1072](https://github.com/xmrig/xmrig/issues/1072) Fixed RandomX `seed_hash` re-initialization. +- [#1072](https://github.com/xmlcore/xmlcore/issues/1072) Fixed RandomX `seed_hash` re-initialization. # v2.99.0-beta -- [#1050](https://github.com/xmrig/xmrig/pull/1050) Added RandomXL algorithm for [Loki](https://loki.network/), algorithm name used by miner is `randomx/loki` or `rx/loki`. -- Added [flexible](https://github.com/xmrig/xmrig/blob/evo/doc/CPU.md) multi algorithm configuration. +- [#1050](https://github.com/xmlcore/xmlcore/pull/1050) Added RandomXL algorithm for [Loki](https://loki.network/), algorithm name used by miner is `randomx/loki` or `rx/loki`. +- Added [flexible](https://github.com/xmlcore/xmlcore/blob/evo/doc/CPU.md) multi algorithm configuration. - Added unlimited switching between incompatible algorithms, all mining options can be changed in runtime. - Breaked backward compatibility with previous configs and command line, `variant` option replaced to `algo`, global option `algo` removed, all CPU related settings moved to `cpu` object. - Options `av`, `safe` and `max-cpu-usage` removed. @@ -157,7 +157,7 @@ - API endpoint `GET /1/threads` replaced to `GET /2/backends`. # v2.16.0-beta -- [#1036](https://github.com/xmrig/xmrig/pull/1036) Added RandomWOW (RandomX with different preferences) algorithm support for [Wownero](http://wownero.org/). +- [#1036](https://github.com/xmlcore/xmlcore/pull/1036) Added RandomWOW (RandomX with different preferences) algorithm support for [Wownero](http://wownero.org/). - Algorithm name used by miner is `randomx/wow` or `rx/wow`. - Currently runtime algorithm switching NOT supported with other algorithms. @@ -167,149 +167,149 @@ - This version also include all changes from stable version v2.14.4. # v2.15.3-beta -- [#1014](https://github.com/xmrig/xmrig/issues/1014) Fixed regression, default value for `algo` option was not applied. +- [#1014](https://github.com/xmlcore/xmlcore/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. +- [#1010](https://github.com/xmlcore/xmlcore/pull/1010#issuecomment-482632107) Added daemon support (solo mining). +- [#1012](https://github.com/xmlcore/xmlcore/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. +- [#1007](https://github.com/xmlcore/xmlcore/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser). +- [#257](https://github.com/xmlcore/xmlcore-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. +- [#314](https://github.com/xmlcore/xmlcore-proxy/issues/314) Added donate over proxy feature. - Added new option `donate-over-proxy`. - Added real graceful exit. # v2.14.4 -- [#992](https://github.com/xmrig/xmrig/pull/992) Fixed compilation with Clang 3.5. -- [#1012](https://github.com/xmrig/xmrig/pull/1012) Fixed compilation with Clang 9.0. +- [#992](https://github.com/xmlcore/xmlcore/pull/992) Fixed compilation with Clang 3.5. +- [#1012](https://github.com/xmlcore/xmlcore/pull/1012) Fixed compilation with Clang 9.0. - In HTTP API for unknown hashrate now used `null` instead of `0.0`. - Fixed MSVC 2019 version detection. - Removed obsolete automatic variants. # v2.14.1 -* [#975](https://github.com/xmrig/xmrig/issues/975) Fixed crash on Linux if double thread mode used. +* [#975](https://github.com/xmlcore/xmlcore/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. +- **[#969](https://github.com/xmlcore/xmlcore/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/xmlcore/xmlcore/issues/931) Added new algorithm `cryptonight/zls`, short alias `cn/zls` for [Zelerius Network](https://zelerius.org) fork.** +- **[#940](https://github.com/xmlcore/xmlcore/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/xmlcore/xmlcore/issues/951#issuecomment-469581529) Fixed crash if AVX was disabled on OS level. +- [#952](https://github.com/xmlcore/xmlcore/issues/952) Fixed compile error on some Linux. +- [#957](https://github.com/xmlcore/xmlcore/issues/957#issuecomment-468890667) Added support for embedded config. +- [#958](https://github.com/xmlcore/xmlcore/pull/958) Fixed incorrect user agent on ARM platforms. +- [#968](https://github.com/xmlcore/xmlcore/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. +- [#946](https://github.com/xmlcore/xmlcore/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. +- **[#938](https://github.com/xmlcore/xmlcore/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/xmlcore/xmlcore/issues/939) Added support for dynamic (runtime) pools reload. +- [#932](https://github.com/xmlcore/xmlcore/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. +- [#929](https://github.com/xmlcore/xmlcore/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. +- [#928](https://github.com/xmlcore/xmlcore/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/xmlcore/xmlcore/issues/749) Added support for detect hardware AES in runtime on ARMv8 platforms. +- [#292](https://github.com/xmlcore/xmlcore/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. +- [#904](https://github.com/xmlcore/xmlcore/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. +- [#913](https://github.com/xmlcore/xmlcore/issues/913) Fixed Masari (MSR) support (this update required for upcoming fork). +- [#915](https://github.com/xmlcore/xmlcore/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. +- [#909](https://github.com/xmlcore/xmlcore/issues/909) Fixed compile errors on FreeBSD. +- [#912](https://github.com/xmlcore/xmlcore/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. +- [#907](https://github.com/xmlcore/xmlcore/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. +- [#899](https://github.com/xmlcore/xmlcore/issues/899) Added support for new algorithm `cn/half` for Masari and Stellite forks. +- [#834](https://github.com/xmlcore/xmlcore/pull/834) Added ASM optimized code for AMD Bulldozer. +- [#839](https://github.com/xmlcore/xmlcore/issues/839) Fixed FreeBSD compile. +- [#857](https://github.com/xmlcore/xmlcore/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. +- [#813](https://github.com/xmlcore/xmlcore/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. +- [#768](https://github.com/xmlcore/xmlcore/issues/768) Fixed build with Visual Studio 2015. +- [#769](https://github.com/xmlcore/xmlcore/issues/769) Fixed regression, some ANSI escape sequences was in log with disabled colors. +- [#777](https://github.com/xmlcore/xmlcore/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).** +- **[#753](https://github.com/xmlcore/xmlcore/issues/753) Added new algorithm [CryptoNight variant 2](https://github.com/xmlcore/xmlcore/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.** +- **[#758](https://github.com/xmlcore/xmlcore/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. +- [#767](https://github.com/xmlcore/xmlcore/issues/767) Added config autosave feature, same with GPU miners. +- [#245](https://github.com/xmlcore/xmlcore-proxy/issues/245) Fixed API ID collision when run multiple miners on same machine. +- [#757](https://github.com/xmlcore/xmlcore/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)**. +- [#700](https://github.com/xmlcore/xmlcore/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. +- [#692](https://github.com/xmlcore/xmlcore/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. +- [#446](https://github.com/xmlcore/xmlcore/issues/446) Likely fixed SIGBUS error on 32 bit ARM CPUs. +- [#551](https://github.com/xmlcore/xmlcore/issues/551) Fixed `cn-heavy` algorithm on ARMv8. +- [#614](https://github.com/xmlcore/xmlcore/issues/614) Fixed display issue with huge pages percentage when colors disabled. +- [#615](https://github.com/xmlcore/xmlcore/issues/615) Fixed build without libcpuid. +- [#629](https://github.com/xmlcore/xmlcore/pull/629) Fixed file logging with non-seekable files. +- [#672](https://github.com/xmlcore/xmlcore/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. + - [#607](https://github.com/xmlcore/xmlcore/issues/607) Fixed donation bug. + - [#610](https://github.com/xmlcore/xmlcore/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). + - [#168](https://github.com/xmlcore/xmlcore-proxy/issues/168) Added support for [mining algorithm negotiation](https://github.com/xmlcore/xmlcore-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. + - [#581](https://github.com/xmlcore/xmlcore/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. +- [#563](https://github.com/xmlcore/xmlcore/issues/563) **Added [advanced threads mode](https://github.com/xmlcore/xmlcore/issues/563), now possible configure each thread individually.** +- [#255](https://github.com/xmlcore/xmlcore/issues/563) Low power mode extended to **triple**, **quard** and **penta** modes. +- [#519](https://github.com/xmlcore/xmlcore/issues/519) Fixed high donation levels, improved donation start time randomization. +- [#554](https://github.com/xmlcore/xmlcore/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. +- [#499](https://github.com/xmlcore/xmlcore/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. + - [#494](https://github.com/xmlcore/xmlcore/issues/494) Command line option `--donate-level` was broken. + - [#502](https://github.com/xmlcore/xmlcore/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.** + - [#476](https://github.com/xmlcore/xmlcore/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. @@ -321,100 +321,100 @@ # 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. +- [#499](https://github.com/xmlcore/xmlcore/issues/499) IPv6 support disabled for internal HTTP API. - Added workaround for nicehash.com if you use `cryptonightv7..nicehash.com` option `variant=1` will be set automatically. # v2.5.2 -- [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect. +- [#448](https://github.com/xmlcore/xmlcore/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**. +- [#454](https://github.com/xmlcore/xmlcore/issues/454) Fixed build with libmicrohttpd version below v0.9.35. +- [#456](https://github.com/xmlcore/xmlcore/issues/459) Verbose errors related to donation pool was not fully silenced. +- [#459](https://github.com/xmlcore/xmlcore/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.** +- [#434](https://github.com/xmlcore/xmlcore/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. +- Added protocol extension, when use the miner with xmlcore-proxy 2.5+ no more need manually specify `nicehash` option. +- [#123](https://github.com/xmlcore/xmlcore-proxy/issues/123) Fixed regression (all versions since 2.4 affected) fragmented responses from pool/proxy was parsed incorrectly. +- [#428](https://github.com/xmlcore/xmlcore/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. +- [#324](https://github.com/xmlcore/xmlcore/pull/324) Fixed build without libmicrohttpd (CMake cache issue). +- [#341](https://github.com/xmlcore/xmlcore/issues/341) Fixed wrong exit code and added command line option `--dry-run`. +- [#385](https://github.com/xmlcore/xmlcore/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. + - [#279](https://github.com/xmlcore/xmlcore/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. + - [#94](https://github.com/xmlcore/xmlcore/issues/94#issuecomment-342019257) [#216](https://github.com/xmlcore/xmlcore/issues/216) Added **ARMv8** and **ARMv7** support. Hardware AES supported, thanks [Imran Yusuff](https://github.com/imranyusuff). + - [#157](https://github.com/xmlcore/xmlcore/issues/157) [#196](https://github.com/xmlcore/xmlcore/issues/196) Fixed Linux compile issues. + - [#184](https://github.com/xmlcore/xmlcore/issues/184) Fixed cache size detection for CPUs with disabled Hyper-Threading. + - [#200](https://github.com/xmlcore/xmlcore/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. + - [#60](https://github.com/xmlcore/xmlcore/issues/60) Added FreeBSD support, thanks [vcambur](https://github.com/vcambur). + - [#153](https://github.com/xmlcore/xmlcore/issues/153) Fixed issues with dwarfpool.com. # v2.4.1 - - [#147](https://github.com/xmrig/xmrig/issues/147) Fixed comparability with monero-stratum. + - [#147](https://github.com/xmlcore/xmlcore/issues/147) Fixed comparability with monero-stratum. # v2.4.0 - - Added [HTTP API](https://github.com/xmrig/xmrig/wiki/API). + - Added [HTTP API](https://github.com/xmlcore/xmlcore/wiki/API). - Added comments support in config file. - libjansson replaced to rapidjson. - - [#98](https://github.com/xmrig/xmrig/issues/98) Ignore `keepalive` option with minergate.com and nicehash.com. - - [#101](https://github.com/xmrig/xmrig/issues/101) Fixed MSVC 2017 (15.3) compile time version detection. - - [#108](https://github.com/xmrig/xmrig/issues/108) Silently ignore invalid values for `donate-level` option. - - [#111](https://github.com/xmrig/xmrig/issues/111) Fixed build without AEON support. + - [#98](https://github.com/xmlcore/xmlcore/issues/98) Ignore `keepalive` option with minergate.com and nicehash.com. + - [#101](https://github.com/xmlcore/xmlcore/issues/101) Fixed MSVC 2017 (15.3) compile time version detection. + - [#108](https://github.com/xmlcore/xmlcore/issues/108) Silently ignore invalid values for `donate-level` option. + - [#111](https://github.com/xmlcore/xmlcore/issues/111) Fixed build without AEON support. # v2.3.1 -- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console. +- [#68](https://github.com/xmlcore/xmlcore/issues/68) Fixed compatibility with Docker containers, was nothing print on console. # v2.3.0 - Added `--cpu-priority` option (0 idle, 2 normal to 5 highest). - Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`. - Added `--no-huge-pages` option, to disable huge pages support. -- [#62](https://github.com/xmrig/xmrig/issues/62) Don't send the login to the dev pool. +- [#62](https://github.com/xmlcore/xmlcore/issues/62) Don't send the login to the dev pool. - Force reconnect if pool block miner IP address. helps switch to backup pool. - Fixed: failed open default config file if path contains non English characters. - Fixed: error occurred if try use unavailable stdin or stdout, regression since version 2.2.0. - Fixed: message about huge pages support successfully enabled on Windows was not shown in release builds. # v2.2.1 -- Fixed [terminal issues](https://github.com/xmrig/xmrig-proxy/issues/2#issuecomment-319914085) after exit on Linux and OS X. +- Fixed [terminal issues](https://github.com/xmlcore/xmlcore-proxy/issues/2#issuecomment-319914085) after exit on Linux and OS X. # v2.2.0 -- [#46](https://github.com/xmrig/xmrig/issues/46) Restored config file support. Now possible use multiple config files and combine with command line options also added support for default config. +- [#46](https://github.com/xmlcore/xmlcore/issues/46) Restored config file support. Now possible use multiple config files and combine with command line options also added support for default config. - Improved colors support on Windows, now used uv_tty, legacy code removed. - QuickEdit Mode now disabled on Windows. - Added interactive commands in console window:: **h**ashrate, **p**ause, **r**esume. - Fixed autoconf mode for AMD FX CPUs. # v2.1.0 -- [#40](https://github.com/xmrig/xmrig/issues/40) +- [#40](https://github.com/xmlcore/xmlcore/issues/40) Improved miner shutdown, fixed crash on exit for Linux and OS X. - Fixed, login request was contain malformed JSON if username or password has some special characters for example `\`. - [#220](https://github.com/fireice-uk/xmr-stak-cpu/pull/220) Better support for Round Robin DNS, IP address now always chosen randomly instead of stuck on first one. -- Changed donation address, new [xmrig-proxy](https://github.com/xmrig/xmrig-proxy) is coming soon. +- Changed donation address, new [xmlcore-proxy](https://github.com/xmlcore/xmlcore-proxy) is coming soon. # v2.0.2 - Better deal with possible duplicate jobs from pool, show warning and ignore duplicates. - For Windows builds libuv updated to version 1.13.1 and gcc to 7.1.0. # v2.0.1 - - [#27](https://github.com/xmrig/xmrig/issues/27) Fixed possibility crash on 32bit systems. + - [#27](https://github.com/xmlcore/xmlcore/issues/27) Fixed possibility crash on 32bit systems. # v2.0.0 - Option `--backup-url` removed, instead now possibility specify multiple pools for example: `-o example1.com:3333 -u user1 -p password1 -k -o example2.com:5555 -u user2 -o example3.com:4444 -u user3` - - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-l, --log-file=FILE` to write log to file. - - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-S, --syslog` to use syslog for logging, Linux only. - - [#18](https://github.com/xmrig/xmrig/issues/18) Added nice messages for accepted/rejected shares with diff and network latency. - - [#20](https://github.com/xmrig/xmrig/issues/20) Fixed `--cpu-affinity` for more than 32 threads. + - [#15](https://github.com/xmlcore/xmlcore/issues/15) Added option `-l, --log-file=FILE` to write log to file. + - [#15](https://github.com/xmlcore/xmlcore/issues/15) Added option `-S, --syslog` to use syslog for logging, Linux only. + - [#18](https://github.com/xmlcore/xmlcore/issues/18) Added nice messages for accepted/rejected shares with diff and network latency. + - [#20](https://github.com/xmlcore/xmlcore/issues/20) Fixed `--cpu-affinity` for more than 32 threads. - Fixed Windows XP support. - Fixed regression, option `--no-color` was not fully disable colored output. - Show resolved pool IP address in miner output. @@ -425,12 +425,12 @@ Improved miner shutdown, fixed crash on exit for Linux and OS X. # v1.0.0 - Miner complete rewritten in C++ with libuv. - This version should be fully compatible (except config file) with previos versions, many new nice features will come in next versions. -- This is still beta. If you found regression, stability or perfomance issues or have an idea for new feature please fell free to open new [issue](https://github.com/xmrig/xmrig/issues/new). +- This is still beta. If you found regression, stability or perfomance issues or have an idea for new feature please fell free to open new [issue](https://github.com/xmlcore/xmlcore/issues/new). - Added new option `--print-time=N`, print hashrate report every N seconds. - New hashrate reports, by default every 60 secons. - Added Microsoft Visual C++ 2015 and 2017 support. - Removed dependency on libcurl. -- To compile this version from source please switch to [dev](https://github.com/xmrig/xmrig/tree/dev) branch. +- To compile this version from source please switch to [dev](https://github.com/xmlcore/xmlcore/tree/dev) branch. # v0.8.2 - Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture). @@ -448,7 +448,7 @@ Improved miner shutdown, fixed crash on exit for Linux and OS X. - Added CryptoNight-Lite support for AEON `-a cryptonight-lite`. - Added `--max-cpu-usage` option for auto CPU configuration mode. - Added `--safe` option for adjust threads and algorithm variations to current CPU. -- No more manual steps to enable huge pages on Windows. XMRig will do it automatically. +- No more manual steps to enable huge pages on Windows. xmlcore will do it automatically. - Removed BMI2 algorithm variation. - Removed default pool URL. @@ -456,7 +456,7 @@ Improved miner shutdown, fixed crash on exit for Linux and OS X. - Added automatic cryptonight self test. - New software AES algorithm variation. Will be automatically selected if cpu not support AES-NI. - Added 32 bit builds. -- Documented [algorithm variations](https://github.com/xmrig/xmrig#algorithm-variations). +- Documented [algorithm variations](https://github.com/xmlcore/xmlcore#algorithm-variations). # v0.5.0 - Initial public release. diff --git a/doc/CPU.md b/doc/CPU.md index 508f1e2c..dd6b19e8 100644 --- a/doc/CPU.md +++ b/doc/CPU.md @@ -93,10 +93,10 @@ Use 1GB hugepages for RandomX dataset (Linux only). Enabled (`true`) or disabled Restore MSR register values to their original values on exit. Used together with `wrmsr`. Enabled (`true`) or disabled (`false`). #### `wrmsr` -[MSR mod](https://xmrig.com/docs/miner/randomx-optimization-guide/msr). Enabled (`true`) or disabled (`false`). It gives up to 15% speedup depending on your system. +[MSR mod](https://xmlcore.com/docs/miner/randomx-optimization-guide/msr). Enabled (`true`) or disabled (`false`). It gives up to 15% speedup depending on your system. #### `cache_qos` -[Cache QoS](https://xmrig.com/docs/miner/randomx-optimization-guide/qos). Enabled (`true`) or disabled (`false`). It's useful when you can't or don't want to mine on all CPU cores to make mining hashrate more stable. +[Cache QoS](https://xmlcore.com/docs/miner/randomx-optimization-guide/qos). Enabled (`true`) or disabled (`false`). It's useful when you can't or don't want to mine on all CPU cores to make mining hashrate more stable. #### `numa` NUMA support (better hashrate on multi-CPU servers and Ryzen Threadripper 1xxx/2xxx). Enabled (`true`) or disabled (`false`). diff --git a/doc/api/1/summary.json b/doc/api/1/summary.json index ed3cd128..d5e87fe9 100644 --- a/doc/api/1/summary.json +++ b/doc/api/1/summary.json @@ -3,7 +3,7 @@ "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", + "ua": "xmlcore/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, diff --git a/doc/build/CMAKE_OPTIONS.md b/doc/build/CMAKE_OPTIONS.md index 81e3914f..88e423be 100644 --- a/doc/build/CMAKE_OPTIONS.md +++ b/doc/build/CMAKE_OPTIONS.md @@ -1,5 +1,5 @@ # CMake options -**Recent version of this document: https://xmrig.com/docs/miner/cmake-options** +**Recent version of this document: https://xmlcore.com/docs/miner/cmake-options** ## Algorithms @@ -12,14 +12,14 @@ ## Features * **`-DWITH_HWLOC=OFF`** -disable [hwloc](https://github.com/xmrig/xmrig/issues/1077) support. +disable [hwloc](https://github.com/xmlcore/xmlcore/issues/1077) support. Disabling this feature is not recommended in most cases. This feature add external dependency to libhwloc (1.10.0+) (except MSVC builds). * **`-DWITH_LIBCPUID=OFF`** disable built in libcpuid support, this feature always disabled if hwloc enabled, if both hwloc and libcpuid disabled auto configuration for CPU will very limited. * **`-DWITH_HTTP=OFF`** disable built in HTTP support, this feature used for HTTP API and daemon (solo mining) support. * **`-DWITH_TLS=OFF`** disable SSL/TLS support (secure connections to pool). This feature add external dependency to OpenSSL. * **`-DWITH_ASM=OFF`** disable assembly optimizations for modern CryptoNight algorithms. -* **`-DWITH_EMBEDDED_CONFIG=ON`** Enable [embedded](https://github.com/xmrig/xmrig/issues/957) config support. +* **`-DWITH_EMBEDDED_CONFIG=ON`** Enable [embedded](https://github.com/xmlcore/xmlcore/issues/957) config support. * **`-DWITH_OPENCL=OFF`** Disable OpenCL backend. * **`-DWITH_CUDA=OFF`** Disable CUDA backend. * **`-DWITH_SSE4_1=OFF`** Disable SSE 4.1 for Blake2 (useful for arm builds). @@ -32,7 +32,7 @@ This feature add external dependency to libhwloc (1.10.0+) (except MSVC builds). ## Special build options -* **`-DXMRIG_DEPS=`** path to precompiled dependencies https://github.com/xmrig/xmrig-deps +* **`-Dxmlcore_DEPS=`** path to precompiled dependencies https://github.com/xmlcore/xmlcore-deps * **`-DARM_TARGET=`** override ARM target, possible values `7` (ARMv7) and `8` (ARMv8). * **`-DUV_INCLUDE_DIR=`** custom path to libuv headers. * **`-DUV_LIBRARY=`** custom path to libuv library. diff --git a/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml b/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml index 39576bb4..0b0fdcdb 100644 --- a/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml +++ b/doc/topology/AMD_Opteron_6272_x4_N8_linux_2_0_4_LXC.xml @@ -28,7 +28,7 @@ - + diff --git a/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml b/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml index 2d889819..bd86c464 100644 --- a/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml +++ b/doc/topology/AMD_Opteron_6348_x4_N8_linux_1_11_2.xml @@ -27,7 +27,7 @@ - + diff --git a/doc/topology/AMD_Opteron_6348_x4_N8_linux_2_0_4.xml b/doc/topology/AMD_Opteron_6348_x4_N8_linux_2_0_4.xml index 909dbcb9..34cfdf12 100644 --- a/doc/topology/AMD_Opteron_6348_x4_N8_linux_2_0_4.xml +++ b/doc/topology/AMD_Opteron_6348_x4_N8_linux_2_0_4.xml @@ -28,7 +28,7 @@ - + diff --git a/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml b/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml index e3ecb6fd..5803bce1 100644 --- a/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml +++ b/doc/topology/AMD_Ryzen_7_2700X_windows_2_0_4.xml @@ -4,7 +4,7 @@ - + diff --git a/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml b/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml index c168e2a0..cc98ce14 100644 --- a/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml +++ b/doc/topology/AMD_Ryzen_Threadripper_2950X_N2_linux_2_0_4.xml @@ -24,7 +24,7 @@ - + diff --git a/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml b/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml index 18c80210..8f400189 100644 --- a/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml +++ b/doc/topology/Intel_Core_i7-3770_linux_2_0_4.xml @@ -28,7 +28,7 @@ - + diff --git a/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml b/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml index c80c7403..86197ea9 100644 --- a/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml +++ b/doc/topology/Intel_Core_i7-6700_linux_2_0_4.xml @@ -28,7 +28,7 @@ - + diff --git a/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml b/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml index fd56a10c..c8781acb 100644 --- a/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml +++ b/doc/topology/Intel_Xeon_Silver_4114_x2_N2_linux_2_0_4.xml @@ -24,7 +24,7 @@ - + diff --git a/main.cpp b/main.cpp new file mode 100644 index 00000000..c4a394dc --- /dev/null +++ b/main.cpp @@ -0,0 +1,5 @@ +#include + +int main(int, char**) { + std::cout << "Hello, world!\n"; +} diff --git a/package.json b/package.json index 80cad8a1..59b2bf26 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "xmrig", + "name": "xmlcore", "version": "3.0.0", "description": "RandomX, CryptoNight and Argon2 miner", "main": "index.js", @@ -11,13 +11,13 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/xmrig/xmrig.git" + "url": "git+https://github.com/xmlcore/xmlcore.git" }, "keywords": [], "author": "", "license": "GPLv3", "bugs": { - "url": "https://github.com/xmrig/xmrig/issues" + "url": "https://github.com/xmlcore/xmlcore/issues" }, - "homepage": "https://github.com/xmrig/xmrig#readme" + "homepage": "https://github.com/xmlcore/xmlcore#readme" } diff --git a/res/app.rc b/res/app.rc index fb41b8b1..95961a45 100644 --- a/res/app.rc +++ b/res/app.rc @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", APP_DESC VALUE "FileVersion", APP_VERSION VALUE "LegalCopyright", APP_COPYRIGHT - VALUE "OriginalFilename", "xmrig.exe" + VALUE "OriginalFilename", "xmlcore.exe" VALUE "ProductName", APP_NAME VALUE "ProductVersion", APP_VERSION END diff --git a/scripts/benchmark_10M.cmd b/scripts/benchmark_10M.cmd index dbbcc78c..464c03a7 100644 --- a/scripts/benchmark_10M.cmd +++ b/scripts/benchmark_10M.cmd @@ -1,4 +1,4 @@ @echo off cd %~dp0 -xmrig.exe --bench=10M --submit +xmlcore.exe --bench=10M --submit pause diff --git a/scripts/benchmark_1M.cmd b/scripts/benchmark_1M.cmd index 5d2166d0..ababe3a3 100644 --- a/scripts/benchmark_1M.cmd +++ b/scripts/benchmark_1M.cmd @@ -1,4 +1,4 @@ @echo off cd %~dp0 -xmrig.exe --bench=1M --submit +xmlcore.exe --bench=1M --submit pause diff --git a/scripts/enable_1gb_pages.sh b/scripts/enable_1gb_pages.sh index 16d889f1..b094feb5 100755 --- a/scripts/enable_1gb_pages.sh +++ b/scripts/enable_1gb_pages.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -# https://xmrig.com/docs/miner/hugepages#onegb-huge-pages +# https://xmlcore.com/docs/miner/hugepages#onegb-huge-pages sysctl -w vm.nr_hugepages=$(nproc) diff --git a/scripts/generate_cl.js b/scripts/generate_cl.js index 7e19290b..8033421e 100644 --- a/scripts/generate_cl.js +++ b/scripts/generate_cl.js @@ -24,7 +24,7 @@ function cn() ])); // fs.writeFileSync('cryptonight_gen.cl', cn); - fs.writeFileSync('cryptonight_cl.h', text2h(cn, 'xmrig', 'cryptonight_cl')); + fs.writeFileSync('cryptonight_cl.h', text2h(cn, 'xmlcore', 'cryptonight_cl')); } @@ -39,7 +39,7 @@ function cn_r() // fs.writeFileSync(key + '_gen.cl', items[key]); // } - fs.writeFileSync('cryptonight_r_cl.h', text2h_bundle('xmrig', items)); + fs.writeFileSync('cryptonight_r_cl.h', text2h_bundle('xmlcore', items)); } @@ -62,7 +62,7 @@ function rx() rx = opencl_minify(rx); //fs.writeFileSync('randomx_gen.cl', rx); - fs.writeFileSync('randomx_cl.h', text2h(rx, 'xmrig', 'randomx_cl')); + fs.writeFileSync('randomx_cl.h', text2h(rx, 'xmlcore', 'randomx_cl')); } @@ -71,7 +71,7 @@ function astrobwt() const astrobwt = opencl_minify(addIncludes('astrobwt.cl', [ 'BWT.cl', 'salsa20.cl', 'sha3.cl' ])); // fs.writeFileSync('astrobwt_gen.cl', astrobwt); - fs.writeFileSync('astrobwt_cl.h', text2h(astrobwt, 'xmrig', 'astrobwt_cl')); + fs.writeFileSync('astrobwt_cl.h', text2h(astrobwt, 'xmlcore', 'astrobwt_cl')); } @@ -81,8 +81,8 @@ function kawpow() const kawpow_dag = opencl_minify(addIncludes('kawpow_dag.cl', [ 'defs.h' ])); // fs.writeFileSync('kawpow_gen.cl', kawpow); - fs.writeFileSync('kawpow_cl.h', text2h(kawpow, 'xmrig', 'kawpow_cl')); - fs.writeFileSync('kawpow_dag_cl.h', text2h(kawpow_dag, 'xmrig', 'kawpow_dag_cl')); + fs.writeFileSync('kawpow_cl.h', text2h(kawpow, 'xmlcore', 'kawpow_cl')); + fs.writeFileSync('kawpow_dag_cl.h', text2h(kawpow_dag, 'xmlcore', 'kawpow_dag_cl')); } diff --git a/scripts/pool_mine_example.cmd b/scripts/pool_mine_example.cmd index 6e35c913..a98b9a63 100644 --- a/scripts/pool_mine_example.cmd +++ b/scripts/pool_mine_example.cmd @@ -1,7 +1,7 @@ :: Example batch file for mining Monero at a pool :: :: Format: -:: xmrig.exe -o : -u -p +:: xmlcore.exe -o : -u -p :: :: Fields: :: pool address The host name of the pool stratum or its IP address, for example pool.hashvault.pro @@ -16,5 +16,5 @@ :: Smaller pools also often have smaller fees/payout limits. cd %~dp0 -xmrig.exe -o pool.hashvault.pro:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x +xmlcore.exe -o pool.hashvault.pro:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x pause diff --git a/scripts/solo_mine_example.cmd b/scripts/solo_mine_example.cmd index c925b36d..37bc44da 100644 --- a/scripts/solo_mine_example.cmd +++ b/scripts/solo_mine_example.cmd @@ -1,7 +1,7 @@ :: Example batch file for mining Monero solo :: :: Format: -:: xmrig.exe -o : -a rx/0 -u --daemon +:: xmlcore.exe -o : -a rx/0 -u --daemon :: :: Fields: :: node address The host name of your monerod node or its IP address. It can also be a public node with RPC enabled, for example node.xmr.to @@ -12,5 +12,5 @@ :: But you will only get a payout when you find a block which can take more than a year for a single low-end PC. cd %~dp0 -xmrig.exe -o node.xmr.to:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon +xmlcore.exe -o node.xmr.to:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon pause diff --git a/src/3rdparty/argon2.h b/src/3rdparty/argon2.h index 6d5f2e69..ece2b1b2 100644 --- a/src/3rdparty/argon2.h +++ b/src/3rdparty/argon2.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +23,11 @@ */ -#ifndef XMRIG_3RDPARTY_ARGON2_H -#define XMRIG_3RDPARTY_ARGON2_H +#ifndef xmlcore_3RDPARTY_ARGON2_H +#define xmlcore_3RDPARTY_ARGON2_H #include "3rdparty/argon2/include/argon2.h" -#endif /* XMRIG_3RDPARTY_ARGON2_H */ +#endif /* xmlcore_3RDPARTY_ARGON2_H */ diff --git a/src/3rdparty/argon2/CMakeLists.txt b/src/3rdparty/argon2/CMakeLists.txt index e02197be..1d62f4f4 100644 --- a/src/3rdparty/argon2/CMakeLists.txt +++ b/src/3rdparty/argon2/CMakeLists.txt @@ -35,7 +35,7 @@ if (CMAKE_C_COMPILER_ID MATCHES MSVC) add_feature_impl(xop "" HAVE_XOP) add_feature_impl(avx2 "/arch:AVX2" HAVE_AVX2) add_feature_impl(avx512f "/arch:AVX512F" HAVE_AVX512F) -elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) +elseif (NOT xmlcore_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) function(add_feature_impl FEATURE GCC_FLAG DEF) add_library(argon2-${FEATURE} STATIC arch/x86_64/lib/argon2-${FEATURE}.c) target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../) diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c index b5f0b5e2..5ed13ae3 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-arch.c @@ -26,11 +26,11 @@ void argon2_get_impl_list(argon2_impl_list *list) { static const argon2_impl IMPLS[] = { { "x86_64", NULL, fill_segment_default }, - { "SSE2", xmrig_ar2_check_sse2, xmrig_ar2_fill_segment_sse2 }, - { "SSSE3", xmrig_ar2_check_ssse3, xmrig_ar2_fill_segment_ssse3 }, - { "XOP", xmrig_ar2_check_xop, xmrig_ar2_fill_segment_xop }, - { "AVX2", xmrig_ar2_check_avx2, xmrig_ar2_fill_segment_avx2 }, - { "AVX-512F", xmrig_ar2_check_avx512f, xmrig_ar2_fill_segment_avx512f }, + { "SSE2", xmlcore_ar2_check_sse2, xmlcore_ar2_fill_segment_sse2 }, + { "SSSE3", xmlcore_ar2_check_ssse3, xmlcore_ar2_fill_segment_ssse3 }, + { "XOP", xmlcore_ar2_check_xop, xmlcore_ar2_fill_segment_xop }, + { "AVX2", xmlcore_ar2_check_avx2, xmlcore_ar2_fill_segment_avx2 }, + { "AVX-512F", xmlcore_ar2_check_avx512f, xmlcore_ar2_fill_segment_avx512f }, }; list->count = sizeof(IMPLS) / sizeof(IMPLS[0]); diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c index c8bf56f5..97961f8a 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.c @@ -223,7 +223,7 @@ static void next_addresses(block *address_block, block *input_block) fill_block(zero2_block, address_block, address_block, 0); } -void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position) +void xmlcore_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position) { block *ref_block = NULL, *curr_block = NULL; block address_block, input_block; @@ -307,7 +307,7 @@ void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_posit * lane. */ position.index = i; - ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); + ref_index = xmlcore_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); /* 2 Creating a new block */ ref_block = @@ -325,11 +325,11 @@ void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_posit extern int cpu_flags_has_avx2(void); -int xmrig_ar2_check_avx2(void) { return cpu_flags_has_avx2(); } +int xmlcore_ar2_check_avx2(void) { return cpu_flags_has_avx2(); } #else -void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position) {} -int xmrig_ar2_check_avx2(void) { return 0; } +void xmlcore_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position) {} +int xmlcore_ar2_check_avx2(void) { return 0; } #endif diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.h index 2c34269a..03e29ffe 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.h +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx2.h @@ -3,7 +3,7 @@ #include "core.h" -void xmrig_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position); -int xmrig_ar2_check_avx2(void); +void xmlcore_ar2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position); +int xmlcore_ar2_check_avx2(void); #endif // ARGON2_AVX2_H diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c index f9df1b87..5294ceb7 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.c @@ -208,7 +208,7 @@ static void next_addresses(block *address_block, block *input_block) fill_block(zero2_block, address_block, address_block, 0); } -void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position) +void xmlcore_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position) { block *ref_block = NULL, *curr_block = NULL; block address_block, input_block; @@ -292,7 +292,7 @@ void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_po * lane. */ position.index = i; - ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); + ref_index = xmlcore_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); /* 2 Creating a new block */ ref_block = @@ -309,11 +309,11 @@ void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_po } extern int cpu_flags_has_avx512f(void); -int xmrig_ar2_check_avx512f(void) { return cpu_flags_has_avx512f(); } +int xmlcore_ar2_check_avx512f(void) { return cpu_flags_has_avx512f(); } #else -void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position) {} -int xmrig_ar2_check_avx512f(void) { return 0; } +void xmlcore_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position) {} +int xmlcore_ar2_check_avx512f(void) { return 0; } #endif diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.h index 882bb7fd..0c41175d 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.h +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-avx512f.h @@ -3,7 +3,7 @@ #include "core.h" -void xmrig_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position); -int xmrig_ar2_check_avx512f(void); +void xmlcore_ar2_fill_segment_avx512f(const argon2_instance_t *instance, argon2_position_t position); +int xmlcore_ar2_check_avx512f(void); #endif // ARGON2_AVX512F_H diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c index 099f851f..3ba33fd5 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.c @@ -100,17 +100,17 @@ static __m128i f(__m128i x, __m128i y) #include "argon2-template-128.h" -void xmrig_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position) +void xmlcore_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position) { fill_segment_128(instance, position); } extern int cpu_flags_has_sse2(void); -int xmrig_ar2_check_sse2(void) { return cpu_flags_has_sse2(); } +int xmlcore_ar2_check_sse2(void) { return cpu_flags_has_sse2(); } #else -void xmrig_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position) {} -int xmrig_ar2_check_sse2(void) { return 0; } +void xmlcore_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position) {} +int xmlcore_ar2_check_sse2(void) { return 0; } #endif diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.h index 9f92fbc6..1ef922bc 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.h +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-sse2.h @@ -3,7 +3,7 @@ #include "core.h" -void xmrig_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position); -int xmrig_ar2_check_sse2(void); +void xmlcore_ar2_fill_segment_sse2(const argon2_instance_t *instance, argon2_position_t position); +int xmlcore_ar2_check_sse2(void); #endif // ARGON2_SSE2_H diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c index 58a022ca..f8eed564 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.c @@ -112,17 +112,17 @@ static __m128i f(__m128i x, __m128i y) #include "argon2-template-128.h" -void xmrig_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position) +void xmlcore_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position) { fill_segment_128(instance, position); } extern int cpu_flags_has_ssse3(void); -int xmrig_ar2_check_ssse3(void) { return cpu_flags_has_ssse3(); } +int xmlcore_ar2_check_ssse3(void) { return cpu_flags_has_ssse3(); } #else -void xmrig_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position) {} -int xmrig_ar2_check_ssse3(void) { return 0; } +void xmlcore_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position) {} +int xmlcore_ar2_check_ssse3(void) { return 0; } #endif diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.h index 7d0346c7..6e5f75f7 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.h +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-ssse3.h @@ -3,7 +3,7 @@ #include "core.h" -void xmrig_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position); -int xmrig_ar2_check_ssse3(void); +void xmlcore_ar2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position); +int xmlcore_ar2_check_ssse3(void); #endif // ARGON2_SSSE3_H diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h index e55bbb92..ba3dc766 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-template-128.h @@ -150,7 +150,7 @@ static void fill_segment_128(const argon2_instance_t *instance, * lane. */ position.index = i; - ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); + ref_index = xmlcore_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); /* 2 Creating a new block */ ref_block = diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c index 6fc6aa4b..03c959bb 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.c @@ -100,17 +100,17 @@ static __m128i f(__m128i x, __m128i y) #include "argon2-template-128.h" -void xmrig_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position) +void xmlcore_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position) { fill_segment_128(instance, position); } extern int cpu_flags_has_xop(void); -int xmrig_ar2_check_xop(void) { return cpu_flags_has_xop(); } +int xmlcore_ar2_check_xop(void) { return cpu_flags_has_xop(); } #else -void xmrig_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position) {} -int xmrig_ar2_check_xop(void) { return 0; } +void xmlcore_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position) {} +int xmlcore_ar2_check_xop(void) { return 0; } #endif diff --git a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.h b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.h index 631f239c..44dbd721 100644 --- a/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.h +++ b/src/3rdparty/argon2/arch/x86_64/lib/argon2-xop.h @@ -3,7 +3,7 @@ #include "core.h" -void xmrig_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position); -int xmrig_ar2_check_xop(void); +void xmlcore_ar2_fill_segment_xop(const argon2_instance_t *instance, argon2_position_t position); +int xmlcore_ar2_check_xop(void); #endif // ARGON2_XOP_H diff --git a/src/3rdparty/argon2/lib/argon2-template-64.h b/src/3rdparty/argon2/lib/argon2-template-64.h index c7541c07..1793c62c 100644 --- a/src/3rdparty/argon2/lib/argon2-template-64.h +++ b/src/3rdparty/argon2/lib/argon2-template-64.h @@ -174,7 +174,7 @@ static void fill_segment_64(const argon2_instance_t *instance, * lane. */ position.index = i; - ref_index = xmrig_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); + ref_index = xmlcore_ar2_index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, ref_lane == position.lane); /* 2 Creating a new block */ ref_block = diff --git a/src/3rdparty/argon2/lib/argon2.c b/src/3rdparty/argon2/lib/argon2.c index ab45229c..bc6d3de9 100644 --- a/src/3rdparty/argon2/lib/argon2.c +++ b/src/3rdparty/argon2/lib/argon2.c @@ -57,7 +57,7 @@ size_t argon2_memory_size(uint32_t m_cost, uint32_t parallelism) { int argon2_ctx_mem(argon2_context *context, argon2_type type, void *memory, size_t memory_size) { /* 1. Validate all inputs */ - int result = xmrig_ar2_validate_inputs(context); + int result = xmlcore_ar2_validate_inputs(context); uint32_t memory_blocks, segment_length; argon2_instance_t instance; @@ -98,20 +98,20 @@ int argon2_ctx_mem(argon2_context *context, argon2_type type, void *memory, /* 3. Initialization: Hashing inputs, allocating memory, filling first * blocks */ - result = xmrig_ar2_initialize(&instance, context); + result = xmlcore_ar2_initialize(&instance, context); if (ARGON2_OK != result) { return result; } /* 4. Filling memory */ - result = xmrig_ar2_fill_memory_blocks(&instance); + result = xmlcore_ar2_fill_memory_blocks(&instance); if (ARGON2_OK != result) { return result; } /* 5. Finalization */ - xmrig_ar2_finalize(context, &instance); + xmlcore_ar2_finalize(context, &instance); return ARGON2_OK; } @@ -174,7 +174,7 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost, result = argon2_ctx(&context, type); if (result != ARGON2_OK) { - xmrig_ar2_clear_internal_memory(out, hashlen); + xmlcore_ar2_clear_internal_memory(out, hashlen); free(out); return result; } @@ -187,13 +187,13 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost, /* if encoding requested, write it */ if (encoded && encodedlen) { if (encode_string(encoded, encodedlen, &context, type) != ARGON2_OK) { - xmrig_ar2_clear_internal_memory(out, hashlen); /* wipe buffers if error */ - xmrig_ar2_clear_internal_memory(encoded, encodedlen); + xmlcore_ar2_clear_internal_memory(out, hashlen); /* wipe buffers if error */ + xmlcore_ar2_clear_internal_memory(encoded, encodedlen); free(out); return ARGON2_ENCODING_FAIL; } } - xmrig_ar2_clear_internal_memory(out, hashlen); + xmlcore_ar2_clear_internal_memory(out, hashlen); free(out); return ARGON2_OK; diff --git a/src/3rdparty/argon2/lib/blake2/blake2.c b/src/3rdparty/argon2/lib/blake2/blake2.c index 76de85a5..b907144e 100644 --- a/src/3rdparty/argon2/lib/blake2/blake2.c +++ b/src/3rdparty/argon2/lib/blake2/blake2.c @@ -128,14 +128,14 @@ static void blake2b_init_state(blake2b_state *S) S->buflen = 0; } -void xmrig_ar2_blake2b_init(blake2b_state *S, size_t outlen) +void xmlcore_ar2_blake2b_init(blake2b_state *S, size_t outlen) { blake2b_init_state(S); /* XOR initial state with param block: */ S->h[0] ^= (uint64_t)outlen | (UINT64_C(1) << 16) | (UINT64_C(1) << 24); } -void xmrig_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen) +void xmlcore_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen) { const uint8_t *pin = (const uint8_t *)in; @@ -160,7 +160,7 @@ void xmrig_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen) S->buflen += inlen; } -void xmrig_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen) +void xmlcore_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen) { uint8_t buffer[BLAKE2B_OUTBYTES] = {0}; unsigned int i; @@ -174,12 +174,12 @@ void xmrig_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen) } memcpy(out, buffer, outlen); - xmrig_ar2_clear_internal_memory(buffer, sizeof(buffer)); - xmrig_ar2_clear_internal_memory(S->buf, sizeof(S->buf)); - xmrig_ar2_clear_internal_memory(S->h, sizeof(S->h)); + xmlcore_ar2_clear_internal_memory(buffer, sizeof(buffer)); + xmlcore_ar2_clear_internal_memory(S->buf, sizeof(S->buf)); + xmlcore_ar2_clear_internal_memory(S->h, sizeof(S->h)); } -void xmrig_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen) +void xmlcore_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen) { uint8_t *pout = (uint8_t *)out; blake2b_state blake_state; @@ -187,39 +187,39 @@ void xmrig_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inl store32(outlen_bytes, (uint32_t)outlen); if (outlen <= BLAKE2B_OUTBYTES) { - xmrig_ar2_blake2b_init(&blake_state, outlen); - xmrig_ar2_blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)); - xmrig_ar2_blake2b_update(&blake_state, in, inlen); - xmrig_ar2_blake2b_final(&blake_state, pout, outlen); + xmlcore_ar2_blake2b_init(&blake_state, outlen); + xmlcore_ar2_blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)); + xmlcore_ar2_blake2b_update(&blake_state, in, inlen); + xmlcore_ar2_blake2b_final(&blake_state, pout, outlen); } else { uint32_t toproduce; uint8_t out_buffer[BLAKE2B_OUTBYTES]; - xmrig_ar2_blake2b_init(&blake_state, BLAKE2B_OUTBYTES); - xmrig_ar2_blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)); - xmrig_ar2_blake2b_update(&blake_state, in, inlen); - xmrig_ar2_blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES); + xmlcore_ar2_blake2b_init(&blake_state, BLAKE2B_OUTBYTES); + xmlcore_ar2_blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)); + xmlcore_ar2_blake2b_update(&blake_state, in, inlen); + xmlcore_ar2_blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES); memcpy(pout, out_buffer, BLAKE2B_OUTBYTES / 2); pout += BLAKE2B_OUTBYTES / 2; toproduce = (uint32_t)outlen - BLAKE2B_OUTBYTES / 2; while (toproduce > BLAKE2B_OUTBYTES) { - xmrig_ar2_blake2b_init(&blake_state, BLAKE2B_OUTBYTES); - xmrig_ar2_blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES); - xmrig_ar2_blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES); + xmlcore_ar2_blake2b_init(&blake_state, BLAKE2B_OUTBYTES); + xmlcore_ar2_blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES); + xmlcore_ar2_blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES); memcpy(pout, out_buffer, BLAKE2B_OUTBYTES / 2); pout += BLAKE2B_OUTBYTES / 2; toproduce -= BLAKE2B_OUTBYTES / 2; } - xmrig_ar2_blake2b_init(&blake_state, toproduce); - xmrig_ar2_blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES); - xmrig_ar2_blake2b_final(&blake_state, out_buffer, toproduce); + xmlcore_ar2_blake2b_init(&blake_state, toproduce); + xmlcore_ar2_blake2b_update(&blake_state, out_buffer, BLAKE2B_OUTBYTES); + xmlcore_ar2_blake2b_final(&blake_state, out_buffer, toproduce); memcpy(pout, out_buffer, toproduce); - xmrig_ar2_clear_internal_memory(out_buffer, sizeof(out_buffer)); + xmlcore_ar2_clear_internal_memory(out_buffer, sizeof(out_buffer)); } } diff --git a/src/3rdparty/argon2/lib/blake2/blake2.h b/src/3rdparty/argon2/lib/blake2/blake2.h index 33f19eec..cda85f30 100644 --- a/src/3rdparty/argon2/lib/blake2/blake2.h +++ b/src/3rdparty/argon2/lib/blake2/blake2.h @@ -20,11 +20,11 @@ typedef struct __blake2b_state { } blake2b_state; /* Streaming API */ -void xmrig_ar2_blake2b_init(blake2b_state *S, size_t outlen); -void xmrig_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen); -void xmrig_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen); +void xmlcore_ar2_blake2b_init(blake2b_state *S, size_t outlen); +void xmlcore_ar2_blake2b_update(blake2b_state *S, const void *in, size_t inlen); +void xmlcore_ar2_blake2b_final(blake2b_state *S, void *out, size_t outlen); -void xmrig_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen); +void xmlcore_ar2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen); #endif // ARGON2_BLAKE2_H diff --git a/src/3rdparty/argon2/lib/core.c b/src/3rdparty/argon2/lib/core.c index 8c5d1c0e..b1ca326b 100644 --- a/src/3rdparty/argon2/lib/core.c +++ b/src/3rdparty/argon2/lib/core.c @@ -77,7 +77,7 @@ static void store_block(void *output, const block *src) { /***************Memory functions*****************/ -int xmrig_ar2_allocate_memory(const argon2_context *context, argon2_instance_t *instance) { +int xmlcore_ar2_allocate_memory(const argon2_context *context, argon2_instance_t *instance) { size_t blocks = instance->memory_blocks; size_t memory_size = blocks * ARGON2_BLOCK_SIZE; @@ -106,10 +106,10 @@ int xmrig_ar2_allocate_memory(const argon2_context *context, argon2_instance_t * return ARGON2_OK; } -void xmrig_ar2_free_memory(const argon2_context *context, const argon2_instance_t *instance) { +void xmlcore_ar2_free_memory(const argon2_context *context, const argon2_instance_t *instance) { size_t memory_size = instance->memory_blocks * ARGON2_BLOCK_SIZE; - xmrig_ar2_clear_internal_memory(instance->memory, memory_size); + xmlcore_ar2_clear_internal_memory(instance->memory, memory_size); if (instance->keep_memory) { /* user-supplied memory -- do not free */ @@ -123,7 +123,7 @@ void xmrig_ar2_free_memory(const argon2_context *context, const argon2_instance_ } } -void NOT_OPTIMIZED xmrig_ar2_secure_wipe_memory(void *v, size_t n) { +void NOT_OPTIMIZED xmlcore_ar2_secure_wipe_memory(void *v, size_t n) { #if defined(_MSC_VER) && VC_GE_2005(_MSC_VER) SecureZeroMemory(v, n); #elif defined memset_s @@ -138,13 +138,13 @@ void NOT_OPTIMIZED xmrig_ar2_secure_wipe_memory(void *v, size_t n) { /* Memory clear flag defaults to true. */ int FLAG_clear_internal_memory = 0; -void xmrig_ar2_clear_internal_memory(void *v, size_t n) { +void xmlcore_ar2_clear_internal_memory(void *v, size_t n) { if (FLAG_clear_internal_memory && v) { - xmrig_ar2_secure_wipe_memory(v, n); + xmlcore_ar2_secure_wipe_memory(v, n); } } -void xmrig_ar2_finalize(const argon2_context *context, argon2_instance_t *instance) { +void xmlcore_ar2_finalize(const argon2_context *context, argon2_instance_t *instance) { if (context != NULL && instance != NULL && context->out != NULL) { block blockhash; uint32_t l; @@ -162,21 +162,21 @@ void xmrig_ar2_finalize(const argon2_context *context, argon2_instance_t *instan { uint8_t blockhash_bytes[ARGON2_BLOCK_SIZE]; store_block(blockhash_bytes, &blockhash); - xmrig_ar2_blake2b_long(context->out, context->outlen, blockhash_bytes, ARGON2_BLOCK_SIZE); + xmlcore_ar2_blake2b_long(context->out, context->outlen, blockhash_bytes, ARGON2_BLOCK_SIZE); /* clear blockhash and blockhash_bytes */ - xmrig_ar2_clear_internal_memory(blockhash.v, ARGON2_BLOCK_SIZE); - xmrig_ar2_clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE); + xmlcore_ar2_clear_internal_memory(blockhash.v, ARGON2_BLOCK_SIZE); + xmlcore_ar2_clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE); } if (instance->print_internals) { print_tag(context->out, context->outlen); } - xmrig_ar2_free_memory(context, instance); + xmlcore_ar2_free_memory(context, instance); } } -uint32_t xmrig_ar2_index_alpha(const argon2_instance_t *instance, const argon2_position_t *position, uint32_t pseudo_rand, int same_lane) { +uint32_t xmlcore_ar2_index_alpha(const argon2_instance_t *instance, const argon2_position_t *position, uint32_t pseudo_rand, int same_lane) { /* * Pass 0: * This lane : all already finished segments plus already constructed @@ -252,7 +252,7 @@ static int fill_memory_blocks_st(argon2_instance_t *instance) { for (s = 0; s < ARGON2_SYNC_POINTS; ++s) { for (l = 0; l < instance->lanes; ++l) { argon2_position_t position = { r, l, (uint8_t)s, 0 }; - xmrig_ar2_fill_segment(instance, position); + xmlcore_ar2_fill_segment(instance, position); } } @@ -263,7 +263,7 @@ static int fill_memory_blocks_st(argon2_instance_t *instance) { return ARGON2_OK; } -int xmrig_ar2_fill_memory_blocks(argon2_instance_t *instance) { +int xmlcore_ar2_fill_memory_blocks(argon2_instance_t *instance) { if (instance == NULL || instance->lanes == 0) { return ARGON2_INCORRECT_PARAMETER; } @@ -271,7 +271,7 @@ int xmrig_ar2_fill_memory_blocks(argon2_instance_t *instance) { return fill_memory_blocks_st(instance); } -int xmrig_ar2_validate_inputs(const argon2_context *context) { +int xmlcore_ar2_validate_inputs(const argon2_context *context) { if (NULL == context) { return ARGON2_INCORRECT_PARAMETER; } @@ -398,7 +398,7 @@ int xmrig_ar2_validate_inputs(const argon2_context *context) { return ARGON2_OK; } -void xmrig_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance) { +void xmlcore_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance) { uint32_t l; /* Make the first and second block in each lane as G(H0||0||i) or G(H0||1||i) */ @@ -407,17 +407,17 @@ void xmrig_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *in store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, 0); store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH + 4, l); - xmrig_ar2_blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash, ARGON2_PREHASH_SEED_LENGTH); + xmlcore_ar2_blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash, ARGON2_PREHASH_SEED_LENGTH); load_block(&instance->memory[l * instance->lane_length + 0], blockhash_bytes); store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, 1); - xmrig_ar2_blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash, ARGON2_PREHASH_SEED_LENGTH); + xmlcore_ar2_blake2b_long(blockhash_bytes, ARGON2_BLOCK_SIZE, blockhash, ARGON2_PREHASH_SEED_LENGTH); load_block(&instance->memory[l * instance->lane_length + 1], blockhash_bytes); } - xmrig_ar2_clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE); + xmlcore_ar2_clear_internal_memory(blockhash_bytes, ARGON2_BLOCK_SIZE); } -void xmrig_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, +void xmlcore_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, argon2_type type) { blake2b_state BlakeHash; uint8_t value[sizeof(uint32_t)]; @@ -426,70 +426,70 @@ void xmrig_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, return; } - xmrig_ar2_blake2b_init(&BlakeHash, ARGON2_PREHASH_DIGEST_LENGTH); + xmlcore_ar2_blake2b_init(&BlakeHash, ARGON2_PREHASH_DIGEST_LENGTH); store32(&value, context->lanes); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); store32(&value, context->outlen); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); store32(&value, context->m_cost); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); store32(&value, context->t_cost); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); store32(&value, context->version); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); store32(&value, (uint32_t)type); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); store32(&value, context->pwdlen); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); if (context->pwd != NULL) { - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->pwd, + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->pwd, context->pwdlen); if (context->flags & ARGON2_FLAG_CLEAR_PASSWORD) { - xmrig_ar2_secure_wipe_memory(context->pwd, context->pwdlen); + xmlcore_ar2_secure_wipe_memory(context->pwd, context->pwdlen); context->pwdlen = 0; } } store32(&value, context->saltlen); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); if (context->salt != NULL) { - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->salt, + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->salt, context->saltlen); } store32(&value, context->secretlen); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); if (context->secret != NULL) { - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->secret, context->secretlen); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->secret, context->secretlen); if (context->flags & ARGON2_FLAG_CLEAR_SECRET) { - xmrig_ar2_secure_wipe_memory(context->secret, context->secretlen); + xmlcore_ar2_secure_wipe_memory(context->secret, context->secretlen); context->secretlen = 0; } } store32(&value, context->adlen); - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)&value, sizeof(value)); if (context->ad != NULL) { - xmrig_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->ad, context->adlen); + xmlcore_ar2_blake2b_update(&BlakeHash, (const uint8_t *)context->ad, context->adlen); } - xmrig_ar2_blake2b_final(&BlakeHash, blockhash, ARGON2_PREHASH_DIGEST_LENGTH); + xmlcore_ar2_blake2b_final(&BlakeHash, blockhash, ARGON2_PREHASH_DIGEST_LENGTH); } -int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context) { +int xmlcore_ar2_initialize(argon2_instance_t *instance, argon2_context *context) { uint8_t blockhash[ARGON2_PREHASH_SEED_LENGTH]; int result = ARGON2_OK; @@ -499,7 +499,7 @@ int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context) { /* 1. Memory allocation */ - result = xmrig_ar2_allocate_memory(context, instance); + result = xmlcore_ar2_allocate_memory(context, instance); if (result != ARGON2_OK) { return result; } @@ -508,9 +508,9 @@ int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context) { /* H_0 + 8 extra bytes to produce the first blocks */ /* uint8_t blockhash[ARGON2_PREHASH_SEED_LENGTH]; */ /* Hashing all inputs */ - xmrig_ar2_initial_hash(blockhash, context, instance->type); + xmlcore_ar2_initial_hash(blockhash, context, instance->type); /* Zeroing 8 extra bytes */ - xmrig_ar2_clear_internal_memory(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, ARGON2_PREHASH_SEED_LENGTH - ARGON2_PREHASH_DIGEST_LENGTH); + xmlcore_ar2_clear_internal_memory(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, ARGON2_PREHASH_SEED_LENGTH - ARGON2_PREHASH_DIGEST_LENGTH); if (instance->print_internals) { initial_kat(blockhash, context, instance->type); @@ -518,9 +518,9 @@ int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context) { /* 3. Creating first blocks, we always have at least two blocks in a slice */ - xmrig_ar2_fill_first_blocks(blockhash, instance); + xmlcore_ar2_fill_first_blocks(blockhash, instance); /* Clearing the hash */ - xmrig_ar2_clear_internal_memory(blockhash, ARGON2_PREHASH_SEED_LENGTH); + xmlcore_ar2_clear_internal_memory(blockhash, ARGON2_PREHASH_SEED_LENGTH); return ARGON2_OK; } diff --git a/src/3rdparty/argon2/lib/core.h b/src/3rdparty/argon2/lib/core.h index 1fc75bcc..9f2c36d9 100644 --- a/src/3rdparty/argon2/lib/core.h +++ b/src/3rdparty/argon2/lib/core.h @@ -110,7 +110,7 @@ typedef struct Argon2_thread_data { * @param instance the Argon2 instance * @return ARGON2_OK if memory is allocated successfully */ -int xmrig_ar2_allocate_memory(const argon2_context *context, argon2_instance_t *instance); +int xmlcore_ar2_allocate_memory(const argon2_context *context, argon2_instance_t *instance); /* * Frees memory at the given pointer, uses the appropriate deallocator as @@ -118,21 +118,21 @@ int xmrig_ar2_allocate_memory(const argon2_context *context, argon2_instance_t * * @param context argon2_context which specifies the deallocator * @param instance the Argon2 instance */ -void xmrig_ar2_free_memory(const argon2_context *context, const argon2_instance_t *instance); +void xmlcore_ar2_free_memory(const argon2_context *context, const argon2_instance_t *instance); /* Function that securely cleans the memory. This ignores any flags set * regarding clearing memory. Usually one just calls clear_internal_memory. * @param mem Pointer to the memory * @param s Memory size in bytes */ -void xmrig_ar2_secure_wipe_memory(void *v, size_t n); +void xmlcore_ar2_secure_wipe_memory(void *v, size_t n); /* Function that securely clears the memory if FLAG_clear_internal_memory is * set. If the flag isn't set, this function does nothing. * @param mem Pointer to the memory * @param s Memory size in bytes */ -ARGON2_PUBLIC void xmrig_ar2_clear_internal_memory(void *v, size_t n); +ARGON2_PUBLIC void xmlcore_ar2_clear_internal_memory(void *v, size_t n); /* * Computes absolute position of reference block in the lane following a skewed @@ -144,7 +144,7 @@ ARGON2_PUBLIC void xmrig_ar2_clear_internal_memory(void *v, size_t n); * If so we can reference the current segment * @pre All pointers must be valid */ -uint32_t xmrig_ar2_index_alpha(const argon2_instance_t *instance, const argon2_position_t *position, uint32_t pseudo_rand, int same_lane); +uint32_t xmlcore_ar2_index_alpha(const argon2_instance_t *instance, const argon2_position_t *position, uint32_t pseudo_rand, int same_lane); /* * Function that validates all inputs against predefined restrictions and return @@ -153,7 +153,7 @@ uint32_t xmrig_ar2_index_alpha(const argon2_instance_t *instance, const argon2_p * @return ARGON2_OK if everything is all right, otherwise one of error codes * (all defined in */ -int xmrig_ar2_validate_inputs(const argon2_context *context); +int xmlcore_ar2_validate_inputs(const argon2_context *context); /* * Hashes all the inputs into @a blockhash[PREHASH_DIGEST_LENGTH], clears @@ -165,7 +165,7 @@ int xmrig_ar2_validate_inputs(const argon2_context *context); * @pre @a blockhash must have at least @a PREHASH_DIGEST_LENGTH bytes * allocated */ -void xmrig_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, argon2_type type); +void xmlcore_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, argon2_type type); /* * Function creates first 2 blocks per lane @@ -173,7 +173,7 @@ void xmrig_ar2_initial_hash(uint8_t *blockhash, argon2_context *context, argon2_ * @param blockhash Pointer to the pre-hashing digest * @pre blockhash must point to @a PREHASH_SEED_LENGTH allocated values */ -void xmrig_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance); +void xmlcore_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *instance); /* * Function allocates memory, hashes the inputs with Blake, and creates first @@ -185,7 +185,7 @@ void xmrig_ar2_fill_first_blocks(uint8_t *blockhash, const argon2_instance_t *in * @return Zero if successful, -1 if memory failed to allocate. @context->state * will be modified if successful. */ -int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context); +int xmlcore_ar2_initialize(argon2_instance_t *instance, argon2_context *context); /* * XORing the last block of each lane, hashing it, making the tag. Deallocates @@ -198,7 +198,7 @@ int xmrig_ar2_initialize(argon2_instance_t *instance, argon2_context *context); * @pre if context->free_cbk is not NULL, it should point to a function that * deallocates memory */ -void xmrig_ar2_finalize(const argon2_context *context, argon2_instance_t *instance); +void xmlcore_ar2_finalize(const argon2_context *context, argon2_instance_t *instance); /* * Function that fills the segment using previous segments also from other @@ -207,7 +207,7 @@ void xmrig_ar2_finalize(const argon2_context *context, argon2_instance_t *instan * @param position Current position * @pre all block pointers must be valid */ -void xmrig_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t position); +void xmlcore_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t position); /* * Function that fills the entire memory t_cost times based on the first two @@ -215,6 +215,6 @@ void xmrig_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t * @param instance Pointer to the current instance * @return ARGON2_OK if successful, @context->state */ -int xmrig_ar2_fill_memory_blocks(argon2_instance_t *instance); +int xmlcore_ar2_fill_memory_blocks(argon2_instance_t *instance); #endif diff --git a/src/3rdparty/argon2/lib/encoding.c b/src/3rdparty/argon2/lib/encoding.c index 6190ae8f..556df855 100644 --- a/src/3rdparty/argon2/lib/encoding.c +++ b/src/3rdparty/argon2/lib/encoding.c @@ -323,7 +323,7 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) { ctx->flags = ARGON2_DEFAULT_FLAGS; /* On return, must have valid context */ - validation_result = xmrig_ar2_validate_inputs(ctx); + validation_result = xmlcore_ar2_validate_inputs(ctx); if (validation_result != ARGON2_OK) { return validation_result; } @@ -371,7 +371,7 @@ int encode_string(char *dst, size_t dst_len, argon2_context *ctx, } while ((void)0, 0) const char* type_string = argon2_type2string(type, 0); - int validation_result = xmrig_ar2_validate_inputs(ctx); + int validation_result = xmlcore_ar2_validate_inputs(ctx); if (!type_string) { return ARGON2_ENCODING_FAIL; diff --git a/src/3rdparty/argon2/lib/impl-select.c b/src/3rdparty/argon2/lib/impl-select.c index bc7d1438..1ef20e57 100644 --- a/src/3rdparty/argon2/lib/impl-select.c +++ b/src/3rdparty/argon2/lib/impl-select.c @@ -86,7 +86,7 @@ void argon2_select_impl() } -void xmrig_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t position) +void xmlcore_ar2_fill_segment(const argon2_instance_t *instance, argon2_position_t position) { selected_argon_impl.fill_segment(instance, position); } diff --git a/src/3rdparty/base32/base32.h b/src/3rdparty/base32/base32.h index 7b8187f0..d69e727d 100644 --- a/src/3rdparty/base32/base32.h +++ b/src/3rdparty/base32/base32.h @@ -25,8 +25,8 @@ // All functions return the number of output bytes or -1 on error. If the // output buffer is too small, the result will silently be truncated. -#ifndef XMRIG_BASE32_H -#define XMRIG_BASE32_H +#ifndef xmlcore_BASE32_H +#define xmlcore_BASE32_H #include @@ -65,4 +65,4 @@ int base32_encode(const uint8_t *data, int length, uint8_t *result, int bufSize) } -#endif /* XMRIG_BASE32_H */ +#endif /* xmlcore_BASE32_H */ diff --git a/src/3rdparty/cl.h b/src/3rdparty/cl.h index bd9a46d0..9fc286d2 100644 --- a/src/3rdparty/cl.h +++ b/src/3rdparty/cl.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CL_H -#define XMRIG_CL_H +#ifndef xmlcore_CL_H +#define xmlcore_CL_H #if defined(__APPLE__) @@ -33,4 +33,4 @@ #endif -#endif /* XMRIG_CL_H */ +#endif /* xmlcore_CL_H */ diff --git a/src/App.cpp b/src/App.cpp index 39ec0d62..8e5e3f53 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -41,22 +41,22 @@ #include "version.h" -xmrig::App::App(Process *process) +xmlcore::App::App(Process *process) { m_controller = std::make_shared(process); } -xmrig::App::~App() +xmlcore::App::~App() { Cpu::release(); } -int xmrig::App::exec() +int xmlcore::App::exec() { if (!m_controller->isReady()) { - LOG_EMERG("no valid configuration found, try https://xmrig.com/wizard"); + LOG_EMERG("no valid configuration found, try https://xmlcore.com/wizard"); return 2; } @@ -94,7 +94,7 @@ int xmrig::App::exec() } -void xmrig::App::onConsoleCommand(char command) +void xmlcore::App::onConsoleCommand(char command) { if (command == 3) { LOG_WARN("%s " YELLOW("Ctrl+C received, exiting"), Tags::signal()); @@ -106,7 +106,7 @@ void xmrig::App::onConsoleCommand(char command) } -void xmrig::App::onSignal(int signum) +void xmlcore::App::onSignal(int signum) { switch (signum) { @@ -121,7 +121,7 @@ void xmrig::App::onSignal(int signum) } -void xmrig::App::close() +void xmlcore::App::close() { m_signals.reset(); m_console.reset(); diff --git a/src/App.h b/src/App.h index 962baead..dbcfdbe4 100644 --- a/src/App.h +++ b/src/App.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_APP_H -#define XMRIG_APP_H +#ifndef xmlcore_APP_H +#define xmlcore_APP_H #include "base/kernel/interfaces/IConsoleListener.h" @@ -35,7 +35,7 @@ #include -namespace xmrig { +namespace xmlcore { class Console; @@ -48,7 +48,7 @@ class Signals; class App : public IConsoleListener, public ISignalListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(App) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(App) App(Process *process); ~App() override; @@ -69,7 +69,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_APP_H */ +#endif /* xmlcore_APP_H */ diff --git a/src/App_unix.cpp b/src/App_unix.cpp index b0b80079..b4e2862f 100644 --- a/src/App_unix.cpp +++ b/src/App_unix.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -34,7 +34,7 @@ #include "core/Controller.h" -bool xmrig::App::background(int &rc) +bool xmlcore::App::background(int &rc) { if (!m_controller->isBackground()) { return false; diff --git a/src/App_win.cpp b/src/App_win.cpp index e803080c..80104070 100644 --- a/src/App_win.cpp +++ b/src/App_win.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "core/Controller.h" -bool xmrig::App::background(int &) +bool xmlcore::App::background(int &) { if (!m_controller->isBackground()) { return false; diff --git a/src/Summary.cpp b/src/Summary.cpp index 6b12e62f..b961e13c 100644 --- a/src/Summary.cpp +++ b/src/Summary.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig + * Copyright 2016-2021 xmlcore * * 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 @@ -39,27 +39,27 @@ #include "version.h" -#ifdef XMRIG_FEATURE_DMI +#ifdef xmlcore_FEATURE_DMI # include "hw/dmi/DmiReader.h" #endif -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "crypto/rx/RxConfig.h" #endif -namespace xmrig { +namespace xmlcore { -#ifdef XMRIG_OS_WIN +#ifdef xmlcore_OS_WIN static constexpr const char *kHugepagesSupported = GREEN_BOLD("permission granted"); #else static constexpr const char *kHugepagesSupported = GREEN_BOLD("supported"); #endif -#ifdef XMRIG_FEATURE_ASM +#ifdef xmlcore_FEATURE_ASM static const char *coloredAsmNames[] = { RED_BOLD("none"), "auto", @@ -81,8 +81,8 @@ static void print_pages(const Config *config) Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "%s", "HUGE PAGES", config->cpu().isHugePages() ? (VirtualMemory::isHugepagesAvailable() ? kHugepagesSupported : RED_BOLD("unavailable")) : RED_BOLD("disabled")); -# ifdef XMRIG_ALGO_RANDOMX -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_ALGO_RANDOMX +# ifdef xmlcore_OS_LINUX Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "%s", "1GB PAGES", (VirtualMemory::isOneGbPagesAvailable() ? (config->rx().isOneGbPages() ? kHugepagesSupported : YELLOW_BOLD("disabled")) : YELLOW_BOLD("unavailable"))); # else @@ -104,7 +104,7 @@ static void print_cpu(const Config *) info->hasAES() ? GREEN_BOLD_S : RED_BOLD_S "-", info->isVM() ? RED_BOLD_S " VM" : "" ); -# if defined(XMRIG_FEATURE_HWLOC) +# if defined(xmlcore_FEATURE_HWLOC) Log::print(WHITE_BOLD(" %-13s") BLACK_BOLD("L2:") WHITE_BOLD("%.1f MB") BLACK_BOLD(" L3:") WHITE_BOLD("%.1f MB") CYAN_BOLD(" %zu") "C" BLACK_BOLD("/") CYAN_BOLD("%zu") "T" BLACK_BOLD(" NUMA:") CYAN_BOLD("%zu"), @@ -136,7 +136,7 @@ static void print_memory(const Config *config) percent ); -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI if (!config->isDMI()) { return; } @@ -179,7 +179,7 @@ static void print_threads(const Config *config) config->pools().donateLevel() ); -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM if (config->cpu().assembly() == Assembly::AUTO) { const Assembly assembly = Cpu::info()->assembly(); @@ -208,10 +208,10 @@ static void print_commands(Config *) } -} // namespace xmrig +} // namespace xmlcore -void xmrig::Summary::print(Controller *controller) +void xmlcore::Summary::print(Controller *controller) { const auto config = controller->config(); diff --git a/src/Summary.h b/src/Summary.h index 0b03f675..e6234574 100644 --- a/src/Summary.h +++ b/src/Summary.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SUMMARY_H -#define XMRIG_SUMMARY_H +#ifndef xmlcore_SUMMARY_H +#define xmlcore_SUMMARY_H -namespace xmrig { +namespace xmlcore { class Controller; @@ -39,7 +39,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_SUMMARY_H */ +#endif /* xmlcore_SUMMARY_H */ diff --git a/src/backend/common/GpuWorker.cpp b/src/backend/common/GpuWorker.cpp index 5a9c3d13..15f89c0c 100644 --- a/src/backend/common/GpuWorker.cpp +++ b/src/backend/common/GpuWorker.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 +21,13 @@ #include "base/tools/Chrono.h" -xmrig::GpuWorker::GpuWorker(size_t id, int64_t affinity, int priority, uint32_t deviceIndex) : Worker(id, affinity, priority), +xmlcore::GpuWorker::GpuWorker(size_t id, int64_t affinity, int priority, uint32_t deviceIndex) : Worker(id, affinity, priority), m_deviceIndex(deviceIndex) { } -void xmrig::GpuWorker::storeStats() +void xmlcore::GpuWorker::storeStats() { // Get index which is unused now const uint32_t index = m_index.load(std::memory_order_relaxed) ^ 1; @@ -42,7 +42,7 @@ void xmrig::GpuWorker::storeStats() } -void xmrig::GpuWorker::hashrateData(uint64_t &hashCount, uint64_t &timeStamp, uint64_t &rawHashes) const +void xmlcore::GpuWorker::hashrateData(uint64_t &hashCount, uint64_t &timeStamp, uint64_t &rawHashes) const { const uint32_t index = m_index.load(std::memory_order_relaxed); diff --git a/src/backend/common/GpuWorker.h b/src/backend/common/GpuWorker.h index 3c828e52..85472146 100644 --- a/src/backend/common/GpuWorker.h +++ b/src/backend/common/GpuWorker.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_GPUWORKER_H -#define XMRIG_GPUWORKER_H +#ifndef xmlcore_GPUWORKER_H +#define xmlcore_GPUWORKER_H #include @@ -27,7 +27,7 @@ #include "backend/common/Worker.h" -namespace xmrig { +namespace xmlcore { class GpuWorker : public Worker @@ -52,7 +52,7 @@ protected: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_GPUWORKER_H */ +#endif /* xmlcore_GPUWORKER_H */ diff --git a/src/backend/common/Hashrate.cpp b/src/backend/common/Hashrate.cpp index 4038e34b..86ac67f9 100644 --- a/src/backend/common/Hashrate.cpp +++ b/src/backend/common/Hashrate.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2017-2018 XMR-Stak , * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -41,7 +41,7 @@ inline static const char *format(double h, char *buf, size_t size) } -xmrig::Hashrate::Hashrate(size_t threads) : +xmlcore::Hashrate::Hashrate(size_t threads) : m_threads(threads + 1) { m_counts = new uint64_t*[m_threads]; @@ -56,7 +56,7 @@ xmrig::Hashrate::Hashrate(size_t threads) : } -xmrig::Hashrate::~Hashrate() +xmlcore::Hashrate::~Hashrate() { for (size_t i = 0; i < m_threads; i++) { delete [] m_counts[i]; @@ -69,20 +69,20 @@ xmrig::Hashrate::~Hashrate() } -const char *xmrig::Hashrate::format(double h, char *buf, size_t size) +const char *xmlcore::Hashrate::format(double h, char *buf, size_t size) { return ::format(h, buf, size); } -rapidjson::Value xmrig::Hashrate::normalize(double d) +rapidjson::Value xmlcore::Hashrate::normalize(double d) { return Json::normalize(d, false); } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::Hashrate::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::Hashrate::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -96,7 +96,7 @@ rapidjson::Value xmrig::Hashrate::toJSON(rapidjson::Document &doc) const } -rapidjson::Value xmrig::Hashrate::toJSON(size_t threadId, rapidjson::Document &doc) const +rapidjson::Value xmlcore::Hashrate::toJSON(size_t threadId, rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -111,7 +111,7 @@ rapidjson::Value xmrig::Hashrate::toJSON(size_t threadId, rapidjson::Document &d #endif -double xmrig::Hashrate::hashrate(size_t index, size_t ms) const +double xmlcore::Hashrate::hashrate(size_t index, size_t ms) const { assert(index < m_threads); if (index >= m_threads) { @@ -122,7 +122,7 @@ double xmrig::Hashrate::hashrate(size_t index, size_t ms) const uint64_t earliestStamp = 0; bool haveFullSet = false; - const uint64_t timeStampLimit = xmrig::Chrono::steadyMSecs() - ms; + const uint64_t timeStampLimit = xmlcore::Chrono::steadyMSecs() - ms; uint64_t* timestamps = m_timestamps[index]; uint64_t* counts = m_counts[index]; @@ -160,7 +160,7 @@ double xmrig::Hashrate::hashrate(size_t index, size_t ms) const } -void xmrig::Hashrate::addData(size_t index, uint64_t count, uint64_t timestamp) +void xmlcore::Hashrate::addData(size_t index, uint64_t count, uint64_t timestamp) { const size_t top = m_top[index]; m_counts[index][top] = count; diff --git a/src/backend/common/Hashrate.h b/src/backend/common/Hashrate.h index ad278cfa..091f2605 100644 --- a/src/backend/common/Hashrate.h +++ b/src/backend/common/Hashrate.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2017-2018 XMR-Stak , * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HASHRATE_H -#define XMRIG_HASHRATE_H +#ifndef xmlcore_HASHRATE_H +#define xmlcore_HASHRATE_H #include @@ -30,13 +30,13 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Hashrate { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Hashrate) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Hashrate) enum Intervals : size_t { ShortInterval = 10000, @@ -56,7 +56,7 @@ public: static const char *format(double h, char *buf, size_t size); static rapidjson::Value normalize(double d); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const; rapidjson::Value toJSON(size_t threadId, rapidjson::Document &doc) const; # endif @@ -75,7 +75,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_HASHRATE_H */ +#endif /* xmlcore_HASHRATE_H */ diff --git a/src/backend/common/HashrateInterpolator.cpp b/src/backend/common/HashrateInterpolator.cpp index 0ac11514..2d345dac 100644 --- a/src/backend/common/HashrateInterpolator.cpp +++ b/src/backend/common/HashrateInterpolator.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -20,7 +20,7 @@ #include "backend/common/HashrateInterpolator.h" -uint64_t xmrig::HashrateInterpolator::interpolate(uint64_t timeStamp) const +uint64_t xmlcore::HashrateInterpolator::interpolate(uint64_t timeStamp) const { timeStamp -= LagMS; @@ -44,7 +44,7 @@ uint64_t xmrig::HashrateInterpolator::interpolate(uint64_t timeStamp) const return 0; } -void xmrig::HashrateInterpolator::addDataPoint(uint64_t count, uint64_t timeStamp) +void xmlcore::HashrateInterpolator::addDataPoint(uint64_t count, uint64_t timeStamp) { std::lock_guard l(m_lock); diff --git a/src/backend/common/HashrateInterpolator.h b/src/backend/common/HashrateInterpolator.h index 65e62443..978d5b26 100644 --- a/src/backend/common/HashrateInterpolator.h +++ b/src/backend/common/HashrateInterpolator.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HASHRATE_INTERPOLATOR_H -#define XMRIG_HASHRATE_INTERPOLATOR_H +#ifndef xmlcore_HASHRATE_INTERPOLATOR_H +#define xmlcore_HASHRATE_INTERPOLATOR_H #include @@ -25,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { class HashrateInterpolator @@ -45,7 +45,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_HASHRATE_INTERPOLATOR_H */ +#endif /* xmlcore_HASHRATE_INTERPOLATOR_H */ diff --git a/src/backend/common/Tags.h b/src/backend/common/Tags.h index 0e298275..ca4c129c 100644 --- a/src/backend/common/Tags.h +++ b/src/backend/common/Tags.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,31 +23,31 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BACKEND_TAGS_H -#define XMRIG_BACKEND_TAGS_H +#ifndef xmlcore_BACKEND_TAGS_H +#define xmlcore_BACKEND_TAGS_H #include -namespace xmrig { +namespace xmlcore { const char *backend_tag(uint32_t backend); const char *cpu_tag(); -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL const char *ocl_tag(); #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA const char *cuda_tag(); #endif -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BACKEND_TAGS_H */ +#endif /* xmlcore_BACKEND_TAGS_H */ diff --git a/src/backend/common/Thread.h b/src/backend/common/Thread.h index fb6c618b..000966f0 100644 --- a/src/backend/common/Thread.h +++ b/src/backend/common/Thread.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_THREAD_H -#define XMRIG_THREAD_H +#ifndef xmlcore_THREAD_H +#define xmlcore_THREAD_H #include "backend/common/interfaces/IWorker.h" @@ -26,13 +26,13 @@ #include -#ifdef XMRIG_OS_APPLE +#ifdef xmlcore_OS_APPLE # include # include #endif -namespace xmrig { +namespace xmlcore { class IBackend; @@ -42,11 +42,11 @@ template class Thread { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Thread) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Thread) inline Thread(IBackend *backend, size_t id, const T &config) : m_id(id), m_config(config), m_backend(backend) {} -# ifdef XMRIG_OS_APPLE +# ifdef xmlcore_OS_APPLE inline ~Thread() { pthread_join(m_thread, nullptr); delete m_worker; } inline void start(void *(*callback)(void *)) @@ -82,7 +82,7 @@ private: IBackend *m_backend; IWorker *m_worker = nullptr; - #ifdef XMRIG_OS_APPLE + #ifdef xmlcore_OS_APPLE pthread_t m_thread{}; # else std::thread m_thread; @@ -90,7 +90,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_THREAD_H */ +#endif /* xmlcore_THREAD_H */ diff --git a/src/backend/common/Threads.cpp b/src/backend/common/Threads.cpp index 920e7def..c5188f59 100644 --- a/src/backend/common/Threads.cpp +++ b/src/backend/common/Threads.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,28 +29,28 @@ #include "crypto/cn/CnAlgo.h" -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL # include "backend/opencl/OclThreads.h" #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA # include "backend/cuda/CudaThreads.h" #endif -namespace xmrig { +namespace xmlcore { static const char *kAsterisk = "*"; static const char *kCn2 = "cn/2"; -} // namespace xmrig +} // namespace xmlcore template -const T &xmrig::Threads::get(const String &profileName) const +const T &xmlcore::Threads::get(const String &profileName) const { static T empty; if (profileName.isNull() || !has(profileName)) { @@ -62,7 +62,7 @@ const T &xmrig::Threads::get(const String &profileName) const template -size_t xmrig::Threads::read(const rapidjson::Value &value) +size_t xmlcore::Threads::read(const rapidjson::Value &value) { using namespace rapidjson; @@ -106,7 +106,7 @@ size_t xmrig::Threads::read(const rapidjson::Value &value) template -xmrig::String xmrig::Threads::profileName(const Algorithm &algorithm, bool strict) const +xmlcore::String xmlcore::Threads::profileName(const Algorithm &algorithm, bool strict) const { if (isDisabled(algorithm)) { return String(); @@ -145,7 +145,7 @@ xmrig::String xmrig::Threads::profileName(const Algorithm &algorithm, bool st template -void xmrig::Threads::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const +void xmlcore::Threads::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -164,16 +164,16 @@ void xmrig::Threads::toJSON(rapidjson::Value &out, rapidjson::Document &doc) } -namespace xmrig { +namespace xmlcore { template class Threads; -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL template class Threads; #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA template class Threads; #endif -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/common/Threads.h b/src/backend/common/Threads.h index 1682efba..130f4ee1 100644 --- a/src/backend/common/Threads.h +++ b/src/backend/common/Threads.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_THREADS_H -#define XMRIG_THREADS_H +#ifndef xmlcore_THREADS_H +#define xmlcore_THREADS_H #include @@ -35,7 +35,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { template @@ -77,7 +77,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_THREADS_H */ +#endif /* xmlcore_THREADS_H */ diff --git a/src/backend/common/Worker.cpp b/src/backend/common/Worker.cpp index b24ac280..2e9df155 100644 --- a/src/backend/common/Worker.cpp +++ b/src/backend/common/Worker.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +22,7 @@ #include "crypto/common/VirtualMemory.h" -xmrig::Worker::Worker(size_t id, int64_t affinity, int priority) : +xmlcore::Worker::Worker(size_t id, int64_t affinity, int priority) : m_affinity(affinity), m_id(id) { diff --git a/src/backend/common/Worker.h b/src/backend/common/Worker.h index f4c12ea5..50150920 100644 --- a/src/backend/common/Worker.h +++ b/src/backend/common/Worker.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_WORKER_H -#define XMRIG_WORKER_H +#ifndef xmlcore_WORKER_H +#define xmlcore_WORKER_H #include "backend/common/interfaces/IWorker.h" -namespace xmrig { +namespace xmlcore { class Worker : public IWorker @@ -45,7 +45,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_WORKER_H */ +#endif /* xmlcore_WORKER_H */ diff --git a/src/backend/common/WorkerJob.h b/src/backend/common/WorkerJob.h index cf664f87..979db270 100644 --- a/src/backend/common/WorkerJob.h +++ b/src/backend/common/WorkerJob.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_WORKERJOB_H -#define XMRIG_WORKERJOB_H +#ifndef xmlcore_WORKERJOB_H +#define xmlcore_WORKERJOB_H #include @@ -33,7 +33,7 @@ #include "crypto/common/Nonce.h" -namespace xmrig { +namespace xmlcore { template @@ -117,14 +117,14 @@ private: template<> -inline uint32_t *xmrig::WorkerJob<1>::nonce(size_t) +inline uint32_t *xmlcore::WorkerJob<1>::nonce(size_t) { return reinterpret_cast(blob() + nonceOffset()); } template<> -inline bool xmrig::WorkerJob<1>::nextRound(uint32_t rounds, uint32_t roundSize) +inline bool xmlcore::WorkerJob<1>::nextRound(uint32_t rounds, uint32_t roundSize) { m_rounds[index()]++; @@ -147,7 +147,7 @@ inline bool xmrig::WorkerJob<1>::nextRound(uint32_t rounds, uint32_t roundSize) template<> -inline void xmrig::WorkerJob<1>::save(const Job &job, uint32_t reserveCount, Nonce::Backend backend) +inline void xmlcore::WorkerJob<1>::save(const Job &job, uint32_t reserveCount, Nonce::Backend backend) { m_index = job.index(); m_jobs[index()] = job; @@ -161,7 +161,7 @@ inline void xmrig::WorkerJob<1>::save(const Job &job, uint32_t reserveCount, Non } -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_WORKERJOB_H */ +#endif /* xmlcore_WORKERJOB_H */ diff --git a/src/backend/common/Workers.cpp b/src/backend/common/Workers.cpp index a70affe6..65424b6c 100644 --- a/src/backend/common/Workers.cpp +++ b/src/backend/common/Workers.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -26,28 +26,28 @@ #include "base/tools/Chrono.h" -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL # include "backend/opencl/OclWorker.h" #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA # include "backend/cuda/CudaWorker.h" #endif -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "backend/common/benchmark/Benchmark.h" #endif -namespace xmrig { +namespace xmlcore { class WorkersPrivate { public: - XMRIG_DISABLE_COPY_MOVE(WorkersPrivate) + xmlcore_DISABLE_COPY_MOVE(WorkersPrivate) WorkersPrivate() = default; ~WorkersPrivate() = default; @@ -58,11 +58,11 @@ public: }; -} // namespace xmrig +} // namespace xmlcore template -xmrig::Workers::Workers() : +xmlcore::Workers::Workers() : d_ptr(new WorkersPrivate()) { @@ -70,14 +70,14 @@ xmrig::Workers::Workers() : template -xmrig::Workers::~Workers() +xmlcore::Workers::~Workers() { delete d_ptr; } template -bool xmrig::Workers::tick(uint64_t) +bool xmlcore::Workers::tick(uint64_t) { if (!d_ptr->hashrate) { return true; @@ -107,7 +107,7 @@ bool xmrig::Workers::tick(uint64_t) d_ptr->hashrate->add(totalHashCount, Chrono::steadyMSecs()); } -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK return !d_ptr->benchmark || !d_ptr->benchmark->finish(totalHashCount); # else return true; @@ -116,23 +116,23 @@ bool xmrig::Workers::tick(uint64_t) template -const xmrig::Hashrate *xmrig::Workers::hashrate() const +const xmlcore::Hashrate *xmlcore::Workers::hashrate() const { return d_ptr->hashrate.get(); } template -void xmrig::Workers::setBackend(IBackend *backend) +void xmlcore::Workers::setBackend(IBackend *backend) { d_ptr->backend = backend; } template -void xmrig::Workers::stop() +void xmlcore::Workers::stop() { -# ifdef XMRIG_MINER_PROJECT +# ifdef xmlcore_MINER_PROJECT Nonce::stop(T::backend()); # endif @@ -142,7 +142,7 @@ void xmrig::Workers::stop() m_workers.clear(); -# ifdef XMRIG_MINER_PROJECT +# ifdef xmlcore_MINER_PROJECT Nonce::touch(T::backend()); # endif @@ -150,9 +150,9 @@ void xmrig::Workers::stop() } -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK template -void xmrig::Workers::start(const std::vector &data, const std::shared_ptr &benchmark) +void xmlcore::Workers::start(const std::vector &data, const std::shared_ptr &benchmark) { if (!benchmark) { return start(data, true); @@ -167,14 +167,14 @@ void xmrig::Workers::start(const std::vector &data, const std::shared_ptr< template -xmrig::IWorker *xmrig::Workers::create(Thread *) +xmlcore::IWorker *xmlcore::Workers::create(Thread *) { return nullptr; } template -void *xmrig::Workers::onReady(void *arg) +void *xmlcore::Workers::onReady(void *arg) { auto handle = static_cast* >(arg); @@ -200,7 +200,7 @@ void *xmrig::Workers::onReady(void *arg) template -void xmrig::Workers::start(const std::vector &data, bool sleep) +void xmlcore::Workers::start(const std::vector &data, bool sleep) { for (const auto &item : data) { m_workers.push_back(new Thread(d_ptr->backend, m_workers.size(), item)); @@ -208,7 +208,7 @@ void xmrig::Workers::start(const std::vector &data, bool sleep) d_ptr->hashrate = std::make_shared(m_workers.size()); -# ifdef XMRIG_MINER_PROJECT +# ifdef xmlcore_MINER_PROJECT Nonce::touch(T::backend()); # endif @@ -218,13 +218,13 @@ void xmrig::Workers::start(const std::vector &data, bool sleep) } -namespace xmrig { +namespace xmlcore { template<> -xmrig::IWorker *xmrig::Workers::create(Thread *handle) +xmlcore::IWorker *xmlcore::Workers::create(Thread *handle) { -# ifdef XMRIG_MINER_PROJECT +# ifdef xmlcore_MINER_PROJECT switch (handle->config().intensity) { case 1: return new CpuWorker<1>(handle->id(), handle->config()); @@ -254,9 +254,9 @@ xmrig::IWorker *xmrig::Workers::create(Thread *han template class Workers; -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL template<> -xmrig::IWorker *xmrig::Workers::create(Thread *handle) +xmlcore::IWorker *xmlcore::Workers::create(Thread *handle) { return new OclWorker(handle->id(), handle->config()); } @@ -266,9 +266,9 @@ template class Workers; #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA template<> -xmrig::IWorker *xmrig::Workers::create(Thread *handle) +xmlcore::IWorker *xmlcore::Workers::create(Thread *handle) { return new CudaWorker(handle->id(), handle->config()); } @@ -278,4 +278,4 @@ template class Workers; #endif -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/common/Workers.h b/src/backend/common/Workers.h index 0ef3b889..2851e59b 100644 --- a/src/backend/common/Workers.h +++ b/src/backend/common/Workers.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,25 +16,25 @@ * along with this program. If not, see . */ -#ifndef XMRIG_WORKERS_H -#define XMRIG_WORKERS_H +#ifndef xmlcore_WORKERS_H +#define xmlcore_WORKERS_H #include "backend/common/Thread.h" #include "backend/cpu/CpuLaunchData.h" -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL # include "backend/opencl/OclLaunchData.h" #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA # include "backend/cuda/CudaLaunchData.h" #endif -namespace xmrig { +namespace xmlcore { class Benchmark; @@ -46,7 +46,7 @@ template class Workers { public: - XMRIG_DISABLE_COPY_MOVE(Workers) + xmlcore_DISABLE_COPY_MOVE(Workers) Workers(); ~Workers(); @@ -59,7 +59,7 @@ public: void setBackend(IBackend *backend); void stop(); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK void start(const std::vector &data, const std::shared_ptr &benchmark); # endif @@ -75,7 +75,7 @@ private: template -void xmrig::Workers::jobEarlyNotification(const Job &job) +void xmlcore::Workers::jobEarlyNotification(const Job &job) { for (Thread* t : m_workers) { if (t->worker()) { @@ -90,21 +90,21 @@ IWorker *Workers::create(Thread *handle); extern template class Workers; -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL template<> IWorker *Workers::create(Thread *handle); extern template class Workers; #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA template<> IWorker *Workers::create(Thread *handle); extern template class Workers; #endif -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_WORKERS_H */ +#endif /* xmlcore_WORKERS_H */ diff --git a/src/backend/common/benchmark/BenchState.cpp b/src/backend/common/benchmark/BenchState.cpp index ec2074dc..69c3b211 100644 --- a/src/backend/common/benchmark/BenchState.cpp +++ b/src/backend/common/benchmark/BenchState.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -30,7 +30,7 @@ #include -namespace xmrig { +namespace xmlcore { class BenchStatePrivate @@ -55,23 +55,23 @@ static BenchStatePrivate *d_ptr = nullptr; std::atomic BenchState::m_data{}; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::BenchState::isDone() +bool xmlcore::BenchState::isDone() { return d_ptr == nullptr; } -uint32_t xmrig::BenchState::size() +uint32_t xmlcore::BenchState::size() { return d_ptr ? d_ptr->size : 0U; } -uint64_t xmrig::BenchState::referenceHash(const Algorithm &algo, uint32_t size, uint32_t threads) +uint64_t xmlcore::BenchState::referenceHash(const Algorithm &algo, uint32_t size, uint32_t threads) { uint64_t hash = 0; @@ -84,7 +84,7 @@ uint64_t xmrig::BenchState::referenceHash(const Algorithm &algo, uint32_t size, } -uint64_t xmrig::BenchState::start(size_t threads, const IBackend *backend) +uint64_t xmlcore::BenchState::start(size_t threads, const IBackend *backend) { assert(d_ptr != nullptr); @@ -103,14 +103,14 @@ uint64_t xmrig::BenchState::start(size_t threads, const IBackend *backend) } -void xmrig::BenchState::destroy() +void xmlcore::BenchState::destroy() { delete d_ptr; d_ptr = nullptr; } -void xmrig::BenchState::done() +void xmlcore::BenchState::done() { assert(d_ptr != nullptr && d_ptr->async && d_ptr->remaining > 0); @@ -127,7 +127,7 @@ void xmrig::BenchState::done() } -void xmrig::BenchState::init(IBenchListener *listener, uint32_t size) +void xmlcore::BenchState::init(IBenchListener *listener, uint32_t size) { assert(d_ptr == nullptr); @@ -135,7 +135,7 @@ void xmrig::BenchState::init(IBenchListener *listener, uint32_t size) } -void xmrig::BenchState::setSize(uint32_t size) +void xmlcore::BenchState::setSize(uint32_t size) { assert(d_ptr != nullptr); diff --git a/src/backend/common/benchmark/BenchState.h b/src/backend/common/benchmark/BenchState.h index 4dd6647f..7b565c6e 100644 --- a/src/backend/common/benchmark/BenchState.h +++ b/src/backend/common/benchmark/BenchState.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BENCHSTATE_H -#define XMRIG_BENCHSTATE_H +#ifndef xmlcore_BENCHSTATE_H +#define xmlcore_BENCHSTATE_H #include @@ -25,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -53,7 +53,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BENCHSTATE_H */ +#endif /* xmlcore_BENCHSTATE_H */ diff --git a/src/backend/common/benchmark/BenchState_test.h b/src/backend/common/benchmark/BenchState_test.h index 3aa6d87d..36080ce8 100644 --- a/src/backend/common/benchmark/BenchState_test.h +++ b/src/backend/common/benchmark/BenchState_test.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BENCHSTATE_TEST_H -#define XMRIG_BENCHSTATE_TEST_H +#ifndef xmlcore_BENCHSTATE_TEST_H +#define xmlcore_BENCHSTATE_TEST_H #include "base/crypto/Algorithm.h" @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { static const std::map > hashCheck = { @@ -109,8 +109,8 @@ static const std::map > hashCheck1T = { }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BENCHSTATE_TEST_H */ +#endif /* xmlcore_BENCHSTATE_TEST_H */ diff --git a/src/backend/common/benchmark/Benchmark.cpp b/src/backend/common/benchmark/Benchmark.cpp index 56f24d72..38093208 100644 --- a/src/backend/common/benchmark/Benchmark.cpp +++ b/src/backend/common/benchmark/Benchmark.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,14 +27,14 @@ #include -xmrig::Benchmark::Benchmark(size_t workers, const IBackend *backend) : +xmlcore::Benchmark::Benchmark(size_t workers, const IBackend *backend) : m_backend(backend), m_workers(workers) { } -bool xmrig::Benchmark::finish(uint64_t totalHashCount) +bool xmlcore::Benchmark::finish(uint64_t totalHashCount) { m_current = totalHashCount; @@ -42,13 +42,13 @@ bool xmrig::Benchmark::finish(uint64_t totalHashCount) } -void xmrig::Benchmark::start() +void xmlcore::Benchmark::start() { m_startTime = BenchState::start(m_workers, m_backend); } -void xmrig::Benchmark::printProgress() const +void xmlcore::Benchmark::printProgress() const { if (!m_startTime || !m_current) { return; diff --git a/src/backend/common/benchmark/Benchmark.h b/src/backend/common/benchmark/Benchmark.h index df0e4f9c..04a57117 100644 --- a/src/backend/common/benchmark/Benchmark.h +++ b/src/backend/common/benchmark/Benchmark.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BENCHMARK_H -#define XMRIG_BENCHMARK_H +#ifndef xmlcore_BENCHMARK_H +#define xmlcore_BENCHMARK_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class IBackend; @@ -32,7 +32,7 @@ class IBackend; class Benchmark { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Benchmark) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Benchmark) Benchmark(size_t workers, const IBackend *backend); ~Benchmark() = default; @@ -49,7 +49,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BENCHMARK_H */ +#endif /* xmlcore_BENCHMARK_H */ diff --git a/src/backend/common/interfaces/IBackend.h b/src/backend/common/interfaces/IBackend.h index 53e8e0f1..91ca097a 100644 --- a/src/backend/common/interfaces/IBackend.h +++ b/src/backend/common/interfaces/IBackend.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IBACKEND_H -#define XMRIG_IBACKEND_H +#ifndef xmlcore_IBACKEND_H +#define xmlcore_IBACKEND_H #include "3rdparty/rapidjson/fwd.h" @@ -27,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -42,7 +42,7 @@ class String; class IBackend { public: - XMRIG_DISABLE_COPY_MOVE(IBackend) + xmlcore_DISABLE_COPY_MOVE(IBackend) IBackend() = default; virtual ~IBackend() = default; @@ -61,19 +61,19 @@ public: virtual void start(IWorker *worker, bool ready) = 0; virtual void stop() = 0; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API virtual rapidjson::Value toJSON(rapidjson::Document &doc) const = 0; virtual void handleRequest(IApiRequest &request) = 0; # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK virtual Benchmark *benchmark() const = 0; virtual void printBenchProgress() const = 0; # endif }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_IBACKEND_H +#endif // xmlcore_IBACKEND_H diff --git a/src/backend/common/interfaces/IBenchListener.h b/src/backend/common/interfaces/IBenchListener.h index fe122df8..dff5afa2 100644 --- a/src/backend/common/interfaces/IBenchListener.h +++ b/src/backend/common/interfaces/IBenchListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IBENCHLISTENER_H -#define XMRIG_IBENCHLISTENER_H +#ifndef xmlcore_IBENCHLISTENER_H +#define xmlcore_IBENCHLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class IBackend; @@ -32,7 +32,7 @@ class IBackend; class IBenchListener { public: - XMRIG_DISABLE_COPY_MOVE(IBenchListener) + xmlcore_DISABLE_COPY_MOVE(IBenchListener) IBenchListener() = default; virtual ~IBenchListener() = default; @@ -42,7 +42,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IBENCHLISTENER_H +#endif // xmlcore_IBENCHLISTENER_H diff --git a/src/backend/common/interfaces/IMemoryPool.h b/src/backend/common/interfaces/IMemoryPool.h index 10d27b50..a4ba1e54 100644 --- a/src/backend/common/interfaces/IMemoryPool.h +++ b/src/backend/common/interfaces/IMemoryPool.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IMEMORYPOOL_H -#define XMRIG_IMEMORYPOOL_H +#ifndef xmlcore_IMEMORYPOOL_H +#define xmlcore_IMEMORYPOOL_H #include "base/tools/Object.h" @@ -27,13 +27,13 @@ #include -namespace xmrig { +namespace xmlcore { class IMemoryPool { public: - XMRIG_DISABLE_COPY_MOVE(IMemoryPool) + xmlcore_DISABLE_COPY_MOVE(IMemoryPool) IMemoryPool() = default; virtual ~IMemoryPool() = default; @@ -44,8 +44,8 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_IMEMORYPOOL_H */ +#endif /* xmlcore_IMEMORYPOOL_H */ diff --git a/src/backend/common/interfaces/IRxListener.h b/src/backend/common/interfaces/IRxListener.h index 11adb0d4..d8647734 100644 --- a/src/backend/common/interfaces/IRxListener.h +++ b/src/backend/common/interfaces/IRxListener.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,31 +17,31 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IRXLISTENER_H -#define XMRIG_IRXLISTENER_H +#ifndef xmlcore_IRXLISTENER_H +#define xmlcore_IRXLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class IRxListener { public: - XMRIG_DISABLE_COPY_MOVE(IRxListener) + xmlcore_DISABLE_COPY_MOVE(IRxListener) IRxListener() = default; virtual ~IRxListener() = default; -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX virtual void onDatasetReady() = 0; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IRXLISTENER_H +#endif // xmlcore_IRXLISTENER_H diff --git a/src/backend/common/interfaces/IRxStorage.h b/src/backend/common/interfaces/IRxStorage.h index ab287a76..fdcf10e2 100644 --- a/src/backend/common/interfaces/IRxStorage.h +++ b/src/backend/common/interfaces/IRxStorage.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IRXSTORAGE_H -#define XMRIG_IRXSTORAGE_H +#ifndef xmlcore_IRXSTORAGE_H +#define xmlcore_IRXSTORAGE_H #include "base/tools/Object.h" @@ -30,7 +30,7 @@ #include -namespace xmrig { +namespace xmlcore { class Job; @@ -41,7 +41,7 @@ class RxSeed; class IRxStorage { public: - XMRIG_DISABLE_COPY_MOVE(IRxStorage) + xmlcore_DISABLE_COPY_MOVE(IRxStorage) IRxStorage() = default; virtual ~IRxStorage() = default; @@ -53,7 +53,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IRXSTORAGE_H +#endif // xmlcore_IRXSTORAGE_H diff --git a/src/backend/common/interfaces/IWorker.h b/src/backend/common/interfaces/IWorker.h index 7ed6ff00..6bd6c3c9 100644 --- a/src/backend/common/interfaces/IWorker.h +++ b/src/backend/common/interfaces/IWorker.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IWORKER_H -#define XMRIG_IWORKER_H +#ifndef xmlcore_IWORKER_H +#define xmlcore_IWORKER_H #include "base/tools/Object.h" @@ -27,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { class Job; @@ -37,7 +37,7 @@ class VirtualMemory; class IWorker { public: - XMRIG_DISABLE_COPY_MOVE(IWorker) + xmlcore_DISABLE_COPY_MOVE(IWorker) IWorker() = default; virtual ~IWorker() = default; @@ -52,7 +52,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_IWORKER_H +#endif // xmlcore_IWORKER_H diff --git a/src/backend/common/misc/PciTopology.h b/src/backend/common/misc/PciTopology.h index af1844c9..11f9bbe6 100644 --- a/src/backend/common/misc/PciTopology.h +++ b/src/backend/common/misc/PciTopology.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_PCITOPOLOGY_H -#define XMRIG_PCITOPOLOGY_H +#ifndef xmlcore_PCITOPOLOGY_H +#define xmlcore_PCITOPOLOGY_H #include @@ -26,7 +26,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class PciTopology @@ -67,7 +67,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_PCITOPOLOGY_H */ +#endif /* xmlcore_PCITOPOLOGY_H */ diff --git a/src/backend/cpu/Cpu.cpp b/src/backend/cpu/Cpu.cpp index a49d6560..d1ea0542 100644 --- a/src/backend/cpu/Cpu.cpp +++ b/src/backend/cpu/Cpu.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -24,20 +24,20 @@ #include "3rdparty/rapidjson/document.h" -#if defined(XMRIG_FEATURE_HWLOC) +#if defined(xmlcore_FEATURE_HWLOC) # include "backend/cpu/platform/HwlocCpuInfo.h" #else # include "backend/cpu/platform/BasicCpuInfo.h" #endif -static xmrig::ICpuInfo *cpuInfo = nullptr; +static xmlcore::ICpuInfo *cpuInfo = nullptr; -xmrig::ICpuInfo *xmrig::Cpu::info() +xmlcore::ICpuInfo *xmlcore::Cpu::info() { if (cpuInfo == nullptr) { -# if defined(XMRIG_FEATURE_HWLOC) +# if defined(xmlcore_FEATURE_HWLOC) cpuInfo = new HwlocCpuInfo(); # else cpuInfo = new BasicCpuInfo(); @@ -48,13 +48,13 @@ xmrig::ICpuInfo *xmrig::Cpu::info() } -rapidjson::Value xmrig::Cpu::toJSON(rapidjson::Document &doc) +rapidjson::Value xmlcore::Cpu::toJSON(rapidjson::Document &doc) { return info()->toJSON(doc); } -void xmrig::Cpu::release() +void xmlcore::Cpu::release() { delete cpuInfo; cpuInfo = nullptr; diff --git a/src/backend/cpu/Cpu.h b/src/backend/cpu/Cpu.h index 186063d3..1764ab59 100644 --- a/src/backend/cpu/Cpu.h +++ b/src/backend/cpu/Cpu.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPU_H -#define XMRIG_CPU_H +#ifndef xmlcore_CPU_H +#define xmlcore_CPU_H #include "backend/cpu/interfaces/ICpuInfo.h" -namespace xmrig { +namespace xmlcore { class Cpu @@ -37,7 +37,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CPU_H */ +#endif /* xmlcore_CPU_H */ diff --git a/src/backend/cpu/CpuBackend.cpp b/src/backend/cpu/CpuBackend.cpp index e4e82aa6..8b8a3c3d 100644 --- a/src/backend/cpu/CpuBackend.cpp +++ b/src/backend/cpu/CpuBackend.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -45,23 +45,23 @@ #include "crypto/rx/RxDataset.h" -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/interfaces/IApiRequest.h" #endif -#ifdef XMRIG_ALGO_ARGON2 +#ifdef xmlcore_ALGO_ARGON2 # include "crypto/argon2/Impl.h" #endif -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "backend/common/benchmark/Benchmark.h" # include "backend/common/benchmark/BenchState.h" #endif -namespace xmrig { +namespace xmlcore { extern template class Threads; @@ -158,7 +158,7 @@ public: status.start(threads, algo.l3()); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK workers.start(threads, benchmark); # else workers.start(threads); @@ -178,7 +178,7 @@ public: { HugePagesInfo pages; - # ifdef XMRIG_ALGO_RANDOMX + # ifdef xmlcore_ALGO_RANDOMX if (algo.family() == Algorithm::RANDOM_X) { pages += Rx::hugePages(); } @@ -212,24 +212,24 @@ public: String profileName; Workers workers; -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK std::shared_ptr benchmark; # endif }; -} // namespace xmrig +} // namespace xmlcore -const char *xmrig::backend_tag(uint32_t backend) +const char *xmlcore::backend_tag(uint32_t backend) { -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL if (backend == Nonce::OPENCL) { return ocl_tag(); } # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA if (backend == Nonce::CUDA) { return cuda_tag(); } @@ -239,65 +239,65 @@ const char *xmrig::backend_tag(uint32_t backend) } -const char *xmrig::cpu_tag() +const char *xmlcore::cpu_tag() { return Tags::cpu(); } -xmrig::CpuBackend::CpuBackend(Controller *controller) : +xmlcore::CpuBackend::CpuBackend(Controller *controller) : d_ptr(new CpuBackendPrivate(controller)) { d_ptr->workers.setBackend(this); } -xmrig::CpuBackend::~CpuBackend() +xmlcore::CpuBackend::~CpuBackend() { delete d_ptr; } -bool xmrig::CpuBackend::isEnabled() const +bool xmlcore::CpuBackend::isEnabled() const { return d_ptr->controller->config()->cpu().isEnabled(); } -bool xmrig::CpuBackend::isEnabled(const Algorithm &algorithm) const +bool xmlcore::CpuBackend::isEnabled(const Algorithm &algorithm) const { return !d_ptr->controller->config()->cpu().threads().get(algorithm).isEmpty(); } -bool xmrig::CpuBackend::tick(uint64_t ticks) +bool xmlcore::CpuBackend::tick(uint64_t ticks) { return d_ptr->workers.tick(ticks); } -const xmrig::Hashrate *xmrig::CpuBackend::hashrate() const +const xmlcore::Hashrate *xmlcore::CpuBackend::hashrate() const { return d_ptr->workers.hashrate(); } -const xmrig::String &xmrig::CpuBackend::profileName() const +const xmlcore::String &xmlcore::CpuBackend::profileName() const { return d_ptr->profileName; } -const xmrig::String &xmrig::CpuBackend::type() const +const xmlcore::String &xmlcore::CpuBackend::type() const { return kType; } -void xmrig::CpuBackend::prepare(const Job &nextJob) +void xmlcore::CpuBackend::prepare(const Job &nextJob) { -# ifdef XMRIG_ALGO_ARGON2 - const xmrig::Algorithm::Family f = nextJob.algorithm().family(); +# ifdef xmlcore_ALGO_ARGON2 + const xmlcore::Algorithm::Family f = nextJob.algorithm().family(); if ((f == Algorithm::ARGON2) || (f == Algorithm::RANDOM_X)) { if (argon2::Impl::select(d_ptr->controller->config()->cpu().argon2Impl())) { LOG_INFO("%s use " WHITE_BOLD("argon2") " implementation " CSI "1;%dm" "%s", @@ -311,7 +311,7 @@ void xmrig::CpuBackend::prepare(const Job &nextJob) } -void xmrig::CpuBackend::printHashrate(bool details) +void xmlcore::CpuBackend::printHashrate(bool details) { if (!details || !hashrate()) { return; @@ -334,7 +334,7 @@ void xmrig::CpuBackend::printHashrate(bool details) i++; } -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL Log::print(WHITE_BOLD_S "| - | - | %7s | %7s | %7s |", Hashrate::format(hashrate()->calc(Hashrate::ShortInterval), num, sizeof num / 3), Hashrate::format(hashrate()->calc(Hashrate::MediumInterval), num + 8, sizeof num / 3), @@ -344,12 +344,12 @@ void xmrig::CpuBackend::printHashrate(bool details) } -void xmrig::CpuBackend::printHealth() +void xmlcore::CpuBackend::printHealth() { } -void xmrig::CpuBackend::setJob(const Job &job) +void xmlcore::CpuBackend::setJob(const Job &job) { if (!isEnabled()) { return stop(); @@ -373,7 +373,7 @@ void xmrig::CpuBackend::setJob(const Job &job) stop(); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (BenchState::size()) { d_ptr->benchmark = std::make_shared(threads.size(), this); } @@ -384,7 +384,7 @@ void xmrig::CpuBackend::setJob(const Job &job) } -void xmrig::CpuBackend::start(IWorker *worker, bool ready) +void xmlcore::CpuBackend::start(IWorker *worker, bool ready) { mutex.lock(); @@ -400,7 +400,7 @@ void xmrig::CpuBackend::start(IWorker *worker, bool ready) } -void xmrig::CpuBackend::stop() +void xmlcore::CpuBackend::stop() { if (d_ptr->threads.empty()) { return; @@ -415,8 +415,8 @@ void xmrig::CpuBackend::stop() } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::CpuBackend::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::CpuBackend::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -431,18 +431,18 @@ rapidjson::Value xmrig::CpuBackend::toJSON(rapidjson::Document &doc) const out.AddMember("priority", cpu.priority(), allocator); out.AddMember("msr", Rx::isMSR(), allocator); -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM const Assembly assembly = Cpu::assembly(cpu.assembly()); out.AddMember("asm", assembly.toJSON(), allocator); # else out.AddMember("asm", false, allocator); # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 out.AddMember("argon2-impl", argon2::Impl::name().toJSON(), allocator); # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT out.AddMember("astrobwt-max-size", cpu.astrobwtMaxSize(), allocator); # endif @@ -475,7 +475,7 @@ rapidjson::Value xmrig::CpuBackend::toJSON(rapidjson::Document &doc) const } -void xmrig::CpuBackend::handleRequest(IApiRequest &request) +void xmlcore::CpuBackend::handleRequest(IApiRequest &request) { if (request.type() == IApiRequest::REQ_SUMMARY) { request.reply().AddMember("hugepages", d_ptr->hugePages(request.version(), request.doc()), request.doc().GetAllocator()); @@ -484,14 +484,14 @@ void xmrig::CpuBackend::handleRequest(IApiRequest &request) #endif -#ifdef XMRIG_FEATURE_BENCHMARK -xmrig::Benchmark *xmrig::CpuBackend::benchmark() const +#ifdef xmlcore_FEATURE_BENCHMARK +xmlcore::Benchmark *xmlcore::CpuBackend::benchmark() const { return d_ptr->benchmark.get(); } -void xmrig::CpuBackend::printBenchProgress() const +void xmlcore::CpuBackend::printBenchProgress() const { if (d_ptr->benchmark) { d_ptr->benchmark->printProgress(); diff --git a/src/backend/cpu/CpuBackend.h b/src/backend/cpu/CpuBackend.h index 2f697b8b..403352f3 100644 --- a/src/backend/cpu/CpuBackend.h +++ b/src/backend/cpu/CpuBackend.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUBACKEND_H -#define XMRIG_CPUBACKEND_H +#ifndef xmlcore_CPUBACKEND_H +#define xmlcore_CPUBACKEND_H #include "backend/common/interfaces/IBackend.h" @@ -33,7 +33,7 @@ #include -namespace xmrig { +namespace xmlcore { class Controller; @@ -44,7 +44,7 @@ class Miner; class CpuBackend : public IBackend { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(CpuBackend) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(CpuBackend) CpuBackend(Controller *controller); ~CpuBackend() override; @@ -65,12 +65,12 @@ protected: void start(IWorker *worker, bool ready) override; void stop() override; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const override; void handleRequest(IApiRequest &request) override; # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK Benchmark *benchmark() const override; void printBenchProgress() const override; # endif @@ -80,7 +80,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CPUBACKEND_H */ +#endif /* xmlcore_CPUBACKEND_H */ diff --git a/src/backend/cpu/CpuConfig.cpp b/src/backend/cpu/CpuConfig.cpp index 8965f6c9..082ef114 100644 --- a/src/backend/cpu/CpuConfig.cpp +++ b/src/backend/cpu/CpuConfig.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { const char *CpuConfig::kEnabled = "enabled"; const char *CpuConfig::kField = "cpu"; @@ -38,15 +38,15 @@ const char *CpuConfig::kMemoryPool = "memory-pool"; const char *CpuConfig::kPriority = "priority"; const char *CpuConfig::kYield = "yield"; -#ifdef XMRIG_FEATURE_ASM +#ifdef xmlcore_FEATURE_ASM const char *CpuConfig::kAsm = "asm"; #endif -#ifdef XMRIG_ALGO_ARGON2 +#ifdef xmlcore_ALGO_ARGON2 const char *CpuConfig::kArgon2Impl = "argon2-impl"; #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT const char *CpuConfig::kAstroBWTMaxSize = "astrobwt-max-size"; const char *CpuConfig::kAstroBWTAVX2 = "astrobwt-avx2"; #endif @@ -57,13 +57,13 @@ extern template class Threads; } -bool xmrig::CpuConfig::isHwAES() const +bool xmlcore::CpuConfig::isHwAES() const { return (m_aes == AES_AUTO ? (Cpu::info()->hasAES() ? AES_HW : AES_SOFT) : m_aes) == AES_HW; } -rapidjson::Value xmrig::CpuConfig::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::CpuConfig::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -82,15 +82,15 @@ rapidjson::Value xmrig::CpuConfig::toJSON(rapidjson::Document &doc) const obj.AddMember(StringRef(kMaxThreadsHint), m_limit, allocator); } -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM obj.AddMember(StringRef(kAsm), m_assembly.toJSON(), allocator); # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 obj.AddMember(StringRef(kArgon2Impl), m_argon2Impl.toJSON(), allocator); # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT obj.AddMember(StringRef(kAstroBWTMaxSize), m_astrobwtMaxSize, allocator); obj.AddMember(StringRef(kAstroBWTAVX2), m_astrobwtAVX2, allocator); # endif @@ -101,13 +101,13 @@ rapidjson::Value xmrig::CpuConfig::toJSON(rapidjson::Document &doc) const } -size_t xmrig::CpuConfig::memPoolSize() const +size_t xmlcore::CpuConfig::memPoolSize() const { return m_memoryPool < 0 ? std::max(Cpu::info()->threads(), Cpu::info()->L3() >> 21) : m_memoryPool; } -std::vector xmrig::CpuConfig::get(const Miner *miner, const Algorithm &algorithm) const +std::vector xmlcore::CpuConfig::get(const Miner *miner, const Algorithm &algorithm) const { if (algorithm.family() == Algorithm::KAWPOW) { return {}; @@ -131,7 +131,7 @@ std::vector xmrig::CpuConfig::get(const Miner *miner, cons } -void xmrig::CpuConfig::read(const rapidjson::Value &value) +void xmlcore::CpuConfig::read(const rapidjson::Value &value) { if (value.IsObject()) { m_enabled = Json::getBool(value, kEnabled, m_enabled); @@ -144,15 +144,15 @@ void xmrig::CpuConfig::read(const rapidjson::Value &value) setMemoryPool(Json::getValue(value, kMemoryPool)); setPriority(Json::getInt(value, kPriority, -1)); -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM m_assembly = Json::getValue(value, kAsm); # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 m_argon2Impl = Json::getString(value, kArgon2Impl); # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT const auto& astroBWTMaxSize = Json::getValue(value, kAstroBWTMaxSize); if (astroBWTMaxSize.IsNull() || !astroBWTMaxSize.IsInt()) { m_shouldSave = true; @@ -185,7 +185,7 @@ void xmrig::CpuConfig::read(const rapidjson::Value &value) } -void xmrig::CpuConfig::generate() +void xmlcore::CpuConfig::generate() { if (!isEnabled() || m_threads.has("*")) { return; @@ -193,19 +193,19 @@ void xmrig::CpuConfig::generate() size_t count = 0; - count += xmrig::generate(m_threads, m_limit); - count += xmrig::generate(m_threads, m_limit); - count += xmrig::generate(m_threads, m_limit); - count += xmrig::generate(m_threads, m_limit); - count += xmrig::generate(m_threads, m_limit); - count += xmrig::generate(m_threads, m_limit); - count += xmrig::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); + count += xmlcore::generate(m_threads, m_limit); m_shouldSave |= count > 0; } -void xmrig::CpuConfig::setAesMode(const rapidjson::Value &value) +void xmlcore::CpuConfig::setAesMode(const rapidjson::Value &value) { if (value.IsBool()) { m_aes = value.GetBool() ? AES_HW : AES_SOFT; @@ -216,7 +216,7 @@ void xmrig::CpuConfig::setAesMode(const rapidjson::Value &value) } -void xmrig::CpuConfig::setHugePages(const rapidjson::Value &value) +void xmlcore::CpuConfig::setHugePages(const rapidjson::Value &value) { if (value.IsBool()) { m_hugePageSize = value.GetBool() ? kDefaultHugePageSizeKb : 0U; @@ -229,7 +229,7 @@ void xmrig::CpuConfig::setHugePages(const rapidjson::Value &value) } -void xmrig::CpuConfig::setMemoryPool(const rapidjson::Value &value) +void xmlcore::CpuConfig::setMemoryPool(const rapidjson::Value &value) { if (value.IsBool()) { m_memoryPool = value.GetBool() ? -1 : 0; diff --git a/src/backend/cpu/CpuConfig.h b/src/backend/cpu/CpuConfig.h index 536c221e..e9605055 100644 --- a/src/backend/cpu/CpuConfig.h +++ b/src/backend/cpu/CpuConfig.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUCONFIG_H -#define XMRIG_CPUCONFIG_H +#ifndef xmlcore_CPUCONFIG_H +#define xmlcore_CPUCONFIG_H #include "backend/common/Threads.h" @@ -26,7 +26,7 @@ #include "crypto/common/Assembly.h" -namespace xmrig { +namespace xmlcore { class CpuConfig @@ -48,15 +48,15 @@ public: static const char *kPriority; static const char *kYield; -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM static const char *kAsm; # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 static const char *kArgon2Impl; # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT static const char *kAstroBWTMaxSize; static const char *kAstroBWTAVX2; # endif @@ -111,7 +111,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CPUCONFIG_H */ +#endif /* xmlcore_CPUCONFIG_H */ diff --git a/src/backend/cpu/CpuConfig_gen.h b/src/backend/cpu/CpuConfig_gen.h index 19bd3b11..f1c5d8a4 100644 --- a/src/backend/cpu/CpuConfig_gen.h +++ b/src/backend/cpu/CpuConfig_gen.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUCONFIG_GEN_H -#define XMRIG_CPUCONFIG_GEN_H +#ifndef xmlcore_CPUCONFIG_GEN_H +#define xmlcore_CPUCONFIG_GEN_H #include "backend/common/Threads.h" @@ -31,7 +31,7 @@ #include "backend/cpu/CpuThreads.h" -namespace xmrig { +namespace xmlcore { static inline size_t generate(const char *key, Threads &threads, const Algorithm &algorithm, uint32_t limit) @@ -64,7 +64,7 @@ size_t inline generate(Threads &threads, uint32_t lim } -#ifdef XMRIG_ALGO_CN_LITE +#ifdef xmlcore_ALGO_CN_LITE template<> size_t inline generate(Threads &threads, uint32_t limit) { @@ -82,7 +82,7 @@ size_t inline generate(Threads &threads, uint32_ #endif -#ifdef XMRIG_ALGO_CN_HEAVY +#ifdef xmlcore_ALGO_CN_HEAVY template<> size_t inline generate(Threads &threads, uint32_t limit) { @@ -91,7 +91,7 @@ size_t inline generate(Threads &threads, uint32 #endif -#ifdef XMRIG_ALGO_CN_PICO +#ifdef xmlcore_ALGO_CN_PICO template<> size_t inline generate(Threads &threads, uint32_t limit) { @@ -100,7 +100,7 @@ size_t inline generate(Threads &threads, uint32_ #endif -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX template<> size_t inline generate(Threads &threads, uint32_t limit) { @@ -141,7 +141,7 @@ size_t inline generate(Threads &threads, uint32 #endif -#ifdef XMRIG_ALGO_ARGON2 +#ifdef xmlcore_ALGO_ARGON2 template<> size_t inline generate(Threads &threads, uint32_t limit) { @@ -150,7 +150,7 @@ size_t inline generate(Threads &threads, uint32_t #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT template<> size_t inline generate(Threads& threads, uint32_t limit) { @@ -158,7 +158,7 @@ size_t inline generate(Threads& threads, uint32 } #endif -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CPUCONFIG_GEN_H */ +#endif /* xmlcore_CPUCONFIG_GEN_H */ diff --git a/src/backend/cpu/CpuLaunchData.cpp b/src/backend/cpu/CpuLaunchData.cpp index a5e0c99e..e2a086df 100644 --- a/src/backend/cpu/CpuLaunchData.cpp +++ b/src/backend/cpu/CpuLaunchData.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -32,7 +32,7 @@ #include -xmrig::CpuLaunchData::CpuLaunchData(const Miner *miner, const Algorithm &algorithm, const CpuConfig &config, const CpuThread &thread, size_t threads) : +xmlcore::CpuLaunchData::CpuLaunchData(const Miner *miner, const Algorithm &algorithm, const CpuConfig &config, const CpuThread &thread, size_t threads) : algorithm(algorithm), assembly(config.assembly()), astrobwtAVX2(config.astrobwtAVX2()), @@ -49,7 +49,7 @@ xmrig::CpuLaunchData::CpuLaunchData(const Miner *miner, const Algorithm &algorit } -bool xmrig::CpuLaunchData::isEqual(const CpuLaunchData &other) const +bool xmlcore::CpuLaunchData::isEqual(const CpuLaunchData &other) const { return (algorithm.l3() == other.algorithm.l3() && assembly == other.assembly @@ -62,7 +62,7 @@ bool xmrig::CpuLaunchData::isEqual(const CpuLaunchData &other) const } -xmrig::CnHash::AlgoVariant xmrig::CpuLaunchData::av() const +xmlcore::CnHash::AlgoVariant xmlcore::CpuLaunchData::av() const { if (intensity <= 2) { return static_cast(!hwAES ? (intensity + 2) : intensity); @@ -72,7 +72,7 @@ xmrig::CnHash::AlgoVariant xmrig::CpuLaunchData::av() const } -const char *xmrig::CpuLaunchData::tag() +const char *xmlcore::CpuLaunchData::tag() { return cpu_tag(); } diff --git a/src/backend/cpu/CpuLaunchData.h b/src/backend/cpu/CpuLaunchData.h index 8801c005..9dc2d470 100644 --- a/src/backend/cpu/CpuLaunchData.h +++ b/src/backend/cpu/CpuLaunchData.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPULAUNCHDATA_H -#define XMRIG_CPULAUNCHDATA_H +#ifndef xmlcore_CPULAUNCHDATA_H +#define xmlcore_CPULAUNCHDATA_H #include "base/crypto/Algorithm.h" @@ -33,7 +33,7 @@ #include "crypto/common/Nonce.h" -namespace xmrig { +namespace xmlcore { class CpuConfig; @@ -71,7 +71,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CPULAUNCHDATA_H */ +#endif /* xmlcore_CPULAUNCHDATA_H */ diff --git a/src/backend/cpu/CpuThread.cpp b/src/backend/cpu/CpuThread.cpp index 4da1baf7..1bad0237 100644 --- a/src/backend/cpu/CpuThread.cpp +++ b/src/backend/cpu/CpuThread.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +28,7 @@ #include "base/io/json/Json.h" -xmrig::CpuThread::CpuThread(const rapidjson::Value &value) +xmlcore::CpuThread::CpuThread(const rapidjson::Value &value) { if (value.IsArray() && value.Size() >= 2) { m_intensity = value[0].GetUint(); @@ -41,7 +41,7 @@ xmrig::CpuThread::CpuThread(const rapidjson::Value &value) } -rapidjson::Value xmrig::CpuThread::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::CpuThread::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; if (m_intensity == 0) { diff --git a/src/backend/cpu/CpuThread.h b/src/backend/cpu/CpuThread.h index b198c800..a3a8cfbc 100644 --- a/src/backend/cpu/CpuThread.h +++ b/src/backend/cpu/CpuThread.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUTHREAD_H -#define XMRIG_CPUTHREAD_H +#ifndef xmlcore_CPUTHREAD_H +#define xmlcore_CPUTHREAD_H #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class CpuThread @@ -56,7 +56,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CPUTHREAD_H */ +#endif /* xmlcore_CPUTHREAD_H */ diff --git a/src/backend/cpu/CpuThreads.cpp b/src/backend/cpu/CpuThreads.cpp index d9ae61b1..c9d49021 100644 --- a/src/backend/cpu/CpuThreads.cpp +++ b/src/backend/cpu/CpuThreads.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "base/io/json/Json.h" -namespace xmrig { +namespace xmlcore { static const char *kAffinity = "affinity"; @@ -83,7 +83,7 @@ static inline int64_t getAffinity(uint64_t index, int64_t affinity) } -xmrig::CpuThreads::CpuThreads(const rapidjson::Value &value) +xmlcore::CpuThreads::CpuThreads(const rapidjson::Value &value) { if (value.IsArray()) { for (auto &v : value.GetArray()) { @@ -110,7 +110,7 @@ xmrig::CpuThreads::CpuThreads(const rapidjson::Value &value) } -xmrig::CpuThreads::CpuThreads(size_t count, uint32_t intensity) +xmlcore::CpuThreads::CpuThreads(size_t count, uint32_t intensity) { m_data.reserve(count); @@ -120,7 +120,7 @@ xmrig::CpuThreads::CpuThreads(size_t count, uint32_t intensity) } -bool xmrig::CpuThreads::isEqual(const CpuThreads &other) const +bool xmlcore::CpuThreads::isEqual(const CpuThreads &other) const { if (isEmpty() && other.isEmpty()) { return true; @@ -130,7 +130,7 @@ bool xmrig::CpuThreads::isEqual(const CpuThreads &other) const } -rapidjson::Value xmrig::CpuThreads::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::CpuThreads::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); diff --git a/src/backend/cpu/CpuThreads.h b/src/backend/cpu/CpuThreads.h index e87f5230..ebe90300 100644 --- a/src/backend/cpu/CpuThreads.h +++ b/src/backend/cpu/CpuThreads.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUTHREADS_H -#define XMRIG_CPUTHREADS_H +#ifndef xmlcore_CPUTHREADS_H +#define xmlcore_CPUTHREADS_H #include @@ -32,7 +32,7 @@ #include "backend/cpu/CpuThread.h" -namespace xmrig { +namespace xmlcore { class CpuThreads @@ -69,7 +69,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CPUTHREADS_H */ +#endif /* xmlcore_CPUTHREADS_H */ diff --git a/src/backend/cpu/CpuWorker.cpp b/src/backend/cpu/CpuWorker.cpp index 794d773f..20ddcaf1 100644 --- a/src/backend/cpu/CpuWorker.cpp +++ b/src/backend/cpu/CpuWorker.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -38,37 +38,37 @@ #include "net/JobResults.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "crypto/randomx/randomx.h" #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "crypto/astrobwt/AstroBWT.h" #endif -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "backend/common/benchmark/BenchState.h" #endif -namespace xmrig { +namespace xmlcore { static constexpr uint32_t kReserveCount = 32768; -#ifdef XMRIG_ALGO_CN_HEAVY +#ifdef xmlcore_ALGO_CN_HEAVY static std::mutex cn_heavyZen3MemoryMutex; VirtualMemory* cn_heavyZen3Memory = nullptr; #endif -} // namespace xmrig +} // namespace xmlcore template -xmrig::CpuWorker::CpuWorker(size_t id, const CpuLaunchData &data) : +xmlcore::CpuWorker::CpuWorker(size_t id, const CpuLaunchData &data) : Worker(id, data.affinity, data.priority), m_algorithm(data.algorithm), m_assembly(data.assembly), @@ -81,7 +81,7 @@ xmrig::CpuWorker::CpuWorker(size_t id, const CpuLaunchData &data) : m_threads(data.threads), m_ctx() { -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY // cn-heavy optimization for Zen3 CPUs if ((N == 1) && (m_av == CnHash::AV_SINGLE) && (m_algorithm.family() == Algorithm::CN_HEAVY) && (Cpu::info()->arch() == ICpuInfo::ARCH_ZEN3)) { std::lock_guard lock(cn_heavyZen3MemoryMutex); @@ -99,15 +99,15 @@ xmrig::CpuWorker::CpuWorker(size_t id, const CpuLaunchData &data) : template -xmrig::CpuWorker::~CpuWorker() +xmlcore::CpuWorker::~CpuWorker() { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX RxVm::destroy(m_vm); # endif CnCtx::release(m_ctx, N); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (m_memory != cn_heavyZen3Memory) # endif { @@ -116,9 +116,9 @@ xmrig::CpuWorker::~CpuWorker() } -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX template -void xmrig::CpuWorker::allocateRandomX_VM() +void xmlcore::CpuWorker::allocateRandomX_VM() { RxDataset *dataset = Rx::dataset(m_job.currentJob(), node()); @@ -142,9 +142,9 @@ void xmrig::CpuWorker::allocateRandomX_VM() template -bool xmrig::CpuWorker::selfTest() +bool xmlcore::CpuWorker::selfTest() { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (m_algorithm.family() == Algorithm::RANDOM_X) { return N == 1; } @@ -169,14 +169,14 @@ bool xmrig::CpuWorker::selfTest() return rc; } -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE if (m_algorithm.family() == Algorithm::CN_LITE) { return verify(Algorithm::CN_LITE_0, test_output_v0_lite) && verify(Algorithm::CN_LITE_1, test_output_v1_lite); } # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (m_algorithm.family() == Algorithm::CN_HEAVY) { return verify(Algorithm::CN_HEAVY_0, test_output_v0_heavy) && verify(Algorithm::CN_HEAVY_XHV, test_output_xhv_heavy) && @@ -184,14 +184,14 @@ bool xmrig::CpuWorker::selfTest() } # endif -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO if (m_algorithm.family() == Algorithm::CN_PICO) { return verify(Algorithm::CN_PICO_0, test_output_pico_trtl) && verify(Algorithm::CN_PICO_TLO, test_output_pico_tlo); } # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 if (m_algorithm.family() == Algorithm::ARGON2) { return verify(Algorithm::AR2_CHUKWA, argon2_chukwa_test_out) && verify(Algorithm::AR2_CHUKWA_V2, argon2_chukwa_v2_test_out) && @@ -199,7 +199,7 @@ bool xmrig::CpuWorker::selfTest() } # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (m_algorithm.family() == Algorithm::ASTROBWT) { return verify(Algorithm::ASTROBWT_DERO, astrobwt_dero_test_out); } @@ -210,7 +210,7 @@ bool xmrig::CpuWorker::selfTest() template -void xmrig::CpuWorker::hashrateData(uint64_t &hashCount, uint64_t &, uint64_t &rawHashes) const +void xmlcore::CpuWorker::hashrateData(uint64_t &hashCount, uint64_t &, uint64_t &rawHashes) const { hashCount = m_count; rawHashes = m_count; @@ -218,7 +218,7 @@ void xmrig::CpuWorker::hashrateData(uint64_t &hashCount, uint64_t &, uint64_t template -void xmrig::CpuWorker::start() +void xmlcore::CpuWorker::start() { while (Nonce::sequence(Nonce::CPU) > 0) { if (Nonce::isPaused()) { @@ -234,7 +234,7 @@ void xmrig::CpuWorker::start() consumeJob(); } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX bool first = true; alignas(16) uint64_t tempHash[8] = {}; # endif @@ -251,7 +251,7 @@ void xmrig::CpuWorker::start() current_job_nonces[i] = *m_job.nonce(i); } -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (m_benchSize) { if (current_job_nonces[0] >= m_benchSize) { return BenchState::done(); @@ -266,7 +266,7 @@ void xmrig::CpuWorker::start() bool valid = true; -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (job.algorithm().family() == Algorithm::RANDOM_X) { if (first) { first = false; @@ -282,7 +282,7 @@ void xmrig::CpuWorker::start() else # endif { -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (job.algorithm().family() == Algorithm::ASTROBWT) { if (!astrobwt::astrobwt_dero(m_job.blob(), job.size(), m_ctx[0]->memory, m_hash, m_astrobwtMaxSize, m_astrobwtAVX2)) valid = false; @@ -302,7 +302,7 @@ void xmrig::CpuWorker::start() for (size_t i = 0; i < N; ++i) { const uint64_t value = *reinterpret_cast(m_hash + (i * 32) + 24); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (m_benchSize) { if (current_job_nonces[i] < m_benchSize) { BenchState::add(value); @@ -328,9 +328,9 @@ void xmrig::CpuWorker::start() template -bool xmrig::CpuWorker::nextRound() +bool xmlcore::CpuWorker::nextRound() { -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK const uint32_t count = m_benchSize ? 1U : kReserveCount; # else constexpr uint32_t count = kReserveCount; @@ -347,7 +347,7 @@ bool xmrig::CpuWorker::nextRound() template -bool xmrig::CpuWorker::verify(const Algorithm &algorithm, const uint8_t *referenceValue) +bool xmlcore::CpuWorker::verify(const Algorithm &algorithm, const uint8_t *referenceValue) { cn_hash_fun func = fn(algorithm); if (!func) { @@ -360,7 +360,7 @@ bool xmrig::CpuWorker::verify(const Algorithm &algorithm, const uint8_t *refe template -bool xmrig::CpuWorker::verify2(const Algorithm &algorithm, const uint8_t *referenceValue) +bool xmlcore::CpuWorker::verify2(const Algorithm &algorithm, const uint8_t *referenceValue) { cn_hash_fun func = fn(algorithm); if (!func) { @@ -386,7 +386,7 @@ bool xmrig::CpuWorker::verify2(const Algorithm &algorithm, const uint8_t *ref } -namespace xmrig { +namespace xmlcore { template<> bool CpuWorker<1>::verify2(const Algorithm &algorithm, const uint8_t *referenceValue) @@ -407,16 +407,16 @@ bool CpuWorker<1>::verify2(const Algorithm &algorithm, const uint8_t *referenceV return true; } -} // namespace xmrig +} // namespace xmlcore template -void xmrig::CpuWorker::allocateCnCtx() +void xmlcore::CpuWorker::allocateCnCtx() { if (m_ctx[0] == nullptr) { int shift = 0; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY // cn-heavy optimization for Zen3 CPUs if (m_memory == cn_heavyZen3Memory) { shift = (id() / 8) * m_algorithm.l3() * 8 + (id() % 8) * 64; @@ -429,7 +429,7 @@ void xmrig::CpuWorker::allocateCnCtx() template -void xmrig::CpuWorker::consumeJob() +void xmlcore::CpuWorker::consumeJob() { if (Nonce::sequence(Nonce::CPU) == 0) { return; @@ -437,7 +437,7 @@ void xmrig::CpuWorker::consumeJob() auto job = m_miner->job(); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK m_benchSize = job.benchSize(); const uint32_t count = m_benchSize ? 1U : kReserveCount; # else @@ -446,7 +446,7 @@ void xmrig::CpuWorker::consumeJob() m_job.add(job, count, Nonce::CPU); -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (m_job.currentJob().algorithm().family() == Algorithm::RANDOM_X) { allocateRandomX_VM(); } @@ -458,7 +458,7 @@ void xmrig::CpuWorker::consumeJob() } -namespace xmrig { +namespace xmlcore { template class CpuWorker<1>; template class CpuWorker<2>; @@ -466,5 +466,5 @@ template class CpuWorker<3>; template class CpuWorker<4>; template class CpuWorker<5>; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/cpu/CpuWorker.h b/src/backend/cpu/CpuWorker.h index 785763af..1c6f0f28 100644 --- a/src/backend/cpu/CpuWorker.h +++ b/src/backend/cpu/CpuWorker.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUWORKER_H -#define XMRIG_CPUWORKER_H +#ifndef xmlcore_CPUWORKER_H +#define xmlcore_CPUWORKER_H #include "backend/common/Worker.h" @@ -27,12 +27,12 @@ #include "net/JobResult.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX class randomx_vm; #endif -namespace xmrig { +namespace xmlcore { class RxVm; @@ -42,7 +42,7 @@ template class CpuWorker : public Worker { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(CpuWorker) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(CpuWorker) CpuWorker(size_t id, const CpuLaunchData &data); ~CpuWorker() override; @@ -59,7 +59,7 @@ protected: private: inline cn_hash_fun fn(const Algorithm &algorithm) const { return CnHash::fn(algorithm, m_av, m_assembly); } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX void allocateRandomX_VM(); # endif @@ -83,11 +83,11 @@ private: VirtualMemory *m_memory = nullptr; WorkerJob m_job; -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX randomx_vm *m_vm = nullptr; # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK uint32_t m_benchSize = 0; # endif }; @@ -104,7 +104,7 @@ extern template class CpuWorker<4>; extern template class CpuWorker<5>; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CPUWORKER_H */ +#endif /* xmlcore_CPUWORKER_H */ diff --git a/src/backend/cpu/cpu.cmake b/src/backend/cpu/cpu.cmake index c485683a..2ebf5589 100644 --- a/src/backend/cpu/cpu.cmake +++ b/src/backend/cpu/cpu.cmake @@ -32,24 +32,24 @@ if (WITH_HWLOC) set(CPUID_LIB ${HWLOC_LIBRARY}) endif() - add_definitions(/DXMRIG_FEATURE_HWLOC) + add_definitions(/Dxmlcore_FEATURE_HWLOC) if (HWLOC_DEBUG) - add_definitions(/DXMRIG_HWLOC_DEBUG) + add_definitions(/Dxmlcore_HWLOC_DEBUG) endif() list(APPEND HEADERS_BACKEND_CPU src/backend/cpu/platform/HwlocCpuInfo.h) list(APPEND SOURCES_BACKEND_CPU src/backend/cpu/platform/HwlocCpuInfo.cpp) else() - remove_definitions(/DXMRIG_FEATURE_HWLOC) + remove_definitions(/Dxmlcore_FEATURE_HWLOC) set(CPUID_LIB "") endif() -if (XMRIG_ARM) +if (xmlcore_ARM) list(APPEND SOURCES_BACKEND_CPU src/backend/cpu/platform/BasicCpuInfo_arm.cpp) - if (XMRIG_OS_UNIX) + if (xmlcore_OS_UNIX) list(APPEND SOURCES_BACKEND_CPU src/backend/cpu/platform/lscpu_arm.cpp) endif() else() diff --git a/src/backend/cpu/interfaces/ICpuInfo.h b/src/backend/cpu/interfaces/ICpuInfo.h index 7a888723..e009f720 100644 --- a/src/backend/cpu/interfaces/ICpuInfo.h +++ b/src/backend/cpu/interfaces/ICpuInfo.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CPUINFO_H -#define XMRIG_CPUINFO_H +#ifndef xmlcore_CPUINFO_H +#define xmlcore_CPUINFO_H #include "backend/cpu/CpuThreads.h" @@ -26,13 +26,13 @@ #include "crypto/common/Assembly.h" -namespace xmrig { +namespace xmlcore { class ICpuInfo { public: - XMRIG_DISABLE_COPY_MOVE(ICpuInfo) + xmlcore_DISABLE_COPY_MOVE(ICpuInfo) enum Vendor : uint32_t { VENDOR_UNKNOWN, @@ -114,7 +114,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_CPUINFO_H +#endif // xmlcore_CPUINFO_H diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp index bcf77e92..5b9c39e8 100644 --- a/src/backend/cpu/platform/BasicCpuInfo.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2017-2019 XMR-Stak , * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -49,7 +49,7 @@ #define EDX_Reg (3) -namespace xmrig { +namespace xmlcore { constexpr size_t kCpuFlagsSize = 14; @@ -57,7 +57,7 @@ static const std::array flagNames = { "aes", "avx" static_assert(kCpuFlagsSize == ICpuInfo::FLAG_MAX, "kCpuFlagsSize and FLAG_MAX mismatch"); -#ifdef XMRIG_FEATURE_MSR +#ifdef xmlcore_FEATURE_MSR constexpr size_t kMsrArraySize = 5; static const std::array msrNames = { MSR_NAMES_LIST }; static_assert(kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch"); @@ -152,25 +152,25 @@ static inline bool has_cat_l3() { return has_feature(EXTENDED_FEATURES, static inline bool is_vm() { return has_feature(PROCESSOR_INFO, ECX_Reg, 1 << 31); } -} // namespace xmrig +} // namespace xmlcore -#ifdef XMRIG_ALGO_ARGON2 +#ifdef xmlcore_ALGO_ARGON2 extern "C" { -int cpu_flags_has_avx2() { return xmrig::has_avx2(); } -int cpu_flags_has_avx512f() { return xmrig::has_avx512f(); } -int cpu_flags_has_sse2() { return xmrig::has_sse2(); } -int cpu_flags_has_ssse3() { return xmrig::has_ssse3(); } -int cpu_flags_has_xop() { return xmrig::has_xop(); } +int cpu_flags_has_avx2() { return xmlcore::has_avx2(); } +int cpu_flags_has_avx512f() { return xmlcore::has_avx512f(); } +int cpu_flags_has_sse2() { return xmlcore::has_sse2(); } +int cpu_flags_has_ssse3() { return xmlcore::has_ssse3(); } +int cpu_flags_has_xop() { return xmlcore::has_xop(); } } #endif -xmrig::BasicCpuInfo::BasicCpuInfo() : +xmlcore::BasicCpuInfo::BasicCpuInfo() : m_threads(std::thread::hardware_concurrency()) { cpu_brand_string(m_brand); @@ -195,7 +195,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() : m_units[i] = i; } -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM if (hasAES()) { char vendor[13] = { 0 }; int32_t data[4] = { 0 }; @@ -295,13 +295,13 @@ xmrig::BasicCpuInfo::BasicCpuInfo() : } -const char *xmrig::BasicCpuInfo::backend() const +const char *xmlcore::BasicCpuInfo::backend() const { return "basic/1"; } -xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm, uint32_t) const +xmlcore::CpuThreads xmlcore::BasicCpuInfo::threads(const Algorithm &algorithm, uint32_t) const { const size_t count = std::thread::hardware_concurrency(); @@ -309,25 +309,25 @@ xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm, uint3 return 1; } -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE if (algorithm.family() == Algorithm::CN_LITE) { return CpuThreads(count, 1); } # endif -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO if (algorithm.family() == Algorithm::CN_PICO) { return CpuThreads(count, 2); } # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (algorithm.family() == Algorithm::CN_HEAVY) { return CpuThreads(std::max(count / 4, 1), 1); } # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (algorithm.family() == Algorithm::RANDOM_X) { if (algorithm == Algorithm::RX_WOW) { return count; @@ -337,13 +337,13 @@ xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm, uint3 } # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 if (algorithm.family() == Algorithm::ARGON2) { return count; } # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (algorithm.family() == Algorithm::ASTROBWT) { CpuThreads threads; for (size_t i = 0; i < count; ++i) { @@ -357,7 +357,7 @@ xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm, uint3 } -rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::BasicCpuInfo::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -381,13 +381,13 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const out.AddMember("nodes", static_cast(nodes()), allocator); out.AddMember("backend", StringRef(backend()), allocator); -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR out.AddMember("msr", StringRef(msrNames[msrMod()]), allocator); # else out.AddMember("msr", "none", allocator); # endif -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM out.AddMember("assembly", StringRef(Assembly(assembly()).toString()), allocator); # else out.AddMember("assembly", "none", allocator); diff --git a/src/backend/cpu/platform/BasicCpuInfo.h b/src/backend/cpu/platform/BasicCpuInfo.h index 88760bac..c455ca2b 100644 --- a/src/backend/cpu/platform/BasicCpuInfo.h +++ b/src/backend/cpu/platform/BasicCpuInfo.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2017-2019 XMR-Stak , * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BASICCPUINFO_H -#define XMRIG_BASICCPUINFO_H +#ifndef xmlcore_BASICCPUINFO_H +#define xmlcore_BASICCPUINFO_H #include "backend/cpu/interfaces/ICpuInfo.h" @@ -27,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { class BasicCpuInfo : public ICpuInfo @@ -72,7 +72,7 @@ protected: Vendor m_vendor = VENDOR_UNKNOWN; private: -# ifndef XMRIG_ARM +# ifndef xmlcore_ARM uint32_t m_procInfo = 0; uint32_t m_family = 0; uint32_t m_model = 0; @@ -85,7 +85,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BASICCPUINFO_H */ +#endif /* xmlcore_BASICCPUINFO_H */ diff --git a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp index 318928cd..fe1928ba 100644 --- a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -36,18 +36,18 @@ #include "3rdparty/rapidjson/document.h" -#if defined(XMRIG_OS_UNIX) -namespace xmrig { +#if defined(xmlcore_OS_UNIX) +namespace xmlcore { extern String cpu_name_arm(); -} // namespace xmrig -#elif defined(XMRIG_OS_MACOS) +} // namespace xmlcore +#elif defined(xmlcore_OS_MACOS) # include #endif -xmrig::BasicCpuInfo::BasicCpuInfo() : +xmlcore::BasicCpuInfo::BasicCpuInfo() : m_threads(std::thread::hardware_concurrency()) { m_units.resize(m_threads); @@ -55,7 +55,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() : m_units[i] = i; } -# ifdef XMRIG_ARMv8 +# ifdef xmlcore_ARMv8 memcpy(m_brand, "ARMv8", 5); # else memcpy(m_brand, "ARMv7", 5); @@ -69,33 +69,33 @@ xmrig::BasicCpuInfo::BasicCpuInfo() : # endif # endif -# if defined(XMRIG_OS_UNIX) +# if defined(xmlcore_OS_UNIX) auto name = cpu_name_arm(); if (!name.isNull()) { strncpy(m_brand, name, sizeof(m_brand) - 1); } m_flags.set(FLAG_PDPE1GB, std::ifstream("/sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages").good()); -# elif defined(XMRIG_OS_MACOS) +# elif defined(xmlcore_OS_MACOS) size_t buflen = sizeof(m_brand); sysctlbyname("machdep.cpu.brand_string", &m_brand, &buflen, nullptr, 0); # endif } -const char *xmrig::BasicCpuInfo::backend() const +const char *xmlcore::BasicCpuInfo::backend() const { return "basic/1"; } -xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &, uint32_t) const +xmlcore::CpuThreads xmlcore::BasicCpuInfo::threads(const Algorithm &, uint32_t) const { return CpuThreads(threads()); } -rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::BasicCpuInfo::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -117,7 +117,7 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const out.AddMember("msr", "none", allocator); out.AddMember("assembly", "none", allocator); -# ifdef XMRIG_ARMv8 +# ifdef xmlcore_ARMv8 out.AddMember("arch", "aarch64", allocator); # else out.AddMember("arch", "aarch32", allocator); diff --git a/src/backend/cpu/platform/HwlocCpuInfo.cpp b/src/backend/cpu/platform/HwlocCpuInfo.cpp index 01efc4b0..86072e6d 100644 --- a/src/backend/cpu/platform/HwlocCpuInfo.cpp +++ b/src/backend/cpu/platform/HwlocCpuInfo.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -17,7 +17,7 @@ */ -#ifdef XMRIG_HWLOC_DEBUG +#ifdef xmlcore_HWLOC_DEBUG # include #endif @@ -37,7 +37,7 @@ #include "base/io/log/Log.h" -namespace xmrig { +namespace xmlcore { uint32_t HwlocCpuInfo::m_features = 0; @@ -93,7 +93,7 @@ static inline size_t countByType(hwloc_topology_t topology, hwloc_obj_type_t typ } -#ifndef XMRIG_ARM +#ifndef xmlcore_ARM static inline std::vector findByType(hwloc_obj_t obj, hwloc_obj_type_t type) { std::vector out; @@ -120,15 +120,15 @@ static inline bool isCacheExclusive(hwloc_obj_t obj) #endif -} // namespace xmrig +} // namespace xmlcore -xmrig::HwlocCpuInfo::HwlocCpuInfo() +xmlcore::HwlocCpuInfo::HwlocCpuInfo() { hwloc_topology_init(&m_topology); hwloc_topology_load(m_topology); -# ifdef XMRIG_HWLOC_DEBUG +# ifdef xmlcore_HWLOC_DEBUG # if defined(UV_VERSION_HEX) && UV_VERSION_HEX >= 0x010c00 { char env[520] = { 0 }; @@ -187,7 +187,7 @@ xmrig::HwlocCpuInfo::HwlocCpuInfo() } } -# if defined(XMRIG_OS_MACOS) && defined(XMRIG_ARM) +# if defined(xmlcore_OS_MACOS) && defined(xmlcore_ARM) if (L2() == 33554432U && m_cores == 8 && m_cores == m_threads) { m_cache[2] = 16777216U; } @@ -195,13 +195,13 @@ xmrig::HwlocCpuInfo::HwlocCpuInfo() } -xmrig::HwlocCpuInfo::~HwlocCpuInfo() +xmlcore::HwlocCpuInfo::~HwlocCpuInfo() { hwloc_topology_destroy(m_topology); } -bool xmrig::HwlocCpuInfo::membind(hwloc_const_bitmap_t nodeset) +bool xmlcore::HwlocCpuInfo::membind(hwloc_const_bitmap_t nodeset) { if (!hwloc_topology_get_support(m_topology)->membind->set_thisthread_membind) { return false; @@ -215,15 +215,15 @@ bool xmrig::HwlocCpuInfo::membind(hwloc_const_bitmap_t nodeset) } -xmrig::CpuThreads xmrig::HwlocCpuInfo::threads(const Algorithm &algorithm, uint32_t limit) const +xmlcore::CpuThreads xmlcore::HwlocCpuInfo::threads(const Algorithm &algorithm, uint32_t limit) const { -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (algorithm == Algorithm::ASTROBWT_DERO) { return allThreads(algorithm, limit); } # endif -# ifndef XMRIG_ARM +# ifndef xmlcore_ARM if (L2() == 0 && L3() == 0) { return BasicCpuInfo::threads(algorithm, limit); } @@ -271,7 +271,7 @@ xmrig::CpuThreads xmrig::HwlocCpuInfo::threads(const Algorithm &algorithm, uint3 } -xmrig::CpuThreads xmrig::HwlocCpuInfo::allThreads(const Algorithm &algorithm, uint32_t limit) const +xmlcore::CpuThreads xmlcore::HwlocCpuInfo::allThreads(const Algorithm &algorithm, uint32_t limit) const { CpuThreads threads; threads.reserve(m_threads); @@ -289,9 +289,9 @@ xmrig::CpuThreads xmrig::HwlocCpuInfo::allThreads(const Algorithm &algorithm, ui -void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorithm &algorithm, CpuThreads &threads, size_t limit) const +void xmlcore::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorithm &algorithm, CpuThreads &threads, size_t limit) const { -# ifndef XMRIG_ARM +# ifndef xmlcore_ARM constexpr size_t oneMiB = 1024U * 1024U; size_t PUs = countByType(cache, HWLOC_OBJ_PU); @@ -336,13 +336,13 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith size_t cacheHashes = ((L3 + extra) + (scratchpad / 2)) / scratchpad; -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO if (intensity && algorithm == Algorithm::CN_PICO_0 && (cacheHashes / PUs) >= 2) { intensity = 2; } # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (extra == 0 && algorithm.l2() > 0) { cacheHashes = std::min(std::max(L2 / algorithm.l2(), cores.size()), cacheHashes); } @@ -411,7 +411,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith } -void xmrig::HwlocCpuInfo::setThreads(size_t threads) +void xmlcore::HwlocCpuInfo::setThreads(size_t threads) { if (!threads) { return; diff --git a/src/backend/cpu/platform/HwlocCpuInfo.h b/src/backend/cpu/platform/HwlocCpuInfo.h index 69b67a30..a338f0db 100644 --- a/src/backend/cpu/platform/HwlocCpuInfo.h +++ b/src/backend/cpu/platform/HwlocCpuInfo.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HWLOCCPUINFO_H -#define XMRIG_HWLOCCPUINFO_H +#ifndef xmlcore_HWLOCCPUINFO_H +#define xmlcore_HWLOCCPUINFO_H #include "backend/cpu/platform/BasicCpuInfo.h" @@ -29,13 +29,13 @@ using hwloc_obj_t = struct hwloc_obj *; using hwloc_topology_t = struct hwloc_topology *; -namespace xmrig { +namespace xmlcore { class HwlocCpuInfo : public BasicCpuInfo { public: - XMRIG_DISABLE_COPY_MOVE(HwlocCpuInfo) + xmlcore_DISABLE_COPY_MOVE(HwlocCpuInfo) enum Feature : uint32_t { @@ -80,7 +80,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_HWLOCCPUINFO_H */ +#endif /* xmlcore_HWLOCCPUINFO_H */ diff --git a/src/backend/cpu/platform/lscpu_arm.cpp b/src/backend/cpu/platform/lscpu_arm.cpp index d632ac49..5b0b0aef 100644 --- a/src/backend/cpu/platform/lscpu_arm.cpp +++ b/src/backend/cpu/platform/lscpu_arm.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018 Riku Voipio * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig + * Copyright (c) 2016-2021 xmlcore * * 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 @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { struct lscpu_desc @@ -333,4 +333,4 @@ String cpu_name_arm() } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/cuda/CudaBackend.cpp b/src/backend/cuda/CudaBackend.cpp index 59eaab1f..b781acec 100644 --- a/src/backend/cuda/CudaBackend.cpp +++ b/src/backend/cuda/CudaBackend.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -47,30 +47,30 @@ #include "core/Controller.h" -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "backend/cuda/runners/CudaAstroBWTRunner.h" #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "crypto/kawpow/KPCache.h" # include "crypto/kawpow/KPHash.h" #endif -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/interfaces/IApiRequest.h" #endif -#ifdef XMRIG_FEATURE_NVML +#ifdef xmlcore_FEATURE_NVML #include "backend/cuda/wrappers/NvmlLib.h" -namespace xmrig { static const char *kNvmlLabel = "NVML"; } +namespace xmlcore { static const char *kNvmlLabel = "NVML"; } #endif -namespace xmrig { +namespace xmlcore { extern template class Threads; @@ -176,7 +176,7 @@ public: Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") WHITE_BOLD("%s") "/" WHITE_BOLD("%s") BLACK_BOLD("/%s"), kLabel, CudaLib::version(runtimeVersion).c_str(), CudaLib::version(driverVersion).c_str(), CudaLib::pluginVersion()); -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML if (cuda.isNvmlEnabled()) { if (NvmlLib::init(cuda.nvmlLoader())) { NvmlLib::assign(devices); @@ -227,7 +227,7 @@ public: size_t algo_l3 = algo.l3(); -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (algo.family() == Algorithm::ASTROBWT) { algo_l3 = CudaAstroBWTRunner::BWT_DATA_STRIDE * 17 + 1024; } @@ -237,7 +237,7 @@ public: for (const auto &data : threads) { size_t mem_used = (data.thread.threads() * data.thread.blocks()) * algo_l3 / oneMiB; -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW if (algo.family() == Algorithm::KAWPOW) { const uint32_t epoch = job.height() / KPHash::EPOCH_LENGTH; mem_used = (KPCache::dag_size(epoch) + oneMiB - 1) / oneMiB; @@ -266,7 +266,7 @@ public: } -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML void printHealth() { for (const auto &device : devices) { @@ -311,70 +311,70 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -const char *xmrig::cuda_tag() +const char *xmlcore::cuda_tag() { return Tags::nvidia(); } -xmrig::CudaBackend::CudaBackend(Controller *controller) : +xmlcore::CudaBackend::CudaBackend(Controller *controller) : d_ptr(new CudaBackendPrivate(controller)) { d_ptr->workers.setBackend(this); } -xmrig::CudaBackend::~CudaBackend() +xmlcore::CudaBackend::~CudaBackend() { delete d_ptr; CudaLib::close(); -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML NvmlLib::close(); # endif } -bool xmrig::CudaBackend::isEnabled() const +bool xmlcore::CudaBackend::isEnabled() const { return d_ptr->controller->config()->cuda().isEnabled() && CudaLib::isInitialized() && !d_ptr->devices.empty();; } -bool xmrig::CudaBackend::isEnabled(const Algorithm &algorithm) const +bool xmlcore::CudaBackend::isEnabled(const Algorithm &algorithm) const { return !d_ptr->controller->config()->cuda().threads().get(algorithm).isEmpty(); } -const xmrig::Hashrate *xmrig::CudaBackend::hashrate() const +const xmlcore::Hashrate *xmlcore::CudaBackend::hashrate() const { return d_ptr->workers.hashrate(); } -const xmrig::String &xmrig::CudaBackend::profileName() const +const xmlcore::String &xmlcore::CudaBackend::profileName() const { return d_ptr->profileName; } -const xmrig::String &xmrig::CudaBackend::type() const +const xmlcore::String &xmlcore::CudaBackend::type() const { return kType; } -void xmrig::CudaBackend::execCommand(char) +void xmlcore::CudaBackend::execCommand(char) { } -void xmrig::CudaBackend::prepare(const Job &job) +void xmlcore::CudaBackend::prepare(const Job &job) { if (d_ptr) { d_ptr->workers.jobEarlyNotification(job); @@ -382,7 +382,7 @@ void xmrig::CudaBackend::prepare(const Job &job) } -void xmrig::CudaBackend::printHashrate(bool details) +void xmlcore::CudaBackend::printHashrate(bool details) { if (!details || !hashrate()) { return; @@ -428,15 +428,15 @@ void xmrig::CudaBackend::printHashrate(bool details) } -void xmrig::CudaBackend::printHealth() +void xmlcore::CudaBackend::printHealth() { -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML d_ptr->printHealth(); # endif } -void xmrig::CudaBackend::setJob(const Job &job) +void xmlcore::CudaBackend::setJob(const Job &job) { const auto &cuda = d_ptr->controller->config()->cuda(); if (cuda.isEnabled()) { @@ -468,7 +468,7 @@ void xmrig::CudaBackend::setJob(const Job &job) } -void xmrig::CudaBackend::start(IWorker *worker, bool ready) +void xmlcore::CudaBackend::start(IWorker *worker, bool ready) { mutex.lock(); @@ -486,7 +486,7 @@ void xmrig::CudaBackend::start(IWorker *worker, bool ready) } -void xmrig::CudaBackend::stop() +void xmlcore::CudaBackend::stop() { if (d_ptr->threads.empty()) { return; @@ -501,14 +501,14 @@ void xmrig::CudaBackend::stop() } -bool xmrig::CudaBackend::tick(uint64_t ticks) +bool xmlcore::CudaBackend::tick(uint64_t ticks) { return d_ptr->workers.tick(ticks); } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::CudaBackend::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::CudaBackend::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -525,7 +525,7 @@ rapidjson::Value xmrig::CudaBackend::toJSON(rapidjson::Document &doc) const versions.AddMember("cuda-driver", Value(CudaLib::version(d_ptr->driverVersion).c_str(), allocator), allocator); versions.AddMember("plugin", String(CudaLib::pluginVersion()).toJSON(doc), allocator); -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML if (NvmlLib::isReady()) { versions.AddMember("nvml", StringRef(NvmlLib::version()), allocator); versions.AddMember("driver", StringRef(NvmlLib::driverVersion()), allocator); @@ -560,7 +560,7 @@ rapidjson::Value xmrig::CudaBackend::toJSON(rapidjson::Document &doc) const } -void xmrig::CudaBackend::handleRequest(IApiRequest &) +void xmlcore::CudaBackend::handleRequest(IApiRequest &) { } #endif diff --git a/src/backend/cuda/CudaBackend.h b/src/backend/cuda/CudaBackend.h index 379e9bf1..0c2391bd 100644 --- a/src/backend/cuda/CudaBackend.h +++ b/src/backend/cuda/CudaBackend.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDABACKEND_H -#define XMRIG_CUDABACKEND_H +#ifndef xmlcore_CUDABACKEND_H +#define xmlcore_CUDABACKEND_H #include @@ -33,7 +33,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Controller; @@ -44,7 +44,7 @@ class Miner; class CudaBackend : public IBackend { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(CudaBackend) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(CudaBackend) CudaBackend(Controller *controller); @@ -65,12 +65,12 @@ protected: void stop() override; bool tick(uint64_t ticks) override; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const override; void handleRequest(IApiRequest &request) override; # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK inline Benchmark *benchmark() const override { return nullptr; } inline void printBenchProgress() const override {} # endif @@ -80,7 +80,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CUDABACKEND_H */ +#endif /* xmlcore_CUDABACKEND_H */ diff --git a/src/backend/cuda/CudaConfig.cpp b/src/backend/cuda/CudaConfig.cpp index abc0b63e..ac3626c2 100644 --- a/src/backend/cuda/CudaConfig.cpp +++ b/src/backend/cuda/CudaConfig.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -32,7 +32,7 @@ #include "base/io/log/Log.h" -namespace xmrig { +namespace xmlcore { static bool generated = false; @@ -42,7 +42,7 @@ static const char *kDevicesHint = "devices-hint"; static const char *kEnabled = "enabled"; static const char *kLoader = "loader"; -#ifdef XMRIG_FEATURE_NVML +#ifdef xmlcore_FEATURE_NVML static const char *kNvml = "nvml"; #endif @@ -53,7 +53,7 @@ extern template class Threads; } -rapidjson::Value xmrig::CudaConfig::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::CudaConfig::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -63,7 +63,7 @@ rapidjson::Value xmrig::CudaConfig::toJSON(rapidjson::Document &doc) const obj.AddMember(StringRef(kEnabled), m_enabled, allocator); obj.AddMember(StringRef(kLoader), m_loader.toJSON(), allocator); -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML if (m_nvmlLoader.isNull()) { obj.AddMember(StringRef(kNvml), m_nvml, allocator); } @@ -78,7 +78,7 @@ rapidjson::Value xmrig::CudaConfig::toJSON(rapidjson::Document &doc) const } -std::vector xmrig::CudaConfig::get(const Miner *miner, const Algorithm &algorithm, const std::vector &devices) const +std::vector xmlcore::CudaConfig::get(const Miner *miner, const Algorithm &algorithm, const std::vector &devices) const { auto deviceIndex = [&devices](uint32_t index) -> int { for (uint32_t i = 0; i < devices.size(); ++i) { @@ -113,7 +113,7 @@ std::vector xmrig::CudaConfig::get(const Miner *miner, co } -void xmrig::CudaConfig::read(const rapidjson::Value &value) +void xmlcore::CudaConfig::read(const rapidjson::Value &value) { if (value.IsObject()) { m_enabled = Json::getBool(value, kEnabled, m_enabled); @@ -123,7 +123,7 @@ void xmrig::CudaConfig::read(const rapidjson::Value &value) setDevicesHint(Json::getString(value, kDevicesHint)); -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML auto &nvml = Json::getValue(value, kNvml); if (nvml.IsString()) { m_nvmlLoader = nvml.GetString(); @@ -150,7 +150,7 @@ void xmrig::CudaConfig::read(const rapidjson::Value &value) } -void xmrig::CudaConfig::generate() +void xmlcore::CudaConfig::generate() { if (generated) { return; @@ -175,20 +175,20 @@ void xmrig::CudaConfig::generate() size_t count = 0; - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); generated = true; m_shouldSave = count > 0; } -void xmrig::CudaConfig::setDevicesHint(const char *devicesHint) +void xmlcore::CudaConfig::setDevicesHint(const char *devicesHint) { if (devicesHint == nullptr) { return; diff --git a/src/backend/cuda/CudaConfig.h b/src/backend/cuda/CudaConfig.h index 1c2f2e03..b0325a93 100644 --- a/src/backend/cuda/CudaConfig.h +++ b/src/backend/cuda/CudaConfig.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDACONFIG_H -#define XMRIG_CUDACONFIG_H +#ifndef xmlcore_CUDACONFIG_H +#define xmlcore_CUDACONFIG_H #include "backend/cuda/CudaLaunchData.h" @@ -31,7 +31,7 @@ #include "backend/cuda/CudaThreads.h" -namespace xmrig { +namespace xmlcore { class CudaConfig @@ -51,7 +51,7 @@ public: inline int32_t bfactor() const { return m_bfactor; } inline int32_t bsleep() const { return m_bsleep; } -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML inline bool isNvmlEnabled() const { return m_nvml; } inline const String &nvmlLoader() const { return m_nvmlLoader; } # endif @@ -74,14 +74,14 @@ private: int32_t m_bsleep = 0; # endif -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML bool m_nvml = true; String m_nvmlLoader; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CUDACONFIG_H */ +#endif /* xmlcore_CUDACONFIG_H */ diff --git a/src/backend/cuda/CudaConfig_gen.h b/src/backend/cuda/CudaConfig_gen.h index 8a685224..a8f1c48d 100644 --- a/src/backend/cuda/CudaConfig_gen.h +++ b/src/backend/cuda/CudaConfig_gen.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDACONFIG_GEN_H -#define XMRIG_CUDACONFIG_GEN_H +#ifndef xmlcore_CUDACONFIG_GEN_H +#define xmlcore_CUDACONFIG_GEN_H #include "backend/common/Threads.h" @@ -34,7 +34,7 @@ #include -namespace xmrig { +namespace xmlcore { static inline size_t generate(const char *key, Threads &threads, const Algorithm &algorithm, const std::vector &devices) @@ -68,7 +68,7 @@ size_t inline generate(Threads &threads, const std:: } -#ifdef XMRIG_ALGO_CN_LITE +#ifdef xmlcore_ALGO_CN_LITE template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -84,7 +84,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_CN_HEAVY +#ifdef xmlcore_ALGO_CN_HEAVY template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -93,7 +93,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_CN_PICO +#ifdef xmlcore_ALGO_CN_PICO template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -102,7 +102,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -132,7 +132,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -141,7 +141,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -150,7 +150,7 @@ size_t inline generate(Threads &threads, const s #endif -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CUDACONFIG_GEN_H */ +#endif /* xmlcore_CUDACONFIG_GEN_H */ diff --git a/src/backend/cuda/CudaLaunchData.cpp b/src/backend/cuda/CudaLaunchData.cpp index 2f791d8b..9dd835c4 100644 --- a/src/backend/cuda/CudaLaunchData.cpp +++ b/src/backend/cuda/CudaLaunchData.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +21,7 @@ #include "backend/common/Tags.h" -xmrig::CudaLaunchData::CudaLaunchData(const Miner *miner, const Algorithm &algorithm, const CudaThread &thread, const CudaDevice &device) : +xmlcore::CudaLaunchData::CudaLaunchData(const Miner *miner, const Algorithm &algorithm, const CudaThread &thread, const CudaDevice &device) : algorithm(algorithm), device(device), thread(thread), @@ -31,7 +31,7 @@ xmrig::CudaLaunchData::CudaLaunchData(const Miner *miner, const Algorithm &algor } -bool xmrig::CudaLaunchData::isEqual(const CudaLaunchData &other) const +bool xmlcore::CudaLaunchData::isEqual(const CudaLaunchData &other) const { return (other.algorithm.family() == algorithm.family() && other.algorithm.l3() == algorithm.l3() && @@ -39,7 +39,7 @@ bool xmrig::CudaLaunchData::isEqual(const CudaLaunchData &other) const } -const char *xmrig::CudaLaunchData::tag() +const char *xmlcore::CudaLaunchData::tag() { return cuda_tag(); } diff --git a/src/backend/cuda/CudaLaunchData.h b/src/backend/cuda/CudaLaunchData.h index 26a8310a..2fed8f60 100644 --- a/src/backend/cuda/CudaLaunchData.h +++ b/src/backend/cuda/CudaLaunchData.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDALAUNCHDATA_H -#define XMRIG_CUDALAUNCHDATA_H +#ifndef xmlcore_CUDALAUNCHDATA_H +#define xmlcore_CUDALAUNCHDATA_H #include "backend/cuda/CudaThread.h" @@ -25,7 +25,7 @@ #include "crypto/common/Nonce.h" -namespace xmrig { +namespace xmlcore { class CudaDevice; @@ -55,7 +55,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLLAUNCHDATA_H */ +#endif /* xmlcore_OCLLAUNCHDATA_H */ diff --git a/src/backend/cuda/CudaThread.cpp b/src/backend/cuda/CudaThread.cpp index fff58eaa..240bc508 100644 --- a/src/backend/cuda/CudaThread.cpp +++ b/src/backend/cuda/CudaThread.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -32,7 +32,7 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kAffinity = "affinity"; static const char *kBFactor = "bfactor"; @@ -42,10 +42,10 @@ static const char *kIndex = "index"; static const char *kThreads = "threads"; static const char *kDatasetHost = "dataset_host"; -} // namespace xmrig +} // namespace xmlcore -xmrig::CudaThread::CudaThread(const rapidjson::Value &value) +xmlcore::CudaThread::CudaThread(const rapidjson::Value &value) { if (!value.IsObject()) { return; @@ -67,7 +67,7 @@ xmrig::CudaThread::CudaThread(const rapidjson::Value &value) } -xmrig::CudaThread::CudaThread(uint32_t index, nvid_ctx *ctx) : +xmlcore::CudaThread::CudaThread(uint32_t index, nvid_ctx *ctx) : m_blocks(CudaLib::deviceInt(ctx, CudaLib::DeviceBlocks)), m_datasetHost(CudaLib::deviceInt(ctx, CudaLib::DeviceDatasetHost)), m_threads(CudaLib::deviceInt(ctx, CudaLib::DeviceThreads)), @@ -79,7 +79,7 @@ xmrig::CudaThread::CudaThread(uint32_t index, nvid_ctx *ctx) : } -bool xmrig::CudaThread::isEqual(const CudaThread &other) const +bool xmlcore::CudaThread::isEqual(const CudaThread &other) const { return m_blocks == other.m_blocks && m_threads == other.m_threads && @@ -91,7 +91,7 @@ bool xmrig::CudaThread::isEqual(const CudaThread &other) const } -rapidjson::Value xmrig::CudaThread::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::CudaThread::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); diff --git a/src/backend/cuda/CudaThread.h b/src/backend/cuda/CudaThread.h index 75110bfd..54a8af6f 100644 --- a/src/backend/cuda/CudaThread.h +++ b/src/backend/cuda/CudaThread.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDATHREAD_H -#define XMRIG_CUDATHREAD_H +#ifndef xmlcore_CUDATHREAD_H +#define xmlcore_CUDATHREAD_H using nvid_ctx = struct nvid_ctx; @@ -32,7 +32,7 @@ using nvid_ctx = struct nvid_ctx; #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class CudaThread @@ -74,7 +74,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CUDATHREAD_H */ +#endif /* xmlcore_CUDATHREAD_H */ diff --git a/src/backend/cuda/CudaThreads.cpp b/src/backend/cuda/CudaThreads.cpp index b5696350..e8e0722e 100644 --- a/src/backend/cuda/CudaThreads.cpp +++ b/src/backend/cuda/CudaThreads.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include -xmrig::CudaThreads::CudaThreads(const rapidjson::Value &value) +xmlcore::CudaThreads::CudaThreads(const rapidjson::Value &value) { if (value.IsArray()) { for (auto &v : value.GetArray()) { @@ -44,7 +44,7 @@ xmrig::CudaThreads::CudaThreads(const rapidjson::Value &value) } -xmrig::CudaThreads::CudaThreads(const std::vector &devices, const Algorithm &algorithm) +xmlcore::CudaThreads::CudaThreads(const std::vector &devices, const Algorithm &algorithm) { for (const auto &device : devices) { device.generate(algorithm, *this); @@ -52,7 +52,7 @@ xmrig::CudaThreads::CudaThreads(const std::vector &devices, const Al } -bool xmrig::CudaThreads::isEqual(const CudaThreads &other) const +bool xmlcore::CudaThreads::isEqual(const CudaThreads &other) const { if (isEmpty() && other.isEmpty()) { return true; @@ -62,7 +62,7 @@ bool xmrig::CudaThreads::isEqual(const CudaThreads &other) const } -rapidjson::Value xmrig::CudaThreads::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::CudaThreads::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); diff --git a/src/backend/cuda/CudaThreads.h b/src/backend/cuda/CudaThreads.h index eb6d54ee..e4de5dce 100644 --- a/src/backend/cuda/CudaThreads.h +++ b/src/backend/cuda/CudaThreads.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDATHREADS_H -#define XMRIG_CUDATHREADS_H +#ifndef xmlcore_CUDATHREADS_H +#define xmlcore_CUDATHREADS_H #include @@ -33,7 +33,7 @@ #include "backend/cuda/wrappers/CudaDevice.h" -namespace xmrig { +namespace xmlcore { class CudaThreads @@ -60,7 +60,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CUDATHREADS_H */ +#endif /* xmlcore_CUDATHREADS_H */ diff --git a/src/backend/cuda/CudaWorker.cpp b/src/backend/cuda/CudaWorker.cpp index 725d59c9..78e6307b 100644 --- a/src/backend/cuda/CudaWorker.cpp +++ b/src/backend/cuda/CudaWorker.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,17 +28,17 @@ #include "net/JobResults.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "backend/cuda/runners/CudaRxRunner.h" #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "backend/cuda/runners/CudaAstroBWTRunner.h" #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "backend/cuda/runners/CudaKawPowRunner.h" #endif @@ -47,7 +47,7 @@ #include -namespace xmrig { +namespace xmlcore { std::atomic CudaWorker::ready; @@ -56,18 +56,18 @@ std::atomic CudaWorker::ready; static inline bool isReady() { return !Nonce::isPaused() && CudaWorker::ready; } -} // namespace xmrig +} // namespace xmlcore -xmrig::CudaWorker::CudaWorker(size_t id, const CudaLaunchData &data) : +xmlcore::CudaWorker::CudaWorker(size_t id, const CudaLaunchData &data) : GpuWorker(id, data.thread.affinity(), -1, data.device.index()), m_algorithm(data.algorithm), m_miner(data.miner) { switch (m_algorithm.family()) { case Algorithm::RANDOM_X: -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX m_runner = new CudaRxRunner(id, data); # endif break; @@ -76,13 +76,13 @@ xmrig::CudaWorker::CudaWorker(size_t id, const CudaLaunchData &data) : break; case Algorithm::ASTROBWT: -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT m_runner = new CudaAstroBWTRunner(id, data); # endif break; case Algorithm::KAWPOW: -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW m_runner = new CudaKawPowRunner(id, data); # endif break; @@ -104,13 +104,13 @@ xmrig::CudaWorker::CudaWorker(size_t id, const CudaLaunchData &data) : } -xmrig::CudaWorker::~CudaWorker() +xmlcore::CudaWorker::~CudaWorker() { delete m_runner; } -void xmrig::CudaWorker::jobEarlyNotification(const Job &job) +void xmlcore::CudaWorker::jobEarlyNotification(const Job &job) { if (m_runner) { m_runner->jobEarlyNotification(job); @@ -118,19 +118,19 @@ void xmrig::CudaWorker::jobEarlyNotification(const Job &job) } -bool xmrig::CudaWorker::selfTest() +bool xmlcore::CudaWorker::selfTest() { return m_runner != nullptr; } -size_t xmrig::CudaWorker::intensity() const +size_t xmlcore::CudaWorker::intensity() const { return m_runner ? m_runner->roundSize() : 0; } -void xmrig::CudaWorker::start() +void xmlcore::CudaWorker::start() { while (Nonce::sequence(Nonce::CUDA) > 0) { if (!isReady()) { @@ -175,7 +175,7 @@ void xmrig::CudaWorker::start() } -bool xmrig::CudaWorker::consumeJob() +bool xmlcore::CudaWorker::consumeJob() { if (Nonce::sequence(Nonce::CUDA) == 0) { return false; @@ -187,7 +187,7 @@ bool xmrig::CudaWorker::consumeJob() } -void xmrig::CudaWorker::storeStats() +void xmlcore::CudaWorker::storeStats() { if (!isReady()) { return; diff --git a/src/backend/cuda/CudaWorker.h b/src/backend/cuda/CudaWorker.h index 24cf1e65..cbea5758 100644 --- a/src/backend/cuda/CudaWorker.h +++ b/src/backend/cuda/CudaWorker.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDAWORKER_H -#define XMRIG_CUDAWORKER_H +#ifndef xmlcore_CUDAWORKER_H +#define xmlcore_CUDAWORKER_H #include "backend/common/GpuWorker.h" @@ -27,7 +27,7 @@ #include "net/JobResult.h" -namespace xmrig { +namespace xmlcore { class ICudaRunner; @@ -36,7 +36,7 @@ class ICudaRunner; class CudaWorker : public GpuWorker { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(CudaWorker) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(CudaWorker) CudaWorker(size_t id, const CudaLaunchData &data); @@ -62,7 +62,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CUDAWORKER_H */ +#endif /* xmlcore_CUDAWORKER_H */ diff --git a/src/backend/cuda/cuda.cmake b/src/backend/cuda/cuda.cmake index 6661ec83..06188bef 100644 --- a/src/backend/cuda/cuda.cmake +++ b/src/backend/cuda/cuda.cmake @@ -1,11 +1,11 @@ -if (BUILD_STATIC AND XMRIG_OS_UNIX AND WITH_CUDA) +if (BUILD_STATIC AND xmlcore_OS_UNIX AND WITH_CUDA) message(WARNING "CUDA backend is not compatible with static build, use -DWITH_CUDA=OFF to suppress this warning") set(WITH_CUDA OFF) endif() if (WITH_CUDA) - add_definitions(/DXMRIG_FEATURE_CUDA) + add_definitions(/Dxmlcore_FEATURE_CUDA) set(HEADERS_BACKEND_CUDA src/backend/cuda/CudaBackend.h @@ -36,7 +36,7 @@ if (WITH_CUDA) ) if (WITH_NVML AND NOT APPLE) - add_definitions(/DXMRIG_FEATURE_NVML) + add_definitions(/Dxmlcore_FEATURE_NVML) list(APPEND HEADERS_BACKEND_CUDA src/backend/cuda/wrappers/nvml_lite.h @@ -46,7 +46,7 @@ if (WITH_CUDA) list(APPEND SOURCES_BACKEND_CUDA src/backend/cuda/wrappers/NvmlLib.cpp) else() - remove_definitions(/DXMRIG_FEATURE_NVML) + remove_definitions(/Dxmlcore_FEATURE_NVML) endif() if (WITH_RANDOMX) @@ -64,8 +64,8 @@ if (WITH_CUDA) list(APPEND SOURCES_BACKEND_CUDA src/backend/cuda/runners/CudaKawPowRunner.cpp) endif() else() - remove_definitions(/DXMRIG_FEATURE_CUDA) - remove_definitions(/DXMRIG_FEATURE_NVML) + remove_definitions(/Dxmlcore_FEATURE_CUDA) + remove_definitions(/Dxmlcore_FEATURE_NVML) set(HEADERS_BACKEND_CUDA "") set(SOURCES_BACKEND_CUDA "") diff --git a/src/backend/cuda/interfaces/ICudaRunner.h b/src/backend/cuda/interfaces/ICudaRunner.h index fbbebb63..e8e27455 100644 --- a/src/backend/cuda/interfaces/ICudaRunner.h +++ b/src/backend/cuda/interfaces/ICudaRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICUDARUNNER_H -#define XMRIG_ICUDARUNNER_H +#ifndef xmlcore_ICUDARUNNER_H +#define xmlcore_ICUDARUNNER_H #include "base/tools/Object.h" @@ -32,7 +32,7 @@ #include -namespace xmrig { +namespace xmlcore { class Job; @@ -41,7 +41,7 @@ class Job; class ICudaRunner { public: - XMRIG_DISABLE_COPY_MOVE(ICudaRunner) + xmlcore_DISABLE_COPY_MOVE(ICudaRunner) ICudaRunner() = default; virtual ~ICudaRunner() = default; @@ -56,7 +56,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICUDARUNNER_H +#endif // xmlcore_ICUDARUNNER_H diff --git a/src/backend/cuda/runners/CudaAstroBWTRunner.cpp b/src/backend/cuda/runners/CudaAstroBWTRunner.cpp index 43431aac..391abc25 100644 --- a/src/backend/cuda/runners/CudaAstroBWTRunner.cpp +++ b/src/backend/cuda/runners/CudaAstroBWTRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,10 +29,10 @@ #include "base/net/stratum/Job.h" -constexpr uint32_t xmrig::CudaAstroBWTRunner::BWT_DATA_STRIDE; +constexpr uint32_t xmlcore::CudaAstroBWTRunner::BWT_DATA_STRIDE; -xmrig::CudaAstroBWTRunner::CudaAstroBWTRunner(size_t index, const CudaLaunchData &data) : +xmlcore::CudaAstroBWTRunner::CudaAstroBWTRunner(size_t index, const CudaLaunchData &data) : CudaBaseRunner(index, data) { m_intensity = m_data.thread.threads() * m_data.thread.blocks(); @@ -40,13 +40,13 @@ xmrig::CudaAstroBWTRunner::CudaAstroBWTRunner(size_t index, const CudaLaunchData } -bool xmrig::CudaAstroBWTRunner::run(uint32_t startNonce, uint32_t *rescount, uint32_t *resnonce) +bool xmlcore::CudaAstroBWTRunner::run(uint32_t startNonce, uint32_t *rescount, uint32_t *resnonce) { return callWrapper(CudaLib::astroBWTHash(m_ctx, startNonce, m_target, rescount, resnonce)); } -bool xmrig::CudaAstroBWTRunner::set(const Job &job, uint8_t *blob) +bool xmlcore::CudaAstroBWTRunner::set(const Job &job, uint8_t *blob) { if (!CudaBaseRunner::set(job, blob)) { return false; @@ -56,7 +56,7 @@ bool xmrig::CudaAstroBWTRunner::set(const Job &job, uint8_t *blob) } -size_t xmrig::CudaAstroBWTRunner::roundSize() const +size_t xmlcore::CudaAstroBWTRunner::roundSize() const { constexpr uint32_t STAGE1_SIZE = 147253; constexpr uint32_t STAGE1_DATA_STRIDE = (STAGE1_SIZE + 256 + 255) & ~255U; @@ -69,7 +69,7 @@ size_t xmrig::CudaAstroBWTRunner::roundSize() const } -size_t xmrig::CudaAstroBWTRunner::processedHashes() const +size_t xmlcore::CudaAstroBWTRunner::processedHashes() const { return CudaLib::deviceInt(m_ctx, CudaLib::DeviceAstroBWTProcessedHashes); } diff --git a/src/backend/cuda/runners/CudaAstroBWTRunner.h b/src/backend/cuda/runners/CudaAstroBWTRunner.h index 0afee8c1..e82122b8 100644 --- a/src/backend/cuda/runners/CudaAstroBWTRunner.h +++ b/src/backend/cuda/runners/CudaAstroBWTRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDAASTROBWTRUNNER_H -#define XMRIG_CUDAASTROBWTRUNNER_H +#ifndef xmlcore_CUDAASTROBWTRUNNER_H +#define xmlcore_CUDAASTROBWTRUNNER_H #include "backend/cuda/runners/CudaBaseRunner.h" -namespace xmrig { +namespace xmlcore { class CudaAstroBWTRunner : public CudaBaseRunner @@ -53,7 +53,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_CUDAASTROBWTRUNNER_H +#endif // xmlcore_CUDAASTROBWTRUNNER_H diff --git a/src/backend/cuda/runners/CudaBaseRunner.cpp b/src/backend/cuda/runners/CudaBaseRunner.cpp index 60a7a7c9..3f1c873c 100644 --- a/src/backend/cuda/runners/CudaBaseRunner.cpp +++ b/src/backend/cuda/runners/CudaBaseRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -31,20 +31,20 @@ #include "base/net/stratum/Job.h" -xmrig::CudaBaseRunner::CudaBaseRunner(size_t id, const CudaLaunchData &data) : +xmlcore::CudaBaseRunner::CudaBaseRunner(size_t id, const CudaLaunchData &data) : m_data(data), m_threadId(id) { } -xmrig::CudaBaseRunner::~CudaBaseRunner() +xmlcore::CudaBaseRunner::~CudaBaseRunner() { CudaLib::release(m_ctx); } -bool xmrig::CudaBaseRunner::init() +bool xmlcore::CudaBaseRunner::init() { m_ctx = CudaLib::alloc(m_data.thread.index(), m_data.thread.bfactor(), m_data.thread.bsleep()); if (!callWrapper(CudaLib::deviceInfo(m_ctx, m_data.thread.blocks(), m_data.thread.threads(), m_data.algorithm, m_data.thread.datasetHost()))) { @@ -55,7 +55,7 @@ bool xmrig::CudaBaseRunner::init() } -bool xmrig::CudaBaseRunner::set(const Job &job, uint8_t *blob) +bool xmlcore::CudaBaseRunner::set(const Job &job, uint8_t *blob) { m_height = job.height(); m_target = job.target(); @@ -64,13 +64,13 @@ bool xmrig::CudaBaseRunner::set(const Job &job, uint8_t *blob) } -size_t xmrig::CudaBaseRunner::intensity() const +size_t xmlcore::CudaBaseRunner::intensity() const { return m_data.thread.threads() * m_data.thread.blocks(); } -bool xmrig::CudaBaseRunner::callWrapper(bool result) const +bool xmlcore::CudaBaseRunner::callWrapper(bool result) const { if (!result) { const char *error = CudaLib::lastError(m_ctx); diff --git a/src/backend/cuda/runners/CudaBaseRunner.h b/src/backend/cuda/runners/CudaBaseRunner.h index fee5ca5a..fa65e2ca 100644 --- a/src/backend/cuda/runners/CudaBaseRunner.h +++ b/src/backend/cuda/runners/CudaBaseRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDABASERUNNER_H -#define XMRIG_CUDABASERUNNER_H +#ifndef xmlcore_CUDABASERUNNER_H +#define xmlcore_CUDABASERUNNER_H #include "backend/cuda/interfaces/ICudaRunner.h" @@ -32,7 +32,7 @@ using nvid_ctx = struct nvid_ctx; -namespace xmrig { +namespace xmlcore { class CudaLaunchData; @@ -41,7 +41,7 @@ class CudaLaunchData; class CudaBaseRunner : public ICudaRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(CudaBaseRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(CudaBaseRunner) CudaBaseRunner(size_t id, const CudaLaunchData &data); ~CudaBaseRunner() override; @@ -65,7 +65,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_CUDABASERUNNER_H +#endif // xmlcore_CUDABASERUNNER_H diff --git a/src/backend/cuda/runners/CudaCnRunner.cpp b/src/backend/cuda/runners/CudaCnRunner.cpp index 4d79efe3..c98d1013 100644 --- a/src/backend/cuda/runners/CudaCnRunner.cpp +++ b/src/backend/cuda/runners/CudaCnRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,12 +27,12 @@ #include "backend/cuda/wrappers/CudaLib.h" -xmrig::CudaCnRunner::CudaCnRunner(size_t index, const CudaLaunchData &data) : CudaBaseRunner(index, data) +xmlcore::CudaCnRunner::CudaCnRunner(size_t index, const CudaLaunchData &data) : CudaBaseRunner(index, data) { } -bool xmrig::CudaCnRunner::run(uint32_t startNonce, uint32_t *rescount, uint32_t *resnonce) +bool xmlcore::CudaCnRunner::run(uint32_t startNonce, uint32_t *rescount, uint32_t *resnonce) { return callWrapper(CudaLib::cnHash(m_ctx, startNonce, m_height, m_target, rescount, resnonce)); } diff --git a/src/backend/cuda/runners/CudaCnRunner.h b/src/backend/cuda/runners/CudaCnRunner.h index e563435b..f5e19d2a 100644 --- a/src/backend/cuda/runners/CudaCnRunner.h +++ b/src/backend/cuda/runners/CudaCnRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDACNRUNNER_H -#define XMRIG_CUDACNRUNNER_H +#ifndef xmlcore_CUDACNRUNNER_H +#define xmlcore_CUDACNRUNNER_H #include "backend/cuda/runners/CudaBaseRunner.h" -namespace xmrig { +namespace xmlcore { class CudaCnRunner : public CudaBaseRunner @@ -42,7 +42,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_CUDACNRUNNER_H +#endif // xmlcore_CUDACNRUNNER_H diff --git a/src/backend/cuda/runners/CudaKawPowRunner.cpp b/src/backend/cuda/runners/CudaKawPowRunner.cpp index a03dd8c8..8083eb44 100644 --- a/src/backend/cuda/runners/CudaKawPowRunner.cpp +++ b/src/backend/cuda/runners/CudaKawPowRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -35,19 +35,19 @@ #include "crypto/kawpow/KPHash.h" -xmrig::CudaKawPowRunner::CudaKawPowRunner(size_t index, const CudaLaunchData &data) : +xmlcore::CudaKawPowRunner::CudaKawPowRunner(size_t index, const CudaLaunchData &data) : CudaBaseRunner(index, data) { } -bool xmrig::CudaKawPowRunner::run(uint32_t /*startNonce*/, uint32_t *rescount, uint32_t *resnonce) +bool xmlcore::CudaKawPowRunner::run(uint32_t /*startNonce*/, uint32_t *rescount, uint32_t *resnonce) { return callWrapper(CudaLib::kawPowHash(m_ctx, m_jobBlob, m_target, rescount, resnonce, &m_skippedHashes)); } -bool xmrig::CudaKawPowRunner::set(const Job &job, uint8_t *blob) +bool xmlcore::CudaKawPowRunner::set(const Job &job, uint8_t *blob) { if (!CudaBaseRunner::set(job, blob)) { return false; @@ -81,7 +81,7 @@ bool xmrig::CudaKawPowRunner::set(const Job &job, uint8_t *blob) } -void xmrig::CudaKawPowRunner::jobEarlyNotification(const Job&) +void xmlcore::CudaKawPowRunner::jobEarlyNotification(const Job&) { CudaLib::kawPowStopHash(m_ctx); } diff --git a/src/backend/cuda/runners/CudaKawPowRunner.h b/src/backend/cuda/runners/CudaKawPowRunner.h index ecd7642d..fd005c0d 100644 --- a/src/backend/cuda/runners/CudaKawPowRunner.h +++ b/src/backend/cuda/runners/CudaKawPowRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDAKAWPOWRUNNER_H -#define XMRIG_CUDAKAWPOWRUNNER_H +#ifndef xmlcore_CUDAKAWPOWRUNNER_H +#define xmlcore_CUDAKAWPOWRUNNER_H #include "backend/cuda/runners/CudaBaseRunner.h" -namespace xmrig { +namespace xmlcore { class CudaKawPowRunner : public CudaBaseRunner @@ -49,7 +49,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_CUDAKAWPOWRUNNER_H +#endif // xmlcore_CUDAKAWPOWRUNNER_H diff --git a/src/backend/cuda/runners/CudaRxRunner.cpp b/src/backend/cuda/runners/CudaRxRunner.cpp index dd64e865..27ecdc3a 100644 --- a/src/backend/cuda/runners/CudaRxRunner.cpp +++ b/src/backend/cuda/runners/CudaRxRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "crypto/rx/RxDataset.h" -xmrig::CudaRxRunner::CudaRxRunner(size_t index, const CudaLaunchData &data) : +xmlcore::CudaRxRunner::CudaRxRunner(size_t index, const CudaLaunchData &data) : CudaBaseRunner(index, data), m_datasetHost(data.thread.datasetHost() > 0) { @@ -47,13 +47,13 @@ xmrig::CudaRxRunner::CudaRxRunner(size_t index, const CudaLaunchData &data) : } -bool xmrig::CudaRxRunner::run(uint32_t startNonce, uint32_t *rescount, uint32_t *resnonce) +bool xmlcore::CudaRxRunner::run(uint32_t startNonce, uint32_t *rescount, uint32_t *resnonce) { return callWrapper(CudaLib::rxHash(m_ctx, startNonce, m_target, rescount, resnonce)); } -bool xmrig::CudaRxRunner::set(const Job &job, uint8_t *blob) +bool xmlcore::CudaRxRunner::set(const Job &job, uint8_t *blob) { const bool rc = CudaBaseRunner::set(job, blob); if (!rc || m_ready) { diff --git a/src/backend/cuda/runners/CudaRxRunner.h b/src/backend/cuda/runners/CudaRxRunner.h index 448400bc..039abe53 100644 --- a/src/backend/cuda/runners/CudaRxRunner.h +++ b/src/backend/cuda/runners/CudaRxRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDARXRUNNER_H -#define XMRIG_CUDARXRUNNER_H +#ifndef xmlcore_CUDARXRUNNER_H +#define xmlcore_CUDARXRUNNER_H #include "backend/cuda/runners/CudaBaseRunner.h" -namespace xmrig { +namespace xmlcore { class CudaRxRunner : public CudaBaseRunner @@ -50,7 +50,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_CUDARXRUNNER_H +#endif // xmlcore_CUDARXRUNNER_H diff --git a/src/backend/cuda/wrappers/CudaDevice.cpp b/src/backend/cuda/wrappers/CudaDevice.cpp index f06fe940..f3f454de 100644 --- a/src/backend/cuda/wrappers/CudaDevice.cpp +++ b/src/backend/cuda/wrappers/CudaDevice.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,14 +31,14 @@ #include "base/io/log/Log.h" -#ifdef XMRIG_FEATURE_NVML +#ifdef xmlcore_FEATURE_NVML # include "backend/cuda/wrappers/NvmlLib.h" #endif #include -xmrig::CudaDevice::CudaDevice(uint32_t index, int32_t bfactor, int32_t bsleep) : +xmlcore::CudaDevice::CudaDevice(uint32_t index, int32_t bfactor, int32_t bsleep) : m_index(index) { auto ctx = CudaLib::alloc(index, bfactor, bsleep); @@ -54,7 +54,7 @@ xmrig::CudaDevice::CudaDevice(uint32_t index, int32_t bfactor, int32_t bsleep) : } -xmrig::CudaDevice::CudaDevice(CudaDevice &&other) noexcept : +xmlcore::CudaDevice::CudaDevice(CudaDevice &&other) noexcept : m_index(other.m_index), m_ctx(other.m_ctx), m_topology(other.m_topology), @@ -64,49 +64,49 @@ xmrig::CudaDevice::CudaDevice(CudaDevice &&other) noexcept : } -xmrig::CudaDevice::~CudaDevice() +xmlcore::CudaDevice::~CudaDevice() { CudaLib::release(m_ctx); } -size_t xmrig::CudaDevice::freeMemSize() const +size_t xmlcore::CudaDevice::freeMemSize() const { return CudaLib::deviceUlong(m_ctx, CudaLib::DeviceMemoryFree); } -size_t xmrig::CudaDevice::globalMemSize() const +size_t xmlcore::CudaDevice::globalMemSize() const { return CudaLib::deviceUlong(m_ctx, CudaLib::DeviceMemoryTotal); } -uint32_t xmrig::CudaDevice::clock() const +uint32_t xmlcore::CudaDevice::clock() const { return CudaLib::deviceUint(m_ctx, CudaLib::DeviceClockRate) / 1000; } -uint32_t xmrig::CudaDevice::computeCapability(bool major) const +uint32_t xmlcore::CudaDevice::computeCapability(bool major) const { return CudaLib::deviceUint(m_ctx, major ? CudaLib::DeviceArchMajor : CudaLib::DeviceArchMinor); } -uint32_t xmrig::CudaDevice::memoryClock() const +uint32_t xmlcore::CudaDevice::memoryClock() const { return CudaLib::deviceUint(m_ctx, CudaLib::DeviceMemoryClockRate) / 1000; } -uint32_t xmrig::CudaDevice::smx() const +uint32_t xmlcore::CudaDevice::smx() const { return CudaLib::deviceUint(m_ctx, CudaLib::DeviceSmx); } -void xmrig::CudaDevice::generate(const Algorithm &algorithm, CudaThreads &threads) const +void xmlcore::CudaDevice::generate(const Algorithm &algorithm, CudaThreads &threads) const { if (!CudaLib::deviceInfo(m_ctx, -1, -1, algorithm)) { return; @@ -116,8 +116,8 @@ void xmrig::CudaDevice::generate(const Algorithm &algorithm, CudaThreads &thread } -#ifdef XMRIG_FEATURE_API -void xmrig::CudaDevice::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +void xmlcore::CudaDevice::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -130,7 +130,7 @@ void xmrig::CudaDevice::toJSON(rapidjson::Value &out, rapidjson::Document &doc) out.AddMember("clock", clock(), allocator); out.AddMember("memory_clock", memoryClock(), allocator); -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML if (m_nvmlDevice) { auto data = NvmlLib::health(m_nvmlDevice); diff --git a/src/backend/cuda/wrappers/CudaDevice.h b/src/backend/cuda/wrappers/CudaDevice.h index 8c624c85..0147fba5 100644 --- a/src/backend/cuda/wrappers/CudaDevice.h +++ b/src/backend/cuda/wrappers/CudaDevice.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDADEVICE_H -#define XMRIG_CUDADEVICE_H +#ifndef xmlcore_CUDADEVICE_H +#define xmlcore_CUDADEVICE_H #include "backend/common/misc/PciTopology.h" @@ -34,7 +34,7 @@ using nvid_ctx = struct nvid_ctx; using nvmlDevice_t = struct nvmlDevice_st *; -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -64,12 +64,12 @@ public: inline uint32_t arch() const { return (computeCapability(true) * 10) + computeCapability(false); } inline uint32_t index() const { return m_index; } -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML inline nvmlDevice_t nvmlDevice() const { return m_nvmlDevice; } inline void setNvmlDevice(nvmlDevice_t device) { m_nvmlDevice = device; } # endif -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void toJSON(rapidjson::Value &out, rapidjson::Document &doc) const; # endif @@ -82,13 +82,13 @@ private: PciTopology m_topology; String m_name; -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML nvmlDevice_t m_nvmlDevice = nullptr; # endif }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CUDADEVICE_H */ +#endif /* xmlcore_CUDADEVICE_H */ diff --git a/src/backend/cuda/wrappers/CudaLib.cpp b/src/backend/cuda/wrappers/CudaLib.cpp index 14563af9..832bd1e9 100644 --- a/src/backend/cuda/wrappers/CudaLib.cpp +++ b/src/backend/cuda/wrappers/CudaLib.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -34,7 +34,7 @@ #include "crypto/rx/RxAlgo.h" -namespace xmrig { +namespace xmlcore { enum Version : uint32_t @@ -50,9 +50,9 @@ static uv_lib_t cudaLib; #if defined(__APPLE__) static String defaultLoader = "/System/Library/Frameworks/OpenCL.framework/OpenCL"; #elif defined(_WIN32) -static String defaultLoader = "xmrig-cuda.dll"; +static String defaultLoader = "xmlcore-cuda.dll"; #else -static String defaultLoader = "libxmrig-cuda.so"; +static String defaultLoader = "libxmlcore-cuda.so"; #endif @@ -137,10 +137,10 @@ String CudaLib::m_error; String CudaLib::m_loader; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::CudaLib::init(const char *fileName) +bool xmlcore::CudaLib::init(const char *fileName) { if (!m_initialized) { m_initialized = true; @@ -165,37 +165,37 @@ bool xmrig::CudaLib::init(const char *fileName) } -const char *xmrig::CudaLib::lastError() noexcept +const char *xmlcore::CudaLib::lastError() noexcept { return m_error; } -void xmrig::CudaLib::close() +void xmlcore::CudaLib::close() { uv_dlclose(&cudaLib); } -bool xmrig::CudaLib::astroBWTHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce) noexcept +bool xmlcore::CudaLib::astroBWTHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce) noexcept { return pAstroBWTHash(ctx, startNonce, target, rescount, resnonce); } -bool xmrig::CudaLib::astroBWTPrepare(nvid_ctx *ctx, uint32_t batchSize) noexcept +bool xmlcore::CudaLib::astroBWTPrepare(nvid_ctx *ctx, uint32_t batchSize) noexcept { return pAstroBWTPrepare(ctx, batchSize); } -bool xmrig::CudaLib::cnHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t height, uint64_t target, uint32_t *rescount, uint32_t *resnonce) +bool xmlcore::CudaLib::cnHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t height, uint64_t target, uint32_t *rescount, uint32_t *resnonce) { return pCnHash(ctx, startNonce, height, target, rescount, resnonce); } -bool xmrig::CudaLib::deviceInfo(nvid_ctx *ctx, int32_t blocks, int32_t threads, const Algorithm &algorithm, int32_t dataset_host) noexcept +bool xmlcore::CudaLib::deviceInfo(nvid_ctx *ctx, int32_t blocks, int32_t threads, const Algorithm &algorithm, int32_t dataset_host) noexcept { const Algorithm algo = RxAlgo::id(algorithm); @@ -203,43 +203,43 @@ bool xmrig::CudaLib::deviceInfo(nvid_ctx *ctx, int32_t blocks, int32_t threads, } -bool xmrig::CudaLib::deviceInit(nvid_ctx *ctx) noexcept +bool xmlcore::CudaLib::deviceInit(nvid_ctx *ctx) noexcept { return pDeviceInit(ctx); } -bool xmrig::CudaLib::rxHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce) noexcept +bool xmlcore::CudaLib::rxHash(nvid_ctx *ctx, uint32_t startNonce, uint64_t target, uint32_t *rescount, uint32_t *resnonce) noexcept { return pRxHash(ctx, startNonce, target, rescount, resnonce); } -bool xmrig::CudaLib::rxPrepare(nvid_ctx *ctx, const void *dataset, size_t datasetSize, bool dataset_host, uint32_t batchSize) noexcept +bool xmlcore::CudaLib::rxPrepare(nvid_ctx *ctx, const void *dataset, size_t datasetSize, bool dataset_host, uint32_t batchSize) noexcept { return pRxPrepare(ctx, dataset, datasetSize, dataset_host, batchSize); } -bool xmrig::CudaLib::kawPowHash(nvid_ctx *ctx, uint8_t* job_blob, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t *skipped_hashes) noexcept +bool xmlcore::CudaLib::kawPowHash(nvid_ctx *ctx, uint8_t* job_blob, uint64_t target, uint32_t *rescount, uint32_t *resnonce, uint32_t *skipped_hashes) noexcept { return pKawPowHash(ctx, job_blob, target, rescount, resnonce, skipped_hashes); } -bool xmrig::CudaLib::kawPowPrepare(nvid_ctx *ctx, const void* cache, size_t cache_size, const void* dag_precalc, size_t dag_size, uint32_t height, const uint64_t* dag_sizes) noexcept +bool xmlcore::CudaLib::kawPowPrepare(nvid_ctx *ctx, const void* cache, size_t cache_size, const void* dag_precalc, size_t dag_size, uint32_t height, const uint64_t* dag_sizes) noexcept { return pKawPowPrepare_v2(ctx, cache, cache_size, dag_precalc, dag_size, height, dag_sizes); } -bool xmrig::CudaLib::kawPowStopHash(nvid_ctx *ctx) noexcept +bool xmlcore::CudaLib::kawPowStopHash(nvid_ctx *ctx) noexcept { return pKawPowStopHash(ctx); } -bool xmrig::CudaLib::setJob(nvid_ctx *ctx, const void *data, size_t size, const Algorithm &algorithm) noexcept +bool xmlcore::CudaLib::setJob(nvid_ctx *ctx, const void *data, size_t size, const Algorithm &algorithm) noexcept { const Algorithm algo = RxAlgo::id(algorithm); @@ -247,43 +247,43 @@ bool xmrig::CudaLib::setJob(nvid_ctx *ctx, const void *data, size_t size, const } -const char *xmrig::CudaLib::deviceName(nvid_ctx *ctx) noexcept +const char *xmlcore::CudaLib::deviceName(nvid_ctx *ctx) noexcept { return pDeviceName(ctx); } -const char *xmrig::CudaLib::lastError(nvid_ctx *ctx) noexcept +const char *xmlcore::CudaLib::lastError(nvid_ctx *ctx) noexcept { return pLastError(ctx); } -const char *xmrig::CudaLib::pluginVersion() noexcept +const char *xmlcore::CudaLib::pluginVersion() noexcept { return pPluginVersion(); } -int32_t xmrig::CudaLib::deviceInt(nvid_ctx *ctx, DeviceProperty property) noexcept +int32_t xmlcore::CudaLib::deviceInt(nvid_ctx *ctx, DeviceProperty property) noexcept { return pDeviceInt(ctx, property); } -nvid_ctx *xmrig::CudaLib::alloc(uint32_t id, int32_t bfactor, int32_t bsleep) noexcept +nvid_ctx *xmlcore::CudaLib::alloc(uint32_t id, int32_t bfactor, int32_t bsleep) noexcept { return pAlloc(id, bfactor, bsleep); } -std::string xmrig::CudaLib::version(uint32_t version) +std::string xmlcore::CudaLib::version(uint32_t version) { return std::to_string(version / 1000) + "." + std::to_string((version % 1000) / 10); } -std::vector xmrig::CudaLib::devices(int32_t bfactor, int32_t bsleep, const std::vector &hints) noexcept +std::vector xmlcore::CudaLib::devices(int32_t bfactor, int32_t bsleep, const std::vector &hints) noexcept { const uint32_t count = deviceCount(); if (!count) { @@ -318,43 +318,43 @@ std::vector xmrig::CudaLib::devices(int32_t bfactor, int32_t } -uint32_t xmrig::CudaLib::deviceCount() noexcept +uint32_t xmlcore::CudaLib::deviceCount() noexcept { return pDeviceCount(); } -uint32_t xmrig::CudaLib::deviceUint(nvid_ctx *ctx, DeviceProperty property) noexcept +uint32_t xmlcore::CudaLib::deviceUint(nvid_ctx *ctx, DeviceProperty property) noexcept { return pDeviceUint(ctx, property); } -uint32_t xmrig::CudaLib::driverVersion() noexcept +uint32_t xmlcore::CudaLib::driverVersion() noexcept { return pVersion(DriverVersion); } -uint32_t xmrig::CudaLib::runtimeVersion() noexcept +uint32_t xmlcore::CudaLib::runtimeVersion() noexcept { return pVersion(RuntimeVersion); } -uint64_t xmrig::CudaLib::deviceUlong(nvid_ctx *ctx, DeviceProperty property) noexcept +uint64_t xmlcore::CudaLib::deviceUlong(nvid_ctx *ctx, DeviceProperty property) noexcept { return pDeviceUlong(ctx, property); } -void xmrig::CudaLib::release(nvid_ctx *ctx) noexcept +void xmlcore::CudaLib::release(nvid_ctx *ctx) noexcept { pRelease(ctx); } -bool xmrig::CudaLib::open() +bool xmlcore::CudaLib::open() { m_error = nullptr; @@ -362,7 +362,7 @@ bool xmrig::CudaLib::open() return true; } -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX if (m_loader == defaultLoader) { m_loader = Process::location(Process::ExeLocation, m_loader); } @@ -381,7 +381,7 @@ bool xmrig::CudaLib::open() } -void xmrig::CudaLib::load() +void xmlcore::CudaLib::load() { DLSYM(Version); diff --git a/src/backend/cuda/wrappers/CudaLib.h b/src/backend/cuda/wrappers/CudaLib.h index d7b776d2..12e1c473 100644 --- a/src/backend/cuda/wrappers/CudaLib.h +++ b/src/backend/cuda/wrappers/CudaLib.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CUDALIB_H -#define XMRIG_CUDALIB_H +#ifndef xmlcore_CUDALIB_H +#define xmlcore_CUDALIB_H using nvid_ctx = struct nvid_ctx; @@ -37,7 +37,7 @@ using nvid_ctx = struct nvid_ctx; #include -namespace xmrig { +namespace xmlcore { class CudaLib @@ -109,7 +109,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CUDALIB_H */ +#endif /* xmlcore_CUDALIB_H */ diff --git a/src/backend/cuda/wrappers/NvmlHealth.h b/src/backend/cuda/wrappers/NvmlHealth.h index 58c1d3eb..f9fa3a1f 100644 --- a/src/backend/cuda/wrappers/NvmlHealth.h +++ b/src/backend/cuda/wrappers/NvmlHealth.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NVMLHEALTH_H -#define XMRIG_NVMLHEALTH_H +#ifndef xmlcore_NVMLHEALTH_H +#define xmlcore_NVMLHEALTH_H #include @@ -40,4 +40,4 @@ struct NvmlHealth }; -#endif /* XMRIG_NVMLHEALTH_H */ +#endif /* xmlcore_NVMLHEALTH_H */ diff --git a/src/backend/cuda/wrappers/NvmlLib.cpp b/src/backend/cuda/wrappers/NvmlLib.cpp index cb05bdc1..b0d3d851 100644 --- a/src/backend/cuda/wrappers/NvmlLib.cpp +++ b/src/backend/cuda/wrappers/NvmlLib.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -33,7 +33,7 @@ -namespace xmrig { +namespace xmlcore { static uv_lib_t nvmlLib; @@ -78,10 +78,10 @@ char NvmlLib::m_nvmlVersion[80] = { 0 }; String NvmlLib::m_loader; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::NvmlLib::init(const char *fileName) +bool xmlcore::NvmlLib::init(const char *fileName) { if (!m_initialized) { m_loader = fileName; @@ -93,13 +93,13 @@ bool xmrig::NvmlLib::init(const char *fileName) } -const char *xmrig::NvmlLib::lastError() noexcept +const char *xmlcore::NvmlLib::lastError() noexcept { return uv_dlerror(&nvmlLib); } -void xmrig::NvmlLib::close() +void xmlcore::NvmlLib::close() { if (m_ready) { pNvmlShutdown(); @@ -109,7 +109,7 @@ void xmrig::NvmlLib::close() } -bool xmrig::NvmlLib::assign(std::vector &devices) +bool xmlcore::NvmlLib::assign(std::vector &devices) { uint32_t count = 0; if (pNvmlDeviceGetCount(&count) != NVML_SUCCESS) { @@ -138,7 +138,7 @@ bool xmrig::NvmlLib::assign(std::vector &devices) } -NvmlHealth xmrig::NvmlLib::health(nvmlDevice_t device) +NvmlHealth xmlcore::NvmlLib::health(nvmlDevice_t device) { if (!device) { return {}; @@ -175,7 +175,7 @@ NvmlHealth xmrig::NvmlLib::health(nvmlDevice_t device) } -bool xmrig::NvmlLib::dlopen() +bool xmlcore::NvmlLib::dlopen() { if (!m_loader.isNull()) { return uv_dlopen(m_loader, &nvmlLib) == 0; @@ -196,7 +196,7 @@ bool xmrig::NvmlLib::dlopen() } -bool xmrig::NvmlLib::load() +bool xmlcore::NvmlLib::load() { try { DLSYM(NvmlDeviceGetClockInfo); diff --git a/src/backend/cuda/wrappers/NvmlLib.h b/src/backend/cuda/wrappers/NvmlLib.h index 85b80d0c..0d94c9de 100644 --- a/src/backend/cuda/wrappers/NvmlLib.h +++ b/src/backend/cuda/wrappers/NvmlLib.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,15 +22,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NVMLLIB_H -#define XMRIG_NVMLLIB_H +#ifndef xmlcore_NVMLLIB_H +#define xmlcore_NVMLLIB_H #include "backend/cuda/wrappers/CudaDevice.h" #include "backend/cuda/wrappers/NvmlHealth.h" -namespace xmrig { +namespace xmlcore { class NvmlLib @@ -60,7 +60,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_NVMLLIB_H */ +#endif /* xmlcore_NVMLLIB_H */ diff --git a/src/backend/cuda/wrappers/nvml_lite.h b/src/backend/cuda/wrappers/nvml_lite.h index 4472847c..1df13456 100644 --- a/src/backend/cuda/wrappers/nvml_lite.h +++ b/src/backend/cuda/wrappers/nvml_lite.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NVML_LITE_H -#define XMRIG_NVML_LITE_H +#ifndef xmlcore_NVML_LITE_H +#define xmlcore_NVML_LITE_H #include @@ -52,4 +52,4 @@ struct nvmlPciInfo_t }; -#endif /* XMRIG_NVML_LITE_H */ +#endif /* xmlcore_NVML_LITE_H */ diff --git a/src/backend/opencl/OclBackend.cpp b/src/backend/opencl/OclBackend.cpp index d0d04f37..4404c29f 100644 --- a/src/backend/opencl/OclBackend.cpp +++ b/src/backend/opencl/OclBackend.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -49,25 +49,25 @@ #include "core/Controller.h" -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "crypto/kawpow/KPCache.h" # include "crypto/kawpow/KPHash.h" #endif -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/interfaces/IApiRequest.h" #endif -#ifdef XMRIG_FEATURE_ADL +#ifdef xmlcore_FEATURE_ADL #include "backend/opencl/wrappers/AdlLib.h" -namespace xmrig { static const char *kAdlLabel = "ADL"; } +namespace xmlcore { static const char *kAdlLabel = "ADL"; } #endif -namespace xmrig { +namespace xmlcore { extern template class Threads; @@ -165,7 +165,7 @@ public: return printDisabled(kLabel, RED_S " (no devices)"); } -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL if (cl.isAdlEnabled()) { if (AdlLib::init()) { Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "press " MAGENTA_BG(WHITE_BOLD_S "e") " for health report", @@ -211,7 +211,7 @@ public: size_t algo_l3 = algo.l3(); -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (algo.family() == Algorithm::ASTROBWT) { algo_l3 = OclAstroBWTRunner::BWT_DATA_STRIDE * 17 + 324; } @@ -221,7 +221,7 @@ public: for (const auto &data : threads) { size_t mem_used = data.thread.intensity() * algo_l3 / oneMiB; -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW if (algo.family() == Algorithm::KAWPOW) { const uint32_t epoch = job.height() / KPHash::EPOCH_LENGTH; mem_used = (KPCache::cache_size(epoch) + KPCache::dag_size(epoch)) / oneMiB; @@ -249,7 +249,7 @@ public: } -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL void printHealth() { if (!AdlLib::isReady()) { @@ -287,70 +287,70 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -const char *xmrig::ocl_tag() +const char *xmlcore::ocl_tag() { return Tags::opencl(); } -xmrig::OclBackend::OclBackend(Controller *controller) : +xmlcore::OclBackend::OclBackend(Controller *controller) : d_ptr(new OclBackendPrivate(controller)) { d_ptr->workers.setBackend(this); } -xmrig::OclBackend::~OclBackend() +xmlcore::OclBackend::~OclBackend() { delete d_ptr; OclLib::close(); -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL AdlLib::close(); # endif } -bool xmrig::OclBackend::isEnabled() const +bool xmlcore::OclBackend::isEnabled() const { return d_ptr->controller->config()->cl().isEnabled() && OclLib::isInitialized() && d_ptr->platform.isValid() && !d_ptr->devices.empty(); } -bool xmrig::OclBackend::isEnabled(const Algorithm &algorithm) const +bool xmlcore::OclBackend::isEnabled(const Algorithm &algorithm) const { return !d_ptr->controller->config()->cl().threads().get(algorithm).isEmpty(); } -const xmrig::Hashrate *xmrig::OclBackend::hashrate() const +const xmlcore::Hashrate *xmlcore::OclBackend::hashrate() const { return d_ptr->workers.hashrate(); } -const xmrig::String &xmrig::OclBackend::profileName() const +const xmlcore::String &xmlcore::OclBackend::profileName() const { return d_ptr->profileName; } -const xmrig::String &xmrig::OclBackend::type() const +const xmlcore::String &xmlcore::OclBackend::type() const { return kType; } -void xmrig::OclBackend::execCommand(char) +void xmlcore::OclBackend::execCommand(char) { } -void xmrig::OclBackend::prepare(const Job &job) +void xmlcore::OclBackend::prepare(const Job &job) { if (d_ptr) { d_ptr->workers.jobEarlyNotification(job); @@ -358,7 +358,7 @@ void xmrig::OclBackend::prepare(const Job &job) } -void xmrig::OclBackend::printHashrate(bool details) +void xmlcore::OclBackend::printHashrate(bool details) { if (!details || !hashrate()) { return; @@ -404,15 +404,15 @@ void xmrig::OclBackend::printHashrate(bool details) } -void xmrig::OclBackend::printHealth() +void xmlcore::OclBackend::printHealth() { -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL d_ptr->printHealth(); # endif } -void xmrig::OclBackend::setJob(const Job &job) +void xmlcore::OclBackend::setJob(const Job &job) { const auto &cl = d_ptr->controller->config()->cl(); if (cl.isEnabled()) { @@ -450,7 +450,7 @@ void xmrig::OclBackend::setJob(const Job &job) } -void xmrig::OclBackend::start(IWorker *worker, bool ready) +void xmlcore::OclBackend::start(IWorker *worker, bool ready) { mutex.lock(); @@ -468,7 +468,7 @@ void xmrig::OclBackend::start(IWorker *worker, bool ready) } -void xmrig::OclBackend::stop() +void xmlcore::OclBackend::stop() { if (d_ptr->threads.empty()) { return; @@ -485,14 +485,14 @@ void xmrig::OclBackend::stop() } -bool xmrig::OclBackend::tick(uint64_t ticks) +bool xmlcore::OclBackend::tick(uint64_t ticks) { return d_ptr->workers.tick(ticks); } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::OclBackend::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::OclBackend::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -530,7 +530,7 @@ rapidjson::Value xmrig::OclBackend::toJSON(rapidjson::Document &doc) const } -void xmrig::OclBackend::handleRequest(IApiRequest &) +void xmlcore::OclBackend::handleRequest(IApiRequest &) { } #endif diff --git a/src/backend/opencl/OclBackend.h b/src/backend/opencl/OclBackend.h index 1c196bae..b0ea297d 100644 --- a/src/backend/opencl/OclBackend.h +++ b/src/backend/opencl/OclBackend.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLBACKEND_H -#define XMRIG_OCLBACKEND_H +#ifndef xmlcore_OCLBACKEND_H +#define xmlcore_OCLBACKEND_H #include @@ -33,7 +33,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Controller; @@ -44,7 +44,7 @@ class Miner; class OclBackend : public IBackend { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclBackend) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclBackend) OclBackend(Controller *controller); @@ -65,12 +65,12 @@ protected: void stop() override; bool tick(uint64_t ticks) override; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const override; void handleRequest(IApiRequest &request) override; # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK inline Benchmark *benchmark() const override { return nullptr; } inline void printBenchProgress() const override {} # endif @@ -80,7 +80,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLBACKEND_H */ +#endif /* xmlcore_OCLBACKEND_H */ diff --git a/src/backend/opencl/OclCache.cpp b/src/backend/opencl/OclCache.cpp index e93019c8..77b7c4a8 100644 --- a/src/backend/opencl/OclCache.cpp +++ b/src/backend/opencl/OclCache.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -40,7 +40,7 @@ #include "base/tools/Chrono.h" -namespace xmrig { +namespace xmlcore { static std::mutex mutex; @@ -105,10 +105,10 @@ static cl_program createFromBinary(const IOclRunner *runner, const std::string & } -} // namespace xmrig +} // namespace xmlcore -cl_program xmrig::OclCache::build(const IOclRunner *runner) +cl_program xmlcore::OclCache::build(const IOclRunner *runner) { std::lock_guard lock(mutex); @@ -119,7 +119,7 @@ cl_program xmrig::OclCache::build(const IOclRunner *runner) std::string fileName; if (runner->data().cache) { # ifdef _WIN32 - fileName = prefix() + "\\xmrig\\.cache\\" + cacheKey(runner) + ".bin"; + fileName = prefix() + "\\xmlcore\\.cache\\" + cacheKey(runner) + ".bin"; # else fileName = prefix() + "/.cache/" + cacheKey(runner) + ".bin"; # endif @@ -139,7 +139,7 @@ cl_program xmrig::OclCache::build(const IOclRunner *runner) } -std::string xmrig::OclCache::cacheKey(const char *deviceKey, const char *options, const char *source) +std::string xmlcore::OclCache::cacheKey(const char *deviceKey, const char *options, const char *source) { std::string in(source); in += options; @@ -155,13 +155,13 @@ std::string xmrig::OclCache::cacheKey(const char *deviceKey, const char *options } -std::string xmrig::OclCache::cacheKey(const IOclRunner *runner) +std::string xmlcore::OclCache::cacheKey(const IOclRunner *runner) { return cacheKey(runner->deviceKey(), runner->buildOptions(), runner->source()); } -void xmrig::OclCache::save(cl_program program, const std::string &fileName) +void xmlcore::OclCache::save(cl_program program, const std::string &fileName) { size_t size = 0; if (OclLib::getProgramInfo(program, CL_PROGRAM_BINARY_SIZES, sizeof(size), &size) != CL_SUCCESS) { diff --git a/src/backend/opencl/OclCache.h b/src/backend/opencl/OclCache.h index 5f17bfca..9bdab2d5 100644 --- a/src/backend/opencl/OclCache.h +++ b/src/backend/opencl/OclCache.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLCACHE_H -#define XMRIG_OCLCACHE_H +#ifndef xmlcore_OCLCACHE_H +#define xmlcore_OCLCACHE_H #include @@ -32,7 +32,7 @@ using cl_program = struct _cl_program *; -namespace xmrig { +namespace xmlcore { class IOclRunner; @@ -52,7 +52,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLCACHE_H */ +#endif /* xmlcore_OCLCACHE_H */ diff --git a/src/backend/opencl/OclCache_unix.cpp b/src/backend/opencl/OclCache_unix.cpp index 563a5b85..f4d27d8e 100644 --- a/src/backend/opencl/OclCache_unix.cpp +++ b/src/backend/opencl/OclCache_unix.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +29,14 @@ #include "backend/opencl/OclCache.h" -void xmrig::OclCache::createDirectory() +void xmlcore::OclCache::createDirectory() { std::string path = prefix() + "/.cache"; mkdir(path.c_str(), 0744); } -std::string xmrig::OclCache::prefix() +std::string xmlcore::OclCache::prefix() { return "."; } diff --git a/src/backend/opencl/OclCache_win.cpp b/src/backend/opencl/OclCache_win.cpp index 81838148..35197c9d 100644 --- a/src/backend/opencl/OclCache_win.cpp +++ b/src/backend/opencl/OclCache_win.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -31,9 +31,9 @@ #include "backend/opencl/OclCache.h" -void xmrig::OclCache::createDirectory() +void xmlcore::OclCache::createDirectory() { - std::string path = prefix() + "/xmrig"; + std::string path = prefix() + "/xmlcore"; _mkdir(path.c_str()); path += "/.cache"; @@ -41,7 +41,7 @@ void xmrig::OclCache::createDirectory() } -std::string xmrig::OclCache::prefix() +std::string xmlcore::OclCache::prefix() { char path[MAX_PATH + 1]; if (SHGetSpecialFolderPathA(HWND_DESKTOP, path, CSIDL_LOCAL_APPDATA, FALSE)) { diff --git a/src/backend/opencl/OclConfig.cpp b/src/backend/opencl/OclConfig.cpp index 093d732a..9248017c 100644 --- a/src/backend/opencl/OclConfig.cpp +++ b/src/backend/opencl/OclConfig.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -32,7 +32,7 @@ #include "base/io/log/Log.h" -namespace xmrig { +namespace xmlcore { static const char *kCache = "cache"; @@ -40,14 +40,14 @@ static const char *kDevicesHint = "devices-hint"; static const char *kEnabled = "enabled"; static const char *kLoader = "loader"; -#ifndef XMRIG_OS_APPLE +#ifndef xmlcore_OS_APPLE static const char *kAMD = "AMD"; static const char *kINTEL = "INTEL"; static const char *kNVIDIA = "NVIDIA"; static const char *kPlatform = "platform"; #endif -#ifdef XMRIG_FEATURE_ADL +#ifdef xmlcore_FEATURE_ADL static const char *kAdl = "adl"; #endif @@ -58,21 +58,21 @@ extern template class Threads; } -#ifndef XMRIG_OS_APPLE -xmrig::OclConfig::OclConfig() : m_platformVendor(kAMD) {} +#ifndef xmlcore_OS_APPLE +xmlcore::OclConfig::OclConfig() : m_platformVendor(kAMD) {} #else -xmrig::OclConfig::OclConfig() = default; +xmlcore::OclConfig::OclConfig() = default; #endif -xmrig::OclPlatform xmrig::OclConfig::platform() const +xmlcore::OclPlatform xmlcore::OclConfig::platform() const { const auto platforms = OclPlatform::get(); if (platforms.empty()) { return {}; } -# ifndef XMRIG_OS_APPLE +# ifndef xmlcore_OS_APPLE if (!m_platformVendor.isEmpty()) { String search; String vendor = m_platformVendor; @@ -108,7 +108,7 @@ xmrig::OclPlatform xmrig::OclConfig::platform() const } -rapidjson::Value xmrig::OclConfig::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::OclConfig::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -119,11 +119,11 @@ rapidjson::Value xmrig::OclConfig::toJSON(rapidjson::Document &doc) const obj.AddMember(StringRef(kCache), m_cache, allocator); obj.AddMember(StringRef(kLoader), m_loader.toJSON(), allocator); -# ifndef XMRIG_OS_APPLE +# ifndef xmlcore_OS_APPLE obj.AddMember(StringRef(kPlatform), m_platformVendor.isEmpty() ? Value(m_platformIndex) : m_platformVendor.toJSON(), allocator); # endif -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL obj.AddMember(StringRef(kAdl), m_adl, allocator); # endif @@ -133,7 +133,7 @@ rapidjson::Value xmrig::OclConfig::toJSON(rapidjson::Document &doc) const } -std::vector xmrig::OclConfig::get(const Miner *miner, const Algorithm &algorithm, const OclPlatform &platform, const std::vector &devices) const +std::vector xmlcore::OclConfig::get(const Miner *miner, const Algorithm &algorithm, const OclPlatform &platform, const std::vector &devices) const { std::vector out; const auto &threads = m_threads.get(algorithm); @@ -164,20 +164,20 @@ std::vector xmrig::OclConfig::get(const Miner *miner, cons } -void xmrig::OclConfig::read(const rapidjson::Value &value) +void xmlcore::OclConfig::read(const rapidjson::Value &value) { if (value.IsObject()) { m_enabled = Json::getBool(value, kEnabled, m_enabled); m_cache = Json::getBool(value, kCache, m_cache); m_loader = Json::getString(value, kLoader); -# ifndef XMRIG_OS_APPLE +# ifndef xmlcore_OS_APPLE setPlatform(Json::getValue(value, kPlatform)); # endif setDevicesHint(Json::getString(value, kDevicesHint)); -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL m_adl = Json::getBool(value, kAdl, m_adl); # endif @@ -198,7 +198,7 @@ void xmrig::OclConfig::read(const rapidjson::Value &value) } -void xmrig::OclConfig::generate() +void xmlcore::OclConfig::generate() { if (!isEnabled() || m_threads.has("*")) { return; @@ -215,19 +215,19 @@ void xmrig::OclConfig::generate() size_t count = 0; - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); - count += xmrig::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); + count += xmlcore::generate(m_threads, devices); m_shouldSave = count > 0; } -void xmrig::OclConfig::setDevicesHint(const char *devicesHint) +void xmlcore::OclConfig::setDevicesHint(const char *devicesHint) { if (devicesHint == nullptr) { return; @@ -242,8 +242,8 @@ void xmrig::OclConfig::setDevicesHint(const char *devicesHint) } -#ifndef XMRIG_OS_APPLE -void xmrig::OclConfig::setPlatform(const rapidjson::Value &platform) +#ifndef xmlcore_OS_APPLE +void xmlcore::OclConfig::setPlatform(const rapidjson::Value &platform) { if (platform.IsString()) { m_platformVendor = platform.GetString(); diff --git a/src/backend/opencl/OclConfig.h b/src/backend/opencl/OclConfig.h index 0aeca97a..96d5ba80 100644 --- a/src/backend/opencl/OclConfig.h +++ b/src/backend/opencl/OclConfig.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLCONFIG_H -#define XMRIG_OCLCONFIG_H +#ifndef xmlcore_OCLCONFIG_H +#define xmlcore_OCLCONFIG_H #include "backend/common/Threads.h" @@ -32,7 +32,7 @@ #include "backend/opencl/wrappers/OclPlatform.h" -namespace xmrig { +namespace xmlcore { class OclConfig @@ -51,7 +51,7 @@ public: inline const String &loader() const { return m_loader; } inline const Threads &threads() const { return m_threads; } -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL inline bool isAdlEnabled() const { return m_adl; } # endif @@ -66,20 +66,20 @@ private: String m_loader; Threads m_threads; -# ifndef XMRIG_OS_APPLE +# ifndef xmlcore_OS_APPLE void setPlatform(const rapidjson::Value &platform); String m_platformVendor; uint32_t m_platformIndex = 0; # endif -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL bool m_adl = true; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLCONFIG_H */ +#endif /* xmlcore_OCLCONFIG_H */ diff --git a/src/backend/opencl/OclConfig_gen.h b/src/backend/opencl/OclConfig_gen.h index cf73ff9b..a8fd4fe2 100644 --- a/src/backend/opencl/OclConfig_gen.h +++ b/src/backend/opencl/OclConfig_gen.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLCONFIG_GEN_H -#define XMRIG_OCLCONFIG_GEN_H +#ifndef xmlcore_OCLCONFIG_GEN_H +#define xmlcore_OCLCONFIG_GEN_H #include "backend/common/Threads.h" @@ -33,7 +33,7 @@ #include -namespace xmrig { +namespace xmlcore { static inline size_t generate(const char *key, Threads &threads, const Algorithm &algorithm, const std::vector &devices) @@ -67,7 +67,7 @@ size_t inline generate(Threads &threads, const std::v } -#ifdef XMRIG_ALGO_CN_LITE +#ifdef xmlcore_ALGO_CN_LITE template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -83,7 +83,7 @@ size_t inline generate(Threads &threads, const s #endif -#ifdef XMRIG_ALGO_CN_HEAVY +#ifdef xmlcore_ALGO_CN_HEAVY template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -92,7 +92,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_CN_PICO +#ifdef xmlcore_ALGO_CN_PICO template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -101,7 +101,7 @@ size_t inline generate(Threads &threads, const s #endif -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX template<> size_t inline generate(Threads &threads, const std::vector &devices) { @@ -126,7 +126,7 @@ size_t inline generate(Threads &threads, const #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT template<> size_t inline generate(Threads& threads, const std::vector& devices) { @@ -135,7 +135,7 @@ size_t inline generate(Threads& threads, const #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW template<> size_t inline generate(Threads& threads, const std::vector& devices) { @@ -160,7 +160,7 @@ static inline std::vector filterDevices(const std::vector } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLCONFIG_GEN_H */ +#endif /* xmlcore_OCLCONFIG_GEN_H */ diff --git a/src/backend/opencl/OclGenerator.h b/src/backend/opencl/OclGenerator.h index 9a04a059..adc4d2be 100644 --- a/src/backend/opencl/OclGenerator.h +++ b/src/backend/opencl/OclGenerator.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLGENERATOR_H -#define XMRIG_OCLGENERATOR_H +#ifndef xmlcore_OCLGENERATOR_H +#define xmlcore_OCLGENERATOR_H -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -37,7 +37,7 @@ class OclThreads; using ocl_gen_config_fun = bool (*)(const OclDevice &device, const Algorithm &algorithm, OclThreads &threads); -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLGENERATOR_H */ +#endif /* xmlcore_OCLGENERATOR_H */ diff --git a/src/backend/opencl/OclLaunchData.cpp b/src/backend/opencl/OclLaunchData.cpp index 48c380f4..63cd195e 100644 --- a/src/backend/opencl/OclLaunchData.cpp +++ b/src/backend/opencl/OclLaunchData.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +29,7 @@ #include "backend/opencl/OclConfig.h" -xmrig::OclLaunchData::OclLaunchData(const Miner *miner, const Algorithm &algorithm, const OclConfig &config, const OclPlatform &platform, const OclThread &thread, const OclDevice &device, int64_t affinity) : +xmlcore::OclLaunchData::OclLaunchData(const Miner *miner, const Algorithm &algorithm, const OclConfig &config, const OclPlatform &platform, const OclThread &thread, const OclDevice &device, int64_t affinity) : algorithm(algorithm), cache(config.isCacheEnabled()), affinity(affinity), @@ -41,14 +41,14 @@ xmrig::OclLaunchData::OclLaunchData(const Miner *miner, const Algorithm &algorit } -bool xmrig::OclLaunchData::isEqual(const OclLaunchData &other) const +bool xmlcore::OclLaunchData::isEqual(const OclLaunchData &other) const { return (other.algorithm == algorithm && other.thread == thread); } -const char *xmrig::OclLaunchData::tag() +const char *xmlcore::OclLaunchData::tag() { return ocl_tag(); } diff --git a/src/backend/opencl/OclLaunchData.h b/src/backend/opencl/OclLaunchData.h index 7cfd5d58..c56b23d3 100644 --- a/src/backend/opencl/OclLaunchData.h +++ b/src/backend/opencl/OclLaunchData.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLLAUNCHDATA_H -#define XMRIG_OCLLAUNCHDATA_H +#ifndef xmlcore_OCLLAUNCHDATA_H +#define xmlcore_OCLLAUNCHDATA_H #include "backend/opencl/OclThread.h" @@ -38,7 +38,7 @@ using cl_context = struct _cl_context *; -namespace xmrig { +namespace xmlcore { class OclConfig; @@ -71,7 +71,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLLAUNCHDATA_H */ +#endif /* xmlcore_OCLLAUNCHDATA_H */ diff --git a/src/backend/opencl/OclThread.cpp b/src/backend/opencl/OclThread.cpp index 77f6ef11..1dcd2c9e 100644 --- a/src/backend/opencl/OclThread.cpp +++ b/src/backend/opencl/OclThread.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kIndex = "index"; static const char *kIntensity = "intensity"; @@ -40,16 +40,16 @@ static const char *kThreads = "threads"; static const char *kUnroll = "unroll"; static const char *kWorksize = "worksize"; -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX static const char *kBFactor = "bfactor"; static const char *kGCNAsm = "gcn_asm"; static const char* kDatasetHost = "dataset_host"; #endif -} // namespace xmrig +} // namespace xmlcore -xmrig::OclThread::OclThread(const rapidjson::Value &value) +xmlcore::OclThread::OclThread(const rapidjson::Value &value) { if (!value.IsObject()) { return; @@ -85,7 +85,7 @@ xmrig::OclThread::OclThread(const rapidjson::Value &value) m_threads.emplace_back(-1); } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX const auto &gcnAsm = Json::getValue(value, kGCNAsm); if (gcnAsm.IsBool()) { m_fields.set(RANDOMX_FIELDS, true); @@ -98,7 +98,7 @@ xmrig::OclThread::OclThread(const rapidjson::Value &value) } -bool xmrig::OclThread::isEqual(const OclThread &other) const +bool xmlcore::OclThread::isEqual(const OclThread &other) const { return other.m_threads.size() == m_threads.size() && std::equal(m_threads.begin(), m_threads.end(), other.m_threads.begin()) && @@ -114,7 +114,7 @@ bool xmrig::OclThread::isEqual(const OclThread &other) const } -rapidjson::Value xmrig::OclThread::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::OclThread::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -145,7 +145,7 @@ rapidjson::Value xmrig::OclThread::toJSON(rapidjson::Document &doc) const out.AddMember(StringRef(kThreads), threads, allocator); if (m_fields.test(RANDOMX_FIELDS)) { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX out.AddMember(StringRef(kBFactor), bfactor(), allocator); out.AddMember(StringRef(kGCNAsm), isAsm(), allocator); out.AddMember(StringRef(kDatasetHost), isDatasetHost(), allocator); diff --git a/src/backend/opencl/OclThread.h b/src/backend/opencl/OclThread.h index 0c3f03e2..9a1bfdf2 100644 --- a/src/backend/opencl/OclThread.h +++ b/src/backend/opencl/OclThread.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLTHREAD_H -#define XMRIG_OCLTHREAD_H +#ifndef xmlcore_OCLTHREAD_H +#define xmlcore_OCLTHREAD_H #include "3rdparty/rapidjson/fwd.h" @@ -33,7 +33,7 @@ #include -namespace xmrig { +namespace xmlcore { class OclThread @@ -51,7 +51,7 @@ public: setIntensity(intensity); } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX OclThread(uint32_t index, uint32_t intensity, uint32_t worksize, uint32_t threads, bool gcnAsm, bool datasetHost, uint32_t bfactor) : m_datasetHost(datasetHost), m_gcnAsm(gcnAsm), @@ -67,7 +67,7 @@ public: } # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT OclThread(uint32_t index, uint32_t intensity, uint32_t threads) : m_fields(4), m_threads(threads, -1), @@ -81,7 +81,7 @@ public: } # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW OclThread(uint32_t index, uint32_t intensity, uint32_t worksize, uint32_t threads) : m_fields(8), m_threads(threads, -1), @@ -140,7 +140,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLTHREAD_H */ +#endif /* xmlcore_OCLTHREAD_H */ diff --git a/src/backend/opencl/OclThreads.cpp b/src/backend/opencl/OclThreads.cpp index 5b699513..73cc81b1 100644 --- a/src/backend/opencl/OclThreads.cpp +++ b/src/backend/opencl/OclThreads.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "base/io/json/Json.h" -xmrig::OclThreads::OclThreads(const rapidjson::Value &value) +xmlcore::OclThreads::OclThreads(const rapidjson::Value &value) { if (value.IsArray()) { for (auto &v : value.GetArray()) { @@ -44,7 +44,7 @@ xmrig::OclThreads::OclThreads(const rapidjson::Value &value) } -xmrig::OclThreads::OclThreads(const std::vector &devices, const Algorithm &algorithm) +xmlcore::OclThreads::OclThreads(const std::vector &devices, const Algorithm &algorithm) { for (const auto &device : devices) { device.generate(algorithm, *this); @@ -52,7 +52,7 @@ xmrig::OclThreads::OclThreads(const std::vector &devices, const Algor } -bool xmrig::OclThreads::isEqual(const OclThreads &other) const +bool xmlcore::OclThreads::isEqual(const OclThreads &other) const { if (isEmpty() && other.isEmpty()) { return true; @@ -62,7 +62,7 @@ bool xmrig::OclThreads::isEqual(const OclThreads &other) const } -rapidjson::Value xmrig::OclThreads::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::OclThreads::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); diff --git a/src/backend/opencl/OclThreads.h b/src/backend/opencl/OclThreads.h index 8d9c101e..1b5d2a85 100644 --- a/src/backend/opencl/OclThreads.h +++ b/src/backend/opencl/OclThreads.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLTHREADS_H -#define XMRIG_OCLTHREADS_H +#ifndef xmlcore_OCLTHREADS_H +#define xmlcore_OCLTHREADS_H #include @@ -33,7 +33,7 @@ #include "backend/opencl/wrappers/OclDevice.h" -namespace xmrig { +namespace xmlcore { class OclThreads @@ -60,7 +60,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLTHREADS_H */ +#endif /* xmlcore_OCLTHREADS_H */ diff --git a/src/backend/opencl/OclWorker.cpp b/src/backend/opencl/OclWorker.cpp index 727a64c9..1367450f 100644 --- a/src/backend/opencl/OclWorker.cpp +++ b/src/backend/opencl/OclWorker.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,16 +29,16 @@ #include "net/JobResults.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "backend/opencl/runners/OclRxJitRunner.h" # include "backend/opencl/runners/OclRxVmRunner.h" #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "backend/opencl/runners/OclAstroBWTRunner.h" #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "backend/opencl/runners/OclKawPowRunner.h" #endif @@ -46,7 +46,7 @@ #include -namespace xmrig { +namespace xmlcore { std::atomic OclWorker::ready; @@ -61,11 +61,11 @@ static inline void printError(size_t id, const char *error) } -} // namespace xmrig +} // namespace xmlcore -xmrig::OclWorker::OclWorker(size_t id, const OclLaunchData &data) : +xmlcore::OclWorker::OclWorker(size_t id, const OclLaunchData &data) : GpuWorker(id, data.affinity, -1, data.device.index()), m_algorithm(data.algorithm), m_miner(data.miner), @@ -73,7 +73,7 @@ xmrig::OclWorker::OclWorker(size_t id, const OclLaunchData &data) : { switch (m_algorithm.family()) { case Algorithm::RANDOM_X: -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (data.thread.isAsm() && data.device.vendorId() == OCL_VENDOR_AMD) { m_runner = new OclRxJitRunner(id, data); } @@ -84,19 +84,19 @@ xmrig::OclWorker::OclWorker(size_t id, const OclLaunchData &data) : break; case Algorithm::ARGON2: -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 m_runner = nullptr; // TODO OclArgon2Runner # endif break; case Algorithm::ASTROBWT: -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT m_runner = new OclAstroBWTRunner(id, data); # endif break; case Algorithm::KAWPOW: -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW m_runner = new OclKawPowRunner(id, data); # endif break; @@ -123,13 +123,13 @@ xmrig::OclWorker::OclWorker(size_t id, const OclLaunchData &data) : } -xmrig::OclWorker::~OclWorker() +xmlcore::OclWorker::~OclWorker() { delete m_runner; } -void xmrig::OclWorker::jobEarlyNotification(const Job &job) +void xmlcore::OclWorker::jobEarlyNotification(const Job &job) { if (m_runner) { m_runner->jobEarlyNotification(job); @@ -137,19 +137,19 @@ void xmrig::OclWorker::jobEarlyNotification(const Job &job) } -bool xmrig::OclWorker::selfTest() +bool xmlcore::OclWorker::selfTest() { return m_runner != nullptr; } -size_t xmrig::OclWorker::intensity() const +size_t xmlcore::OclWorker::intensity() const { return m_runner ? m_runner->roundSize() : 0; } -void xmrig::OclWorker::start() +void xmlcore::OclWorker::start() { cl_uint results[0x100]; @@ -206,7 +206,7 @@ void xmrig::OclWorker::start() } -bool xmrig::OclWorker::consumeJob() +bool xmlcore::OclWorker::consumeJob() { if (Nonce::sequence(Nonce::OPENCL) == 0) { return false; @@ -227,7 +227,7 @@ bool xmrig::OclWorker::consumeJob() } -void xmrig::OclWorker::storeStats(uint64_t t) +void xmlcore::OclWorker::storeStats(uint64_t t) { if (!isReady()) { return; diff --git a/src/backend/opencl/OclWorker.h b/src/backend/opencl/OclWorker.h index 4dfe2a77..73a2cad7 100644 --- a/src/backend/opencl/OclWorker.h +++ b/src/backend/opencl/OclWorker.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLWORKER_H -#define XMRIG_OCLWORKER_H +#ifndef xmlcore_OCLWORKER_H +#define xmlcore_OCLWORKER_H #include "backend/common/GpuWorker.h" @@ -27,7 +27,7 @@ #include "net/JobResult.h" -namespace xmrig { +namespace xmlcore { class IOclRunner; @@ -37,7 +37,7 @@ class Job; class OclWorker : public GpuWorker { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclWorker) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclWorker) OclWorker(size_t id, const OclLaunchData &data); @@ -64,7 +64,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLWORKER_H */ +#endif /* xmlcore_OCLWORKER_H */ diff --git a/src/backend/opencl/cl/OclSource.cpp b/src/backend/opencl/cl/OclSource.cpp index facb2bdc..1d1fc534 100644 --- a/src/backend/opencl/cl/OclSource.cpp +++ b/src/backend/opencl/cl/OclSource.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,35 +28,35 @@ #include "base/crypto/Algorithm.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "backend/opencl/cl/rx/randomx_cl.h" #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "backend/opencl/cl/astrobwt/astrobwt_cl.h" #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "backend/opencl/cl/kawpow/kawpow_cl.h" # include "backend/opencl/cl/kawpow/kawpow_dag_cl.h" #endif -const char *xmrig::OclSource::get(const Algorithm &algorithm) +const char *xmlcore::OclSource::get(const Algorithm &algorithm) { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (algorithm.family() == Algorithm::RANDOM_X) { return randomx_cl; } # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (algorithm.family() == Algorithm::ASTROBWT) { return astrobwt_cl; } # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW if (algorithm.family() == Algorithm::KAWPOW) { return kawpow_dag_cl; } diff --git a/src/backend/opencl/cl/OclSource.h b/src/backend/opencl/cl/OclSource.h index 6f41d1eb..4346efeb 100644 --- a/src/backend/opencl/cl/OclSource.h +++ b/src/backend/opencl/cl/OclSource.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLSOURCE_H -#define XMRIG_OCLSOURCE_H +#ifndef xmlcore_OCLSOURCE_H +#define xmlcore_OCLSOURCE_H -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -40,7 +40,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLSOURCE_H */ +#endif /* xmlcore_OCLSOURCE_H */ diff --git a/src/backend/opencl/cl/astrobwt/BWT.cl b/src/backend/opencl/cl/astrobwt/BWT.cl index e68fb71e..00f791aa 100644 --- a/src/backend/opencl/cl/astrobwt/BWT.cl +++ b/src/backend/opencl/cl/astrobwt/BWT.cl @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 diff --git a/src/backend/opencl/cl/astrobwt/astrobwt.cl b/src/backend/opencl/cl/astrobwt/astrobwt.cl index 476366c8..bd9081b2 100644 --- a/src/backend/opencl/cl/astrobwt/astrobwt.cl +++ b/src/backend/opencl/cl/astrobwt/astrobwt.cl @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 diff --git a/src/backend/opencl/cl/astrobwt/astrobwt_cl.h b/src/backend/opencl/cl/astrobwt/astrobwt_cl.h index 4db13d99..1b7fb1bb 100644 --- a/src/backend/opencl/cl/astrobwt/astrobwt_cl.h +++ b/src/backend/opencl/cl/astrobwt/astrobwt_cl.h @@ -1,6 +1,6 @@ #pragma once -namespace xmrig { +namespace xmlcore { static const char astrobwt_cl[12493] = { 0x74,0x79,0x70,0x65,0x64,0x65,0x66,0x20,0x75,0x63,0x68,0x61,0x72,0x20,0x75,0x69,0x6e,0x74,0x38,0x5f,0x74,0x3b,0x0a,0x74,0x79,0x70,0x65,0x64,0x65,0x66,0x20,0x75, @@ -396,4 +396,4 @@ static const char astrobwt_cl[12493] = { 0x5d,0x3d,0x41,0x5b,0x74,0x5d,0x3b,0x0a,0x7d,0x0a,0x7d,0x0a,0x00 }; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/cl/astrobwt/salsa20.cl b/src/backend/opencl/cl/astrobwt/salsa20.cl index 12a68321..cbb75ed9 100644 --- a/src/backend/opencl/cl/astrobwt/salsa20.cl +++ b/src/backend/opencl/cl/astrobwt/salsa20.cl @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 diff --git a/src/backend/opencl/cl/astrobwt/sha3.cl b/src/backend/opencl/cl/astrobwt/sha3.cl index c68fe99a..e20ff18d 100644 --- a/src/backend/opencl/cl/astrobwt/sha3.cl +++ b/src/backend/opencl/cl/astrobwt/sha3.cl @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 diff --git a/src/backend/opencl/cl/cn/cryptonight.cl b/src/backend/opencl/cl/cn/cryptonight.cl index 8b69185b..4950a8f0 100644 --- a/src/backend/opencl/cl/cn/cryptonight.cl +++ b/src/backend/opencl/cl/cn/cryptonight.cl @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 diff --git a/src/backend/opencl/cl/cn/cryptonight_cl.h b/src/backend/opencl/cl/cn/cryptonight_cl.h index 831dd639..6c70c5aa 100644 --- a/src/backend/opencl/cl/cn/cryptonight_cl.h +++ b/src/backend/opencl/cl/cn/cryptonight_cl.h @@ -1,6 +1,6 @@ #pragma once -namespace xmrig { +namespace xmlcore { static const char cryptonight_cl[60969] = { 0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x63,0x6c,0x5f,0x63,0x6c,0x61,0x6e,0x67,0x5f,0x73,0x74,0x6f,0x72,0x61,0x67,0x65,0x5f,0x63,0x6c,0x61,0x73,0x73,0x5f,0x73,0x70, @@ -1911,4 +1911,4 @@ static const char cryptonight_cl[60969] = { 0x7d,0x0a,0x7d,0x0a,0x7d,0x0a,0x7d,0x0a,0x00 }; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/cl/cn/cryptonight_r.cl b/src/backend/opencl/cl/cn/cryptonight_r.cl index 0b7b7dae..257e155d 100644 --- a/src/backend/opencl/cl/cn/cryptonight_r.cl +++ b/src/backend/opencl/cl/cn/cryptonight_r.cl @@ -105,7 +105,7 @@ __kernel void KERNEL_NAME(__global ulong *input, __global uint4 *Scratchpad, __g const uint r7 = as_uint4(bx1).s0; const uint r8 = as_uint4(bx1).s2; -XMRIG_INCLUDE_RANDOM_MATH +xmlcore_INCLUDE_RANDOM_MATH const uint2 al = (uint2)(as_uint2(a[0]).s0 ^ r2, as_uint2(a[0]).s1 ^ r3); const uint2 ah = (uint2)(as_uint2(a[1]).s0 ^ r0, as_uint2(a[1]).s1 ^ r1); diff --git a/src/backend/opencl/cl/cn/cryptonight_r_cl.h b/src/backend/opencl/cl/cn/cryptonight_r_cl.h index 59fef50d..07bf9f7b 100644 --- a/src/backend/opencl/cl/cn/cryptonight_r_cl.h +++ b/src/backend/opencl/cl/cn/cryptonight_r_cl.h @@ -1,6 +1,6 @@ #pragma once -namespace xmrig { +namespace xmlcore { static const char cryptonight_r_defines_cl[7709] = { 0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x5f,0x5f,0x4e,0x56,0x5f,0x43,0x4c,0x5f,0x43,0x5f,0x56,0x45,0x52,0x53,0x49,0x4f,0x4e,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65, @@ -356,4 +356,4 @@ static const char cryptonight_r_cl[3424] = { 0x66,0x65,0x6e,0x63,0x65,0x28,0x43,0x4c,0x4b,0x5f,0x47,0x4c,0x4f,0x42,0x41,0x4c,0x5f,0x4d,0x45,0x4d,0x5f,0x46,0x45,0x4e,0x43,0x45,0x29,0x3b,0x0a,0x7d,0x0a,0x00 }; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/cl/cn/keccak.cl b/src/backend/opencl/cl/cn/keccak.cl index e677a2ed..5d3babcc 100644 --- a/src/backend/opencl/cl/cn/keccak.cl +++ b/src/backend/opencl/cl/cn/keccak.cl @@ -1,5 +1,5 @@ -#ifndef XMRIG_KECCAK_CL -#define XMRIG_KECCAK_CL +#ifndef xmlcore_KECCAK_CL +#define xmlcore_KECCAK_CL static const __constant ulong keccakf_rndc[24] = diff --git a/src/backend/opencl/cl/cn/wolf-aes.cl b/src/backend/opencl/cl/cn/wolf-aes.cl index f65a908d..7030ce7d 100644 --- a/src/backend/opencl/cl/cn/wolf-aes.cl +++ b/src/backend/opencl/cl/cn/wolf-aes.cl @@ -4,7 +4,7 @@ #ifdef cl_amd_media_ops2 # pragma OPENCL EXTENSION cl_amd_media_ops2 : enable -# define xmrig_amd_bfe(src0, src1, src2) amd_bfe(src0, src1, src2) +# define xmlcore_amd_bfe(src0, src1, src2) amd_bfe(src0, src1, src2) #else /* taken from: https://www.khronos.org/registry/OpenCL/extensions/amd/cl_amd_media_ops2.txt * Built-in Function: @@ -21,7 +21,7 @@ * dst.s0 = src0.s0 >> offset; * similar operation applied to other components of the vectors */ -inline int xmrig_amd_bfe(const uint src0, const uint offset, const uint width) +inline int xmlcore_amd_bfe(const uint src0, const uint offset, const uint width) { /* casts are removed because we can implement everything as uint * int offset = src1; @@ -112,7 +112,7 @@ static const __constant uint AES0_C[256] = 0xCBB0B07BU, 0xFC5454A8U, 0xD6BBBB6DU, 0x3A16162CU }; -#define BYTE(x, y) (xmrig_amd_bfe((x), (y) << 3U, 8U)) +#define BYTE(x, y) (xmlcore_amd_bfe((x), (y) << 3U, 8U)) #if (ALGO == ALGO_CN_HEAVY_TUBE) inline uint4 AES_Round_bittube2(const __local uint *AES0, const __local uint *AES1, uint4 x, uint4 k) diff --git a/src/backend/opencl/cl/cn/wolf-skein.cl b/src/backend/opencl/cl/cn/wolf-skein.cl index f7862c92..88af6b62 100644 --- a/src/backend/opencl/cl/cn/wolf-skein.cl +++ b/src/backend/opencl/cl/cn/wolf-skein.cl @@ -3,7 +3,7 @@ #ifdef cl_amd_media_ops # pragma OPENCL EXTENSION cl_amd_media_ops : enable -# define xmrig_amd_bitalign(src0, src1, src2) amd_bitalign(src0, src1, src2) +# define xmlcore_amd_bitalign(src0, src1, src2) amd_bitalign(src0, src1, src2) #else /* taken from https://www.khronos.org/registry/OpenCL/extensions/amd/cl_amd_media_ops.txt * Build-in Function @@ -15,7 +15,7 @@ * The implemented function is modified because the last is in our case always a scalar. * We can ignore the bitwise AND operation. */ -inline uint2 xmrig_amd_bitalign(const uint2 src0, const uint2 src1, const uint src2) +inline uint2 xmlcore_amd_bitalign(const uint2 src0, const uint2 src1, const uint src2) { uint2 result; result.s0 = (uint) (((((long)src0.s0) << 32) | (long)src1.s0) >> (src2)); @@ -54,10 +54,10 @@ static const __constant ulong SKEIN512_256_IV[8] = ulong SKEIN_ROT(const uint2 x, const uint y) { if (y < 32) { - return(as_ulong(xmrig_amd_bitalign(x, x.s10, 32 - y))); + return(as_ulong(xmlcore_amd_bitalign(x, x.s10, 32 - y))); } else { - return(as_ulong(xmrig_amd_bitalign(x.s10, x, 32 - (y - 32)))); + return(as_ulong(xmlcore_amd_bitalign(x.s10, x, 32 - (y - 32)))); } } diff --git a/src/backend/opencl/cl/kawpow/kawpow.cl b/src/backend/opencl/cl/kawpow/kawpow.cl index c1a6cb2f..f2003adc 100644 --- a/src/backend/opencl/cl/kawpow/kawpow.cl +++ b/src/backend/opencl/cl/kawpow/kawpow.cl @@ -223,13 +223,13 @@ __kernel void progpow_search(__global dag_t const* g_dag, __global uint* job_blo if (hack_false) barrier(CLK_LOCAL_MEM_FENCE); uint32_t data; - XMRIG_INCLUDE_PROGPOW_RANDOM_MATH + xmlcore_INCLUDE_PROGPOW_RANDOM_MATH // consume global load data // hack to prevent compiler from reordering LD and usage if (hack_false) barrier(CLK_LOCAL_MEM_FENCE); - XMRIG_INCLUDE_PROGPOW_DATA_LOADS + xmlcore_INCLUDE_PROGPOW_DATA_LOADS } // Reduce mix data to a per-lane 32-bit digest diff --git a/src/backend/opencl/cl/kawpow/kawpow_cl.h b/src/backend/opencl/cl/kawpow/kawpow_cl.h index b046eba8..776826b1 100644 --- a/src/backend/opencl/cl/kawpow/kawpow_cl.h +++ b/src/backend/opencl/cl/kawpow/kawpow_cl.h @@ -1,6 +1,6 @@ #pragma once -namespace xmrig { +namespace xmlcore { static const char kawpow_cl[5870] = { 0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x63,0x6c,0x5f,0x63,0x6c,0x61,0x6e,0x67,0x5f,0x73,0x74,0x6f,0x72,0x61,0x67,0x65,0x5f,0x63,0x6c,0x61,0x73,0x73,0x5f,0x73,0x70, @@ -189,4 +189,4 @@ static const char kawpow_cl[5870] = { 0x5b,0x6b,0x5d,0x3d,0x67,0x69,0x64,0x3b,0x0a,0x7d,0x0a,0x7d,0x0a,0x00 }; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/cl/kawpow/kawpow_dag_cl.h b/src/backend/opencl/cl/kawpow/kawpow_dag_cl.h index 862e1840..4b26fd6b 100644 --- a/src/backend/opencl/cl/kawpow/kawpow_dag_cl.h +++ b/src/backend/opencl/cl/kawpow/kawpow_dag_cl.h @@ -1,6 +1,6 @@ #pragma once -namespace xmrig { +namespace xmlcore { static const char kawpow_dag_cl[5990] = { 0x23,0x69,0x66,0x64,0x65,0x66,0x20,0x63,0x6c,0x5f,0x63,0x6c,0x61,0x6e,0x67,0x5f,0x73,0x74,0x6f,0x72,0x61,0x67,0x65,0x5f,0x63,0x6c,0x61,0x73,0x73,0x5f,0x73,0x70, @@ -193,4 +193,4 @@ static const char kawpow_dag_cl[5990] = { 0x29,0x3b,0x0a,0x7d,0x0a,0x00 }; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/cl/rx/randomx_cl.h b/src/backend/opencl/cl/rx/randomx_cl.h index db191656..07ec2ecd 100644 --- a/src/backend/opencl/cl/rx/randomx_cl.h +++ b/src/backend/opencl/cl/rx/randomx_cl.h @@ -1,6 +1,6 @@ #pragma once -namespace xmrig { +namespace xmlcore { static const char randomx_cl[128907] = { 0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f,0x5f,0x43,0x4e,0x5f,0x30,0x20,0x30,0x0a,0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x41,0x4c,0x47,0x4f, @@ -4034,4 +4034,4 @@ static const char randomx_cl[128907] = { 0x79,0x5b,0x31,0x35,0x5d,0x29,0x3b,0x0a,0x7d,0x0a,0x00 }; -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/generators/ocl_generic_astrobwt_generator.cpp b/src/backend/opencl/generators/ocl_generic_astrobwt_generator.cpp index 95dffd5b..e53c0328 100644 --- a/src/backend/opencl/generators/ocl_generic_astrobwt_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_astrobwt_generator.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "crypto/rx/RxAlgo.h" -namespace xmrig { +namespace xmlcore { bool ocl_generic_astrobwt_generator(const OclDevice &device, const Algorithm &algorithm, OclThreads &threads) @@ -61,4 +61,4 @@ bool ocl_generic_astrobwt_generator(const OclDevice &device, const Algorithm &al } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/generators/ocl_generic_cn_generator.cpp b/src/backend/opencl/generators/ocl_generic_cn_generator.cpp index c2d8ea7e..ed19bc96 100644 --- a/src/backend/opencl/generators/ocl_generic_cn_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_cn_generator.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -33,7 +33,7 @@ #include -namespace xmrig { +namespace xmlcore { constexpr const size_t oneMiB = 1024u * 1024u; @@ -121,4 +121,4 @@ bool ocl_generic_cn_generator(const OclDevice &device, const Algorithm &algorith } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/generators/ocl_generic_kawpow_generator.cpp b/src/backend/opencl/generators/ocl_generic_kawpow_generator.cpp index 831c7a46..f440e4f0 100644 --- a/src/backend/opencl/generators/ocl_generic_kawpow_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_kawpow_generator.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "crypto/rx/RxAlgo.h" -namespace xmrig { +namespace xmlcore { bool ocl_generic_kawpow_generator(const OclDevice &device, const Algorithm &algorithm, OclThreads &threads) @@ -61,4 +61,4 @@ bool ocl_generic_kawpow_generator(const OclDevice &device, const Algorithm &algo } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/generators/ocl_generic_rx_generator.cpp b/src/backend/opencl/generators/ocl_generic_rx_generator.cpp index 49a73f40..abae5233 100644 --- a/src/backend/opencl/generators/ocl_generic_rx_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_rx_generator.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "crypto/rx/RxAlgo.h" -namespace xmrig { +namespace xmlcore { bool ocl_generic_rx_generator(const OclDevice &device, const Algorithm &algorithm, OclThreads &threads) @@ -107,4 +107,4 @@ bool ocl_generic_rx_generator(const OclDevice &device, const Algorithm &algorith } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/generators/ocl_vega_cn_generator.cpp b/src/backend/opencl/generators/ocl_vega_cn_generator.cpp index 5293fb22..3d504b3d 100644 --- a/src/backend/opencl/generators/ocl_vega_cn_generator.cpp +++ b/src/backend/opencl/generators/ocl_vega_cn_generator.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -33,7 +33,7 @@ #include -namespace xmrig { +namespace xmlcore { constexpr const size_t oneMiB = 1024u * 1024u; @@ -132,4 +132,4 @@ bool ocl_vega_cn_generator(const OclDevice &device, const Algorithm &algorithm, } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/interfaces/IOclRunner.h b/src/backend/opencl/interfaces/IOclRunner.h index c53af037..fbf35b4f 100644 --- a/src/backend/opencl/interfaces/IOclRunner.h +++ b/src/backend/opencl/interfaces/IOclRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IOCLRUNNER_H -#define XMRIG_IOCLRUNNER_H +#ifndef xmlcore_IOCLRUNNER_H +#define xmlcore_IOCLRUNNER_H #include "base/tools/Object.h" @@ -35,7 +35,7 @@ using cl_context = struct _cl_context *; -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -46,7 +46,7 @@ class OclLaunchData; class IOclRunner { public: - XMRIG_DISABLE_COPY_MOVE(IOclRunner) + xmlcore_DISABLE_COPY_MOVE(IOclRunner) IOclRunner() = default; virtual ~IOclRunner() = default; @@ -73,7 +73,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IOCLRUNNER_H +#endif // xmlcore_IOCLRUNNER_H diff --git a/src/backend/opencl/kernels/Cn0Kernel.cpp b/src/backend/opencl/kernels/Cn0Kernel.cpp index eec86e23..4ea8c33c 100644 --- a/src/backend/opencl/kernels/Cn0Kernel.cpp +++ b/src/backend/opencl/kernels/Cn0Kernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::Cn0Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads) +void xmlcore::Cn0Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads) { const size_t offset[2] = { nonce, 1 }; const size_t gthreads[2] = { threads, 8 }; @@ -38,7 +38,7 @@ void xmrig::Cn0Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t th // __kernel void cn0(__global ulong *input, __global uint4 *Scratchpad, __global ulong *states, uint Threads) -void xmrig::Cn0Kernel::setArgs(cl_mem input, int inlen, cl_mem scratchpads, cl_mem states, uint32_t threads) +void xmlcore::Cn0Kernel::setArgs(cl_mem input, int inlen, cl_mem scratchpads, cl_mem states, uint32_t threads) { setArg(0, sizeof(cl_mem), &input); setArg(1, sizeof(int), &inlen); diff --git a/src/backend/opencl/kernels/Cn0Kernel.h b/src/backend/opencl/kernels/Cn0Kernel.h index 54fe15e3..7f8587f3 100644 --- a/src/backend/opencl/kernels/Cn0Kernel.h +++ b/src/backend/opencl/kernels/Cn0Kernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CN0KERNEL_H -#define XMRIG_CN0KERNEL_H +#ifndef xmlcore_CN0KERNEL_H +#define xmlcore_CN0KERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class Cn0Kernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CN0KERNEL_H */ +#endif /* xmlcore_CN0KERNEL_H */ diff --git a/src/backend/opencl/kernels/Cn1Kernel.cpp b/src/backend/opencl/kernels/Cn1Kernel.cpp index fad7889c..131c1886 100644 --- a/src/backend/opencl/kernels/Cn1Kernel.cpp +++ b/src/backend/opencl/kernels/Cn1Kernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -30,20 +30,20 @@ #include "backend/opencl/wrappers/OclLib.h" -xmrig::Cn1Kernel::Cn1Kernel(cl_program program) +xmlcore::Cn1Kernel::Cn1Kernel(cl_program program) : OclKernel(program, "cn1") { } -xmrig::Cn1Kernel::Cn1Kernel(cl_program program, uint64_t height) +xmlcore::Cn1Kernel::Cn1Kernel(cl_program program, uint64_t height) : OclKernel(program, ("cn1_" + std::to_string(height)).c_str()) { } -void xmrig::Cn1Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads, size_t worksize) +void xmlcore::Cn1Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads, size_t worksize) { const size_t offset = nonce; const size_t gthreads = threads; @@ -54,7 +54,7 @@ void xmrig::Cn1Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t th // __kernel void cn1(__global ulong *input, __global uint4 *Scratchpad, __global ulong *states, uint Threads) -void xmrig::Cn1Kernel::setArgs(cl_mem input, cl_mem scratchpads, cl_mem states, uint32_t threads) +void xmlcore::Cn1Kernel::setArgs(cl_mem input, cl_mem scratchpads, cl_mem states, uint32_t threads) { setArg(0, sizeof(cl_mem), &input); setArg(1, sizeof(cl_mem), &scratchpads); diff --git a/src/backend/opencl/kernels/Cn1Kernel.h b/src/backend/opencl/kernels/Cn1Kernel.h index 08d33de2..1fcc4e4f 100644 --- a/src/backend/opencl/kernels/Cn1Kernel.h +++ b/src/backend/opencl/kernels/Cn1Kernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CN1KERNEL_H -#define XMRIG_CN1KERNEL_H +#ifndef xmlcore_CN1KERNEL_H +#define xmlcore_CN1KERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class Cn1Kernel : public OclKernel @@ -43,7 +43,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CN1KERNEL_H */ +#endif /* xmlcore_CN1KERNEL_H */ diff --git a/src/backend/opencl/kernels/Cn2Kernel.cpp b/src/backend/opencl/kernels/Cn2Kernel.cpp index 1dbb03b1..0abc8e6e 100644 --- a/src/backend/opencl/kernels/Cn2Kernel.cpp +++ b/src/backend/opencl/kernels/Cn2Kernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::Cn2Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads) +void xmlcore::Cn2Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads) { const size_t offset[2] = { nonce, 1 }; const size_t gthreads[2] = { threads, 8 }; @@ -38,7 +38,7 @@ void xmrig::Cn2Kernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t th // __kernel void cn2(__global uint4 *Scratchpad, __global ulong *states, __global uint *Branch0, __global uint *Branch1, __global uint *Branch2, __global uint *Branch3, uint Threads) -void xmrig::Cn2Kernel::setArgs(cl_mem scratchpads, cl_mem states, const std::vector &branches, uint32_t threads) +void xmlcore::Cn2Kernel::setArgs(cl_mem scratchpads, cl_mem states, const std::vector &branches, uint32_t threads) { setArg(0, sizeof(cl_mem), &scratchpads); setArg(1, sizeof(cl_mem), &states); diff --git a/src/backend/opencl/kernels/Cn2Kernel.h b/src/backend/opencl/kernels/Cn2Kernel.h index cb4aaede..8696e8b2 100644 --- a/src/backend/opencl/kernels/Cn2Kernel.h +++ b/src/backend/opencl/kernels/Cn2Kernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CN2KERNEL_H -#define XMRIG_CN2KERNEL_H +#ifndef xmlcore_CN2KERNEL_H +#define xmlcore_CN2KERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class Cn2Kernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CN2KERNEL_H */ +#endif /* xmlcore_CN2KERNEL_H */ diff --git a/src/backend/opencl/kernels/CnBranchKernel.cpp b/src/backend/opencl/kernels/CnBranchKernel.cpp index a0813a74..56b9e803 100644 --- a/src/backend/opencl/kernels/CnBranchKernel.cpp +++ b/src/backend/opencl/kernels/CnBranchKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,21 +27,21 @@ #include "backend/opencl/wrappers/OclLib.h" -namespace xmrig { +namespace xmlcore { static const char *names[4] = { "Blake", "Groestl", "JH", "Skein" }; -} // namespace xmrig +} // namespace xmlcore -xmrig::CnBranchKernel::CnBranchKernel(size_t index, cl_program program) : OclKernel(program, names[index]) +xmlcore::CnBranchKernel::CnBranchKernel(size_t index, cl_program program) : OclKernel(program, names[index]) { } -void xmrig::CnBranchKernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads, size_t worksize) +void xmlcore::CnBranchKernel::enqueue(cl_command_queue queue, uint32_t nonce, size_t threads, size_t worksize) { const size_t offset = nonce; const size_t gthreads = threads; @@ -52,7 +52,7 @@ void xmrig::CnBranchKernel::enqueue(cl_command_queue queue, uint32_t nonce, size // __kernel void Skein(__global ulong *states, __global uint *BranchBuf, __global uint *output, ulong Target, uint Threads) -void xmrig::CnBranchKernel::setArgs(cl_mem states, cl_mem branch, cl_mem output, uint32_t threads) +void xmlcore::CnBranchKernel::setArgs(cl_mem states, cl_mem branch, cl_mem output, uint32_t threads) { setArg(0, sizeof(cl_mem), &states); setArg(1, sizeof(cl_mem), &branch); @@ -61,7 +61,7 @@ void xmrig::CnBranchKernel::setArgs(cl_mem states, cl_mem branch, cl_mem output, } -void xmrig::CnBranchKernel::setTarget(uint64_t target) +void xmlcore::CnBranchKernel::setTarget(uint64_t target) { setArg(3, sizeof(cl_ulong), &target); } diff --git a/src/backend/opencl/kernels/CnBranchKernel.h b/src/backend/opencl/kernels/CnBranchKernel.h index a52c928d..6bc96ae8 100644 --- a/src/backend/opencl/kernels/CnBranchKernel.h +++ b/src/backend/opencl/kernels/CnBranchKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CNBRANCHKERNEL_H -#define XMRIG_CNBRANCHKERNEL_H +#ifndef xmlcore_CNBRANCHKERNEL_H +#define xmlcore_CNBRANCHKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class CnBranchKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CNBRANCHKERNEL_H */ +#endif /* xmlcore_CNBRANCHKERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.cpp index 95f65d32..2f372e06 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,13 +27,13 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_FilterKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::AstroBWT_FilterKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { enqueueNDRange(queue, 1, nullptr, &threads, &workgroup_size); } -void xmrig::AstroBWT_FilterKernel::setArgs(uint32_t nonce, uint32_t bwt_max_size, cl_mem hashes, cl_mem filtered_hashes) +void xmlcore::AstroBWT_FilterKernel::setArgs(uint32_t nonce, uint32_t bwt_max_size, cl_mem hashes, cl_mem filtered_hashes) { setArg(0, sizeof(uint32_t), &nonce); setArg(1, sizeof(uint32_t), &bwt_max_size); diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.h index 60a748de..919aacf6 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_FilterKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWT_FILTERKERNEL_H -#define XMRIG_ASTROBWT_FILTERKERNEL_H +#ifndef xmlcore_ASTROBWT_FILTERKERNEL_H +#define xmlcore_ASTROBWT_FILTERKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_FilterKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWT_FILTERKERNEL_H */ +#endif /* xmlcore_ASTROBWT_FILTERKERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.cpp index 4f3d8aee..b8376c6a 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,13 +27,13 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_FindSharesKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::AstroBWT_FindSharesKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { enqueueNDRange(queue, 1, nullptr, &threads, &workgroup_size); } -void xmrig::AstroBWT_FindSharesKernel::setArgs(cl_mem hashes, cl_mem filtered_hashes, cl_mem shares) +void xmlcore::AstroBWT_FindSharesKernel::setArgs(cl_mem hashes, cl_mem filtered_hashes, cl_mem shares) { setArg(0, sizeof(cl_mem), &hashes); setArg(1, sizeof(cl_mem), &filtered_hashes); @@ -41,7 +41,7 @@ void xmrig::AstroBWT_FindSharesKernel::setArgs(cl_mem hashes, cl_mem filtered_ha } -void xmrig::AstroBWT_FindSharesKernel::setTarget(uint64_t target) +void xmlcore::AstroBWT_FindSharesKernel::setTarget(uint64_t target) { setArg(2, sizeof(uint64_t), &target); } diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.h index 6645cc56..e63e9998 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_FindSharesKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWTFINDSHARESKERNEL_H -#define XMRIG_ASTROBWTFINDSHARESKERNEL_H +#ifndef xmlcore_ASTROBWTFINDSHARESKERNEL_H +#define xmlcore_ASTROBWTFINDSHARESKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_FindSharesKernel : public OclKernel @@ -43,7 +43,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWTFINDSHARESKERNEL_H */ +#endif /* xmlcore_ASTROBWTFINDSHARESKERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.cpp index c08562a6..44733c5f 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +27,14 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_MainKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::AstroBWT_MainKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { const size_t gthreads = threads * workgroup_size; enqueueNDRange(queue, 1, nullptr, >hreads, &workgroup_size); } -void xmrig::AstroBWT_MainKernel::setArgs(cl_mem inputs, cl_mem input_sizes, uint32_t input_stride, cl_mem indices, cl_mem tmp_indices) +void xmlcore::AstroBWT_MainKernel::setArgs(cl_mem inputs, cl_mem input_sizes, uint32_t input_stride, cl_mem indices, cl_mem tmp_indices) { setArg(0, sizeof(cl_mem), &inputs); setArg(1, sizeof(cl_mem), &input_sizes); diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.h index 812256eb..367c537b 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_MainKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWT_MAINKERNEL_H -#define XMRIG_ASTROBWT_MAINKERNEL_H +#ifndef xmlcore_ASTROBWT_MAINKERNEL_H +#define xmlcore_ASTROBWT_MAINKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_MainKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWT_MAINKERNEL_H */ +#endif /* xmlcore_ASTROBWT_MAINKERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.cpp index 962e4821..66e38ccc 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,13 +27,13 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_PrepareBatch2Kernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::AstroBWT_PrepareBatch2Kernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { enqueueNDRange(queue, 1, nullptr, &threads, &workgroup_size); } -void xmrig::AstroBWT_PrepareBatch2Kernel::setArgs(cl_mem hashes, cl_mem filtered_hashes, cl_mem bwt_data_sizes) +void xmlcore::AstroBWT_PrepareBatch2Kernel::setArgs(cl_mem hashes, cl_mem filtered_hashes, cl_mem bwt_data_sizes) { setArg(0, sizeof(cl_mem), &hashes); setArg(1, sizeof(cl_mem), &filtered_hashes); diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.h index 8dd1f983..e33c3977 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_PrepareBatch2Kernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWT_PREPAREBATCH2KERNEL_H -#define XMRIG_ASTROBWT_PREPAREBATCH2KERNEL_H +#ifndef xmlcore_ASTROBWT_PREPAREBATCH2KERNEL_H +#define xmlcore_ASTROBWT_PREPAREBATCH2KERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_PrepareBatch2Kernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWT_PREPAREBATCH2KERNEL_H */ +#endif /* xmlcore_ASTROBWT_PREPAREBATCH2KERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.cpp index ac80ae10..c6b8c17e 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_SHA3InitialKernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::AstroBWT_SHA3InitialKernel::enqueue(cl_command_queue queue, size_t threads) { const size_t workgroup_size = 32; const size_t gthreads = threads * workgroup_size; @@ -35,7 +35,7 @@ void xmrig::AstroBWT_SHA3InitialKernel::enqueue(cl_command_queue queue, size_t t } -void xmrig::AstroBWT_SHA3InitialKernel::setArgs(cl_mem input, uint32_t input_size, uint32_t nonce, cl_mem output_salsa20_keys) +void xmlcore::AstroBWT_SHA3InitialKernel::setArgs(cl_mem input, uint32_t input_size, uint32_t nonce, cl_mem output_salsa20_keys) { setArg(0, sizeof(cl_mem), &input); setArg(1, sizeof(uint32_t), &input_size); diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.h index ad6486c5..639a4a42 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3InitialKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWT_SHA3INITIALKERNEL_H -#define XMRIG_ASTROBWT_SHA3INITIALKERNEL_H +#ifndef xmlcore_ASTROBWT_SHA3INITIALKERNEL_H +#define xmlcore_ASTROBWT_SHA3INITIALKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_SHA3InitialKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWT_SHA3INITIALKERNEL_H */ +#endif /* xmlcore_ASTROBWT_SHA3INITIALKERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.cpp index 323505cb..6f6d9bc8 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_SHA3Kernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::AstroBWT_SHA3Kernel::enqueue(cl_command_queue queue, size_t threads) { const size_t workgroup_size = 32; const size_t gthreads = threads * workgroup_size; @@ -35,7 +35,7 @@ void xmrig::AstroBWT_SHA3Kernel::enqueue(cl_command_queue queue, size_t threads) } -void xmrig::AstroBWT_SHA3Kernel::setArgs(cl_mem inputs, cl_mem input_sizes, uint32_t input_stride, cl_mem output_salsa20_keys) +void xmlcore::AstroBWT_SHA3Kernel::setArgs(cl_mem inputs, cl_mem input_sizes, uint32_t input_stride, cl_mem output_salsa20_keys) { setArg(0, sizeof(cl_mem), &inputs); setArg(1, sizeof(cl_mem), &input_sizes); diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.h index 62dc1a1a..92f7fe3a 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_SHA3Kernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWT_SHA3KERNEL_H -#define XMRIG_ASTROBWT_SHA3KERNEL_H +#ifndef xmlcore_ASTROBWT_SHA3KERNEL_H +#define xmlcore_ASTROBWT_SHA3KERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_SHA3Kernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWT_SHA3KERNEL_H */ +#endif /* xmlcore_ASTROBWT_SHA3KERNEL_H */ diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.cpp b/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.cpp index 8a0ae9ae..217e425f 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.cpp +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +27,14 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::AstroBWT_Salsa20Kernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::AstroBWT_Salsa20Kernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { const size_t gthreads = threads * workgroup_size; enqueueNDRange(queue, 1, nullptr, >hreads, &workgroup_size); } -void xmrig::AstroBWT_Salsa20Kernel::setArgs(cl_mem salsa20_keys, cl_mem outputs, cl_mem output_sizes, uint32_t output_stride) +void xmlcore::AstroBWT_Salsa20Kernel::setArgs(cl_mem salsa20_keys, cl_mem outputs, cl_mem output_sizes, uint32_t output_stride) { setArg(0, sizeof(cl_mem), &salsa20_keys); setArg(1, sizeof(cl_mem), &outputs); diff --git a/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.h b/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.h index 945b1fd6..8184e73d 100644 --- a/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.h +++ b/src/backend/opencl/kernels/astrobwt/AstroBWT_Salsa20Kernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASTROBWT_SALSA20KERNEL_H -#define XMRIG_ASTROBWT_SALSA20KERNEL_H +#ifndef xmlcore_ASTROBWT_SALSA20KERNEL_H +#define xmlcore_ASTROBWT_SALSA20KERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_Salsa20Kernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASTROBWT_SALSA20KERNEL_H */ +#endif /* xmlcore_ASTROBWT_SALSA20KERNEL_H */ diff --git a/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.cpp b/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.cpp index 0130a37d..ec725d51 100644 --- a/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.cpp +++ b/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,13 +28,13 @@ #include "crypto/kawpow/KPCache.h" -void xmrig::KawPow_CalculateDAGKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::KawPow_CalculateDAGKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { enqueueNDRange(queue, 1, nullptr, &threads, &workgroup_size); } -void xmrig::KawPow_CalculateDAGKernel::setArgs(uint32_t start, cl_mem g_light, cl_mem g_dag, uint32_t dag_words, uint32_t light_words) +void xmlcore::KawPow_CalculateDAGKernel::setArgs(uint32_t start, cl_mem g_light, cl_mem g_dag, uint32_t dag_words, uint32_t light_words) { setArg(0, sizeof(start), &start); setArg(1, sizeof(g_light), &g_light); diff --git a/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.h b/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.h index 042b768f..5a9ed211 100644 --- a/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.h +++ b/src/backend/opencl/kernels/kawpow/KawPow_CalculateDAGKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_KAWPOW_CALCULATEDAGKERNEL_H -#define XMRIG_KAWPOW_CALCULATEDAGKERNEL_H +#ifndef xmlcore_KAWPOW_CALCULATEDAGKERNEL_H +#define xmlcore_KAWPOW_CALCULATEDAGKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class KawPow_CalculateDAGKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_KAWPOW_CALCULATEDAGKERNEL_H */ +#endif /* xmlcore_KAWPOW_CALCULATEDAGKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.cpp b/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.cpp index 1b60d31b..1c54868b 100644 --- a/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.cpp +++ b/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::Blake2bHashRegistersKernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::Blake2bHashRegistersKernel::enqueue(cl_command_queue queue, size_t threads) { const size_t gthreads = threads; static const size_t lthreads = 64; @@ -38,7 +38,7 @@ void xmrig::Blake2bHashRegistersKernel::enqueue(cl_command_queue queue, size_t t // __kernel void blake2b_hash_registers_32(__global void *out, __global const void* in, uint inStrideBytes) // __kernel void blake2b_hash_registers_64(__global void *out, __global const void* in, uint inStrideBytes) -void xmrig::Blake2bHashRegistersKernel::setArgs(cl_mem out, cl_mem in, uint32_t inStrideBytes) +void xmlcore::Blake2bHashRegistersKernel::setArgs(cl_mem out, cl_mem in, uint32_t inStrideBytes) { setArg(0, sizeof(cl_mem), &out); setArg(1, sizeof(cl_mem), &in); diff --git a/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.h b/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.h index 538033a0..d7c48693 100644 --- a/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.h +++ b/src/backend/opencl/kernels/rx/Blake2bHashRegistersKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BLAKE2BHASHREGISTERSKERNEL_H -#define XMRIG_BLAKE2BHASHREGISTERSKERNEL_H +#ifndef xmlcore_BLAKE2BHASHREGISTERSKERNEL_H +#define xmlcore_BLAKE2BHASHREGISTERSKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class Blake2bHashRegistersKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BLAKE2BHASHREGISTERSKERNEL_H */ +#endif /* xmlcore_BLAKE2BHASHREGISTERSKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.cpp b/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.cpp index 7b6126e0..120c96d9 100644 --- a/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.cpp +++ b/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::Blake2bInitialHashKernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::Blake2bInitialHashKernel::enqueue(cl_command_queue queue, size_t threads) { const size_t gthreads = threads; static const size_t lthreads = 64; @@ -37,14 +37,14 @@ void xmrig::Blake2bInitialHashKernel::enqueue(cl_command_queue queue, size_t thr // __kernel void blake2b_initial_hash(__global void *out, __global const void* blockTemplate, uint blockTemplateSize, uint start_nonce) -void xmrig::Blake2bInitialHashKernel::setArgs(cl_mem out, cl_mem blockTemplate) +void xmlcore::Blake2bInitialHashKernel::setArgs(cl_mem out, cl_mem blockTemplate) { setArg(0, sizeof(cl_mem), &out); setArg(1, sizeof(cl_mem), &blockTemplate); } -void xmrig::Blake2bInitialHashKernel::setBlobSize(size_t size) +void xmlcore::Blake2bInitialHashKernel::setBlobSize(size_t size) { const uint32_t s = size; @@ -52,7 +52,7 @@ void xmrig::Blake2bInitialHashKernel::setBlobSize(size_t size) } -void xmrig::Blake2bInitialHashKernel::setNonce(uint32_t nonce) +void xmlcore::Blake2bInitialHashKernel::setNonce(uint32_t nonce) { setArg(3, sizeof(uint32_t), &nonce); } diff --git a/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.h b/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.h index 2eb6627b..a5b4e2f4 100644 --- a/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.h +++ b/src/backend/opencl/kernels/rx/Blake2bInitialHashKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BLAKE2BINITIALHASHKERNEL_H -#define XMRIG_BLAKE2BINITIALHASHKERNEL_H +#ifndef xmlcore_BLAKE2BINITIALHASHKERNEL_H +#define xmlcore_BLAKE2BINITIALHASHKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class Blake2bInitialHashKernel : public OclKernel @@ -44,7 +44,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BLAKE2BINITIALHASHKERNEL_H */ +#endif /* xmlcore_BLAKE2BINITIALHASHKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/ExecuteVmKernel.cpp b/src/backend/opencl/kernels/rx/ExecuteVmKernel.cpp index 2963ce6e..2d579655 100644 --- a/src/backend/opencl/kernels/rx/ExecuteVmKernel.cpp +++ b/src/backend/opencl/kernels/rx/ExecuteVmKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::ExecuteVmKernel::enqueue(cl_command_queue queue, size_t threads, size_t worksize) +void xmlcore::ExecuteVmKernel::enqueue(cl_command_queue queue, size_t threads, size_t worksize) { const size_t gthreads = (worksize == 16) ? (threads * 16) : (threads * 8); const size_t lthreads = (worksize == 16) ? 32 : 16; @@ -37,7 +37,7 @@ void xmrig::ExecuteVmKernel::enqueue(cl_command_queue queue, size_t threads, siz // __kernel void execute_vm(__global void* vm_states, __global void* rounding, __global void* scratchpads, __global const void* dataset_ptr, uint32_t batch_size, uint32_t num_iterations, uint32_t first, uint32_t last) -void xmrig::ExecuteVmKernel::setArgs(cl_mem vm_states, cl_mem rounding, cl_mem scratchpads, cl_mem dataset_ptr, uint32_t batch_size) +void xmlcore::ExecuteVmKernel::setArgs(cl_mem vm_states, cl_mem rounding, cl_mem scratchpads, cl_mem dataset_ptr, uint32_t batch_size) { setArg(0, sizeof(cl_mem), &vm_states); setArg(1, sizeof(cl_mem), &rounding); @@ -47,13 +47,13 @@ void xmrig::ExecuteVmKernel::setArgs(cl_mem vm_states, cl_mem rounding, cl_mem s } -void xmrig::ExecuteVmKernel::setFirst(uint32_t first) +void xmlcore::ExecuteVmKernel::setFirst(uint32_t first) { setArg(6, sizeof(uint32_t), &first); } -void xmrig::ExecuteVmKernel::setIterations(uint32_t num_iterations) +void xmlcore::ExecuteVmKernel::setIterations(uint32_t num_iterations) { setArg(5, sizeof(uint32_t), &num_iterations); setFirst(1); @@ -61,7 +61,7 @@ void xmrig::ExecuteVmKernel::setIterations(uint32_t num_iterations) } -void xmrig::ExecuteVmKernel::setLast(uint32_t last) +void xmlcore::ExecuteVmKernel::setLast(uint32_t last) { setArg(7, sizeof(uint32_t), &last); } diff --git a/src/backend/opencl/kernels/rx/ExecuteVmKernel.h b/src/backend/opencl/kernels/rx/ExecuteVmKernel.h index 4ab5813f..6568216e 100644 --- a/src/backend/opencl/kernels/rx/ExecuteVmKernel.h +++ b/src/backend/opencl/kernels/rx/ExecuteVmKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_EXECUTEVMKERNEL_H -#define XMRIG_EXECUTEVMKERNEL_H +#ifndef xmlcore_EXECUTEVMKERNEL_H +#define xmlcore_EXECUTEVMKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class ExecuteVmKernel : public OclKernel @@ -45,7 +45,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_EXECUTEVMKERNEL_H */ +#endif /* xmlcore_EXECUTEVMKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/FillAesKernel.cpp b/src/backend/opencl/kernels/rx/FillAesKernel.cpp index b196b406..f2941ace 100644 --- a/src/backend/opencl/kernels/rx/FillAesKernel.cpp +++ b/src/backend/opencl/kernels/rx/FillAesKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::FillAesKernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::FillAesKernel::enqueue(cl_command_queue queue, size_t threads) { const size_t gthreads = threads * 4; static const size_t lthreads = 64; @@ -38,7 +38,7 @@ void xmrig::FillAesKernel::enqueue(cl_command_queue queue, size_t threads) // __kernel void fillAes1Rx4_scratchpad(__global void* state, __global void* out, uint batch_size, uint rx_version) // __kernel void fillAes4Rx4_entropy(__global void* state, __global void* out, uint batch_size, uint rx_version) -void xmrig::FillAesKernel::setArgs(cl_mem state, cl_mem out, uint32_t batch_size, uint32_t rx_version) +void xmlcore::FillAesKernel::setArgs(cl_mem state, cl_mem out, uint32_t batch_size, uint32_t rx_version) { setArg(0, sizeof(cl_mem), &state); setArg(1, sizeof(cl_mem), &out); diff --git a/src/backend/opencl/kernels/rx/FillAesKernel.h b/src/backend/opencl/kernels/rx/FillAesKernel.h index 59d7e59c..d951f778 100644 --- a/src/backend/opencl/kernels/rx/FillAesKernel.h +++ b/src/backend/opencl/kernels/rx/FillAesKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_FILLAESKERNEL_H -#define XMRIG_FILLAESKERNEL_H +#ifndef xmlcore_FILLAESKERNEL_H +#define xmlcore_FILLAESKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class FillAesKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_FILLAESKERNEL_H */ +#endif /* xmlcore_FILLAESKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/FindSharesKernel.cpp b/src/backend/opencl/kernels/rx/FindSharesKernel.cpp index 583112ed..ed86dd9a 100644 --- a/src/backend/opencl/kernels/rx/FindSharesKernel.cpp +++ b/src/backend/opencl/kernels/rx/FindSharesKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::FindSharesKernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::FindSharesKernel::enqueue(cl_command_queue queue, size_t threads) { const size_t gthreads = threads; static const size_t lthreads = 64; @@ -37,20 +37,20 @@ void xmrig::FindSharesKernel::enqueue(cl_command_queue queue, size_t threads) // __kernel void find_shares(__global const uint64_t* hashes, uint64_t target, uint32_t start_nonce, __global uint32_t* shares) -void xmrig::FindSharesKernel::setArgs(cl_mem hashes, cl_mem shares) +void xmlcore::FindSharesKernel::setArgs(cl_mem hashes, cl_mem shares) { setArg(0, sizeof(cl_mem), &hashes); setArg(3, sizeof(cl_mem), &shares); } -void xmrig::FindSharesKernel::setTarget(uint64_t target) +void xmlcore::FindSharesKernel::setTarget(uint64_t target) { setArg(1, sizeof(uint64_t), &target); } -void xmrig::FindSharesKernel::setNonce(uint32_t nonce) +void xmlcore::FindSharesKernel::setNonce(uint32_t nonce) { setArg(2, sizeof(uint32_t), &nonce); } diff --git a/src/backend/opencl/kernels/rx/FindSharesKernel.h b/src/backend/opencl/kernels/rx/FindSharesKernel.h index b1fe1427..131a3030 100644 --- a/src/backend/opencl/kernels/rx/FindSharesKernel.h +++ b/src/backend/opencl/kernels/rx/FindSharesKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_FINDSHARESKERNEL_H -#define XMRIG_FINDSHARESKERNEL_H +#ifndef xmlcore_FINDSHARESKERNEL_H +#define xmlcore_FINDSHARESKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class FindSharesKernel : public OclKernel @@ -44,7 +44,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_FINDSHARESKERNEL_H */ +#endif /* xmlcore_FINDSHARESKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/HashAesKernel.cpp b/src/backend/opencl/kernels/rx/HashAesKernel.cpp index 3bdbc8bc..10c739ce 100644 --- a/src/backend/opencl/kernels/rx/HashAesKernel.cpp +++ b/src/backend/opencl/kernels/rx/HashAesKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::HashAesKernel::enqueue(cl_command_queue queue, size_t threads) +void xmlcore::HashAesKernel::enqueue(cl_command_queue queue, size_t threads) { const size_t gthreads = threads * 4; static const size_t lthreads = 64; @@ -37,7 +37,7 @@ void xmrig::HashAesKernel::enqueue(cl_command_queue queue, size_t threads) // __kernel void hashAes1Rx4(__global const void* input, __global void* hash, uint hashOffsetBytes, uint hashStrideBytes, uint batch_size) -void xmrig::HashAesKernel::setArgs(cl_mem input, cl_mem hash, uint32_t hashStrideBytes, uint32_t batch_size) +void xmlcore::HashAesKernel::setArgs(cl_mem input, cl_mem hash, uint32_t hashStrideBytes, uint32_t batch_size) { const uint32_t hashOffsetBytes = 192; diff --git a/src/backend/opencl/kernels/rx/HashAesKernel.h b/src/backend/opencl/kernels/rx/HashAesKernel.h index 41026239..7d363757 100644 --- a/src/backend/opencl/kernels/rx/HashAesKernel.h +++ b/src/backend/opencl/kernels/rx/HashAesKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HASHAESKERNEL_H -#define XMRIG_HASHAESKERNEL_H +#ifndef xmlcore_HASHAESKERNEL_H +#define xmlcore_HASHAESKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class HashAesKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_HASHAESKERNEL_H */ +#endif /* xmlcore_HASHAESKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/InitVmKernel.cpp b/src/backend/opencl/kernels/rx/InitVmKernel.cpp index f221995f..62a6c095 100644 --- a/src/backend/opencl/kernels/rx/InitVmKernel.cpp +++ b/src/backend/opencl/kernels/rx/InitVmKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::InitVmKernel::enqueue(cl_command_queue queue, size_t threads, uint32_t iteration) +void xmlcore::InitVmKernel::enqueue(cl_command_queue queue, size_t threads, uint32_t iteration) { setArg(3, sizeof(uint32_t), &iteration); @@ -39,7 +39,7 @@ void xmrig::InitVmKernel::enqueue(cl_command_queue queue, size_t threads, uint32 // __kernel void init_vm(__global const void* entropy_data, __global void* vm_states, __global uint32_t* rounding, uint32_t iteration) -void xmrig::InitVmKernel::setArgs(cl_mem entropy_data, cl_mem vm_states, cl_mem rounding) +void xmlcore::InitVmKernel::setArgs(cl_mem entropy_data, cl_mem vm_states, cl_mem rounding) { setArg(0, sizeof(cl_mem), &entropy_data); setArg(1, sizeof(cl_mem), &vm_states); diff --git a/src/backend/opencl/kernels/rx/InitVmKernel.h b/src/backend/opencl/kernels/rx/InitVmKernel.h index bba7cf43..5ef424ee 100644 --- a/src/backend/opencl/kernels/rx/InitVmKernel.h +++ b/src/backend/opencl/kernels/rx/InitVmKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_INITVMKERNEL_H -#define XMRIG_INITVMKERNEL_H +#ifndef xmlcore_INITVMKERNEL_H +#define xmlcore_INITVMKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class InitVmKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_INITVMKERNEL_H */ +#endif /* xmlcore_INITVMKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/RxJitKernel.cpp b/src/backend/opencl/kernels/rx/RxJitKernel.cpp index 8a58aa0f..0b0028b1 100644 --- a/src/backend/opencl/kernels/rx/RxJitKernel.cpp +++ b/src/backend/opencl/kernels/rx/RxJitKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +27,7 @@ #include "backend/opencl/wrappers/OclLib.h" -void xmrig::RxJitKernel::enqueue(cl_command_queue queue, size_t threads, uint32_t iteration) +void xmlcore::RxJitKernel::enqueue(cl_command_queue queue, size_t threads, uint32_t iteration) { setArg(6, sizeof(uint32_t), &iteration); @@ -39,7 +39,7 @@ void xmrig::RxJitKernel::enqueue(cl_command_queue queue, size_t threads, uint32_ // __kernel void randomx_jit(__global ulong* entropy, __global ulong* registers, __global uint2* intermediate_programs, __global uint* programs, uint batch_size, __global uint32_t* rounding, uint32_t iteration) -void xmrig::RxJitKernel::setArgs(cl_mem entropy, cl_mem registers, cl_mem intermediate_programs, cl_mem programs, uint32_t batch_size, cl_mem rounding) +void xmlcore::RxJitKernel::setArgs(cl_mem entropy, cl_mem registers, cl_mem intermediate_programs, cl_mem programs, uint32_t batch_size, cl_mem rounding) { setArg(0, sizeof(cl_mem), &entropy); setArg(1, sizeof(cl_mem), ®isters); diff --git a/src/backend/opencl/kernels/rx/RxJitKernel.h b/src/backend/opencl/kernels/rx/RxJitKernel.h index 12464d87..9bac410c 100644 --- a/src/backend/opencl/kernels/rx/RxJitKernel.h +++ b/src/backend/opencl/kernels/rx/RxJitKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RXJITKERNEL_H -#define XMRIG_RXJITKERNEL_H +#ifndef xmlcore_RXJITKERNEL_H +#define xmlcore_RXJITKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class RxJitKernel : public OclKernel @@ -42,7 +42,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_RXJITKERNEL_H */ +#endif /* xmlcore_RXJITKERNEL_H */ diff --git a/src/backend/opencl/kernels/rx/RxRunKernel.cpp b/src/backend/opencl/kernels/rx/RxRunKernel.cpp index a88068d7..7f0c92ee 100644 --- a/src/backend/opencl/kernels/rx/RxRunKernel.cpp +++ b/src/backend/opencl/kernels/rx/RxRunKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -30,14 +30,14 @@ #include "crypto/rx/RxAlgo.h" -void xmrig::RxRunKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) +void xmlcore::RxRunKernel::enqueue(cl_command_queue queue, size_t threads, size_t workgroup_size) { const size_t gthreads = threads * workgroup_size; enqueueNDRange(queue, 1, nullptr, >hreads, &workgroup_size); } -void xmrig::RxRunKernel::setArgs(cl_mem dataset, cl_mem scratchpads, cl_mem registers, cl_mem rounding, cl_mem programs, uint32_t batch_size, const Algorithm &algorithm) +void xmlcore::RxRunKernel::setArgs(cl_mem dataset, cl_mem scratchpads, cl_mem registers, cl_mem rounding, cl_mem programs, uint32_t batch_size, const Algorithm &algorithm) { setArg(0, sizeof(cl_mem), &dataset); setArg(1, sizeof(cl_mem), &scratchpads); diff --git a/src/backend/opencl/kernels/rx/RxRunKernel.h b/src/backend/opencl/kernels/rx/RxRunKernel.h index dbc2ce09..29532e03 100644 --- a/src/backend/opencl/kernels/rx/RxRunKernel.h +++ b/src/backend/opencl/kernels/rx/RxRunKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RXRUNKERNEL_H -#define XMRIG_RXRUNKERNEL_H +#ifndef xmlcore_RXRUNKERNEL_H +#define xmlcore_RXRUNKERNEL_H #include "backend/opencl/wrappers/OclKernel.h" -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -45,7 +45,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_RXRUNKERNEL_H */ +#endif /* xmlcore_RXRUNKERNEL_H */ diff --git a/src/backend/opencl/opencl.cmake b/src/backend/opencl/opencl.cmake index acaed339..5b04557e 100644 --- a/src/backend/opencl/opencl.cmake +++ b/src/backend/opencl/opencl.cmake @@ -1,4 +1,4 @@ -if (BUILD_STATIC AND XMRIG_OS_UNIX AND WITH_OPENCL) +if (BUILD_STATIC AND xmlcore_OS_UNIX AND WITH_OPENCL) message(WARNING "OpenCL backend is not compatible with static build, use -DWITH_OPENCL=OFF to suppress this warning") set(WITH_OPENCL OFF) @@ -7,7 +7,7 @@ endif() if (WITH_OPENCL) add_definitions(/DCL_TARGET_OPENCL_VERSION=200) add_definitions(/DCL_USE_DEPRECATED_OPENCL_1_2_APIS) - add_definitions(/DXMRIG_FEATURE_OPENCL) + add_definitions(/Dxmlcore_FEATURE_OPENCL) set(HEADERS_BACKEND_OPENCL src/backend/opencl/cl/OclSource.h @@ -147,34 +147,34 @@ if (WITH_OPENCL) endif() if (WITH_STRICT_CACHE) - add_definitions(/DXMRIG_STRICT_OPENCL_CACHE) + add_definitions(/Dxmlcore_STRICT_OPENCL_CACHE) else() - remove_definitions(/DXMRIG_STRICT_OPENCL_CACHE) + remove_definitions(/Dxmlcore_STRICT_OPENCL_CACHE) endif() if (WITH_INTERLEAVE_DEBUG_LOG) - add_definitions(/DXMRIG_INTERLEAVE_DEBUG) + add_definitions(/Dxmlcore_INTERLEAVE_DEBUG) endif() - if (WITH_ADL AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX)) - add_definitions(/DXMRIG_FEATURE_ADL) + if (WITH_ADL AND (xmlcore_OS_WIN OR xmlcore_OS_LINUX)) + add_definitions(/Dxmlcore_FEATURE_ADL) list(APPEND HEADERS_BACKEND_OPENCL src/backend/opencl/wrappers/AdlHealth.h src/backend/opencl/wrappers/AdlLib.h ) - if (XMRIG_OS_WIN) + if (xmlcore_OS_WIN) list(APPEND SOURCES_BACKEND_OPENCL src/backend/opencl/wrappers/AdlLib.cpp) else() list(APPEND SOURCES_BACKEND_OPENCL src/backend/opencl/wrappers/AdlLib_linux.cpp) endif() else() - remove_definitions(/DXMRIG_FEATURE_ADL) + remove_definitions(/Dxmlcore_FEATURE_ADL) endif() else() - remove_definitions(/DXMRIG_FEATURE_OPENCL) - remove_definitions(/DXMRIG_FEATURE_ADL) + remove_definitions(/Dxmlcore_FEATURE_OPENCL) + remove_definitions(/Dxmlcore_FEATURE_ADL) set(HEADERS_BACKEND_OPENCL "") set(SOURCES_BACKEND_OPENCL "") diff --git a/src/backend/opencl/runners/OclAstroBWTRunner.cpp b/src/backend/opencl/runners/OclAstroBWTRunner.cpp index fb9ecb22..87d87da8 100644 --- a/src/backend/opencl/runners/OclAstroBWTRunner.cpp +++ b/src/backend/opencl/runners/OclAstroBWTRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -37,7 +37,7 @@ #include "base/net/stratum/Job.h" -namespace xmrig { +namespace xmlcore { constexpr int STAGE1_SIZE = 147253; @@ -45,10 +45,10 @@ constexpr uint32_t STAGE1_DATA_STRIDE = (STAGE1_SIZE + 256 + 255) & ~255U; constexpr uint32_t OclAstroBWTRunner::BWT_DATA_STRIDE; -} // namespace xmrig +} // namespace xmlcore -xmrig::OclAstroBWTRunner::OclAstroBWTRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) +xmlcore::OclAstroBWTRunner::OclAstroBWTRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) { switch (data.device.type()) { @@ -77,7 +77,7 @@ xmrig::OclAstroBWTRunner::OclAstroBWTRunner(size_t index, const OclLaunchData &d } -xmrig::OclAstroBWTRunner::~OclAstroBWTRunner() +xmlcore::OclAstroBWTRunner::~OclAstroBWTRunner() { delete m_sha3_initial_kernel; delete m_sha3_kernel; @@ -98,7 +98,7 @@ xmrig::OclAstroBWTRunner::~OclAstroBWTRunner() } -size_t xmrig::OclAstroBWTRunner::bufferSize() const +size_t xmlcore::OclAstroBWTRunner::bufferSize() const { return OclBaseRunner::bufferSize() + align(m_batch_size1 * 32) + // m_salsa20_keys @@ -110,7 +110,7 @@ size_t xmrig::OclAstroBWTRunner::bufferSize() const } -void xmrig::OclAstroBWTRunner::run(uint32_t nonce, uint32_t *hashOutput) +void xmlcore::OclAstroBWTRunner::run(uint32_t nonce, uint32_t *hashOutput) { m_sha3_initial_kernel->setArg(2, sizeof(nonce), &nonce); m_salsa20_kernel->setArg(3, sizeof(STAGE1_DATA_STRIDE), &STAGE1_DATA_STRIDE); @@ -164,7 +164,7 @@ void xmrig::OclAstroBWTRunner::run(uint32_t nonce, uint32_t *hashOutput) } -void xmrig::OclAstroBWTRunner::set(const Job &job, uint8_t *blob) +void xmlcore::OclAstroBWTRunner::set(const Job &job, uint8_t *blob) { if (job.size() > (Job::kMaxBlobSize - 4)) { throw std::length_error("job size too big"); @@ -190,7 +190,7 @@ void xmrig::OclAstroBWTRunner::set(const Job &job, uint8_t *blob) } -void xmrig::OclAstroBWTRunner::build() +void xmlcore::OclAstroBWTRunner::build() { OclBaseRunner::build(); @@ -204,7 +204,7 @@ void xmrig::OclAstroBWTRunner::build() } -void xmrig::OclAstroBWTRunner::init() +void xmlcore::OclAstroBWTRunner::init() { OclBaseRunner::init(); diff --git a/src/backend/opencl/runners/OclAstroBWTRunner.h b/src/backend/opencl/runners/OclAstroBWTRunner.h index 5b337e9c..af232916 100644 --- a/src/backend/opencl/runners/OclAstroBWTRunner.h +++ b/src/backend/opencl/runners/OclAstroBWTRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,13 +22,13 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLASTROBWTRUNNER_H -#define XMRIG_OCLASTROBWTRUNNER_H +#ifndef xmlcore_OCLASTROBWTRUNNER_H +#define xmlcore_OCLASTROBWTRUNNER_H #include "backend/opencl/runners/OclBaseRunner.h" -namespace xmrig { +namespace xmlcore { class AstroBWT_FilterKernel; @@ -46,7 +46,7 @@ public: static constexpr uint32_t BWT_DATA_MAX_SIZE = 600 * 1024 - 256; static constexpr uint32_t BWT_DATA_STRIDE = (BWT_DATA_MAX_SIZE + 256 + 255) & ~255U; - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclAstroBWTRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclAstroBWTRunner) OclAstroBWTRunner(size_t index, const OclLaunchData &data); ~OclAstroBWTRunner() override; @@ -89,7 +89,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLASTROBWTRUNNER_H +#endif // xmlcore_OCLASTROBWTRUNNER_H diff --git a/src/backend/opencl/runners/OclBaseRunner.cpp b/src/backend/opencl/runners/OclBaseRunner.cpp index 9e2a48a9..fdfdf1f2 100644 --- a/src/backend/opencl/runners/OclBaseRunner.cpp +++ b/src/backend/opencl/runners/OclBaseRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -38,7 +38,7 @@ constexpr size_t oneGiB = 1024 * 1024 * 1024; -xmrig::OclBaseRunner::OclBaseRunner(size_t id, const OclLaunchData &data) : +xmlcore::OclBaseRunner::OclBaseRunner(size_t id, const OclLaunchData &data) : m_ctx(data.ctx), m_algorithm(data.algorithm), m_source(OclSource::get(data.algorithm)), @@ -49,7 +49,7 @@ xmrig::OclBaseRunner::OclBaseRunner(size_t id, const OclLaunchData &data) : { m_deviceKey = data.device.name(); -# ifdef XMRIG_STRICT_OPENCL_CACHE +# ifdef xmlcore_STRICT_OPENCL_CACHE m_deviceKey += ":"; m_deviceKey += data.platform.version(); @@ -63,7 +63,7 @@ xmrig::OclBaseRunner::OclBaseRunner(size_t id, const OclLaunchData &data) : } -xmrig::OclBaseRunner::~OclBaseRunner() +xmlcore::OclBaseRunner::~OclBaseRunner() { OclLib::release(m_program); OclLib::release(m_input); @@ -73,19 +73,19 @@ xmrig::OclBaseRunner::~OclBaseRunner() } -size_t xmrig::OclBaseRunner::bufferSize() const +size_t xmlcore::OclBaseRunner::bufferSize() const { return align(Job::kMaxBlobSize) + align(sizeof(cl_uint) * 0x100); } -uint32_t xmrig::OclBaseRunner::deviceIndex() const +uint32_t xmlcore::OclBaseRunner::deviceIndex() const { return data().thread.index(); } -void xmrig::OclBaseRunner::build() +void xmlcore::OclBaseRunner::build() { m_program = OclCache::build(this); @@ -95,7 +95,7 @@ void xmrig::OclBaseRunner::build() } -void xmrig::OclBaseRunner::init() +void xmlcore::OclBaseRunner::init() { m_queue = OclLib::createCommandQueue(m_ctx, data().device.id()); @@ -115,7 +115,7 @@ void xmrig::OclBaseRunner::init() } -cl_mem xmrig::OclBaseRunner::createSubBuffer(cl_mem_flags flags, size_t size) +cl_mem xmlcore::OclBaseRunner::createSubBuffer(cl_mem_flags flags, size_t size) { auto mem = OclLib::createSubBuffer(m_buffer, flags, m_offset, size); @@ -125,13 +125,13 @@ cl_mem xmrig::OclBaseRunner::createSubBuffer(cl_mem_flags flags, size_t size) } -size_t xmrig::OclBaseRunner::align(size_t size) const +size_t xmlcore::OclBaseRunner::align(size_t size) const { return VirtualMemory::align(size, m_align); } -void xmrig::OclBaseRunner::enqueueReadBuffer(cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void *ptr) +void xmlcore::OclBaseRunner::enqueueReadBuffer(cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void *ptr) { const cl_int ret = OclLib::enqueueReadBuffer(m_queue, buffer, blocking_read, offset, size, ptr, 0, nullptr, nullptr); if (ret != CL_SUCCESS) { @@ -140,7 +140,7 @@ void xmrig::OclBaseRunner::enqueueReadBuffer(cl_mem buffer, cl_bool blocking_rea } -void xmrig::OclBaseRunner::enqueueWriteBuffer(cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void *ptr) +void xmlcore::OclBaseRunner::enqueueWriteBuffer(cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void *ptr) { const cl_int ret = OclLib::enqueueWriteBuffer(m_queue, buffer, blocking_write, offset, size, ptr, 0, nullptr, nullptr); if (ret != CL_SUCCESS) { @@ -149,7 +149,7 @@ void xmrig::OclBaseRunner::enqueueWriteBuffer(cl_mem buffer, cl_bool blocking_wr } -void xmrig::OclBaseRunner::finalize(uint32_t *hashOutput) +void xmlcore::OclBaseRunner::finalize(uint32_t *hashOutput) { enqueueReadBuffer(m_output, CL_TRUE, 0, sizeof(cl_uint) * 0x100, hashOutput); diff --git a/src/backend/opencl/runners/OclBaseRunner.h b/src/backend/opencl/runners/OclBaseRunner.h index c2e3202b..c28431d6 100644 --- a/src/backend/opencl/runners/OclBaseRunner.h +++ b/src/backend/opencl/runners/OclBaseRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLBASERUNNER_H -#define XMRIG_OCLBASERUNNER_H +#ifndef xmlcore_OCLBASERUNNER_H +#define xmlcore_OCLBASERUNNER_H #include @@ -34,7 +34,7 @@ #include "base/crypto/Algorithm.h" -namespace xmrig { +namespace xmlcore { class OclLaunchData; @@ -43,7 +43,7 @@ class OclLaunchData; class OclBaseRunner : public IOclRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclBaseRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclBaseRunner) OclBaseRunner(size_t id, const OclLaunchData &data); ~OclBaseRunner() override; @@ -91,7 +91,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLBASERUNNER_H +#endif // xmlcore_OCLBASERUNNER_H diff --git a/src/backend/opencl/runners/OclCnRunner.cpp b/src/backend/opencl/runners/OclCnRunner.cpp index 92038f0f..55956979 100644 --- a/src/backend/opencl/runners/OclCnRunner.cpp +++ b/src/backend/opencl/runners/OclCnRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -36,7 +36,7 @@ #include "crypto/cn/CnAlgo.h" -xmrig::OclCnRunner::OclCnRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) +xmlcore::OclCnRunner::OclCnRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) { uint32_t stridedIndex = data.thread.stridedIndex(); if (data.device.vendorId() == OCL_VENDOR_NVIDIA) { @@ -59,7 +59,7 @@ xmrig::OclCnRunner::OclCnRunner(size_t index, const OclLaunchData &data) : OclBa } -xmrig::OclCnRunner::~OclCnRunner() +xmlcore::OclCnRunner::~OclCnRunner() { delete m_cn0; delete m_cn1; @@ -80,7 +80,7 @@ xmrig::OclCnRunner::~OclCnRunner() } -size_t xmrig::OclCnRunner::bufferSize() const +size_t xmlcore::OclCnRunner::bufferSize() const { return OclBaseRunner::bufferSize() + align(m_algorithm.l3() * m_intensity) + @@ -89,7 +89,7 @@ size_t xmrig::OclCnRunner::bufferSize() const } -void xmrig::OclCnRunner::run(uint32_t nonce, uint32_t *hashOutput) +void xmlcore::OclCnRunner::run(uint32_t nonce, uint32_t *hashOutput) { static const cl_uint zero = 0; @@ -116,7 +116,7 @@ void xmrig::OclCnRunner::run(uint32_t nonce, uint32_t *hashOutput) } -void xmrig::OclCnRunner::set(const Job &job, uint8_t *blob) +void xmlcore::OclCnRunner::set(const Job &job, uint8_t *blob) { if (job.size() > (Job::kMaxBlobSize - 4)) { throw std::length_error("job size too big"); @@ -153,7 +153,7 @@ void xmrig::OclCnRunner::set(const Job &job, uint8_t *blob) } -void xmrig::OclCnRunner::build() +void xmlcore::OclCnRunner::build() { OclBaseRunner::build(); @@ -177,7 +177,7 @@ void xmrig::OclCnRunner::build() } -void xmrig::OclCnRunner::init() +void xmlcore::OclCnRunner::init() { OclBaseRunner::init(); diff --git a/src/backend/opencl/runners/OclCnRunner.h b/src/backend/opencl/runners/OclCnRunner.h index bae581ce..671bb125 100644 --- a/src/backend/opencl/runners/OclCnRunner.h +++ b/src/backend/opencl/runners/OclCnRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLCNRUNNER_H -#define XMRIG_OCLCNRUNNER_H +#ifndef xmlcore_OCLCNRUNNER_H +#define xmlcore_OCLCNRUNNER_H #include "backend/opencl/runners/OclBaseRunner.h" -namespace xmrig { +namespace xmlcore { class Cn0Kernel; @@ -41,7 +41,7 @@ class CnBranchKernel; class OclCnRunner : public OclBaseRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclCnRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclCnRunner) OclCnRunner(size_t index, const OclLaunchData &data); ~OclCnRunner() override; @@ -76,7 +76,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLCNRUNNER_H +#endif // xmlcore_OCLCNRUNNER_H diff --git a/src/backend/opencl/runners/OclKawPowRunner.cpp b/src/backend/opencl/runners/OclKawPowRunner.cpp index fcc0058b..304e2e75 100644 --- a/src/backend/opencl/runners/OclKawPowRunner.cpp +++ b/src/backend/opencl/runners/OclKawPowRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -40,7 +40,7 @@ #include "crypto/kawpow/KPHash.h" -namespace xmrig { +namespace xmlcore { constexpr size_t BLOB_SIZE = 40; @@ -194,7 +194,7 @@ void OclKawPowRunner::jobEarlyNotification(const Job&) } -void xmrig::OclKawPowRunner::build() +void xmlcore::OclKawPowRunner::build() { OclBaseRunner::build(); @@ -202,7 +202,7 @@ void xmrig::OclKawPowRunner::build() } -void xmrig::OclKawPowRunner::init() +void xmlcore::OclKawPowRunner::init() { OclBaseRunner::init(); @@ -210,4 +210,4 @@ void xmrig::OclKawPowRunner::init() m_stop = OclLib::createBuffer(m_ctx, CL_MEM_READ_ONLY, sizeof(uint32_t) * 2); } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/runners/OclKawPowRunner.h b/src/backend/opencl/runners/OclKawPowRunner.h index a88414e5..0cbd8c3a 100644 --- a/src/backend/opencl/runners/OclKawPowRunner.h +++ b/src/backend/opencl/runners/OclKawPowRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLKAWPOWRUNNER_H -#define XMRIG_OCLKAWPOWRUNNER_H +#ifndef xmlcore_OCLKAWPOWRUNNER_H +#define xmlcore_OCLKAWPOWRUNNER_H #include "backend/opencl/runners/OclBaseRunner.h" @@ -31,7 +31,7 @@ #include -namespace xmrig { +namespace xmlcore { class KawPow_CalculateDAGKernel; @@ -40,7 +40,7 @@ class KawPow_CalculateDAGKernel; class OclKawPowRunner : public OclBaseRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclKawPowRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclKawPowRunner) OclKawPowRunner(size_t index, const OclLaunchData &data); ~OclKawPowRunner() override; @@ -79,7 +79,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLKAWPOWRUNNER_H +#endif // xmlcore_OCLKAWPOWRUNNER_H diff --git a/src/backend/opencl/runners/OclRxBaseRunner.cpp b/src/backend/opencl/runners/OclRxBaseRunner.cpp index 2a8cf6f9..418ad2bc 100644 --- a/src/backend/opencl/runners/OclRxBaseRunner.cpp +++ b/src/backend/opencl/runners/OclRxBaseRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -37,7 +37,7 @@ #include "crypto/rx/RxDataset.h" -xmrig::OclRxBaseRunner::OclRxBaseRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) +xmlcore::OclRxBaseRunner::OclRxBaseRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) { switch (data.thread.worksize()) { case 2: @@ -65,7 +65,7 @@ xmrig::OclRxBaseRunner::OclRxBaseRunner(size_t index, const OclLaunchData &data) } -xmrig::OclRxBaseRunner::~OclRxBaseRunner() +xmlcore::OclRxBaseRunner::~OclRxBaseRunner() { delete m_fillAes1Rx4_scratchpad; delete m_fillAes4Rx4_entropy; @@ -83,7 +83,7 @@ xmrig::OclRxBaseRunner::~OclRxBaseRunner() } -void xmrig::OclRxBaseRunner::run(uint32_t nonce, uint32_t *hashOutput) +void xmlcore::OclRxBaseRunner::run(uint32_t nonce, uint32_t *hashOutput) { static const uint32_t zero = 0; @@ -119,7 +119,7 @@ void xmrig::OclRxBaseRunner::run(uint32_t nonce, uint32_t *hashOutput) } -void xmrig::OclRxBaseRunner::set(const Job &job, uint8_t *blob) +void xmlcore::OclRxBaseRunner::set(const Job &job, uint8_t *blob) { if (!data().thread.isDatasetHost() && m_seed != job.seed()) { m_seed = job.seed(); @@ -139,7 +139,7 @@ void xmrig::OclRxBaseRunner::set(const Job &job, uint8_t *blob) } -size_t xmrig::OclRxBaseRunner::bufferSize() const +size_t xmlcore::OclRxBaseRunner::bufferSize() const { return OclBaseRunner::bufferSize() + align((m_algorithm.l3() + 64) * m_intensity) + @@ -149,7 +149,7 @@ size_t xmrig::OclRxBaseRunner::bufferSize() const } -void xmrig::OclRxBaseRunner::build() +void xmlcore::OclRxBaseRunner::build() { OclBaseRunner::build(); @@ -174,7 +174,7 @@ void xmrig::OclRxBaseRunner::build() } -void xmrig::OclRxBaseRunner::init() +void xmlcore::OclRxBaseRunner::init() { OclBaseRunner::init(); diff --git a/src/backend/opencl/runners/OclRxBaseRunner.h b/src/backend/opencl/runners/OclRxBaseRunner.h index f0d594c8..4b25951b 100644 --- a/src/backend/opencl/runners/OclRxBaseRunner.h +++ b/src/backend/opencl/runners/OclRxBaseRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,15 +22,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLRXBASERUNNER_H -#define XMRIG_OCLRXBASERUNNER_H +#ifndef xmlcore_OCLRXBASERUNNER_H +#define xmlcore_OCLRXBASERUNNER_H #include "backend/opencl/runners/OclBaseRunner.h" #include "base/tools/Buffer.h" -namespace xmrig { +namespace xmlcore { class Blake2bHashRegistersKernel; @@ -43,7 +43,7 @@ class HashAesKernel; class OclRxBaseRunner : public OclBaseRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclRxBaseRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclRxBaseRunner) OclRxBaseRunner(size_t index, const OclLaunchData &data); ~OclRxBaseRunner() override; @@ -76,7 +76,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLRXBASERUNNER_H +#endif // xmlcore_OCLRXBASERUNNER_H diff --git a/src/backend/opencl/runners/OclRxJitRunner.cpp b/src/backend/opencl/runners/OclRxJitRunner.cpp index 84d84c49..32a11914 100644 --- a/src/backend/opencl/runners/OclRxJitRunner.cpp +++ b/src/backend/opencl/runners/OclRxJitRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -35,12 +35,12 @@ #include "backend/opencl/wrappers/OclError.h" -xmrig::OclRxJitRunner::OclRxJitRunner(size_t index, const OclLaunchData &data) : OclRxBaseRunner(index, data) +xmlcore::OclRxJitRunner::OclRxJitRunner(size_t index, const OclLaunchData &data) : OclRxBaseRunner(index, data) { } -xmrig::OclRxJitRunner::~OclRxJitRunner() +xmlcore::OclRxJitRunner::~OclRxJitRunner() { delete m_randomx_jit; delete m_randomx_run; @@ -52,13 +52,13 @@ xmrig::OclRxJitRunner::~OclRxJitRunner() } -size_t xmrig::OclRxJitRunner::bufferSize() const +size_t xmlcore::OclRxJitRunner::bufferSize() const { return OclRxBaseRunner::bufferSize() + align(256 * m_intensity) + align(5120 * m_intensity) + align(10048 * m_intensity); } -void xmrig::OclRxJitRunner::build() +void xmlcore::OclRxJitRunner::build() { OclRxBaseRunner::build(); @@ -78,7 +78,7 @@ void xmrig::OclRxJitRunner::build() } -void xmrig::OclRxJitRunner::execute(uint32_t iteration) +void xmlcore::OclRxJitRunner::execute(uint32_t iteration) { m_randomx_jit->enqueue(m_queue, m_intensity, iteration); @@ -88,7 +88,7 @@ void xmrig::OclRxJitRunner::execute(uint32_t iteration) } -void xmrig::OclRxJitRunner::init() +void xmlcore::OclRxJitRunner::init() { OclRxBaseRunner::init(); @@ -98,7 +98,7 @@ void xmrig::OclRxJitRunner::init() } -bool xmrig::OclRxJitRunner::loadAsmProgram() +bool xmlcore::OclRxJitRunner::loadAsmProgram() { // Adrenaline drivers on Windows and amdgpu-pro drivers on Linux use ELF header's flags (offset 0x30) to store internal device ID // Read it from compiled OpenCL code and substitute this ID into pre-compiled binary to make sure the driver accepts it diff --git a/src/backend/opencl/runners/OclRxJitRunner.h b/src/backend/opencl/runners/OclRxJitRunner.h index 9e43363c..338efd5b 100644 --- a/src/backend/opencl/runners/OclRxJitRunner.h +++ b/src/backend/opencl/runners/OclRxJitRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLRXJITRUNNER_H -#define XMRIG_OCLRXJITRUNNER_H +#ifndef xmlcore_OCLRXJITRUNNER_H +#define xmlcore_OCLRXJITRUNNER_H #include "backend/opencl/runners/OclRxBaseRunner.h" -namespace xmrig { +namespace xmlcore { class RxJitKernel; @@ -39,7 +39,7 @@ class RxRunKernel; class OclRxJitRunner : public OclRxBaseRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclRxJitRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclRxJitRunner) OclRxJitRunner(size_t index, const OclLaunchData &data); ~OclRxJitRunner() override; @@ -62,7 +62,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLRXRUNNER_H +#endif // xmlcore_OCLRXRUNNER_H diff --git a/src/backend/opencl/runners/OclRxVmRunner.cpp b/src/backend/opencl/runners/OclRxVmRunner.cpp index 3a30d561..c9a8821c 100644 --- a/src/backend/opencl/runners/OclRxVmRunner.cpp +++ b/src/backend/opencl/runners/OclRxVmRunner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -36,12 +36,12 @@ #include -xmrig::OclRxVmRunner::OclRxVmRunner(size_t index, const OclLaunchData &data) : OclRxBaseRunner(index, data) +xmlcore::OclRxVmRunner::OclRxVmRunner(size_t index, const OclLaunchData &data) : OclRxBaseRunner(index, data) { } -xmrig::OclRxVmRunner::~OclRxVmRunner() +xmlcore::OclRxVmRunner::~OclRxVmRunner() { delete m_init_vm; delete m_execute_vm; @@ -50,13 +50,13 @@ xmrig::OclRxVmRunner::~OclRxVmRunner() } -size_t xmrig::OclRxVmRunner::bufferSize() const +size_t xmlcore::OclRxVmRunner::bufferSize() const { return OclRxBaseRunner::bufferSize() + (align(2560 * m_intensity)); } -void xmrig::OclRxVmRunner::build() +void xmlcore::OclRxVmRunner::build() { OclRxBaseRunner::build(); @@ -74,7 +74,7 @@ void xmrig::OclRxVmRunner::build() } -void xmrig::OclRxVmRunner::execute(uint32_t iteration) +void xmlcore::OclRxVmRunner::execute(uint32_t iteration) { const uint32_t bfactor = std::min(data().thread.bfactor(), 8u); const uint32_t num_iterations = RxAlgo::programIterations(m_algorithm) >> bfactor; @@ -97,7 +97,7 @@ void xmrig::OclRxVmRunner::execute(uint32_t iteration) } -void xmrig::OclRxVmRunner::init() +void xmlcore::OclRxVmRunner::init() { OclRxBaseRunner::init(); diff --git a/src/backend/opencl/runners/OclRxVmRunner.h b/src/backend/opencl/runners/OclRxVmRunner.h index 8d044e74..0967263b 100644 --- a/src/backend/opencl/runners/OclRxVmRunner.h +++ b/src/backend/opencl/runners/OclRxVmRunner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLRXVMRUNNER_H -#define XMRIG_OCLRXVMRUNNER_H +#ifndef xmlcore_OCLRXVMRUNNER_H +#define xmlcore_OCLRXVMRUNNER_H #include "backend/opencl/runners/OclRxBaseRunner.h" -namespace xmrig { +namespace xmlcore { class ExecuteVmKernel; @@ -39,7 +39,7 @@ class InitVmKernel; class OclRxVmRunner : public OclRxBaseRunner { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclRxVmRunner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclRxVmRunner) OclRxVmRunner(size_t index, const OclLaunchData &data); ~OclRxVmRunner() override; @@ -57,7 +57,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_OCLRXVMRUNNER_H +#endif // xmlcore_OCLRXVMRUNNER_H diff --git a/src/backend/opencl/runners/tools/OclCnR.cpp b/src/backend/opencl/runners/tools/OclCnR.cpp index c27a58f0..1cf6cae4 100644 --- a/src/backend/opencl/runners/tools/OclCnR.cpp +++ b/src/backend/opencl/runners/tools/OclCnR.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -46,7 +46,7 @@ #include -namespace xmrig { +namespace xmlcore { class CnrCacheEntry @@ -238,7 +238,7 @@ private: for (size_t i = 0; i < OclCnR::kHeightChunkSize; ++i) { V4_Instruction code[256]; const int code_size = v4_random_math_init(code, offset + i); - const std::string kernel = std::regex_replace(std::string(cryptonight_r_cl), std::regex("XMRIG_INCLUDE_RANDOM_MATH"), getCode(code, code_size)); + const std::string kernel = std::regex_replace(std::string(cryptonight_r_cl), std::regex("xmlcore_INCLUDE_RANDOM_MATH"), getCode(code, code_size)); source += std::regex_replace(kernel, std::regex("KERNEL_NAME"), "cn1_" + std::to_string(offset + i)); } @@ -268,11 +268,11 @@ static CnrBuilder builder; static std::mutex bg_mutex; -} // namespace xmrig +} // namespace xmlcore -cl_program xmrig::OclCnR::get(const IOclRunner &runner, uint64_t height) +cl_program xmlcore::OclCnR::get(const IOclRunner &runner, uint64_t height) { const uint64_t offset = (height / kHeightChunkSize) * kHeightChunkSize; @@ -300,7 +300,7 @@ cl_program xmrig::OclCnR::get(const IOclRunner &runner, uint64_t height) } -void xmrig::OclCnR::clear() +void xmlcore::OclCnR::clear() { std::lock_guard lock(bg_mutex); diff --git a/src/backend/opencl/runners/tools/OclCnR.h b/src/backend/opencl/runners/tools/OclCnR.h index d4b5bb06..0b75c1cc 100644 --- a/src/backend/opencl/runners/tools/OclCnR.h +++ b/src/backend/opencl/runners/tools/OclCnR.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLCNR_H -#define XMRIG_OCLCNR_H +#ifndef xmlcore_OCLCNR_H +#define xmlcore_OCLCNR_H #include @@ -33,7 +33,7 @@ using cl_program = struct _cl_program *; -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -50,7 +50,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLCNR_H */ +#endif /* xmlcore_OCLCNR_H */ diff --git a/src/backend/opencl/runners/tools/OclKawPow.cpp b/src/backend/opencl/runners/tools/OclKawPow.cpp index 15feeb80..103d84e4 100644 --- a/src/backend/opencl/runners/tools/OclKawPow.cpp +++ b/src/backend/opencl/runners/tools/OclKawPow.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -48,7 +48,7 @@ #include -namespace xmrig { +namespace xmlcore { class KawPowCacheEntry @@ -288,7 +288,7 @@ private: } } - std::string kernel = std::regex_replace(std::string(kawpow_cl), std::regex("XMRIG_INCLUDE_PROGPOW_RANDOM_MATH"), ret.str()); + std::string kernel = std::regex_replace(std::string(kawpow_cl), std::regex("xmlcore_INCLUDE_PROGPOW_RANDOM_MATH"), ret.str()); ret.str(std::string()); ret << merge("mix[0]", "data_dag.s[0]", rnd()); @@ -301,7 +301,7 @@ private: ret << merge(dest, "data_dag.s[" + std::to_string(i) + "]", r); } - kernel = std::regex_replace(kernel, std::regex("XMRIG_INCLUDE_PROGPOW_DATA_LOADS"), ret.str()); + kernel = std::regex_replace(kernel, std::regex("xmlcore_INCLUDE_PROGPOW_DATA_LOADS"), ret.str()); return kernel; } @@ -419,4 +419,4 @@ void OclKawPow::clear() cache.clear(); } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/backend/opencl/runners/tools/OclKawPow.h b/src/backend/opencl/runners/tools/OclKawPow.h index 8d072680..6a925c11 100644 --- a/src/backend/opencl/runners/tools/OclKawPow.h +++ b/src/backend/opencl/runners/tools/OclKawPow.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLKAWPOW_H -#define XMRIG_OCLKAWPOW_H +#ifndef xmlcore_OCLKAWPOW_H +#define xmlcore_OCLKAWPOW_H #include @@ -33,7 +33,7 @@ using cl_kernel = struct _cl_kernel *; -namespace xmrig { +namespace xmlcore { class IOclRunner; @@ -47,7 +47,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLKAWPOW_H */ +#endif /* xmlcore_OCLKAWPOW_H */ diff --git a/src/backend/opencl/runners/tools/OclSharedData.cpp b/src/backend/opencl/runners/tools/OclSharedData.cpp index 38e6a676..cfc480b6 100644 --- a/src/backend/opencl/runners/tools/OclSharedData.cpp +++ b/src/backend/opencl/runners/tools/OclSharedData.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -40,7 +40,7 @@ constexpr size_t oneGiB = 1024 * 1024 * 1024; -cl_mem xmrig::OclSharedData::createBuffer(cl_context context, size_t size, size_t &offset, size_t limit) +cl_mem xmlcore::OclSharedData::createBuffer(cl_context context, size_t size, size_t &offset, size_t limit) { std::lock_guard lock(m_mutex); @@ -62,7 +62,7 @@ cl_mem xmrig::OclSharedData::createBuffer(cl_context context, size_t size, size_ } -uint64_t xmrig::OclSharedData::adjustDelay(size_t id) +uint64_t xmlcore::OclSharedData::adjustDelay(size_t id) { if (m_threads < 2) { return 0; @@ -95,7 +95,7 @@ uint64_t xmrig::OclSharedData::adjustDelay(size_t id) std::this_thread::sleep_for(std::chrono::milliseconds(delay)); -# ifdef XMRIG_INTERLEAVE_DEBUG +# ifdef xmlcore_INTERLEAVE_DEBUG LOG_WARN("Thread #%zu was paused for %" PRIu64 " ms to adjust interleaving", id, delay); # endif @@ -103,7 +103,7 @@ uint64_t xmrig::OclSharedData::adjustDelay(size_t id) } -uint64_t xmrig::OclSharedData::resumeDelay(size_t id) +uint64_t xmlcore::OclSharedData::resumeDelay(size_t id) { if (m_threads < 2) { return 0; @@ -127,7 +127,7 @@ uint64_t xmrig::OclSharedData::resumeDelay(size_t id) delay = 1000; } -# ifdef XMRIG_INTERLEAVE_DEBUG +# ifdef xmlcore_INTERLEAVE_DEBUG LOG_WARN("Thread #%zu will be paused for %" PRIu64 " ms to before resuming", id, delay); # endif @@ -137,17 +137,17 @@ uint64_t xmrig::OclSharedData::resumeDelay(size_t id) } -void xmrig::OclSharedData::release() +void xmlcore::OclSharedData::release() { OclLib::release(m_buffer); -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX OclLib::release(m_dataset); # endif } -void xmrig::OclSharedData::setResumeCounter(uint32_t value) +void xmlcore::OclSharedData::setResumeCounter(uint32_t value) { if (m_threads < 2) { return; @@ -158,7 +158,7 @@ void xmrig::OclSharedData::setResumeCounter(uint32_t value) } -void xmrig::OclSharedData::setRunTime(uint64_t time) +void xmlcore::OclSharedData::setRunTime(uint64_t time) { // averagingBias = 1.0 - only the last delta time is taken into account // averagingBias = 0.5 - the last delta time has the same weight as all the previous ones combined @@ -170,8 +170,8 @@ void xmrig::OclSharedData::setRunTime(uint64_t time) } -#ifdef XMRIG_ALGO_RANDOMX -cl_mem xmrig::OclSharedData::dataset() const +#ifdef xmlcore_ALGO_RANDOMX +cl_mem xmlcore::OclSharedData::dataset() const { if (!m_dataset) { throw std::runtime_error("RandomX dataset is not available"); @@ -181,7 +181,7 @@ cl_mem xmrig::OclSharedData::dataset() const } -void xmrig::OclSharedData::createDataset(cl_context ctx, const Job &job, bool host) +void xmlcore::OclSharedData::createDataset(cl_context ctx, const Job &job, bool host) { if (m_dataset) { return; diff --git a/src/backend/opencl/runners/tools/OclSharedData.h b/src/backend/opencl/runners/tools/OclSharedData.h index 393ed3b8..964bd22b 100644 --- a/src/backend/opencl/runners/tools/OclSharedData.h +++ b/src/backend/opencl/runners/tools/OclSharedData.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLSHAREDDATA_H -#define XMRIG_OCLSHAREDDATA_H +#ifndef xmlcore_OCLSHAREDDATA_H +#define xmlcore_OCLSHAREDDATA_H #include @@ -34,7 +34,7 @@ using cl_context = struct _cl_context *; using cl_mem = struct _cl_mem *; -namespace xmrig { +namespace xmlcore { class Job; @@ -56,7 +56,7 @@ public: inline OclSharedData &operator++() { ++m_threads; return *this; } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX cl_mem dataset() const; void createDataset(cl_context ctx, const Job &job, bool host); # endif @@ -71,13 +71,13 @@ private: uint32_t m_resumeCounter = 0; uint64_t m_timestamp = 0; -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX cl_mem m_dataset = nullptr; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLSHAREDDATA_H */ +#endif /* xmlcore_OCLSHAREDDATA_H */ diff --git a/src/backend/opencl/runners/tools/OclSharedState.cpp b/src/backend/opencl/runners/tools/OclSharedState.cpp index 0b16a301..14f356d0 100644 --- a/src/backend/opencl/runners/tools/OclSharedState.cpp +++ b/src/backend/opencl/runners/tools/OclSharedState.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -31,22 +31,22 @@ #include -namespace xmrig { +namespace xmlcore { static std::map map; -} // namespace xmrig +} // namespace xmlcore -xmrig::OclSharedData &xmrig::OclSharedState::get(uint32_t index) +xmlcore::OclSharedData &xmlcore::OclSharedState::get(uint32_t index) { return map[index]; } -void xmrig::OclSharedState::release() +void xmlcore::OclSharedState::release() { for (auto &kv : map) { kv.second.release(); @@ -56,7 +56,7 @@ void xmrig::OclSharedState::release() } -void xmrig::OclSharedState::start(const std::vector &threads, const Job &job) +void xmlcore::OclSharedState::start(const std::vector &threads, const Job &job) { assert(map.empty()); @@ -65,7 +65,7 @@ void xmrig::OclSharedState::start(const std::vector &threads, con ++sharedData; -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (data.algorithm.family() == Algorithm::RANDOM_X) { sharedData.createDataset(data.ctx, job, data.thread.isDatasetHost()); } diff --git a/src/backend/opencl/runners/tools/OclSharedState.h b/src/backend/opencl/runners/tools/OclSharedState.h index 610056cd..3d85c61c 100644 --- a/src/backend/opencl/runners/tools/OclSharedState.h +++ b/src/backend/opencl/runners/tools/OclSharedState.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLSHAREDSTATE_H -#define XMRIG_OCLSHAREDSTATE_H +#ifndef xmlcore_OCLSHAREDSTATE_H +#define xmlcore_OCLSHAREDSTATE_H #include "backend/opencl/OclLaunchData.h" -namespace xmrig { +namespace xmlcore { class OclSharedState @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OCLSHAREDSTATE_H */ +#endif /* xmlcore_OCLSHAREDSTATE_H */ diff --git a/src/backend/opencl/wrappers/AdlHealth.h b/src/backend/opencl/wrappers/AdlHealth.h index a0b2ac6e..3138fa1c 100644 --- a/src/backend/opencl/wrappers/AdlHealth.h +++ b/src/backend/opencl/wrappers/AdlHealth.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright 2008-2018 Advanced Micro Devices, Inc. * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ADLHEALTH_H -#define XMRIG_ADLHEALTH_H +#ifndef xmlcore_ADLHEALTH_H +#define xmlcore_ADLHEALTH_H #include @@ -35,4 +35,4 @@ struct AdlHealth }; -#endif /* XMRIG_ADLHEALTH_H */ +#endif /* xmlcore_ADLHEALTH_H */ diff --git a/src/backend/opencl/wrappers/AdlLib.cpp b/src/backend/opencl/wrappers/AdlLib.cpp index d3b3bef4..9b028686 100644 --- a/src/backend/opencl/wrappers/AdlLib.cpp +++ b/src/backend/opencl/wrappers/AdlLib.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright 2008-2018 Advanced Micro Devices, Inc. * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +28,7 @@ #include "backend/opencl/wrappers/OclDevice.h" -namespace xmrig { +namespace xmlcore { static std::vector adapters; @@ -155,10 +155,10 @@ static void getSensorsData_v8(const AdapterInfo &adapter, AdlHealth &health) } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::AdlLib::init() +bool xmlcore::AdlLib::init() { if (!m_initialized) { m_ready = dlopen() && load(); @@ -169,13 +169,13 @@ bool xmrig::AdlLib::init() } -const char *xmrig::AdlLib::lastError() noexcept +const char *xmlcore::AdlLib::lastError() noexcept { return uv_dlerror(&adlLib); } -void xmrig::AdlLib::close() +void xmlcore::AdlLib::close() { if (m_ready) { ADL_Main_Control_Destroy(); @@ -185,7 +185,7 @@ void xmrig::AdlLib::close() } -AdlHealth xmrig::AdlLib::health(const OclDevice &device) +AdlHealth xmlcore::AdlLib::health(const OclDevice &device) { if (!isReady() || device.vendorId() != OCL_VENDOR_AMD) { return {}; @@ -218,13 +218,13 @@ AdlHealth xmrig::AdlLib::health(const OclDevice &device) } -bool xmrig::AdlLib::dlopen() +bool xmlcore::AdlLib::dlopen() { return uv_dlopen("atiadlxx.dll", &adlLib) == 0; } -bool xmrig::AdlLib::load() +bool xmlcore::AdlLib::load() { try { DLSYM(ADL_Main_Control_Create); diff --git a/src/backend/opencl/wrappers/AdlLib.h b/src/backend/opencl/wrappers/AdlLib.h index 70cb6d4f..bcea8775 100644 --- a/src/backend/opencl/wrappers/AdlLib.h +++ b/src/backend/opencl/wrappers/AdlLib.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright 2008-2018 Advanced Micro Devices, Inc. * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ADLLIB_H -#define XMRIG_ADLLIB_H +#ifndef xmlcore_ADLLIB_H +#define xmlcore_ADLLIB_H #include "backend/opencl/wrappers/AdlHealth.h" -namespace xmrig { +namespace xmlcore { class OclDevice; @@ -51,7 +51,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ADLLIB_H */ +#endif /* xmlcore_ADLLIB_H */ diff --git a/src/backend/opencl/wrappers/AdlLib_linux.cpp b/src/backend/opencl/wrappers/AdlLib_linux.cpp index 7d7adb31..16842c33 100644 --- a/src/backend/opencl/wrappers/AdlLib_linux.cpp +++ b/src/backend/opencl/wrappers/AdlLib_linux.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2008-2018 Advanced Micro Devices, Inc. * Copyright (c) 2020 Patrick Bollinger * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -32,7 +32,7 @@ #include -namespace xmrig { +namespace xmlcore { bool AdlLib::m_initialized = false; @@ -132,10 +132,10 @@ static size_t sysfs_prefix(char path[PATH_MAX], const PciTopology &topology) } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::AdlLib::init() +bool xmlcore::AdlLib::init() { if (!m_initialized) { m_ready = dlopen() && load(); @@ -146,19 +146,19 @@ bool xmrig::AdlLib::init() } -const char *xmrig::AdlLib::lastError() noexcept +const char *xmlcore::AdlLib::lastError() noexcept { return nullptr; } -void xmrig::AdlLib::close() +void xmlcore::AdlLib::close() { } // https://dri.freedesktop.org/docs/drm/gpu/amdgpu.html#gpu-power-thermal-controls-and-monitoring -AdlHealth xmrig::AdlLib::health(const OclDevice &device) +AdlHealth xmlcore::AdlLib::health(const OclDevice &device) { if (!isReady() || device.vendorId() != OCL_VENDOR_AMD) { return {}; @@ -186,7 +186,7 @@ AdlHealth xmrig::AdlLib::health(const OclDevice &device) } -bool xmrig::AdlLib::dlopen() +bool xmlcore::AdlLib::dlopen() { struct stat sb; if (stat(kPrefix.c_str(), &sb) == -1) { @@ -197,7 +197,7 @@ bool xmrig::AdlLib::dlopen() } -bool xmrig::AdlLib::load() +bool xmlcore::AdlLib::load() { return true; } diff --git a/src/backend/opencl/wrappers/OclContext.cpp b/src/backend/opencl/wrappers/OclContext.cpp index eed4272c..5092ba81 100644 --- a/src/backend/opencl/wrappers/OclContext.cpp +++ b/src/backend/opencl/wrappers/OclContext.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +28,14 @@ #include "backend/opencl/wrappers/OclLib.h" -xmrig::OclContext::OclContext(const OclDevice &device) +xmlcore::OclContext::OclContext(const OclDevice &device) { std::vector ids = { device.id() }; m_ctx = OclLib::createContext(ids); } -xmrig::OclContext::~OclContext() +xmlcore::OclContext::~OclContext() { if (m_ctx) { OclLib::release(m_ctx); @@ -43,7 +43,7 @@ xmrig::OclContext::~OclContext() } -bool xmrig::OclContext::init(const std::vector &devices, std::vector &threads) +bool xmlcore::OclContext::init(const std::vector &devices, std::vector &threads) { if (!m_ctx) { std::vector ids(devices.size()); diff --git a/src/backend/opencl/wrappers/OclContext.h b/src/backend/opencl/wrappers/OclContext.h index fb45358e..b3e6307f 100644 --- a/src/backend/opencl/wrappers/OclContext.h +++ b/src/backend/opencl/wrappers/OclContext.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLCONTEXT_H -#define XMRIG_OCLCONTEXT_H +#ifndef xmlcore_OCLCONTEXT_H +#define xmlcore_OCLCONTEXT_H #include "backend/opencl/OclLaunchData.h" @@ -34,7 +34,7 @@ using cl_context = struct _cl_context *; -namespace xmrig { +namespace xmlcore { class Job; @@ -43,7 +43,7 @@ class Job; class OclContext { public: - XMRIG_DISABLE_COPY_MOVE(OclContext) + xmlcore_DISABLE_COPY_MOVE(OclContext) OclContext() = default; OclContext(const OclDevice &device); @@ -59,7 +59,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLCONTEXT_H */ +#endif /* xmlcore_OCLCONTEXT_H */ diff --git a/src/backend/opencl/wrappers/OclDevice.cpp b/src/backend/opencl/wrappers/OclDevice.cpp index 87bf21b0..2d8d64ff 100644 --- a/src/backend/opencl/wrappers/OclDevice.cpp +++ b/src/backend/opencl/wrappers/OclDevice.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "base/io/log/Log.h" -#ifdef XMRIG_FEATURE_ADL +#ifdef xmlcore_FEATURE_ADL # include "backend/opencl/wrappers/AdlLib.h" #endif @@ -46,18 +46,18 @@ typedef union } topology_amd; -namespace xmrig { +namespace xmlcore { -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX extern bool ocl_generic_rx_generator(const OclDevice &device, const Algorithm &algorithm, OclThreads &threads); #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT extern bool ocl_generic_astrobwt_generator(const OclDevice& device, const Algorithm& algorithm, OclThreads& threads); #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW extern bool ocl_generic_kawpow_generator(const OclDevice& device, const Algorithm& algorithm, OclThreads& threads); #endif @@ -66,13 +66,13 @@ extern bool ocl_generic_cn_generator(const OclDevice &device, const Algorithm &a static ocl_gen_config_fun generators[] = { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX ocl_generic_rx_generator, # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT ocl_generic_astrobwt_generator, # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW ocl_generic_kawpow_generator, # endif ocl_vega_cn_generator, @@ -140,10 +140,10 @@ static OclDevice::Type getType(const String &name) } -} // namespace xmrig +} // namespace xmlcore -xmrig::OclDevice::OclDevice(uint32_t index, cl_device_id id, cl_platform_id platform) : +xmlcore::OclDevice::OclDevice(uint32_t index, cl_device_id id, cl_platform_id platform) : m_id(id), m_platform(platform), m_board(OclLib::getString(id, 0x4038 /* CL_DEVICE_BOARD_NAME_AMD */)), @@ -174,7 +174,7 @@ xmrig::OclDevice::OclDevice(uint32_t index, cl_device_id id, cl_platform_id plat } -xmrig::String xmrig::OclDevice::printableName() const +xmlcore::String xmlcore::OclDevice::printableName() const { const size_t size = m_board.size() + m_name.size() + 64; char *buf = new char[size](); @@ -190,13 +190,13 @@ xmrig::String xmrig::OclDevice::printableName() const } -uint32_t xmrig::OclDevice::clock() const +uint32_t xmlcore::OclDevice::clock() const { return OclLib::getUint(id(), CL_DEVICE_MAX_CLOCK_FREQUENCY); } -void xmrig::OclDevice::generate(const Algorithm &algorithm, OclThreads &threads) const +void xmlcore::OclDevice::generate(const Algorithm &algorithm, OclThreads &threads) const { for (auto fn : generators) { if (fn(*this, algorithm, threads)) { @@ -206,8 +206,8 @@ void xmrig::OclDevice::generate(const Algorithm &algorithm, OclThreads &threads) } -#ifdef XMRIG_FEATURE_API -void xmrig::OclDevice::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +void xmlcore::OclDevice::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -218,7 +218,7 @@ void xmrig::OclDevice::toJSON(rapidjson::Value &out, rapidjson::Document &doc) c out.AddMember("cu", computeUnits(), allocator); out.AddMember("global_mem", static_cast(globalMemSize()), allocator); -# ifdef XMRIG_FEATURE_ADL +# ifdef xmlcore_FEATURE_ADL if (AdlLib::isReady()) { auto data = AdlLib::health(*this); diff --git a/src/backend/opencl/wrappers/OclDevice.h b/src/backend/opencl/wrappers/OclDevice.h index ebe96d5a..93c33469 100644 --- a/src/backend/opencl/wrappers/OclDevice.h +++ b/src/backend/opencl/wrappers/OclDevice.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLDEVICE_H -#define XMRIG_OCLDEVICE_H +#ifndef xmlcore_OCLDEVICE_H +#define xmlcore_OCLDEVICE_H #include "backend/common/misc/PciTopology.h" @@ -38,7 +38,7 @@ using cl_device_id = struct _cl_device_id *; using cl_platform_id = struct _cl_platform_id *; -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -82,7 +82,7 @@ public: inline size_t maxMemAllocSize() const { return m_maxMemoryAlloc; } inline uint32_t index() const { return m_index; } -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void toJSON(rapidjson::Value &out, rapidjson::Document &doc) const; # endif @@ -102,7 +102,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLDEVICE_H */ +#endif /* xmlcore_OCLDEVICE_H */ diff --git a/src/backend/opencl/wrappers/OclError.cpp b/src/backend/opencl/wrappers/OclError.cpp index 29e92b38..ce5afaca 100644 --- a/src/backend/opencl/wrappers/OclError.cpp +++ b/src/backend/opencl/wrappers/OclError.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -26,7 +26,7 @@ #include "backend/opencl/wrappers/OclError.h" -const char *xmrig::OclError::toString(cl_int ret) +const char *xmlcore::OclError::toString(cl_int ret) { switch(ret) { diff --git a/src/backend/opencl/wrappers/OclError.h b/src/backend/opencl/wrappers/OclError.h index a9a30859..9ec1a258 100644 --- a/src/backend/opencl/wrappers/OclError.h +++ b/src/backend/opencl/wrappers/OclError.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLERROR_H -#define XMRIG_OCLERROR_H +#ifndef xmlcore_OCLERROR_H +#define xmlcore_OCLERROR_H #include "3rdparty/cl.h" @@ -34,7 +34,7 @@ #define OCL_ERR_BAD_PARAMS (1) -namespace xmrig { +namespace xmlcore { class OclError @@ -44,7 +44,7 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLERROR_H */ +#endif /* xmlcore_OCLERROR_H */ diff --git a/src/backend/opencl/wrappers/OclKernel.cpp b/src/backend/opencl/wrappers/OclKernel.cpp index 7de93c47..4b9afa3c 100644 --- a/src/backend/opencl/wrappers/OclKernel.cpp +++ b/src/backend/opencl/wrappers/OclKernel.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -33,20 +33,20 @@ #include -xmrig::OclKernel::OclKernel(cl_program program, const char *name) : +xmlcore::OclKernel::OclKernel(cl_program program, const char *name) : m_name(name) { m_kernel = OclLib::createKernel(program, name); } -xmrig::OclKernel::~OclKernel() +xmlcore::OclKernel::~OclKernel() { OclLib::release(m_kernel); } -void xmrig::OclKernel::enqueueNDRange(cl_command_queue queue, uint32_t work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size) +void xmlcore::OclKernel::enqueueNDRange(cl_command_queue queue, uint32_t work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size) { const cl_int ret = OclLib::enqueueNDRangeKernel(queue, m_kernel, work_dim, global_work_offset, global_work_size, local_work_size, 0, nullptr, nullptr); if (ret != CL_SUCCESS) { @@ -58,7 +58,7 @@ void xmrig::OclKernel::enqueueNDRange(cl_command_queue queue, uint32_t work_dim, } -void xmrig::OclKernel::setArg(uint32_t index, size_t size, const void *value) +void xmlcore::OclKernel::setArg(uint32_t index, size_t size, const void *value) { const cl_int ret = OclLib::setKernelArg(m_kernel, index, size, value); if (ret != CL_SUCCESS) { diff --git a/src/backend/opencl/wrappers/OclKernel.h b/src/backend/opencl/wrappers/OclKernel.h index 8664d130..ef277c29 100644 --- a/src/backend/opencl/wrappers/OclKernel.h +++ b/src/backend/opencl/wrappers/OclKernel.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLKERNEL_H -#define XMRIG_OCLKERNEL_H +#ifndef xmlcore_OCLKERNEL_H +#define xmlcore_OCLKERNEL_H #include "base/tools/Object.h" @@ -36,13 +36,13 @@ using cl_mem = struct _cl_mem *; using cl_program = struct _cl_program *; -namespace xmrig { +namespace xmlcore { class OclKernel { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(OclKernel) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(OclKernel) OclKernel(cl_program program, const char *name); virtual ~OclKernel(); @@ -60,7 +60,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLKERNEL_H */ +#endif /* xmlcore_OCLKERNEL_H */ diff --git a/src/backend/opencl/wrappers/OclLib.cpp b/src/backend/opencl/wrappers/OclLib.cpp index 4794f36b..44d2a646 100644 --- a/src/backend/opencl/wrappers/OclLib.cpp +++ b/src/backend/opencl/wrappers/OclLib.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -36,7 +36,7 @@ #if defined(OCL_DEBUG_REFERENCE_COUNT) -# define LOG_REFS(x, ...) xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__) +# define LOG_REFS(x, ...) xmlcore::Log::print(xmlcore::Log::WARNING, x, ##__VA_ARGS__) #else # define LOG_REFS(x, ...) #endif @@ -162,7 +162,7 @@ static unloadPlatformCompiler_t pUnloadPlatformCompiler = nu #define DLSYM(x) if (uv_dlsym(&oclLib, k##x, reinterpret_cast(&p##x)) == -1) { throw std::runtime_error(kSymbolNotFound); } -namespace xmrig { +namespace xmlcore { bool OclLib::m_initialized = false; bool OclLib::m_ready = false; @@ -184,10 +184,10 @@ static String getOclString(FUNC fn, OBJ obj, PARAM param) } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::OclLib::init(const char *fileName) +bool xmlcore::OclLib::init(const char *fileName) { if (!m_initialized) { m_loader = fileName == nullptr ? defaultLoader() : Env::expand(fileName); @@ -199,19 +199,19 @@ bool xmrig::OclLib::init(const char *fileName) } -const char *xmrig::OclLib::lastError() +const char *xmlcore::OclLib::lastError() { return uv_dlerror(&oclLib); } -void xmrig::OclLib::close() +void xmlcore::OclLib::close() { uv_dlclose(&oclLib); } -bool xmrig::OclLib::load() +bool xmlcore::OclLib::load() { try { DLSYM(CreateCommandQueue); @@ -259,7 +259,7 @@ bool xmrig::OclLib::load() } -xmrig::String xmrig::OclLib::defaultLoader() +xmlcore::String xmlcore::OclLib::defaultLoader() { # if defined(__APPLE__) return "/System/Library/Frameworks/OpenCL.framework/OpenCL"; @@ -271,7 +271,7 @@ xmrig::String xmrig::OclLib::defaultLoader() } -cl_command_queue xmrig::OclLib::createCommandQueue(cl_context context, cl_device_id device, cl_int *errcode_ret) noexcept +cl_command_queue xmlcore::OclLib::createCommandQueue(cl_context context, cl_device_id device, cl_int *errcode_ret) noexcept { cl_command_queue result; @@ -298,7 +298,7 @@ cl_command_queue xmrig::OclLib::createCommandQueue(cl_context context, cl_device } -cl_command_queue xmrig::OclLib::createCommandQueue(cl_context context, cl_device_id device) +cl_command_queue xmlcore::OclLib::createCommandQueue(cl_context context, cl_device_id device) { cl_int ret; cl_command_queue queue = createCommandQueue(context, device, &ret); @@ -310,7 +310,7 @@ cl_command_queue xmrig::OclLib::createCommandQueue(cl_context context, cl_device } -cl_context xmrig::OclLib::createContext(const cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), void *user_data, cl_int *errcode_ret) +cl_context xmlcore::OclLib::createContext(const cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), void *user_data, cl_int *errcode_ret) { assert(pCreateContext != nullptr); @@ -325,14 +325,14 @@ cl_context xmrig::OclLib::createContext(const cl_context_properties *properties, } -cl_context xmrig::OclLib::createContext(const std::vector &ids) +cl_context xmlcore::OclLib::createContext(const std::vector &ids) { cl_int ret; return createContext(nullptr, static_cast(ids.size()), ids.data(), nullptr, nullptr, &ret); } -cl_int xmrig::OclLib::buildProgram(cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void (CL_CALLBACK *pfn_notify)(cl_program program, void *user_data), void *user_data) noexcept +cl_int xmlcore::OclLib::buildProgram(cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void (CL_CALLBACK *pfn_notify)(cl_program program, void *user_data), void *user_data) noexcept { assert(pBuildProgram != nullptr); @@ -345,7 +345,7 @@ cl_int xmrig::OclLib::buildProgram(cl_program program, cl_uint num_devices, cons } -cl_int xmrig::OclLib::enqueueNDRangeKernel(cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) noexcept +cl_int xmlcore::OclLib::enqueueNDRangeKernel(cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) noexcept { assert(pEnqueueNDRangeKernel != nullptr); @@ -353,7 +353,7 @@ cl_int xmrig::OclLib::enqueueNDRangeKernel(cl_command_queue command_queue, cl_ke } -cl_int xmrig::OclLib::enqueueReadBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) noexcept +cl_int xmlcore::OclLib::enqueueReadBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) noexcept { assert(pEnqueueReadBuffer != nullptr); @@ -366,7 +366,7 @@ cl_int xmrig::OclLib::enqueueReadBuffer(cl_command_queue command_queue, cl_mem b } -cl_int xmrig::OclLib::enqueueWriteBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) noexcept +cl_int xmlcore::OclLib::enqueueWriteBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) noexcept { assert(pEnqueueWriteBuffer != nullptr); @@ -379,7 +379,7 @@ cl_int xmrig::OclLib::enqueueWriteBuffer(cl_command_queue command_queue, cl_mem } -cl_int xmrig::OclLib::finish(cl_command_queue command_queue) noexcept +cl_int xmlcore::OclLib::finish(cl_command_queue command_queue) noexcept { assert(pFinish != nullptr); @@ -387,19 +387,19 @@ cl_int xmrig::OclLib::finish(cl_command_queue command_queue) noexcept } -cl_int xmrig::OclLib::getCommandQueueInfo(cl_command_queue command_queue, cl_command_queue_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getCommandQueueInfo(cl_command_queue command_queue, cl_command_queue_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { return pGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); } -cl_int xmrig::OclLib::getContextInfo(cl_context context, cl_context_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getContextInfo(cl_context context, cl_context_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { return pGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); } -cl_int xmrig::OclLib::getDeviceIDs(cl_platform_id platform, cl_device_type device_type, cl_uint num_entries, cl_device_id *devices, cl_uint *num_devices) noexcept +cl_int xmlcore::OclLib::getDeviceIDs(cl_platform_id platform, cl_device_type device_type, cl_uint num_entries, cl_device_id *devices, cl_uint *num_devices) noexcept { assert(pGetDeviceIDs != nullptr); @@ -407,7 +407,7 @@ cl_int xmrig::OclLib::getDeviceIDs(cl_platform_id platform, cl_device_type devic } -cl_int xmrig::OclLib::getDeviceInfo(cl_device_id device, cl_device_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getDeviceInfo(cl_device_id device, cl_device_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { assert(pGetDeviceInfo != nullptr); @@ -420,19 +420,19 @@ cl_int xmrig::OclLib::getDeviceInfo(cl_device_id device, cl_device_info param_na } -cl_int xmrig::OclLib::getKernelInfo(cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getKernelInfo(cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { return pGetKernelInfo(kernel, param_name, param_value_size, param_value, param_value_size_ret); } -cl_int xmrig::OclLib::getMemObjectInfo(cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getMemObjectInfo(cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { return pGetMemObjectInfo(memobj, param_name, param_value_size, param_value, param_value_size_ret); } -cl_int xmrig::OclLib::getPlatformIDs(cl_uint num_entries, cl_platform_id *platforms, cl_uint *num_platforms) +cl_int xmlcore::OclLib::getPlatformIDs(cl_uint num_entries, cl_platform_id *platforms, cl_uint *num_platforms) { assert(pGetPlatformIDs != nullptr); @@ -440,7 +440,7 @@ cl_int xmrig::OclLib::getPlatformIDs(cl_uint num_entries, cl_platform_id *platfo } -cl_int xmrig::OclLib::getPlatformInfo(cl_platform_id platform, cl_platform_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getPlatformInfo(cl_platform_id platform, cl_platform_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { assert(pGetPlatformInfo != nullptr); @@ -448,7 +448,7 @@ cl_int xmrig::OclLib::getPlatformInfo(cl_platform_id platform, cl_platform_info } -cl_int xmrig::OclLib::getProgramBuildInfo(cl_program program, cl_device_id device, cl_program_build_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept +cl_int xmlcore::OclLib::getProgramBuildInfo(cl_program program, cl_device_id device, cl_program_build_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) noexcept { assert(pGetProgramBuildInfo != nullptr); @@ -461,7 +461,7 @@ cl_int xmrig::OclLib::getProgramBuildInfo(cl_program program, cl_device_id devic } -cl_int xmrig::OclLib::getProgramInfo(cl_program program, cl_program_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) +cl_int xmlcore::OclLib::getProgramInfo(cl_program program, cl_program_info param_name, size_t param_value_size, void *param_value, size_t *param_value_size_ret) { assert(pGetProgramInfo != nullptr); @@ -474,7 +474,7 @@ cl_int xmrig::OclLib::getProgramInfo(cl_program program, cl_program_info param_n } -cl_int xmrig::OclLib::release(cl_command_queue command_queue) noexcept +cl_int xmlcore::OclLib::release(cl_command_queue command_queue) noexcept { assert(pReleaseCommandQueue != nullptr); assert(pGetCommandQueueInfo != nullptr); @@ -496,7 +496,7 @@ cl_int xmrig::OclLib::release(cl_command_queue command_queue) noexcept } -cl_int xmrig::OclLib::release(cl_context context) noexcept +cl_int xmlcore::OclLib::release(cl_context context) noexcept { assert(pReleaseContext != nullptr); @@ -511,7 +511,7 @@ cl_int xmrig::OclLib::release(cl_context context) noexcept } -cl_int xmrig::OclLib::release(cl_device_id id) noexcept +cl_int xmlcore::OclLib::release(cl_device_id id) noexcept { assert(pReleaseDevice != nullptr); @@ -526,7 +526,7 @@ cl_int xmrig::OclLib::release(cl_device_id id) noexcept } -cl_int xmrig::OclLib::release(cl_kernel kernel) noexcept +cl_int xmlcore::OclLib::release(cl_kernel kernel) noexcept { assert(pReleaseKernel != nullptr); @@ -545,7 +545,7 @@ cl_int xmrig::OclLib::release(cl_kernel kernel) noexcept } -cl_int xmrig::OclLib::release(cl_mem mem_obj) noexcept +cl_int xmlcore::OclLib::release(cl_mem mem_obj) noexcept { assert(pReleaseMemObject != nullptr); @@ -564,7 +564,7 @@ cl_int xmrig::OclLib::release(cl_mem mem_obj) noexcept } -cl_int xmrig::OclLib::release(cl_program program) noexcept +cl_int xmlcore::OclLib::release(cl_program program) noexcept { assert(pReleaseProgram != nullptr); @@ -583,7 +583,7 @@ cl_int xmrig::OclLib::release(cl_program program) noexcept } -cl_int xmrig::OclLib::setKernelArg(cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void *arg_value) noexcept +cl_int xmlcore::OclLib::setKernelArg(cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void *arg_value) noexcept { assert(pSetKernelArg != nullptr); @@ -591,13 +591,13 @@ cl_int xmrig::OclLib::setKernelArg(cl_kernel kernel, cl_uint arg_index, size_t a } -cl_int xmrig::OclLib::unloadPlatformCompiler(cl_platform_id platform) noexcept +cl_int xmlcore::OclLib::unloadPlatformCompiler(cl_platform_id platform) noexcept { return pUnloadPlatformCompiler(platform); } -cl_kernel xmrig::OclLib::createKernel(cl_program program, const char *kernel_name, cl_int *errcode_ret) noexcept +cl_kernel xmlcore::OclLib::createKernel(cl_program program, const char *kernel_name, cl_int *errcode_ret) noexcept { assert(pCreateKernel != nullptr); @@ -613,7 +613,7 @@ cl_kernel xmrig::OclLib::createKernel(cl_program program, const char *kernel_nam } -cl_kernel xmrig::OclLib::createKernel(cl_program program, const char *kernel_name) +cl_kernel xmlcore::OclLib::createKernel(cl_program program, const char *kernel_name) { cl_int ret; cl_kernel kernel = createKernel(program, kernel_name, &ret); @@ -625,7 +625,7 @@ cl_kernel xmrig::OclLib::createKernel(cl_program program, const char *kernel_nam } -cl_mem xmrig::OclLib::createBuffer(cl_context context, cl_mem_flags flags, size_t size, void *host_ptr) +cl_mem xmlcore::OclLib::createBuffer(cl_context context, cl_mem_flags flags, size_t size, void *host_ptr) { cl_int ret; cl_mem mem = createBuffer(context, flags, size, host_ptr, &ret); @@ -637,7 +637,7 @@ cl_mem xmrig::OclLib::createBuffer(cl_context context, cl_mem_flags flags, size_ } -cl_mem xmrig::OclLib::createBuffer(cl_context context, cl_mem_flags flags, size_t size, void *host_ptr, cl_int *errcode_ret) noexcept +cl_mem xmlcore::OclLib::createBuffer(cl_context context, cl_mem_flags flags, size_t size, void *host_ptr, cl_int *errcode_ret) noexcept { assert(pCreateBuffer != nullptr); @@ -653,7 +653,7 @@ cl_mem xmrig::OclLib::createBuffer(cl_context context, cl_mem_flags flags, size_ } -cl_mem xmrig::OclLib::createSubBuffer(cl_mem buffer, cl_mem_flags flags, size_t offset, size_t size, cl_int *errcode_ret) noexcept +cl_mem xmlcore::OclLib::createSubBuffer(cl_mem buffer, cl_mem_flags flags, size_t offset, size_t size, cl_int *errcode_ret) noexcept { const cl_buffer_region region = { offset, size }; @@ -669,7 +669,7 @@ cl_mem xmrig::OclLib::createSubBuffer(cl_mem buffer, cl_mem_flags flags, size_t } -cl_mem xmrig::OclLib::createSubBuffer(cl_mem buffer, cl_mem_flags flags, size_t offset, size_t size) +cl_mem xmlcore::OclLib::createSubBuffer(cl_mem buffer, cl_mem_flags flags, size_t offset, size_t size) { cl_int ret; cl_mem mem = createSubBuffer(buffer, flags, offset, size, &ret); @@ -681,7 +681,7 @@ cl_mem xmrig::OclLib::createSubBuffer(cl_mem buffer, cl_mem_flags flags, size_t } -cl_mem xmrig::OclLib::retain(cl_mem memobj) noexcept +cl_mem xmlcore::OclLib::retain(cl_mem memobj) noexcept { assert(pRetainMemObject != nullptr); @@ -693,7 +693,7 @@ cl_mem xmrig::OclLib::retain(cl_mem memobj) noexcept } -cl_program xmrig::OclLib::createProgramWithBinary(cl_context context, cl_uint num_devices, const cl_device_id *device_list, const size_t *lengths, const unsigned char **binaries, cl_int *binary_status, cl_int *errcode_ret) noexcept +cl_program xmlcore::OclLib::createProgramWithBinary(cl_context context, cl_uint num_devices, const cl_device_id *device_list, const size_t *lengths, const unsigned char **binaries, cl_int *binary_status, cl_int *errcode_ret) noexcept { assert(pCreateProgramWithBinary != nullptr); @@ -708,7 +708,7 @@ cl_program xmrig::OclLib::createProgramWithBinary(cl_context context, cl_uint nu } -cl_program xmrig::OclLib::createProgramWithSource(cl_context context, cl_uint count, const char **strings, const size_t *lengths, cl_int *errcode_ret) noexcept +cl_program xmlcore::OclLib::createProgramWithSource(cl_context context, cl_uint count, const char **strings, const size_t *lengths, cl_int *errcode_ret) noexcept { assert(pCreateProgramWithSource != nullptr); @@ -723,7 +723,7 @@ cl_program xmrig::OclLib::createProgramWithSource(cl_context context, cl_uint co } -cl_program xmrig::OclLib::retain(cl_program program) noexcept +cl_program xmlcore::OclLib::retain(cl_program program) noexcept { assert(pRetainProgram != nullptr); @@ -735,7 +735,7 @@ cl_program xmrig::OclLib::retain(cl_program program) noexcept } -cl_uint xmrig::OclLib::getNumPlatforms() noexcept +cl_uint xmlcore::OclLib::getNumPlatforms() noexcept { cl_uint count = 0; cl_int ret; @@ -752,7 +752,7 @@ cl_uint xmrig::OclLib::getNumPlatforms() noexcept } -cl_uint xmrig::OclLib::getUint(cl_command_queue command_queue, cl_command_queue_info param_name, cl_uint defaultValue) noexcept +cl_uint xmlcore::OclLib::getUint(cl_command_queue command_queue, cl_command_queue_info param_name, cl_uint defaultValue) noexcept { getCommandQueueInfo(command_queue, param_name, sizeof(cl_uint), &defaultValue); @@ -760,7 +760,7 @@ cl_uint xmrig::OclLib::getUint(cl_command_queue command_queue, cl_command_queue_ } -cl_uint xmrig::OclLib::getUint(cl_context context, cl_context_info param_name, cl_uint defaultValue) noexcept +cl_uint xmlcore::OclLib::getUint(cl_context context, cl_context_info param_name, cl_uint defaultValue) noexcept { getContextInfo(context, param_name, sizeof(cl_uint), &defaultValue); @@ -768,7 +768,7 @@ cl_uint xmrig::OclLib::getUint(cl_context context, cl_context_info param_name, c } -cl_uint xmrig::OclLib::getUint(cl_device_id id, cl_device_info param, cl_uint defaultValue) noexcept +cl_uint xmlcore::OclLib::getUint(cl_device_id id, cl_device_info param, cl_uint defaultValue) noexcept { getDeviceInfo(id, param, sizeof(cl_uint), &defaultValue); @@ -776,7 +776,7 @@ cl_uint xmrig::OclLib::getUint(cl_device_id id, cl_device_info param, cl_uint de } -cl_uint xmrig::OclLib::getUint(cl_kernel kernel, cl_kernel_info param_name, cl_uint defaultValue) noexcept +cl_uint xmlcore::OclLib::getUint(cl_kernel kernel, cl_kernel_info param_name, cl_uint defaultValue) noexcept { getKernelInfo(kernel, param_name, sizeof(cl_uint), &defaultValue); @@ -784,7 +784,7 @@ cl_uint xmrig::OclLib::getUint(cl_kernel kernel, cl_kernel_info param_name, cl_ } -cl_uint xmrig::OclLib::getUint(cl_mem memobj, cl_mem_info param_name, cl_uint defaultValue) noexcept +cl_uint xmlcore::OclLib::getUint(cl_mem memobj, cl_mem_info param_name, cl_uint defaultValue) noexcept { getMemObjectInfo(memobj, param_name, sizeof(cl_uint), &defaultValue); @@ -792,7 +792,7 @@ cl_uint xmrig::OclLib::getUint(cl_mem memobj, cl_mem_info param_name, cl_uint de } -cl_uint xmrig::OclLib::getUint(cl_program program, cl_program_info param, cl_uint defaultValue) noexcept +cl_uint xmlcore::OclLib::getUint(cl_program program, cl_program_info param, cl_uint defaultValue) noexcept { getProgramInfo(program, param, sizeof(cl_uint), &defaultValue); @@ -800,7 +800,7 @@ cl_uint xmrig::OclLib::getUint(cl_program program, cl_program_info param, cl_uin } -cl_ulong xmrig::OclLib::getUlong(cl_device_id id, cl_device_info param, cl_ulong defaultValue) noexcept +cl_ulong xmlcore::OclLib::getUlong(cl_device_id id, cl_device_info param, cl_ulong defaultValue) noexcept { getDeviceInfo(id, param, sizeof(cl_ulong), &defaultValue); @@ -808,7 +808,7 @@ cl_ulong xmrig::OclLib::getUlong(cl_device_id id, cl_device_info param, cl_ulong } -cl_ulong xmrig::OclLib::getUlong(cl_mem memobj, cl_mem_info param_name, cl_ulong defaultValue) noexcept +cl_ulong xmlcore::OclLib::getUlong(cl_mem memobj, cl_mem_info param_name, cl_ulong defaultValue) noexcept { getMemObjectInfo(memobj, param_name, sizeof(cl_ulong), &defaultValue); @@ -816,7 +816,7 @@ cl_ulong xmrig::OclLib::getUlong(cl_mem memobj, cl_mem_info param_name, cl_ulong } -std::vector xmrig::OclLib::getPlatformIDs() noexcept +std::vector xmlcore::OclLib::getPlatformIDs() noexcept { const uint32_t count = getNumPlatforms(); std::vector platforms(count); @@ -829,7 +829,7 @@ std::vector xmrig::OclLib::getPlatformIDs() noexcept } -xmrig::String xmrig::OclLib::getProgramBuildLog(cl_program program, cl_device_id device) noexcept +xmlcore::String xmlcore::OclLib::getProgramBuildLog(cl_program program, cl_device_id device) noexcept { size_t size = 0; if (getProgramBuildInfo(program, device, CL_PROGRAM_BUILD_LOG, 0, nullptr, &size) != CL_SUCCESS) { @@ -853,25 +853,25 @@ xmrig::String xmrig::OclLib::getProgramBuildLog(cl_program program, cl_device_id } -xmrig::String xmrig::OclLib::getString(cl_device_id id, cl_device_info param) noexcept +xmlcore::String xmlcore::OclLib::getString(cl_device_id id, cl_device_info param) noexcept { return getOclString(OclLib::getDeviceInfo, id, param); } -xmrig::String xmrig::OclLib::getString(cl_kernel kernel, cl_kernel_info param_name) noexcept +xmlcore::String xmlcore::OclLib::getString(cl_kernel kernel, cl_kernel_info param_name) noexcept { return getOclString(OclLib::getKernelInfo, kernel, param_name); } -xmrig::String xmrig::OclLib::getString(cl_platform_id platform, cl_platform_info param_name) noexcept +xmlcore::String xmlcore::OclLib::getString(cl_platform_id platform, cl_platform_info param_name) noexcept { return getOclString(OclLib::getPlatformInfo, platform, param_name); } -xmrig::String xmrig::OclLib::getString(cl_program program, cl_program_info param_name) noexcept +xmlcore::String xmlcore::OclLib::getString(cl_program program, cl_program_info param_name) noexcept { return getOclString(OclLib::getProgramInfo, program, param_name); } diff --git a/src/backend/opencl/wrappers/OclLib.h b/src/backend/opencl/wrappers/OclLib.h index b4db1d8d..540414a8 100644 --- a/src/backend/opencl/wrappers/OclLib.h +++ b/src/backend/opencl/wrappers/OclLib.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLLIB_H -#define XMRIG_OCLLIB_H +#ifndef xmlcore_OCLLIB_H +#define xmlcore_OCLLIB_H #include @@ -33,7 +33,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class OclLib @@ -110,7 +110,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLLIB_H */ +#endif /* xmlcore_OCLLIB_H */ diff --git a/src/backend/opencl/wrappers/OclPlatform.cpp b/src/backend/opencl/wrappers/OclPlatform.cpp index 6c3509f0..7cdd3944 100644 --- a/src/backend/opencl/wrappers/OclPlatform.cpp +++ b/src/backend/opencl/wrappers/OclPlatform.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +28,7 @@ #include "backend/opencl/wrappers/OclLib.h" -std::vector xmrig::OclPlatform::get() +std::vector xmlcore::OclPlatform::get() { const std::vector platforms = OclLib::getPlatformIDs(); std::vector out; @@ -46,7 +46,7 @@ std::vector xmrig::OclPlatform::get() } -void xmrig::OclPlatform::print() +void xmlcore::OclPlatform::print() { const auto platforms = OclPlatform::get(); @@ -63,7 +63,7 @@ void xmrig::OclPlatform::print() } -rapidjson::Value xmrig::OclPlatform::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::OclPlatform::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -84,7 +84,7 @@ rapidjson::Value xmrig::OclPlatform::toJSON(rapidjson::Document &doc) const } -std::vector xmrig::OclPlatform::devices() const +std::vector xmlcore::OclPlatform::devices() const { std::vector out; if (!isValid()) { @@ -109,31 +109,31 @@ std::vector xmrig::OclPlatform::devices() const } -xmrig::String xmrig::OclPlatform::extensions() const +xmlcore::String xmlcore::OclPlatform::extensions() const { return OclLib::getString(id(), CL_PLATFORM_EXTENSIONS); } -xmrig::String xmrig::OclPlatform::name() const +xmlcore::String xmlcore::OclPlatform::name() const { return OclLib::getString(id(), CL_PLATFORM_NAME); } -xmrig::String xmrig::OclPlatform::profile() const +xmlcore::String xmlcore::OclPlatform::profile() const { return OclLib::getString(id(), CL_PLATFORM_PROFILE); } -xmrig::String xmrig::OclPlatform::vendor() const +xmlcore::String xmlcore::OclPlatform::vendor() const { return OclLib::getString(id(), CL_PLATFORM_VENDOR); } -xmrig::String xmrig::OclPlatform::version() const +xmlcore::String xmlcore::OclPlatform::version() const { return OclLib::getString(id(), CL_PLATFORM_VERSION); } diff --git a/src/backend/opencl/wrappers/OclPlatform.h b/src/backend/opencl/wrappers/OclPlatform.h index dc9bd24e..127fd721 100644 --- a/src/backend/opencl/wrappers/OclPlatform.h +++ b/src/backend/opencl/wrappers/OclPlatform.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLPLATFORM_H -#define XMRIG_OCLPLATFORM_H +#ifndef xmlcore_OCLPLATFORM_H +#define xmlcore_OCLPLATFORM_H #include @@ -36,7 +36,7 @@ using cl_platform_id = struct _cl_platform_id *; -namespace xmrig { +namespace xmlcore { class OclPlatform @@ -66,7 +66,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLPLATFORM_H */ +#endif /* xmlcore_OCLPLATFORM_H */ diff --git a/src/backend/opencl/wrappers/OclVendor.h b/src/backend/opencl/wrappers/OclVendor.h index def59b77..bb9eefe5 100644 --- a/src/backend/opencl/wrappers/OclVendor.h +++ b/src/backend/opencl/wrappers/OclVendor.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OCLVENDOR_H -#define XMRIG_OCLVENDOR_H +#ifndef xmlcore_OCLVENDOR_H +#define xmlcore_OCLVENDOR_H -namespace xmrig { +namespace xmlcore { enum OclVendor : unsigned { @@ -37,7 +37,7 @@ enum OclVendor : unsigned { }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_OCLVENDOR_H */ +#endif /* xmlcore_OCLVENDOR_H */ diff --git a/src/base/api/Api.cpp b/src/base/api/Api.cpp index 3a71fd9c..c96ead41 100644 --- a/src/base/api/Api.cpp +++ b/src/base/api/Api.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -35,7 +35,7 @@ #include "version.h" -#ifdef XMRIG_FEATURE_HTTP +#ifdef xmlcore_FEATURE_HTTP # include "base/api/Httpd.h" #endif @@ -43,7 +43,7 @@ #include -namespace xmrig { +namespace xmlcore { static rapidjson::Value getResources(rapidjson::Document &doc) @@ -77,10 +77,10 @@ static rapidjson::Value getResources(rapidjson::Document &doc) } -} // namespace xmrig +} // namespace xmlcore -xmrig::Api::Api(Base *base) : +xmlcore::Api::Api(Base *base) : m_base(base), m_timestamp(Chrono::currentMSecsSinceEpoch()) { @@ -90,15 +90,15 @@ xmrig::Api::Api(Base *base) : } -xmrig::Api::~Api() +xmlcore::Api::~Api() { -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP delete m_httpd; # endif } -void xmrig::Api::request(const HttpData &req) +void xmlcore::Api::request(const HttpData &req) { HttpApiRequest request(req, m_base->config()->http().isRestricted()); @@ -106,26 +106,26 @@ void xmrig::Api::request(const HttpData &req) } -void xmrig::Api::start() +void xmlcore::Api::start() { genWorkerId(m_base->config()->apiWorkerId()); -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP m_httpd = new Httpd(m_base); m_httpd->start(); # endif } -void xmrig::Api::stop() +void xmlcore::Api::stop() { -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP m_httpd->stop(); # endif } -void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig) +void xmlcore::Api::onConfigChanged(Config *config, Config *previousConfig) { if (config->apiId() != previousConfig->apiId()) { genId(config->apiId()); @@ -137,7 +137,7 @@ void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig) } -void xmrig::Api::exec(IApiRequest &request) +void xmlcore::Api::exec(IApiRequest &request) { using namespace rapidjson; @@ -154,25 +154,25 @@ void xmrig::Api::exec(IApiRequest &request) reply.AddMember("resources", getResources(request.doc()), allocator); Value features(kArrayType); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API features.PushBack("api", allocator); # endif -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM features.PushBack("asm", allocator); # endif -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP features.PushBack("http", allocator); # endif -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC features.PushBack("hwloc", allocator); # endif -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS features.PushBack("tls", allocator); # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL features.PushBack("opencl", allocator); # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA features.PushBack("cuda", allocator); # endif reply.AddMember("features", features, allocator); @@ -190,7 +190,7 @@ void xmrig::Api::exec(IApiRequest &request) } -void xmrig::Api::genId(const String &id) +void xmlcore::Api::genId(const String &id) { memset(m_id, 0, sizeof(m_id)); @@ -230,7 +230,7 @@ void xmrig::Api::genId(const String &id) } -void xmrig::Api::genWorkerId(const String &id) +void xmlcore::Api::genWorkerId(const String &id) { m_workerId = Env::expand(id); if (m_workerId.isEmpty()) { diff --git a/src/base/api/Api.h b/src/base/api/Api.h index f412a317..34c966cb 100644 --- a/src/base/api/Api.h +++ b/src/base/api/Api.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_API_H -#define XMRIG_API_H +#ifndef xmlcore_API_H +#define xmlcore_API_H #include @@ -28,7 +28,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Base; @@ -42,7 +42,7 @@ class String; class Api : public IBaseListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Api) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Api) Api(Base *base); ~Api() override; @@ -72,7 +72,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_API_H */ +#endif /* xmlcore_API_H */ diff --git a/src/base/api/Httpd.cpp b/src/base/api/Httpd.cpp index 1aba8796..ccf9b71c 100644 --- a/src/base/api/Httpd.cpp +++ b/src/base/api/Httpd.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -34,14 +34,14 @@ #include "core/Controller.h" -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include "base/net/https/HttpsServer.h" #else # include "base/net/http/HttpServer.h" #endif -namespace xmrig { +namespace xmlcore { static const char *kAuthorization = "authorization"; @@ -50,10 +50,10 @@ static const char *favicon = nullptr; static size_t faviconSize = 0; #endif -} // namespace xmrig +} // namespace xmlcore -xmrig::Httpd::Httpd(Base *base) : +xmlcore::Httpd::Httpd(Base *base) : m_base(base) { m_httpListener = std::make_shared(this); @@ -62,10 +62,10 @@ xmrig::Httpd::Httpd(Base *base) : } -xmrig::Httpd::~Httpd() = default; +xmlcore::Httpd::~Httpd() = default; -bool xmrig::Httpd::start() +bool xmlcore::Httpd::start() { const auto &config = m_base->config()->http(); @@ -75,7 +75,7 @@ bool xmrig::Httpd::start() bool tls = false; -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS m_http = new HttpsServer(m_httpListener); tls = m_http->setTls(m_base->config()->tls()); # else @@ -116,7 +116,7 @@ bool xmrig::Httpd::start() } -void xmrig::Httpd::stop() +void xmlcore::Httpd::stop() { delete m_server; delete m_http; @@ -128,7 +128,7 @@ void xmrig::Httpd::stop() -void xmrig::Httpd::onConfigChanged(Config *config, Config *previousConfig) +void xmlcore::Httpd::onConfigChanged(Config *config, Config *previousConfig) { if (config->http() == previousConfig->http()) { return; @@ -139,7 +139,7 @@ void xmrig::Httpd::onConfigChanged(Config *config, Config *previousConfig) } -void xmrig::Httpd::onHttpData(const HttpData &data) +void xmlcore::Httpd::onHttpData(const HttpData &data) { if (data.method == HTTP_OPTIONS) { return HttpApiResponse(data.id()).end(); @@ -181,7 +181,7 @@ void xmrig::Httpd::onHttpData(const HttpData &data) } -int xmrig::Httpd::auth(const HttpData &req) const +int xmlcore::Httpd::auth(const HttpData &req) const { const Http &config = m_base->config()->http(); diff --git a/src/base/api/Httpd.h b/src/base/api/Httpd.h index 462a0671..4cb84527 100644 --- a/src/base/api/Httpd.h +++ b/src/base/api/Httpd.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HTTPD_H -#define XMRIG_HTTPD_H +#ifndef xmlcore_HTTPD_H +#define xmlcore_HTTPD_H #include "base/kernel/interfaces/IBaseListener.h" @@ -35,7 +35,7 @@ #include -namespace xmrig { +namespace xmlcore { class Base; @@ -47,7 +47,7 @@ class TcpServer; class Httpd : public IBaseListener, public IHttpListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Httpd) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Httpd) Httpd(Base *base); ~Httpd() override; @@ -67,7 +67,7 @@ private: TcpServer *m_server = nullptr; uint16_t m_port = 0; -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS HttpsServer *m_http = nullptr; # else HttpServer *m_http = nullptr; @@ -75,7 +75,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_HTTPD_H */ +#endif /* xmlcore_HTTPD_H */ diff --git a/src/base/api/interfaces/IApiListener.h b/src/base/api/interfaces/IApiListener.h index 71ee9c76..cad7f38c 100644 --- a/src/base/api/interfaces/IApiListener.h +++ b/src/base/api/interfaces/IApiListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IAPILISTENER_H -#define XMRIG_IAPILISTENER_H +#ifndef xmlcore_IAPILISTENER_H +#define xmlcore_IAPILISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class IApiRequest; @@ -32,18 +32,18 @@ class IApiRequest; class IApiListener { public: - XMRIG_DISABLE_COPY_MOVE(IApiListener) + xmlcore_DISABLE_COPY_MOVE(IApiListener) IApiListener() = default; virtual ~IApiListener() = default; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API virtual void onRequest(IApiRequest &request) = 0; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IAPILISTENER_H +#endif // xmlcore_IAPILISTENER_H diff --git a/src/base/api/interfaces/IApiRequest.h b/src/base/api/interfaces/IApiRequest.h index 35fb27d5..e892a5b7 100644 --- a/src/base/api/interfaces/IApiRequest.h +++ b/src/base/api/interfaces/IApiRequest.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IAPIREQUEST_H -#define XMRIG_IAPIREQUEST_H +#ifndef xmlcore_IAPIREQUEST_H +#define xmlcore_IAPIREQUEST_H #include "3rdparty/rapidjson/fwd.h" #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class String; @@ -33,7 +33,7 @@ class String; class IApiRequest { public: - XMRIG_DISABLE_COPY_MOVE(IApiRequest) + xmlcore_DISABLE_COPY_MOVE(IApiRequest) enum Method { METHOD_DELETE, @@ -87,7 +87,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IAPIREQUEST_H +#endif // xmlcore_IAPIREQUEST_H diff --git a/src/base/api/requests/ApiRequest.cpp b/src/base/api/requests/ApiRequest.cpp index 4f0bd044..15cd0daf 100644 --- a/src/base/api/requests/ApiRequest.cpp +++ b/src/base/api/requests/ApiRequest.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -26,11 +26,11 @@ #include "base/api/requests/ApiRequest.h" -xmrig::ApiRequest::ApiRequest(Source source, bool restricted) : +xmlcore::ApiRequest::ApiRequest(Source source, bool restricted) : m_restricted(restricted), m_source(source) { } -xmrig::ApiRequest::~ApiRequest() = default; +xmlcore::ApiRequest::~ApiRequest() = default; diff --git a/src/base/api/requests/ApiRequest.h b/src/base/api/requests/ApiRequest.h index c87e822c..d85e4b61 100644 --- a/src/base/api/requests/ApiRequest.h +++ b/src/base/api/requests/ApiRequest.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +23,8 @@ */ -#ifndef XMRIG_APIREQUEST_H -#define XMRIG_APIREQUEST_H +#ifndef xmlcore_APIREQUEST_H +#define xmlcore_APIREQUEST_H #include "base/api/interfaces/IApiRequest.h" @@ -32,13 +32,13 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class ApiRequest : public IApiRequest { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(ApiRequest) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(ApiRequest) ApiRequest(Source source, bool restricted); ~ApiRequest() override; @@ -71,8 +71,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_APIREQUEST_H +#endif // xmlcore_APIREQUEST_H diff --git a/src/base/api/requests/HttpApiRequest.cpp b/src/base/api/requests/HttpApiRequest.cpp index 70fa2523..0324311e 100644 --- a/src/base/api/requests/HttpApiRequest.cpp +++ b/src/base/api/requests/HttpApiRequest.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -30,7 +30,7 @@ #include "base/net/http/HttpData.h" -namespace xmrig { +namespace xmlcore { static const char *kError = "error"; @@ -61,10 +61,10 @@ static inline const char *rpcError(int code) { } -} // namespace xmrig +} // namespace xmlcore -xmrig::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) : +xmlcore::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) : ApiRequest(SOURCE_HTTP, restricted), m_req(req), m_res(req.id()), @@ -106,7 +106,7 @@ xmrig::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) : } -bool xmrig::HttpApiRequest::accept() +bool xmlcore::HttpApiRequest::accept() { using namespace rapidjson; @@ -131,7 +131,7 @@ bool xmrig::HttpApiRequest::accept() } -const rapidjson::Value &xmrig::HttpApiRequest::json() const +const rapidjson::Value &xmlcore::HttpApiRequest::json() const { if (type() == REQ_JSON_RPC) { return Json::getValue(m_body, "params"); @@ -141,13 +141,13 @@ const rapidjson::Value &xmrig::HttpApiRequest::json() const } -xmrig::IApiRequest::Method xmrig::HttpApiRequest::method() const +xmlcore::IApiRequest::Method xmlcore::HttpApiRequest::method() const { return static_cast(m_req.method); } -void xmrig::HttpApiRequest::done(int status) +void xmlcore::HttpApiRequest::done(int status) { ApiRequest::done(status); @@ -175,7 +175,7 @@ void xmrig::HttpApiRequest::done(int status) } -void xmrig::HttpApiRequest::setRpcError(int code, const char *message) +void xmlcore::HttpApiRequest::setRpcError(int code, const char *message) { using namespace rapidjson; auto &allocator = doc().GetAllocator(); @@ -188,13 +188,13 @@ void xmrig::HttpApiRequest::setRpcError(int code, const char *message) } -void xmrig::HttpApiRequest::setRpcResult(rapidjson::Value &result) +void xmlcore::HttpApiRequest::setRpcResult(rapidjson::Value &result) { rpcDone(kResult, result); } -void xmrig::HttpApiRequest::rpcDone(const char *key, rapidjson::Value &value) +void xmlcore::HttpApiRequest::rpcDone(const char *key, rapidjson::Value &value) { ApiRequest::done(0); diff --git a/src/base/api/requests/HttpApiRequest.h b/src/base/api/requests/HttpApiRequest.h index 2a355582..75d2dbe2 100644 --- a/src/base/api/requests/HttpApiRequest.h +++ b/src/base/api/requests/HttpApiRequest.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ */ -#ifndef XMRIG_HTTPAPIREQUEST_H -#define XMRIG_HTTPAPIREQUEST_H +#ifndef xmlcore_HTTPAPIREQUEST_H +#define xmlcore_HTTPAPIREQUEST_H #include "base/api/requests/ApiRequest.h" @@ -32,7 +32,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class HttpData; @@ -67,8 +67,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPAPIREQUEST_H +#endif // xmlcore_HTTPAPIREQUEST_H diff --git a/src/base/base.cmake b/src/base/base.cmake index cd6ee88b..7194d527 100644 --- a/src/base/base.cmake +++ b/src/base/base.cmake @@ -198,13 +198,13 @@ if (WITH_HTTP) src/base/net/tools/TcpServer.cpp ) - add_definitions(/DXMRIG_FEATURE_HTTP) - add_definitions(/DXMRIG_FEATURE_API) + add_definitions(/Dxmlcore_FEATURE_HTTP) + add_definitions(/Dxmlcore_FEATURE_API) else() set(HEADERS_BASE_HTTP "") set(SOURCES_BASE_HTTP "") - remove_definitions(/DXMRIG_FEATURE_HTTP) - remove_definitions(/DXMRIG_FEATURE_API) + remove_definitions(/Dxmlcore_FEATURE_HTTP) + remove_definitions(/Dxmlcore_FEATURE_API) endif() @@ -214,9 +214,9 @@ endif() if (WITH_ENV_VARS) - add_definitions(/DXMRIG_FEATURE_ENV) + add_definitions(/Dxmlcore_FEATURE_ENV) else() - remove_definitions(/DXMRIG_FEATURE_ENV) + remove_definitions(/Dxmlcore_FEATURE_ENV) endif() @@ -234,7 +234,7 @@ endif() if (WITH_RANDOMX AND WITH_BENCHMARK) - add_definitions(/DXMRIG_FEATURE_BENCHMARK) + add_definitions(/Dxmlcore_FEATURE_BENCHMARK) list(APPEND HEADERS_BASE src/base/net/stratum/benchmark/BenchClient.h @@ -246,5 +246,5 @@ if (WITH_RANDOMX AND WITH_BENCHMARK) src/base/net/stratum/benchmark/BenchConfig.cpp ) else() - remove_definitions(/DXMRIG_FEATURE_BENCHMARK) + remove_definitions(/Dxmlcore_FEATURE_BENCHMARK) endif() diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp index a8a99f04..29b947c6 100644 --- a/src/base/crypto/Algorithm.cpp +++ b/src/base/crypto/Algorithm.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -39,7 +39,7 @@ #endif -namespace xmrig { +namespace xmlcore { struct AlgoName @@ -70,7 +70,7 @@ static AlgoName const algorithm_names[] = { { "cryptonight/rwz", "cn/rwz", Algorithm::CN_RWZ }, { "cryptonight/zls", "cn/zls", Algorithm::CN_ZLS }, { "cryptonight/double", "cn/double", Algorithm::CN_DOUBLE }, -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE { "cryptonight-lite/0", "cn-lite/0", Algorithm::CN_LITE_0 }, { "cryptonight-lite/1", "cn-lite/1", Algorithm::CN_LITE_1 }, { "cryptonight-lite", "cn-lite", Algorithm::CN_LITE_1 }, @@ -79,7 +79,7 @@ static AlgoName const algorithm_names[] = { { "cryptonight-aeonv7", nullptr, Algorithm::CN_LITE_1 }, { "cryptonight_lite_v7", nullptr, Algorithm::CN_LITE_1 }, # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY { "cryptonight-heavy/0", "cn-heavy/0", Algorithm::CN_HEAVY_0 }, { "cryptonight-heavy", "cn-heavy", Algorithm::CN_HEAVY_0 }, { "cryptonight_heavy", nullptr, Algorithm::CN_HEAVY_0 }, @@ -88,7 +88,7 @@ static AlgoName const algorithm_names[] = { { "cryptonight-heavy/tube", "cn-heavy/tube", Algorithm::CN_HEAVY_TUBE }, { "cryptonight-bittube2", nullptr, Algorithm::CN_HEAVY_TUBE }, # endif -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO { "cryptonight-pico", "cn-pico", Algorithm::CN_PICO_0 }, { "cryptonight-pico/trtl", "cn-pico/trtl", Algorithm::CN_PICO_0 }, { "cryptonight-turtle", "cn-trtl", Algorithm::CN_PICO_0 }, @@ -99,7 +99,7 @@ static AlgoName const algorithm_names[] = { { "cryptonight-talleo", "cn-talleo", Algorithm::CN_PICO_TLO }, { "cryptonight_talleo", "cn_talleo", Algorithm::CN_PICO_TLO }, # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX { "randomx/0", "rx/0", Algorithm::RX_0 }, { "randomx/test", "rx/test", Algorithm::RX_0 }, { "RandomX", "rx", Algorithm::RX_0 }, @@ -112,18 +112,18 @@ static AlgoName const algorithm_names[] = { { "randomx/keva", "rx/keva", Algorithm::RX_KEVA }, { "RandomKEVA", nullptr, Algorithm::RX_KEVA }, # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 { "argon2/chukwa", nullptr, Algorithm::AR2_CHUKWA }, { "chukwa", nullptr, Algorithm::AR2_CHUKWA }, { "argon2/chukwav2", nullptr, Algorithm::AR2_CHUKWA_V2 }, { "chukwav2", nullptr, Algorithm::AR2_CHUKWA_V2 }, { "argon2/wrkz", nullptr, Algorithm::AR2_WRKZ }, # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT { "astrobwt", nullptr, Algorithm::ASTROBWT_DERO }, { "astrobwt/dero", nullptr, Algorithm::ASTROBWT_DERO }, # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW { "kawpow", nullptr, Algorithm::KAWPOW_RVN }, { "kawpow/rvn", nullptr, Algorithm::KAWPOW_RVN }, # endif @@ -132,16 +132,16 @@ static AlgoName const algorithm_names[] = { }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -xmrig::Algorithm::Algorithm(const rapidjson::Value &value) : +xmlcore::Algorithm::Algorithm(const rapidjson::Value &value) : m_id(parse(value.GetString())) { } -rapidjson::Value xmrig::Algorithm::toJSON() const +rapidjson::Value xmlcore::Algorithm::toJSON() const { using namespace rapidjson; @@ -149,15 +149,15 @@ rapidjson::Value xmrig::Algorithm::toJSON() const } -rapidjson::Value xmrig::Algorithm::toJSON(rapidjson::Document &) const +rapidjson::Value xmlcore::Algorithm::toJSON(rapidjson::Document &) const { return toJSON(); } -size_t xmrig::Algorithm::l2() const +size_t xmlcore::Algorithm::l2() const { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX switch (m_id) { case RX_0: case RX_SFX: @@ -179,7 +179,7 @@ size_t xmrig::Algorithm::l2() const } -size_t xmrig::Algorithm::l3() const +size_t xmlcore::Algorithm::l3() const { constexpr size_t oneMiB = 0x100000; @@ -203,7 +203,7 @@ size_t xmrig::Algorithm::l3() const break; } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (f == RANDOM_X) { switch (m_id) { case RX_0: @@ -223,7 +223,7 @@ size_t xmrig::Algorithm::l3() const } # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 if (f == ARGON2) { switch (m_id) { case AR2_CHUKWA: @@ -241,7 +241,7 @@ size_t xmrig::Algorithm::l3() const } # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (f == ASTROBWT) { switch (m_id) { case ASTROBWT_DERO: @@ -253,7 +253,7 @@ size_t xmrig::Algorithm::l3() const } # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW if (f == KAWPOW) { switch (m_id) { case KAWPOW_RVN: @@ -269,21 +269,21 @@ size_t xmrig::Algorithm::l3() const } -uint32_t xmrig::Algorithm::maxIntensity() const +uint32_t xmlcore::Algorithm::maxIntensity() const { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (family() == RANDOM_X) { return 1; } # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 if (family() == ARGON2) { return 1; } # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT if (family() == ASTROBWT) { return 1; } @@ -293,7 +293,7 @@ uint32_t xmrig::Algorithm::maxIntensity() const } -xmrig::Algorithm::Family xmrig::Algorithm::family(Id id) +xmlcore::Algorithm::Family xmlcore::Algorithm::family(Id id) { switch (id) { case CN_0: @@ -310,26 +310,26 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id) case CN_CCX: return CN; -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE case CN_LITE_0: case CN_LITE_1: return CN_LITE; # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY case CN_HEAVY_0: case CN_HEAVY_TUBE: case CN_HEAVY_XHV: return CN_HEAVY; # endif -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO case CN_PICO_0: case CN_PICO_TLO: return CN_PICO; # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX case RX_0: case RX_WOW: case RX_ARQ: @@ -338,19 +338,19 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id) return RANDOM_X; # endif -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 case AR2_CHUKWA: case AR2_CHUKWA_V2: case AR2_WRKZ: return ARGON2; # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT case ASTROBWT_DERO: return ASTROBWT; # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW case KAWPOW_RVN: return KAWPOW; # endif @@ -363,7 +363,7 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id) } -xmrig::Algorithm::Id xmrig::Algorithm::parse(const char *name) +xmlcore::Algorithm::Id xmlcore::Algorithm::parse(const char *name) { if (name == nullptr || strlen(name) < 1) { return INVALID; @@ -379,7 +379,7 @@ xmrig::Algorithm::Id xmrig::Algorithm::parse(const char *name) } -const char *xmrig::Algorithm::name(bool shortName) const +const char *xmlcore::Algorithm::name(bool shortName) const { for (const AlgoName &item : algorithm_names) { if (item.id == m_id) { diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h index 655fa1c6..7ee8616d 100644 --- a/src/base/crypto/Algorithm.h +++ b/src/base/crypto/Algorithm.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ALGORITHM_H -#define XMRIG_ALGORITHM_H +#ifndef xmlcore_ALGORITHM_H +#define xmlcore_ALGORITHM_H #include @@ -33,7 +33,7 @@ #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class Algorithm @@ -127,7 +127,7 @@ private: using Algorithms = std::vector; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_ALGORITHM_H */ +#endif /* xmlcore_ALGORITHM_H */ diff --git a/src/base/crypto/Coin.cpp b/src/base/crypto/Coin.cpp index 33115484..78f4d9af 100644 --- a/src/base/crypto/Coin.cpp +++ b/src/base/crypto/Coin.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -36,7 +36,7 @@ #endif -namespace xmrig { +namespace xmlcore { struct CoinName @@ -60,11 +60,11 @@ static CoinName const coin_names[] = { }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -xmrig::Algorithm::Id xmrig::Coin::algorithm(uint8_t blobVersion) const +xmlcore::Algorithm::Id xmlcore::Coin::algorithm(uint8_t blobVersion) const { switch (id()) { case MONERO: @@ -94,7 +94,7 @@ xmrig::Algorithm::Id xmrig::Coin::algorithm(uint8_t blobVersion) const -const char *xmrig::Coin::name() const +const char *xmlcore::Coin::name() const { for (const auto &i : coin_names) { if (i.id == m_id) { @@ -106,7 +106,7 @@ const char *xmrig::Coin::name() const } -rapidjson::Value xmrig::Coin::toJSON() const +rapidjson::Value xmlcore::Coin::toJSON() const { using namespace rapidjson; @@ -114,7 +114,7 @@ rapidjson::Value xmrig::Coin::toJSON() const } -xmrig::Coin::Id xmrig::Coin::parse(const char *name) +xmlcore::Coin::Id xmlcore::Coin::parse(const char *name) { if (name == nullptr || strlen(name) < 3) { return INVALID; diff --git a/src/base/crypto/Coin.h b/src/base/crypto/Coin.h index 084672fc..97f041f0 100644 --- a/src/base/crypto/Coin.h +++ b/src/base/crypto/Coin.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,15 +23,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_COIN_H -#define XMRIG_COIN_H +#ifndef xmlcore_COIN_H +#define xmlcore_COIN_H #include "3rdparty/rapidjson/fwd.h" #include "base/crypto/Algorithm.h" -namespace xmrig { +namespace xmlcore { class Coin @@ -74,7 +74,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_COIN_H */ +#endif /* xmlcore_COIN_H */ diff --git a/src/base/crypto/keccak.cpp b/src/base/crypto/keccak.cpp index 6d7f093f..7cc3927f 100644 --- a/src/base/crypto/keccak.cpp +++ b/src/base/crypto/keccak.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2011 Markku-Juhani O. Saarinen * Copyright 2012-2014 pooler @@ -7,7 +7,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -51,7 +51,7 @@ const uint64_t keccakf_rndc[24] = // update the state with given number of rounds -void xmrig::keccakf(uint64_t st[25], int rounds) +void xmlcore::keccakf(uint64_t st[25], int rounds) { int i, j, round; uint64_t t, bc[5]; @@ -165,7 +165,7 @@ void xmrig::keccakf(uint64_t st[25], int rounds) typedef uint64_t state_t[25]; -void xmrig::keccak(const uint8_t *in, int inlen, uint8_t *md, int mdlen) +void xmlcore::keccak(const uint8_t *in, int inlen, uint8_t *md, int mdlen) { state_t st; alignas(8) uint8_t temp[144]; @@ -181,7 +181,7 @@ void xmrig::keccak(const uint8_t *in, int inlen, uint8_t *md, int mdlen) st[i] ^= ((uint64_t *) in)[i]; } - xmrig::keccakf(st, KECCAK_ROUNDS); + xmlcore::keccakf(st, KECCAK_ROUNDS); } // last block and padding diff --git a/src/base/crypto/keccak.h b/src/base/crypto/keccak.h index 2b039c90..fc93affb 100644 --- a/src/base/crypto/keccak.h +++ b/src/base/crypto/keccak.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2011 Markku-Juhani O. Saarinen * Copyright 2012-2014 pooler @@ -7,7 +7,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,14 +24,14 @@ */ -#ifndef XMRIG_KECCAK_H -#define XMRIG_KECCAK_H +#ifndef xmlcore_KECCAK_H +#define xmlcore_KECCAK_H #include #include -namespace xmrig { +namespace xmlcore { // compute a keccak hash (md) of given byte length from "in" void keccak(const uint8_t *in, int inlen, uint8_t *md, int mdlen); @@ -51,6 +51,6 @@ inline void keccak(const char *in, size_t inlen, uint8_t *md) // update the state void keccakf(uint64_t st[25], int norounds); -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_KECCAK_H */ +#endif /* xmlcore_KECCAK_H */ diff --git a/src/base/crypto/sha3.cpp b/src/base/crypto/sha3.cpp index ad41bd3d..9ea0dc9f 100644 --- a/src/base/crypto/sha3.cpp +++ b/src/base/crypto/sha3.cpp @@ -133,7 +133,7 @@ sha3_Update(void *priv, void const *bufIn, size_t len) ctx->saved = 0; if(++ctx->wordIndex == (SHA3_KECCAK_SPONGE_WORDS - SHA3_CW(ctx->capacityWords))) { - xmrig::keccakf(ctx->s, KECCAK_ROUNDS); + xmlcore::keccakf(ctx->s, KECCAK_ROUNDS); ctx->wordIndex = 0; } } @@ -162,7 +162,7 @@ sha3_Update(void *priv, void const *bufIn, size_t len) ctx->s[ctx->wordIndex] ^= t; if(++ctx->wordIndex == (SHA3_KECCAK_SPONGE_WORDS - SHA3_CW(ctx->capacityWords))) { - xmrig::keccakf(ctx->s, KECCAK_ROUNDS); + xmlcore::keccakf(ctx->s, KECCAK_ROUNDS); ctx->wordIndex = 0; } } @@ -210,7 +210,7 @@ sha3_Finalize(void *priv) ctx->s[SHA3_KECCAK_SPONGE_WORDS - SHA3_CW(ctx->capacityWords) - 1] ^= SHA3_CONST(0x8000000000000000UL); - xmrig::keccakf(ctx->s, KECCAK_ROUNDS); + xmlcore::keccakf(ctx->s, KECCAK_ROUNDS); /* Return first bytes of the ctx->s. This conversion is not needed for * little-endian platforms e.g. wrap with #if !defined(__BYTE_ORDER__) diff --git a/src/base/io/Async.cpp b/src/base/io/Async.cpp index 255be8c0..8467b459 100644 --- a/src/base/io/Async.cpp +++ b/src/base/io/Async.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2015-2020 libuv project contributors. * Copyright (c) 2020 cohcho * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +23,7 @@ #include "base/tools/Handle.h" -// since 2019.05.16, Version 1.29.0 (Stable) https://github.com/xmrig/xmrig/pull/1889 +// since 2019.05.16, Version 1.29.0 (Stable) https://github.com/xmlcore/xmlcore/pull/1889 #if (UV_VERSION_MAJOR >= 1) && (UV_VERSION_MINOR >= 29) && defined(__linux__) #include #include @@ -31,7 +31,7 @@ #include -namespace xmrig { +namespace xmlcore { struct uv_async_t: uv_poll_t @@ -109,11 +109,11 @@ static int uv_async_send(uv_async_t *async) -} // namespace xmrig +} // namespace xmlcore #endif -namespace xmrig { +namespace xmlcore { class AsyncPrivate @@ -125,10 +125,10 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::Async::Async(Callback callback) : d_ptr(new AsyncPrivate()) +xmlcore::Async::Async(Callback callback) : d_ptr(new AsyncPrivate()) { d_ptr->callback = std::move(callback); d_ptr->async = new uv_async_t; @@ -138,7 +138,7 @@ xmrig::Async::Async(Callback callback) : d_ptr(new AsyncPrivate()) } -xmrig::Async::Async(IAsyncListener *listener) : d_ptr(new AsyncPrivate()) +xmlcore::Async::Async(IAsyncListener *listener) : d_ptr(new AsyncPrivate()) { d_ptr->listener = listener; d_ptr->async = new uv_async_t; @@ -148,7 +148,7 @@ xmrig::Async::Async(IAsyncListener *listener) : d_ptr(new AsyncPrivate()) } -xmrig::Async::~Async() +xmlcore::Async::~Async() { Handle::close(d_ptr->async); @@ -156,7 +156,7 @@ xmrig::Async::~Async() } -void xmrig::Async::send() +void xmlcore::Async::send() { uv_async_send(d_ptr->async); } diff --git a/src/base/io/Async.h b/src/base/io/Async.h index 19491082..72c6467e 100644 --- a/src/base/io/Async.h +++ b/src/base/io/Async.h @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2015-2020 libuv project contributors. * Copyright (c) 2020 cohcho * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASYNC_H -#define XMRIG_ASYNC_H +#ifndef xmlcore_ASYNC_H +#define xmlcore_ASYNC_H #include "base/tools/Object.h" @@ -28,7 +28,7 @@ #include -namespace xmrig { +namespace xmlcore { class AsyncPrivate; @@ -38,7 +38,7 @@ class IAsyncListener; class Async { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Async) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Async) using Callback = std::function; @@ -53,7 +53,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_ASYNC_H */ +#endif /* xmlcore_ASYNC_H */ diff --git a/src/base/io/Console.cpp b/src/base/io/Console.cpp index 5af7e4a4..5a9ef9cb 100644 --- a/src/base/io/Console.cpp +++ b/src/base/io/Console.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +22,7 @@ #include "base/tools/Handle.h" -xmrig::Console::Console(IConsoleListener *listener) +xmlcore::Console::Console(IConsoleListener *listener) : m_listener(listener) { if (!isSupported()) { @@ -42,7 +42,7 @@ xmrig::Console::Console(IConsoleListener *listener) } -xmrig::Console::~Console() +xmlcore::Console::~Console() { uv_tty_reset_mode(); @@ -50,14 +50,14 @@ xmrig::Console::~Console() } -bool xmrig::Console::isSupported() const +bool xmlcore::Console::isSupported() const { const uv_handle_type type = uv_guess_handle(0); return type == UV_TTY || type == UV_NAMED_PIPE; } -void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf) +void xmlcore::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf) { auto console = static_cast(handle->data); buf->len = 1; @@ -65,7 +65,7 @@ void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf) } -void xmrig::Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) +void xmlcore::Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { if (nread < 0) { return uv_close(reinterpret_cast(stream), nullptr); diff --git a/src/base/io/Console.h b/src/base/io/Console.h index 65523b94..c6e87a3a 100644 --- a/src/base/io/Console.h +++ b/src/base/io/Console.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONSOLE_H -#define XMRIG_CONSOLE_H +#ifndef xmlcore_CONSOLE_H +#define xmlcore_CONSOLE_H #include "base/tools/Object.h" @@ -28,14 +28,14 @@ using uv_handle_t = struct uv_handle_s; using uv_stream_t = struct uv_stream_s; using uv_tty_t = struct uv_tty_s; -#ifdef XMRIG_OS_WIN +#ifdef xmlcore_OS_WIN using ssize_t = intptr_t; #else # include #endif -namespace xmrig { +namespace xmlcore { class IConsoleListener; @@ -44,7 +44,7 @@ class IConsoleListener; class Console { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Console) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Console) Console(IConsoleListener *listener); ~Console(); @@ -61,7 +61,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CONSOLE_H */ +#endif /* xmlcore_CONSOLE_H */ diff --git a/src/base/io/Env.cpp b/src/base/io/Env.cpp index 6abb8807..1bfc8156 100644 --- a/src/base/io/Env.cpp +++ b/src/base/io/Env.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -41,24 +41,24 @@ #endif -namespace xmrig { +namespace xmlcore { -#ifdef XMRIG_FEATURE_ENV +#ifdef xmlcore_FEATURE_ENV static std::map variables; static void createVariables() { - variables.insert({ "XMRIG_VERSION", APP_VERSION }); - variables.insert({ "XMRIG_KIND", APP_KIND }); - variables.insert({ "XMRIG_HOSTNAME", Env::hostname() }); - variables.insert({ "XMRIG_EXE", Process::exepath() }); - variables.insert({ "XMRIG_EXE_DIR", Process::location(Process::ExeLocation) }); - variables.insert({ "XMRIG_CWD", Process::location(Process::CwdLocation) }); - variables.insert({ "XMRIG_HOME_DIR", Process::location(Process::HomeLocation) }); - variables.insert({ "XMRIG_TEMP_DIR", Process::location(Process::TempLocation) }); - variables.insert({ "XMRIG_DATA_DIR", Process::location(Process::DataLocation) }); + variables.insert({ "xmlcore_VERSION", APP_VERSION }); + variables.insert({ "xmlcore_KIND", APP_KIND }); + variables.insert({ "xmlcore_HOSTNAME", Env::hostname() }); + variables.insert({ "xmlcore_EXE", Process::exepath() }); + variables.insert({ "xmlcore_EXE_DIR", Process::location(Process::ExeLocation) }); + variables.insert({ "xmlcore_CWD", Process::location(Process::CwdLocation) }); + variables.insert({ "xmlcore_HOME_DIR", Process::location(Process::HomeLocation) }); + variables.insert({ "xmlcore_TEMP_DIR", Process::location(Process::TempLocation) }); + variables.insert({ "xmlcore_DATA_DIR", Process::location(Process::DataLocation) }); String hostname = "HOSTNAME"; if (!getenv(hostname)) { @@ -68,12 +68,12 @@ static void createVariables() #endif -} // namespace xmrig +} // namespace xmlcore -xmrig::String xmrig::Env::expand(const char *in, const std::map &extra) +xmlcore::String xmlcore::Env::expand(const char *in, const std::map &extra) { -# ifdef XMRIG_FEATURE_ENV +# ifdef xmlcore_FEATURE_ENV if (in == nullptr) { return {}; } @@ -117,9 +117,9 @@ xmrig::String xmrig::Env::expand(const char *in, const std::map } -xmrig::String xmrig::Env::get(const String &name, const std::map &extra) +xmlcore::String xmlcore::Env::get(const String &name, const std::map &extra) { -# ifdef XMRIG_FEATURE_ENV +# ifdef xmlcore_FEATURE_ENV if (variables.empty()) { createVariables(); } @@ -141,7 +141,7 @@ xmrig::String xmrig::Env::get(const String &name, const std::map } -xmrig::String xmrig::Env::hostname() +xmlcore::String xmlcore::Env::hostname() { char buf[UV_MAXHOSTNAMESIZE]{}; size_t size = sizeof(buf); diff --git a/src/base/io/Env.h b/src/base/io/Env.h index ba7017da..dd691bb8 100644 --- a/src/base/io/Env.h +++ b/src/base/io/Env.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ENV_H -#define XMRIG_ENV_H +#ifndef xmlcore_ENV_H +#define xmlcore_ENV_H #include "base/tools/String.h" @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { class Env @@ -38,7 +38,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_ENV_H */ +#endif /* xmlcore_ENV_H */ diff --git a/src/base/io/Signals.cpp b/src/base/io/Signals.cpp index dfe4a89b..4286284e 100644 --- a/src/base/io/Signals.cpp +++ b/src/base/io/Signals.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,16 +25,16 @@ #ifdef SIGUSR1 -static const int signums[xmrig::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM, SIGUSR1 }; +static const int signums[xmlcore::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM, SIGUSR1 }; #else -static const int signums[xmrig::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM }; +static const int signums[xmlcore::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM }; #endif -xmrig::Signals::Signals(ISignalListener *listener) +xmlcore::Signals::Signals(ISignalListener *listener) : m_listener(listener) { -# ifndef XMRIG_OS_WIN +# ifndef xmlcore_OS_WIN signal(SIGPIPE, SIG_IGN); # endif @@ -50,7 +50,7 @@ xmrig::Signals::Signals(ISignalListener *listener) } -xmrig::Signals::~Signals() +xmlcore::Signals::~Signals() { for (auto signal : m_signals) { Handle::close(signal); @@ -58,7 +58,7 @@ xmrig::Signals::~Signals() } -void xmrig::Signals::onSignal(uv_signal_t *handle, int signum) +void xmlcore::Signals::onSignal(uv_signal_t *handle, int signum) { switch (signum) { diff --git a/src/base/io/Signals.h b/src/base/io/Signals.h index 56be5889..22c32d93 100644 --- a/src/base/io/Signals.h +++ b/src/base/io/Signals.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SIGNALS_H -#define XMRIG_SIGNALS_H +#ifndef xmlcore_SIGNALS_H +#define xmlcore_SIGNALS_H #include "base/tools/Object.h" @@ -30,7 +30,7 @@ using uv_signal_t = struct uv_signal_s; -namespace xmrig { +namespace xmlcore { class ISignalListener; @@ -39,7 +39,7 @@ class ISignalListener; class Signals { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Signals) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Signals) # ifdef SIGUSR1 constexpr static const size_t kSignalsCount = 4; @@ -60,7 +60,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_SIGNALS_H */ +#endif /* xmlcore_SIGNALS_H */ diff --git a/src/base/io/Watcher.cpp b/src/base/io/Watcher.cpp index f5ce9647..6f96933b 100644 --- a/src/base/io/Watcher.cpp +++ b/src/base/io/Watcher.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -32,7 +32,7 @@ #include "base/tools/Timer.h" -xmrig::Watcher::Watcher(const String &path, IWatcherListener *listener) : +xmlcore::Watcher::Watcher(const String &path, IWatcherListener *listener) : m_listener(listener), m_path(path) { @@ -46,7 +46,7 @@ xmrig::Watcher::Watcher(const String &path, IWatcherListener *listener) : } -xmrig::Watcher::~Watcher() +xmlcore::Watcher::~Watcher() { delete m_timer; @@ -54,7 +54,7 @@ xmrig::Watcher::~Watcher() } -void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int, int) +void xmlcore::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int, int) { if (!filename) { return; @@ -64,14 +64,14 @@ void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int, } -void xmrig::Watcher::queueUpdate() +void xmlcore::Watcher::queueUpdate() { m_timer->stop(); m_timer->start(kDelay, 0); } -void xmrig::Watcher::reload() +void xmlcore::Watcher::reload() { m_listener->onFileChanged(m_path); @@ -82,7 +82,7 @@ void xmrig::Watcher::reload() } -void xmrig::Watcher::start() +void xmlcore::Watcher::start() { - uv_fs_event_start(m_fsEvent, xmrig::Watcher::onFsEvent, m_path, 0); + uv_fs_event_start(m_fsEvent, xmlcore::Watcher::onFsEvent, m_path, 0); } diff --git a/src/base/io/Watcher.h b/src/base/io/Watcher.h index 6438cb7a..5576c1f2 100644 --- a/src/base/io/Watcher.h +++ b/src/base/io/Watcher.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_WATCHER_H -#define XMRIG_WATCHER_H +#ifndef xmlcore_WATCHER_H +#define xmlcore_WATCHER_H #include "base/kernel/interfaces/ITimerListener.h" @@ -33,7 +33,7 @@ typedef struct uv_fs_event_s uv_fs_event_t; -namespace xmrig { +namespace xmlcore { class IWatcherListener; @@ -65,7 +65,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_WATCHER_H */ +#endif /* xmlcore_WATCHER_H */ diff --git a/src/base/io/json/Json.cpp b/src/base/io/json/Json.cpp index 99a087e9..aa80fea8 100644 --- a/src/base/io/json/Json.cpp +++ b/src/base/io/json/Json.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -26,14 +26,14 @@ #include -namespace xmrig { +namespace xmlcore { static const rapidjson::Value kNullValue; } -bool xmrig::Json::getBool(const rapidjson::Value &obj, const char *key, bool defaultValue) +bool xmlcore::Json::getBool(const rapidjson::Value &obj, const char *key, bool defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -48,13 +48,13 @@ bool xmrig::Json::getBool(const rapidjson::Value &obj, const char *key, bool def } -bool xmrig::Json::isEmpty(const rapidjson::Value &obj) +bool xmlcore::Json::isEmpty(const rapidjson::Value &obj) { return !obj.IsObject() || obj.ObjectEmpty(); } -const char *xmrig::Json::getString(const rapidjson::Value &obj, const char *key, const char *defaultValue) +const char *xmlcore::Json::getString(const rapidjson::Value &obj, const char *key, const char *defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -69,7 +69,7 @@ const char *xmrig::Json::getString(const rapidjson::Value &obj, const char *key, } -const rapidjson::Value &xmrig::Json::getArray(const rapidjson::Value &obj, const char *key) +const rapidjson::Value &xmlcore::Json::getArray(const rapidjson::Value &obj, const char *key) { if (isEmpty(obj)) { return kNullValue; @@ -84,7 +84,7 @@ const rapidjson::Value &xmrig::Json::getArray(const rapidjson::Value &obj, const } -const rapidjson::Value &xmrig::Json::getObject(const rapidjson::Value &obj, const char *key) +const rapidjson::Value &xmlcore::Json::getObject(const rapidjson::Value &obj, const char *key) { if (isEmpty(obj)) { return kNullValue; @@ -99,7 +99,7 @@ const rapidjson::Value &xmrig::Json::getObject(const rapidjson::Value &obj, cons } -const rapidjson::Value &xmrig::Json::getValue(const rapidjson::Value &obj, const char *key) +const rapidjson::Value &xmlcore::Json::getValue(const rapidjson::Value &obj, const char *key) { if (isEmpty(obj)) { return kNullValue; @@ -114,7 +114,7 @@ const rapidjson::Value &xmrig::Json::getValue(const rapidjson::Value &obj, const } -double xmrig::Json::getDouble(const rapidjson::Value &obj, const char *key, double defaultValue) +double xmlcore::Json::getDouble(const rapidjson::Value &obj, const char *key, double defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -129,7 +129,7 @@ double xmrig::Json::getDouble(const rapidjson::Value &obj, const char *key, doub } -int xmrig::Json::getInt(const rapidjson::Value &obj, const char *key, int defaultValue) +int xmlcore::Json::getInt(const rapidjson::Value &obj, const char *key, int defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -144,7 +144,7 @@ int xmrig::Json::getInt(const rapidjson::Value &obj, const char *key, int defaul } -int64_t xmrig::Json::getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue) +int64_t xmlcore::Json::getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -159,7 +159,7 @@ int64_t xmrig::Json::getInt64(const rapidjson::Value &obj, const char *key, int6 } -xmrig::String xmrig::Json::getString(const rapidjson::Value &obj, const char *key, size_t maxSize) +xmlcore::String xmlcore::Json::getString(const rapidjson::Value &obj, const char *key, size_t maxSize) { if (isEmpty(obj)) { return {}; @@ -178,7 +178,7 @@ xmrig::String xmrig::Json::getString(const rapidjson::Value &obj, const char *ke } -uint64_t xmrig::Json::getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue) +uint64_t xmlcore::Json::getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -193,7 +193,7 @@ uint64_t xmrig::Json::getUint64(const rapidjson::Value &obj, const char *key, ui } -unsigned xmrig::Json::getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue) +unsigned xmlcore::Json::getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue) { if (isEmpty(obj)) { return defaultValue; @@ -208,7 +208,7 @@ unsigned xmrig::Json::getUint(const rapidjson::Value &obj, const char *key, unsi } -rapidjson::Value xmrig::Json::normalize(double value, bool zero) +rapidjson::Value xmlcore::Json::normalize(double value, bool zero) { using namespace rapidjson; @@ -220,7 +220,7 @@ rapidjson::Value xmrig::Json::normalize(double value, bool zero) } -bool xmrig::Json::convertOffset(std::istream &ifs, size_t offset, size_t &line, size_t &pos, std::vector &s) +bool xmlcore::Json::convertOffset(std::istream &ifs, size_t offset, size_t &line, size_t &pos, std::vector &s) { std::string prev_t; std::string t; @@ -251,12 +251,12 @@ bool xmrig::Json::convertOffset(std::istream &ifs, size_t offset, size_t &line, } -xmrig::JsonReader::JsonReader() : +xmlcore::JsonReader::JsonReader() : m_obj(kNullValue) {} -bool xmrig::JsonReader::isEmpty() const +bool xmlcore::JsonReader::isEmpty() const { return Json::isEmpty(m_obj); } diff --git a/src/base/io/json/Json.h b/src/base/io/json/Json.h index e5d0fcc6..d8a660bb 100644 --- a/src/base/io/json/Json.h +++ b/src/base/io/json/Json.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_JSON_H -#define XMRIG_JSON_H +#ifndef xmlcore_JSON_H +#define xmlcore_JSON_H #include "base/kernel/interfaces/IJsonReader.h" @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { class Json @@ -82,7 +82,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_JSON_H */ +#endif /* xmlcore_JSON_H */ diff --git a/src/base/io/json/JsonChain.cpp b/src/base/io/json/JsonChain.cpp index 0a4a1857..2c48ecea 100644 --- a/src/base/io/json/JsonChain.cpp +++ b/src/base/io/json/JsonChain.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,17 +23,17 @@ #include "base/io/log/Log.h" -namespace xmrig { +namespace xmlcore { static const rapidjson::Value kNullValue; } -xmrig::JsonChain::JsonChain() = default; +xmlcore::JsonChain::JsonChain() = default; -bool xmrig::JsonChain::add(rapidjson::Document &&doc) +bool xmlcore::JsonChain::add(rapidjson::Document &&doc) { if (doc.HasParseError() || !doc.IsObject() || doc.ObjectEmpty()) { return false; @@ -45,7 +45,7 @@ bool xmrig::JsonChain::add(rapidjson::Document &&doc) } -bool xmrig::JsonChain::addFile(const char *fileName) +bool xmlcore::JsonChain::addFile(const char *fileName) { using namespace rapidjson; Document doc; @@ -88,7 +88,7 @@ bool xmrig::JsonChain::addFile(const char *fileName) } -bool xmrig::JsonChain::addRaw(const char *json) +bool xmlcore::JsonChain::addRaw(const char *json) { using namespace rapidjson; Document doc; @@ -98,7 +98,7 @@ bool xmrig::JsonChain::addRaw(const char *json) } -void xmrig::JsonChain::dump(const char *fileName) +void xmlcore::JsonChain::dump(const char *fileName) { rapidjson::Document doc(rapidjson::kArrayType); @@ -110,7 +110,7 @@ void xmrig::JsonChain::dump(const char *fileName) } -bool xmrig::JsonChain::getBool(const char *key, bool defaultValue) const +bool xmlcore::JsonChain::getBool(const char *key, bool defaultValue) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -123,7 +123,7 @@ bool xmrig::JsonChain::getBool(const char *key, bool defaultValue) const } -const char *xmrig::JsonChain::getString(const char *key, const char *defaultValue) const +const char *xmlcore::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); @@ -136,7 +136,7 @@ const char *xmrig::JsonChain::getString(const char *key, const char *defaultValu } -const rapidjson::Value &xmrig::JsonChain::getArray(const char *key) const +const rapidjson::Value &xmlcore::JsonChain::getArray(const char *key) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -149,7 +149,7 @@ const rapidjson::Value &xmrig::JsonChain::getArray(const char *key) const } -const rapidjson::Value &xmrig::JsonChain::getObject(const char *key) const +const rapidjson::Value &xmlcore::JsonChain::getObject(const char *key) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -162,7 +162,7 @@ const rapidjson::Value &xmrig::JsonChain::getObject(const char *key) const } -const rapidjson::Value &xmrig::JsonChain::getValue(const char *key) const +const rapidjson::Value &xmlcore::JsonChain::getValue(const char *key) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -176,7 +176,7 @@ const rapidjson::Value &xmrig::JsonChain::getValue(const char *key) const -const rapidjson::Value &xmrig::JsonChain::object() const +const rapidjson::Value &xmlcore::JsonChain::object() const { assert(false); @@ -184,7 +184,7 @@ const rapidjson::Value &xmrig::JsonChain::object() const } -double xmrig::JsonChain::getDouble(const char *key, double defaultValue) const +double xmlcore::JsonChain::getDouble(const char *key, double defaultValue) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -197,7 +197,7 @@ double xmrig::JsonChain::getDouble(const char *key, double defaultValue) const } -int xmrig::JsonChain::getInt(const char *key, int defaultValue) const +int xmlcore::JsonChain::getInt(const char *key, int defaultValue) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -210,7 +210,7 @@ int xmrig::JsonChain::getInt(const char *key, int defaultValue) const } -int64_t xmrig::JsonChain::getInt64(const char *key, int64_t defaultValue) const +int64_t xmlcore::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); @@ -224,7 +224,7 @@ int64_t xmrig::JsonChain::getInt64(const char *key, int64_t defaultValue) const -xmrig::String xmrig::JsonChain::getString(const char *key, size_t maxSize) const +xmlcore::String xmlcore::JsonChain::getString(const char *key, size_t maxSize) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); @@ -241,7 +241,7 @@ xmrig::String xmrig::JsonChain::getString(const char *key, size_t maxSize) const } -uint64_t xmrig::JsonChain::getUint64(const char *key, uint64_t defaultValue) const +uint64_t xmlcore::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); @@ -254,7 +254,7 @@ uint64_t xmrig::JsonChain::getUint64(const char *key, uint64_t defaultValue) con } -unsigned xmrig::JsonChain::getUint(const char *key, unsigned defaultValue) const +unsigned xmlcore::JsonChain::getUint(const char *key, unsigned defaultValue) const { for (auto it = m_chain.rbegin(); it != m_chain.rend(); ++it) { auto i = it->FindMember(key); diff --git a/src/base/io/json/JsonChain.h b/src/base/io/json/JsonChain.h index d7fc2f05..4426cc0d 100644 --- a/src/base/io/json/JsonChain.h +++ b/src/base/io/json/JsonChain.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_JSONCHAIN_H -#define XMRIG_JSONCHAIN_H +#ifndef xmlcore_JSONCHAIN_H +#define xmlcore_JSONCHAIN_H #include @@ -28,7 +28,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class JsonChain : public IJsonReader @@ -67,7 +67,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_JSONCHAIN_H */ +#endif /* xmlcore_JSONCHAIN_H */ diff --git a/src/base/io/json/JsonRequest.cpp b/src/base/io/json/JsonRequest.cpp index 2bfdda00..20071658 100644 --- a/src/base/io/json/JsonRequest.cpp +++ b/src/base/io/json/JsonRequest.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +21,7 @@ #include "3rdparty/rapidjson/document.h" -namespace xmrig { +namespace xmlcore { const char *JsonRequest::k2_0 = "2.0"; @@ -42,16 +42,16 @@ const char *JsonRequest::kInternalError = "internal error"; static uint64_t nextId = 0; -} // namespace xmrig +} // namespace xmlcore -rapidjson::Document xmrig::JsonRequest::create(const char *method) +rapidjson::Document xmlcore::JsonRequest::create(const char *method) { return create(++nextId, method); } -rapidjson::Document xmrig::JsonRequest::create(int64_t id, const char *method) +rapidjson::Document xmlcore::JsonRequest::create(int64_t id, const char *method) { using namespace rapidjson; Document doc(kObjectType); @@ -65,13 +65,13 @@ rapidjson::Document xmrig::JsonRequest::create(int64_t id, const char *method) } -uint64_t xmrig::JsonRequest::create(rapidjson::Document &doc, const char *method, rapidjson::Value ¶ms) +uint64_t xmlcore::JsonRequest::create(rapidjson::Document &doc, const char *method, rapidjson::Value ¶ms) { return create(doc, ++nextId, method, params); } -uint64_t xmrig::JsonRequest::create(rapidjson::Document &doc, int64_t id, const char *method, rapidjson::Value ¶ms) +uint64_t xmlcore::JsonRequest::create(rapidjson::Document &doc, int64_t id, const char *method, rapidjson::Value ¶ms) { using namespace rapidjson; auto &allocator = doc.GetAllocator(); diff --git a/src/base/io/json/JsonRequest.h b/src/base/io/json/JsonRequest.h index 21451a43..6e01ebb8 100644 --- a/src/base/io/json/JsonRequest.h +++ b/src/base/io/json/JsonRequest.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_JSONREQUEST_H -#define XMRIG_JSONREQUEST_H +#ifndef xmlcore_JSONREQUEST_H +#define xmlcore_JSONREQUEST_H #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class JsonRequest @@ -57,7 +57,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_JSONREQUEST_H */ +#endif /* xmlcore_JSONREQUEST_H */ diff --git a/src/base/io/json/Json_unix.cpp b/src/base/io/json/Json_unix.cpp index d2a2f351..90c6ba4b 100644 --- a/src/base/io/json/Json_unix.cpp +++ b/src/base/io/json/Json_unix.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +27,7 @@ #include "3rdparty/rapidjson/prettywriter.h" -bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc) +bool xmlcore::Json::get(const char *fileName, rapidjson::Document &doc) { std::ifstream ifs(fileName, std::ios_base::in | std::ios_base::binary); if (!ifs.is_open()) { @@ -41,7 +41,7 @@ bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc) } -bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc) +bool xmlcore::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()) { @@ -51,7 +51,7 @@ bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc) rapidjson::OStreamWrapper osw(ofs); rapidjson::PrettyWriter writer(osw); -# ifdef XMRIG_JSON_SINGLE_LINE_ARRAY +# ifdef xmlcore_JSON_SINGLE_LINE_ARRAY writer.SetFormatOptions(rapidjson::kFormatSingleLineArray); # endif @@ -61,7 +61,7 @@ bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc) } -bool xmrig::Json::convertOffset(const char* fileName, size_t offset, size_t& line, size_t& pos, std::vector& s) +bool xmlcore::Json::convertOffset(const char* fileName, size_t offset, size_t& line, size_t& pos, std::vector& s) { std::ifstream ifs(fileName, std::ios_base::in | std::ios_base::binary); if (!ifs.is_open()) { diff --git a/src/base/io/json/Json_win.cpp b/src/base/io/json/Json_win.cpp index cd7cf584..3a6cb317 100644 --- a/src/base/io/json/Json_win.cpp +++ b/src/base/io/json/Json_win.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -37,7 +37,7 @@ #include "3rdparty/rapidjson/prettywriter.h" -namespace xmrig { +namespace xmlcore { #if defined(_MSC_VER) || defined (__GNUC__) @@ -79,10 +79,10 @@ static std::wstring toUtf16(const char *str) } #endif -} // namespace xmrig +} // namespace xmlcore -bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc) +bool xmlcore::Json::get(const char *fileName, rapidjson::Document &doc) { OPEN_IFS(fileName) @@ -94,7 +94,7 @@ bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc) } -bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc) +bool xmlcore::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; @@ -122,7 +122,7 @@ bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc) OStreamWrapper osw(ofs); PrettyWriter writer(osw); -# ifdef XMRIG_JSON_SINGLE_LINE_ARRAY +# ifdef xmlcore_JSON_SINGLE_LINE_ARRAY writer.SetFormatOptions(kFormatSingleLineArray); # endif @@ -132,7 +132,7 @@ bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc) } -bool xmrig::Json::convertOffset(const char *fileName, size_t offset, size_t &line, size_t &pos, std::vector &s) +bool xmlcore::Json::convertOffset(const char *fileName, size_t offset, size_t &line, size_t &pos, std::vector &s) { OPEN_IFS(fileName) diff --git a/src/base/io/log/FileLogWriter.cpp b/src/base/io/log/FileLogWriter.cpp index 921d9337..6640a3f9 100644 --- a/src/base/io/log/FileLogWriter.cpp +++ b/src/base/io/log/FileLogWriter.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { static void fsWriteCallback(uv_fs_t *req) @@ -40,10 +40,10 @@ static void fsWriteCallback(uv_fs_t *req) static const char *kNewLine = "\n"; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::FileLogWriter::open(const char *fileName) +bool xmlcore::FileLogWriter::open(const char *fileName) { assert(fileName != nullptr); if (!fileName) { @@ -58,7 +58,7 @@ bool xmrig::FileLogWriter::open(const char *fileName) } -bool xmrig::FileLogWriter::write(const char *data, size_t size) +bool xmlcore::FileLogWriter::write(const char *data, size_t size) { if (!isOpen()) { return false; @@ -76,7 +76,7 @@ bool xmrig::FileLogWriter::write(const char *data, size_t size) } -bool xmrig::FileLogWriter::writeLine(const char *data, size_t size) +bool xmlcore::FileLogWriter::writeLine(const char *data, size_t size) { uv_buf_t buf[2] = { uv_buf_init(new char[size], size), diff --git a/src/base/io/log/FileLogWriter.h b/src/base/io/log/FileLogWriter.h index 5dca4c58..d20cdea5 100644 --- a/src/base/io/log/FileLogWriter.h +++ b/src/base/io/log/FileLogWriter.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_FILELOGWRITER_H -#define XMRIG_FILELOGWRITER_H +#ifndef xmlcore_FILELOGWRITER_H +#define xmlcore_FILELOGWRITER_H #include -namespace xmrig { +namespace xmlcore { class FileLogWriter @@ -43,7 +43,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_FILELOGWRITER_H */ +#endif /* xmlcore_FILELOGWRITER_H */ diff --git a/src/base/io/log/Log.cpp b/src/base/io/log/Log.cpp index e144858a..d92cf7e2 100644 --- a/src/base/io/log/Log.cpp +++ b/src/base/io/log/Log.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -40,7 +40,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { static const char *colors_map[] = { @@ -63,7 +63,7 @@ static const char *colors_map[] = { class LogPrivate { public: - XMRIG_DISABLE_COPY_MOVE(LogPrivate) + xmlcore_DISABLE_COPY_MOVE(LogPrivate) LogPrivate() = default; @@ -199,11 +199,11 @@ LogPrivate *Log::d = nullptr; uint32_t Log::m_verbose = 0; -} /* namespace xmrig */ +} /* namespace xmlcore */ -void xmrig::Log::add(ILogBackend *backend) +void xmlcore::Log::add(ILogBackend *backend) { assert(d != nullptr); @@ -213,20 +213,20 @@ void xmrig::Log::add(ILogBackend *backend) } -void xmrig::Log::destroy() +void xmlcore::Log::destroy() { delete d; d = nullptr; } -void xmrig::Log::init() +void xmlcore::Log::init() { d = new LogPrivate(); } -void xmrig::Log::print(const char *fmt, ...) +void xmlcore::Log::print(const char *fmt, ...) { if (!d) { return; @@ -241,7 +241,7 @@ void xmrig::Log::print(const char *fmt, ...) } -void xmrig::Log::print(Level level, const char *fmt, ...) +void xmlcore::Log::print(Level level, const char *fmt, ...) { if (!d) { return; diff --git a/src/base/io/log/Log.h b/src/base/io/log/Log.h index 6da2e892..5e5d65e8 100644 --- a/src/base/io/log/Log.h +++ b/src/base/io/log/Log.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_LOG_H -#define XMRIG_LOG_H +#ifndef xmlcore_LOG_H +#define xmlcore_LOG_H #include #include -namespace xmrig { +namespace xmlcore { class ILogBackend; @@ -76,7 +76,7 @@ private: #define BRIGHT_BLACK_S CSI "0;90m" // somewhat MD.GRAY #define BLACK_S CSI "0;30m" -#ifdef XMRIG_OS_APPLE +#ifdef xmlcore_OS_APPLE # define BLACK_BOLD_S CSI "0;37m" #else # define BLACK_BOLD_S CSI "1;30m" // another name for GRAY @@ -136,36 +136,36 @@ private: #define CYAN_BG_BOLD(x) CYAN_BG_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__) -#define LOG_VERBOSE(x, ...) if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); } -#define LOG_V1(x, ...) if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); } -#define LOG_V2(x, ...) if (xmrig::Log::verbose() > 1) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); } -#define LOG_V3(x, ...) if (xmrig::Log::verbose() > 2) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); } -#define LOG_V4(x, ...) if (xmrig::Log::verbose() > 3) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); } -#define LOG_V5(x, ...) if (xmrig::Log::verbose() > 4) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); } +#define LOG_EMERG(x, ...) xmlcore::Log::print(xmlcore::Log::EMERG, x, ##__VA_ARGS__) +#define LOG_ALERT(x, ...) xmlcore::Log::print(xmlcore::Log::ALERT, x, ##__VA_ARGS__) +#define LOG_CRIT(x, ...) xmlcore::Log::print(xmlcore::Log::CRIT, x, ##__VA_ARGS__) +#define LOG_ERR(x, ...) xmlcore::Log::print(xmlcore::Log::ERR, x, ##__VA_ARGS__) +#define LOG_WARN(x, ...) xmlcore::Log::print(xmlcore::Log::WARNING, x, ##__VA_ARGS__) +#define LOG_NOTICE(x, ...) xmlcore::Log::print(xmlcore::Log::NOTICE, x, ##__VA_ARGS__) +#define LOG_INFO(x, ...) xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__) +#define LOG_VERBOSE(x, ...) if (xmlcore::Log::verbose() > 0) { xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__); } +#define LOG_V1(x, ...) if (xmlcore::Log::verbose() > 0) { xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__); } +#define LOG_V2(x, ...) if (xmlcore::Log::verbose() > 1) { xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__); } +#define LOG_V3(x, ...) if (xmlcore::Log::verbose() > 2) { xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__); } +#define LOG_V4(x, ...) if (xmlcore::Log::verbose() > 3) { xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__); } +#define LOG_V5(x, ...) if (xmlcore::Log::verbose() > 4) { xmlcore::Log::print(xmlcore::Log::INFO, x, ##__VA_ARGS__); } #ifdef APP_DEBUG -# define LOG_DEBUG(x, ...) xmrig::Log::print(xmrig::Log::DEBUG, x, ##__VA_ARGS__) +# define LOG_DEBUG(x, ...) xmlcore::Log::print(xmlcore::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__) +# define LOG_DEBUG_ERR(x, ...) xmlcore::Log::print(xmlcore::Log::ERR, x, ##__VA_ARGS__) +# define LOG_DEBUG_WARN(x, ...) xmlcore::Log::print(xmlcore::Log::WARNING, x, ##__VA_ARGS__) #else # define LOG_DEBUG_ERR(x, ...) # define LOG_DEBUG_WARN(x, ...) #endif -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_LOG_H */ +#endif /* xmlcore_LOG_H */ diff --git a/src/base/io/log/Tags.cpp b/src/base/io/log/Tags.cpp index 3960a14d..6c47b7a3 100644 --- a/src/base/io/log/Tags.cpp +++ b/src/base/io/log/Tags.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +21,7 @@ #include "base/io/log/Log.h" -const char *xmrig::Tags::config() +const char *xmlcore::Tags::config() { static const char *tag = CYAN_BG_BOLD(WHITE_BOLD_S " config "); @@ -29,7 +29,7 @@ const char *xmrig::Tags::config() } -const char *xmrig::Tags::network() +const char *xmlcore::Tags::network() { static const char *tag = BLUE_BG_BOLD(WHITE_BOLD_S " net "); @@ -37,7 +37,7 @@ const char *xmrig::Tags::network() } -const char *xmrig::Tags::signal() +const char *xmlcore::Tags::signal() { static const char *tag = YELLOW_BG_BOLD(WHITE_BOLD_S " signal "); @@ -45,8 +45,8 @@ const char *xmrig::Tags::signal() } -#ifdef XMRIG_MINER_PROJECT -const char *xmrig::Tags::cpu() +#ifdef xmlcore_MINER_PROJECT +const char *xmlcore::Tags::cpu() { static const char *tag = CYAN_BG_BOLD(WHITE_BOLD_S " cpu "); @@ -54,7 +54,7 @@ const char *xmrig::Tags::cpu() } -const char *xmrig::Tags::miner() +const char *xmlcore::Tags::miner() { static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " miner "); @@ -62,8 +62,8 @@ const char *xmrig::Tags::miner() } -#ifdef XMRIG_ALGO_RANDOMX -const char *xmrig::Tags::randomx() +#ifdef xmlcore_ALGO_RANDOMX +const char *xmlcore::Tags::randomx() { static const char *tag = BLUE_BG(WHITE_BOLD_S " randomx ") " "; @@ -72,8 +72,8 @@ const char *xmrig::Tags::randomx() #endif -#ifdef XMRIG_FEATURE_BENCHMARK -const char *xmrig::Tags::bench() +#ifdef xmlcore_FEATURE_BENCHMARK +const char *xmlcore::Tags::bench() { static const char *tag = GREEN_BG_BOLD(WHITE_BOLD_S " bench "); @@ -83,8 +83,8 @@ const char *xmrig::Tags::bench() #endif -#ifdef XMRIG_PROXY_PROJECT -const char *xmrig::Tags::proxy() +#ifdef xmlcore_PROXY_PROJECT +const char *xmlcore::Tags::proxy() { static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " proxy "); @@ -93,8 +93,8 @@ const char *xmrig::Tags::proxy() #endif -#ifdef XMRIG_FEATURE_CUDA -const char *xmrig::Tags::nvidia() +#ifdef xmlcore_FEATURE_CUDA +const char *xmlcore::Tags::nvidia() { static const char *tag = GREEN_BG_BOLD(WHITE_BOLD_S " nvidia "); @@ -103,8 +103,8 @@ const char *xmrig::Tags::nvidia() #endif -#ifdef XMRIG_FEATURE_OPENCL -const char *xmrig::Tags::opencl() +#ifdef xmlcore_FEATURE_OPENCL +const char *xmlcore::Tags::opencl() { static const char *tag = MAGENTA_BG_BOLD(WHITE_BOLD_S " opencl "); @@ -113,8 +113,8 @@ const char *xmrig::Tags::opencl() #endif -#ifdef XMRIG_FEATURE_PROFILING -const char* xmrig::Tags::profiler() +#ifdef xmlcore_FEATURE_PROFILING +const char* xmlcore::Tags::profiler() { static const char* tag = CYAN_BG_BOLD(WHITE_BOLD_S " profile "); diff --git a/src/base/io/log/Tags.h b/src/base/io/log/Tags.h index 9f690ef2..13e697c0 100644 --- a/src/base/io/log/Tags.h +++ b/src/base/io/log/Tags.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TAGS_H -#define XMRIG_TAGS_H +#ifndef xmlcore_TAGS_H +#define xmlcore_TAGS_H #include #include -namespace xmrig { +namespace xmlcore { class Tags @@ -34,36 +34,36 @@ public: static const char *network(); static const char *signal(); -# ifdef XMRIG_MINER_PROJECT +# ifdef xmlcore_MINER_PROJECT static const char *cpu(); static const char *miner(); -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX static const char *randomx(); # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK static const char *bench(); # endif # endif -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT static const char *proxy(); # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA static const char *nvidia(); # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL static const char *opencl(); # endif -# ifdef XMRIG_FEATURE_PROFILING +# ifdef xmlcore_FEATURE_PROFILING static const char* profiler(); # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_TAGS_H */ +#endif /* xmlcore_TAGS_H */ diff --git a/src/base/io/log/backends/ConsoleLog.cpp b/src/base/io/log/backends/ConsoleLog.cpp index cc3081fd..ef0fad41 100644 --- a/src/base/io/log/backends/ConsoleLog.cpp +++ b/src/base/io/log/backends/ConsoleLog.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +27,7 @@ #include -xmrig::ConsoleLog::ConsoleLog(const Title &title) +xmlcore::ConsoleLog::ConsoleLog(const Title &title) { if (!isSupported()) { Log::setColors(false); @@ -43,7 +43,7 @@ xmrig::ConsoleLog::ConsoleLog(const Title &title) uv_tty_set_mode(m_tty, UV_TTY_MODE_NORMAL); -# ifdef XMRIG_OS_WIN +# ifdef xmlcore_OS_WIN m_stream = reinterpret_cast(m_tty); HANDLE handle = GetStdHandle(STD_INPUT_HANDLE); @@ -62,19 +62,19 @@ xmrig::ConsoleLog::ConsoleLog(const Title &title) } -xmrig::ConsoleLog::~ConsoleLog() +xmlcore::ConsoleLog::~ConsoleLog() { Handle::close(m_tty); } -void xmrig::ConsoleLog::print(uint64_t, int, const char *line, size_t, size_t size, bool colors) +void xmlcore::ConsoleLog::print(uint64_t, int, const char *line, size_t, size_t size, bool colors) { if (!m_tty || Log::isColors() != colors) { return; } -# ifdef XMRIG_OS_WIN +# ifdef xmlcore_OS_WIN uv_buf_t buf = uv_buf_init(const_cast(line), static_cast(size)); if (!isWritable()) { @@ -91,15 +91,15 @@ void xmrig::ConsoleLog::print(uint64_t, int, const char *line, size_t, size_t si } -bool xmrig::ConsoleLog::isSupported() const +bool xmlcore::ConsoleLog::isSupported() const { const uv_handle_type type = uv_guess_handle(1); return type == UV_TTY || type == UV_NAMED_PIPE; } -#ifdef XMRIG_OS_WIN -bool xmrig::ConsoleLog::isWritable() const +#ifdef xmlcore_OS_WIN +bool xmlcore::ConsoleLog::isWritable() const { if (!m_stream || uv_is_writable(m_stream) != 1) { return false; diff --git a/src/base/io/log/backends/ConsoleLog.h b/src/base/io/log/backends/ConsoleLog.h index 01917763..3e234864 100644 --- a/src/base/io/log/backends/ConsoleLog.h +++ b/src/base/io/log/backends/ConsoleLog.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONSOLELOG_H -#define XMRIG_CONSOLELOG_H +#ifndef xmlcore_CONSOLELOG_H +#define xmlcore_CONSOLELOG_H using uv_stream_t = struct uv_stream_s; @@ -29,7 +29,7 @@ using uv_tty_t = struct uv_tty_s; #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Title; @@ -38,7 +38,7 @@ class Title; class ConsoleLog : public ILogBackend { public: - XMRIG_DISABLE_COPY_MOVE(ConsoleLog) + xmlcore_DISABLE_COPY_MOVE(ConsoleLog) ConsoleLog(const Title &title); ~ConsoleLog() override; @@ -51,7 +51,7 @@ private: uv_tty_t *m_tty = nullptr; -# ifdef XMRIG_OS_WIN +# ifdef xmlcore_OS_WIN bool isWritable() const; uv_stream_t *m_stream = nullptr; @@ -59,7 +59,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CONSOLELOG_H */ +#endif /* xmlcore_CONSOLELOG_H */ diff --git a/src/base/io/log/backends/FileLog.cpp b/src/base/io/log/backends/FileLog.cpp index 51e5b1f7..c59b27cd 100644 --- a/src/base/io/log/backends/FileLog.cpp +++ b/src/base/io/log/backends/FileLog.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,13 +25,13 @@ #include -xmrig::FileLog::FileLog(const char *fileName) : +xmlcore::FileLog::FileLog(const char *fileName) : m_writer(fileName) { } -void xmrig::FileLog::print(uint64_t, int, const char *line, size_t, size_t size, bool colors) +void xmlcore::FileLog::print(uint64_t, int, const char *line, size_t, size_t size, bool colors) { if (!m_writer.isOpen() || colors) { return; diff --git a/src/base/io/log/backends/FileLog.h b/src/base/io/log/backends/FileLog.h index c52cefd9..9d57a2fd 100644 --- a/src/base/io/log/backends/FileLog.h +++ b/src/base/io/log/backends/FileLog.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_FILELOG_H -#define XMRIG_FILELOG_H +#ifndef xmlcore_FILELOG_H +#define xmlcore_FILELOG_H #include "base/io/log/FileLogWriter.h" #include "base/kernel/interfaces/ILogBackend.h" -namespace xmrig { +namespace xmlcore { class FileLog : public ILogBackend @@ -41,7 +41,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_FILELOG_H */ +#endif /* xmlcore_FILELOG_H */ diff --git a/src/base/io/log/backends/SysLog.cpp b/src/base/io/log/backends/SysLog.cpp index bd333908..63468d91 100644 --- a/src/base/io/log/backends/SysLog.cpp +++ b/src/base/io/log/backends/SysLog.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,19 +25,19 @@ #include "version.h" -xmrig::SysLog::SysLog() +xmlcore::SysLog::SysLog() { openlog(APP_ID, LOG_PID, LOG_USER); } -xmrig::SysLog::~SysLog() +xmlcore::SysLog::~SysLog() { closelog(); } -void xmrig::SysLog::print(uint64_t, int level, const char *line, size_t offset, size_t, bool colors) +void xmlcore::SysLog::print(uint64_t, int level, const char *line, size_t offset, size_t, bool colors) { if (colors) { return; diff --git a/src/base/io/log/backends/SysLog.h b/src/base/io/log/backends/SysLog.h index 447ad006..660033d0 100644 --- a/src/base/io/log/backends/SysLog.h +++ b/src/base/io/log/backends/SysLog.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2019 Spudz76 * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,20 +17,20 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SYSLOG_H -#define XMRIG_SYSLOG_H +#ifndef xmlcore_SYSLOG_H +#define xmlcore_SYSLOG_H #include "base/kernel/interfaces/ILogBackend.h" -namespace xmrig { +namespace xmlcore { class SysLog : public ILogBackend { public: - XMRIG_DISABLE_COPY_MOVE(SysLog) + xmlcore_DISABLE_COPY_MOVE(SysLog) SysLog(); ~SysLog() override; @@ -40,7 +40,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_SYSLOG_H */ +#endif /* xmlcore_SYSLOG_H */ diff --git a/src/base/kernel/Base.cpp b/src/base/kernel/Base.cpp index 698dc10c..85ecca1d 100644 --- a/src/base/kernel/Base.cpp +++ b/src/base/kernel/Base.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -49,31 +49,31 @@ #endif -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/Api.h" # include "base/api/interfaces/IApiRequest.h" -namespace xmrig { +namespace xmlcore { static const char *kConfigPathV1 = "/1/config"; static const char *kConfigPathV2 = "/2/config"; -} // namespace xmrig +} // namespace xmlcore #endif -#ifdef XMRIG_FEATURE_EMBEDDED_CONFIG +#ifdef xmlcore_FEATURE_EMBEDDED_CONFIG # include "core/config/Config_default.h" #endif -namespace xmrig { +namespace xmlcore { class BasePrivate { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(BasePrivate) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(BasePrivate) inline BasePrivate(Process *process) @@ -86,7 +86,7 @@ public: inline ~BasePrivate() { -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API delete api; # endif @@ -147,12 +147,12 @@ private: return config.release(); } - chain.addFile(Process::location(Process::HomeLocation, ".config" XMRIG_DIR_SEPARATOR APP_ID ".json")); + chain.addFile(Process::location(Process::HomeLocation, ".config" xmlcore_DIR_SEPARATOR APP_ID ".json")); if (read(chain, config)) { return config.release(); } -# ifdef XMRIG_FEATURE_EMBEDDED_CONFIG +# ifdef xmlcore_FEATURE_EMBEDDED_CONFIG chain.addRaw(default_config); if (read(chain, config)) { @@ -165,31 +165,31 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::Base::Base(Process *process) +xmlcore::Base::Base(Process *process) : d_ptr(new BasePrivate(process)) { } -xmrig::Base::~Base() +xmlcore::Base::~Base() { delete d_ptr; } -bool xmrig::Base::isReady() const +bool xmlcore::Base::isReady() const { return d_ptr->config != nullptr; } -int xmrig::Base::init() +int xmlcore::Base::init() { -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API d_ptr->api = new Api(this); d_ptr->api->addListener(this); # endif @@ -217,9 +217,9 @@ int xmrig::Base::init() } -void xmrig::Base::start() +void xmlcore::Base::start() { -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API api()->start(); # endif @@ -233,9 +233,9 @@ void xmrig::Base::start() } -void xmrig::Base::stop() +void xmlcore::Base::stop() { -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API api()->stop(); # endif @@ -244,7 +244,7 @@ void xmrig::Base::stop() } -xmrig::Api *xmrig::Base::api() const +xmlcore::Api *xmlcore::Base::api() const { assert(d_ptr->api != nullptr); @@ -252,13 +252,13 @@ xmrig::Api *xmrig::Base::api() const } -bool xmrig::Base::isBackground() const +bool xmlcore::Base::isBackground() const { return d_ptr->config && d_ptr->config->isBackground(); } -bool xmrig::Base::reload(const rapidjson::Value &json) +bool xmlcore::Base::reload(const rapidjson::Value &json) { JsonReader reader(json); if (reader.isEmpty()) { @@ -286,7 +286,7 @@ bool xmrig::Base::reload(const rapidjson::Value &json) } -xmrig::Config *xmrig::Base::config() const +xmlcore::Config *xmlcore::Base::config() const { assert(d_ptr->config != nullptr); @@ -294,13 +294,13 @@ xmrig::Config *xmrig::Base::config() const } -void xmrig::Base::addListener(IBaseListener *listener) +void xmlcore::Base::addListener(IBaseListener *listener) { d_ptr->listeners.push_back(listener); } -void xmrig::Base::onFileChanged(const String &fileName) +void xmlcore::Base::onFileChanged(const String &fileName) { LOG_WARN("%s " YELLOW("\"%s\" was changed, reloading configuration"), Tags::config(), fileName.data()); @@ -320,8 +320,8 @@ void xmrig::Base::onFileChanged(const String &fileName) } -#ifdef XMRIG_FEATURE_API -void xmrig::Base::onRequest(IApiRequest &request) +#ifdef xmlcore_FEATURE_API +void xmlcore::Base::onRequest(IApiRequest &request) { if (request.method() == IApiRequest::METHOD_GET) { if (request.url() == kConfigPathV1 || request.url() == kConfigPathV2) { diff --git a/src/base/kernel/Base.h b/src/base/kernel/Base.h index f113c0f7..cd9e3af2 100644 --- a/src/base/kernel/Base.h +++ b/src/base/kernel/Base.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BASE_H -#define XMRIG_BASE_H +#ifndef xmlcore_BASE_H +#define xmlcore_BASE_H #include "3rdparty/rapidjson/fwd.h" @@ -33,7 +33,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Api; @@ -46,7 +46,7 @@ class Process; class Base : public IWatcherListener, public IApiListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Base) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Base) Base(Process *process); ~Base() override; @@ -65,7 +65,7 @@ public: protected: void onFileChanged(const String &fileName) override; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void onRequest(IApiRequest &request) override; # endif @@ -74,7 +74,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BASE_H */ +#endif /* xmlcore_BASE_H */ diff --git a/src/base/kernel/Entry.cpp b/src/base/kernel/Entry.cpp index a50cb634..efdd83ca 100644 --- a/src/base/kernel/Entry.cpp +++ b/src/base/kernel/Entry.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,15 +27,15 @@ #include -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include #endif -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC # include #endif -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL # include "backend/opencl/wrappers/OclLib.h" # include "backend/opencl/wrappers/OclPlatform.h" #endif @@ -46,7 +46,7 @@ #include "version.h" -namespace xmrig { +namespace xmlcore { static int showVersion() @@ -79,7 +79,7 @@ static int showVersion() printf("\nlibuv/%s\n", uv_version_string()); -# if defined(XMRIG_FEATURE_TLS) +# if defined(xmlcore_FEATURE_TLS) { # if defined(LIBRESSL_VERSION_TEXT) printf("LibreSSL/%s\n", LIBRESSL_VERSION_TEXT + 9); @@ -90,7 +90,7 @@ static int showVersion() } # endif -# if defined(XMRIG_FEATURE_HWLOC) +# if defined(xmlcore_FEATURE_HWLOC) # if defined(HWLOC_VERSION) printf("hwloc/%s\n", HWLOC_VERSION); # elif HWLOC_API_VERSION >= 0x20000 @@ -104,7 +104,7 @@ static int showVersion() } -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC static int exportTopology(const Process &) { const String path = Process::location(Process::ExeLocation, "topology.xml"); @@ -131,10 +131,10 @@ static int exportTopology(const Process &) #endif -} // namespace xmrig +} // namespace xmlcore -xmrig::Entry::Id xmrig::Entry::get(const Process &process) +xmlcore::Entry::Id xmlcore::Entry::get(const Process &process) { const Arguments &args = process.arguments(); if (args.hasArg("-h") || args.hasArg("--help")) { @@ -145,13 +145,13 @@ xmrig::Entry::Id xmrig::Entry::get(const Process &process) return Version; } -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC if (args.hasArg("--export-topology")) { return Topo; } # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL if (args.hasArg("--print-platforms")) { return Platforms; } @@ -161,7 +161,7 @@ xmrig::Entry::Id xmrig::Entry::get(const Process &process) } -int xmrig::Entry::exec(const Process &process, Id id) +int xmlcore::Entry::exec(const Process &process, Id id) { switch (id) { case Usage: @@ -171,12 +171,12 @@ int xmrig::Entry::exec(const Process &process, Id id) case Version: return showVersion(); -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC case Topo: return exportTopology(process); # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL case Platforms: if (OclLib::init()) { OclPlatform::print(); diff --git a/src/base/kernel/Entry.h b/src/base/kernel/Entry.h index a459410f..e7541d3b 100644 --- a/src/base/kernel/Entry.h +++ b/src/base/kernel/Entry.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ENTRY_H -#define XMRIG_ENTRY_H +#ifndef xmlcore_ENTRY_H +#define xmlcore_ENTRY_H -namespace xmrig { +namespace xmlcore { class Process; @@ -48,7 +48,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_ENTRY_H */ +#endif /* xmlcore_ENTRY_H */ diff --git a/src/base/kernel/Platform.cpp b/src/base/kernel/Platform.cpp index 955a4eac..76cfffc3 100644 --- a/src/base/kernel/Platform.cpp +++ b/src/base/kernel/Platform.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -24,22 +24,22 @@ #include -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include # include #endif -namespace xmrig { +namespace xmlcore { String Platform::m_userAgent; -} // namespace xmrig +} // namespace xmlcore -void xmrig::Platform::init(const char *userAgent) +void xmlcore::Platform::init(const char *userAgent) { -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS SSL_library_init(); SSL_load_error_strings(); ERR_load_BIO_strings(); diff --git a/src/base/kernel/Platform.h b/src/base/kernel/Platform.h index 293cedc7..6c82784f 100644 --- a/src/base/kernel/Platform.h +++ b/src/base/kernel/Platform.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_PLATFORM_H -#define XMRIG_PLATFORM_H +#ifndef xmlcore_PLATFORM_H +#define xmlcore_PLATFORM_H #include @@ -26,7 +26,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Platform @@ -57,7 +57,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_PLATFORM_H */ +#endif /* xmlcore_PLATFORM_H */ diff --git a/src/base/kernel/Platform_hwloc.cpp b/src/base/kernel/Platform_hwloc.cpp index 8d9d9f59..6830e517 100644 --- a/src/base/kernel/Platform_hwloc.cpp +++ b/src/base/kernel/Platform_hwloc.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -26,8 +26,8 @@ #include -#ifndef XMRIG_OS_APPLE -bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) +#ifndef xmlcore_OS_APPLE +bool xmlcore::Platform::setThreadAffinity(uint64_t cpu_id) { auto cpu = static_cast(Cpu::info()); hwloc_obj_t pu = hwloc_get_pu_obj_by_os_index(cpu->topology(), static_cast(cpu_id)); diff --git a/src/base/kernel/Platform_mac.cpp b/src/base/kernel/Platform_mac.cpp index 20ad9652..762e0287 100644 --- a/src/base/kernel/Platform_mac.cpp +++ b/src/base/kernel/Platform_mac.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -31,14 +31,14 @@ #include "version.h" -char *xmrig::Platform::createUserAgent() +char *xmlcore::Platform::createUserAgent() { constexpr const size_t max = 256; char *buf = new char[max](); int length = snprintf(buf, max, "%s/%s (Macintosh; macOS" -# ifdef XMRIG_ARM +# ifdef xmlcore_ARM "; arm64" # else "; x86_64" @@ -55,18 +55,18 @@ char *xmrig::Platform::createUserAgent() } -bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) +bool xmlcore::Platform::setThreadAffinity(uint64_t cpu_id) { return true; } -void xmrig::Platform::setProcessPriority(int) +void xmlcore::Platform::setProcessPriority(int) { } -void xmrig::Platform::setThreadPriority(int priority) +void xmlcore::Platform::setThreadPriority(int priority) { if (priority == -1) { return; @@ -103,7 +103,7 @@ void xmrig::Platform::setThreadPriority(int priority) } -bool xmrig::Platform::isOnBatteryPower() +bool xmlcore::Platform::isOnBatteryPower() { return IOPSGetTimeRemainingEstimate() != kIOPSTimeRemainingUnlimited; } diff --git a/src/base/kernel/Platform_unix.cpp b/src/base/kernel/Platform_unix.cpp index bbded9f6..ee46d170 100644 --- a/src/base/kernel/Platform_unix.cpp +++ b/src/base/kernel/Platform_unix.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -45,7 +45,7 @@ typedef cpuset_t cpu_set_t; #endif -char *xmrig::Platform::createUserAgent() +char *xmlcore::Platform::createUserAgent() { constexpr const size_t max = 256; @@ -72,8 +72,8 @@ char *xmrig::Platform::createUserAgent() } -#ifndef XMRIG_FEATURE_HWLOC -bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) +#ifndef xmlcore_FEATURE_HWLOC +bool xmlcore::Platform::setThreadAffinity(uint64_t cpu_id) { cpu_set_t mn; CPU_ZERO(&mn); @@ -91,12 +91,12 @@ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) #endif -void xmrig::Platform::setProcessPriority(int) +void xmlcore::Platform::setProcessPriority(int) { } -void xmrig::Platform::setThreadPriority(int priority) +void xmlcore::Platform::setThreadPriority(int priority) { if (priority == -1) { return; @@ -144,7 +144,7 @@ void xmrig::Platform::setThreadPriority(int priority) } -bool xmrig::Platform::isOnBatteryPower() +bool xmlcore::Platform::isOnBatteryPower() { for (int i = 0; i <= 1; ++i) { char buf[64]; diff --git a/src/base/kernel/Platform_win.cpp b/src/base/kernel/Platform_win.cpp index a487e17b..95d2e933 100644 --- a/src/base/kernel/Platform_win.cpp +++ b/src/base/kernel/Platform_win.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -45,7 +45,7 @@ static inline OSVERSIONINFOEX winOsVersion() } -char *xmrig::Platform::createUserAgent() +char *xmlcore::Platform::createUserAgent() { const auto osver = winOsVersion(); constexpr const size_t max = 256; @@ -69,8 +69,8 @@ char *xmrig::Platform::createUserAgent() } -#ifndef XMRIG_FEATURE_HWLOC -bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) +#ifndef xmlcore_FEATURE_HWLOC +bool xmlcore::Platform::setThreadAffinity(uint64_t cpu_id) { const bool result = (SetThreadAffinityMask(GetCurrentThread(), 1ULL << cpu_id) != 0); Sleep(1); @@ -79,7 +79,7 @@ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id) #endif -void xmrig::Platform::setProcessPriority(int priority) +void xmlcore::Platform::setProcessPriority(int priority) { if (priority == -1) { return; @@ -116,7 +116,7 @@ void xmrig::Platform::setProcessPriority(int priority) } -void xmrig::Platform::setThreadPriority(int priority) +void xmlcore::Platform::setThreadPriority(int priority) { if (priority == -1) { return; @@ -153,7 +153,7 @@ void xmrig::Platform::setThreadPriority(int priority) } -bool xmrig::Platform::isOnBatteryPower() +bool xmlcore::Platform::isOnBatteryPower() { SYSTEM_POWER_STATUS st; if (GetSystemPowerStatus(&st)) { diff --git a/src/base/kernel/Process.cpp b/src/base/kernel/Process.cpp index 6f63b647..8a032109 100644 --- a/src/base/kernel/Process.cpp +++ b/src/base/kernel/Process.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +28,7 @@ #include "version.h" -#ifdef XMRIG_OS_WIN +#ifdef xmlcore_OS_WIN # ifdef _MSC_VER # include # define MKDIR(path) _mkdir(path.c_str()); @@ -40,7 +40,7 @@ #endif -namespace xmrig { +namespace xmlcore { static char pathBuf[520]; @@ -81,7 +81,7 @@ static std::string getPath(Process::Location location) } const auto path = std::string(pathBuf, size); - const auto pos = path.rfind(*XMRIG_DIR_SEPARATOR); + const auto pos = path.rfind(*xmlcore_DIR_SEPARATOR); if (pos != std::string::npos) { return path.substr(0, pos); @@ -115,19 +115,19 @@ static void setDataDir(const char *path) } -} // namespace xmrig +} // namespace xmlcore -xmrig::Process::Process(int argc, char **argv) : +xmlcore::Process::Process(int argc, char **argv) : m_arguments(argc, argv) { srand(static_cast(Chrono::currentMSecsSinceEpoch() ^ reinterpret_cast(this))); setDataDir(m_arguments.value("--data-dir", "-d")); -# ifdef XMRIG_SHARED_DATADIR +# ifdef xmlcore_SHARED_DATADIR if (dataDir.empty()) { - dataDir = fmt::format("{}" XMRIG_DIR_SEPARATOR ".xmrig" XMRIG_DIR_SEPARATOR, location(HomeLocation)); + dataDir = fmt::format("{}" xmlcore_DIR_SEPARATOR ".xmlcore" xmlcore_DIR_SEPARATOR, location(HomeLocation)); MKDIR(dataDir); dataDir += APP_KIND; @@ -139,7 +139,7 @@ xmrig::Process::Process(int argc, char **argv) : } -int xmrig::Process::ppid() +int xmlcore::Process::ppid() { # if UV_VERSION_HEX >= 0x011000 return uv_os_getppid(); @@ -149,7 +149,7 @@ int xmrig::Process::ppid() } -xmrig::String xmrig::Process::exepath() +xmlcore::String xmlcore::Process::exepath() { size_t size = sizeof(pathBuf); @@ -157,12 +157,12 @@ xmrig::String xmrig::Process::exepath() } -xmrig::String xmrig::Process::location(Location location, const char *fileName) +xmlcore::String xmlcore::Process::location(Location location, const char *fileName) { auto path = getPath(location); if (path.empty() || fileName == nullptr) { return path.c_str(); } - return fmt::format("{}" XMRIG_DIR_SEPARATOR "{}", path, fileName).c_str(); + return fmt::format("{}" xmlcore_DIR_SEPARATOR "{}", path, fileName).c_str(); } diff --git a/src/base/kernel/Process.h b/src/base/kernel/Process.h index 754e7a56..4b0a6044 100644 --- a/src/base/kernel/Process.h +++ b/src/base/kernel/Process.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -#ifndef XMRIG_PROCESS_H -#define XMRIG_PROCESS_H +#ifndef xmlcore_PROCESS_H +#define xmlcore_PROCESS_H #include "base/tools/Arguments.h" #ifdef WIN32 -# define XMRIG_DIR_SEPARATOR "\\" +# define xmlcore_DIR_SEPARATOR "\\" #else -# define XMRIG_DIR_SEPARATOR "/" +# define xmlcore_DIR_SEPARATOR "/" #endif -namespace xmrig { +namespace xmlcore { class Process @@ -58,7 +58,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_PROCESS_H */ +#endif /* xmlcore_PROCESS_H */ diff --git a/src/base/kernel/Process_unix.cpp b/src/base/kernel/Process_unix.cpp index 3f1fdeb2..803878f3 100644 --- a/src/base/kernel/Process_unix.cpp +++ b/src/base/kernel/Process_unix.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -24,7 +24,7 @@ #include "base/kernel/Process.h" -int xmrig::Process::pid() +int xmlcore::Process::pid() { # if UV_VERSION_HEX >= 0x011200 return uv_os_getpid(); diff --git a/src/base/kernel/Process_win.cpp b/src/base/kernel/Process_win.cpp index a8d5d2d4..b84b4126 100644 --- a/src/base/kernel/Process_win.cpp +++ b/src/base/kernel/Process_win.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +23,7 @@ #include "base/kernel/Process.h" -int xmrig::Process::pid() +int xmlcore::Process::pid() { # if UV_VERSION_HEX >= 0x011200 return uv_os_getpid(); diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp index 27aa2ce9..49a24db3 100644 --- a/src/base/kernel/config/BaseConfig.cpp +++ b/src/base/kernel/config/BaseConfig.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -40,16 +40,16 @@ #include -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include #endif -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC # include "backend/cpu/Cpu.h" #endif -namespace xmrig { +namespace xmlcore { const char *BaseConfig::kApi = "api"; @@ -70,15 +70,15 @@ const char *BaseConfig::kVerbose = "verbose"; const char *BaseConfig::kWatch = "watch"; -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS const char *BaseConfig::kTls = "tls"; #endif -} // namespace xmrig +} // namespace xmlcore -bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName) +bool xmlcore::BaseConfig::read(const IJsonReader &reader, const char *fileName) { m_fileName = fileName; @@ -97,7 +97,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName) m_printTime = std::min(reader.getUint(kPrintTime, m_printTime), 3600U); m_title = reader.getValue(kTitle); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS m_tls = reader.getValue(kTls); # endif @@ -117,7 +117,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName) } -bool xmrig::BaseConfig::save() +bool xmlcore::BaseConfig::save() { if (m_fileName.isNull()) { return false; @@ -135,7 +135,7 @@ bool xmrig::BaseConfig::save() } -void xmrig::BaseConfig::printVersions() +void xmlcore::BaseConfig::printVersions() { char buf[256] = { 0 }; @@ -151,7 +151,7 @@ void xmrig::BaseConfig::printVersions() std::string libs; -# if defined(XMRIG_FEATURE_TLS) +# if defined(xmlcore_FEATURE_TLS) { # if defined(LIBRESSL_VERSION_TEXT) snprintf(buf, sizeof buf, "LibreSSL/%s ", LIBRESSL_VERSION_TEXT + 9); @@ -164,7 +164,7 @@ void xmrig::BaseConfig::printVersions() } # endif -# if defined(XMRIG_FEATURE_HWLOC) +# if defined(xmlcore_FEATURE_HWLOC) libs += Cpu::info()->backend(); # endif @@ -172,7 +172,7 @@ void xmrig::BaseConfig::printVersions() } -void xmrig::BaseConfig::setVerbose(const rapidjson::Value &value) +void xmlcore::BaseConfig::setVerbose(const rapidjson::Value &value) { if (value.IsBool()) { Log::setVerbose(value.GetBool() ? 1 : 0); diff --git a/src/base/kernel/config/BaseConfig.h b/src/base/kernel/config/BaseConfig.h index f97a711b..4a54128b 100644 --- a/src/base/kernel/config/BaseConfig.h +++ b/src/base/kernel/config/BaseConfig.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BASECONFIG_H -#define XMRIG_BASECONFIG_H +#ifndef xmlcore_BASECONFIG_H +#define xmlcore_BASECONFIG_H #include "base/kernel/config/Title.h" @@ -32,12 +32,12 @@ #include "base/net/stratum/Pools.h" -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include "base/net/tls/TlsConfig.h" #endif -namespace xmrig { +namespace xmlcore { class IJsonReader; @@ -63,7 +63,7 @@ public: static const char *kVerbose; static const char *kWatch; -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS static const char *kTls; # endif @@ -83,7 +83,7 @@ public: inline const Title &title() const { return m_title; } inline uint32_t printTime() const { return m_printTime; } -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS inline const TlsConfig &tls() const { return m_tls; } # endif @@ -114,7 +114,7 @@ protected: Title m_title; uint32_t m_printTime = 60; -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS TlsConfig m_tls; # endif @@ -123,7 +123,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BASECONFIG_H */ +#endif /* xmlcore_BASECONFIG_H */ diff --git a/src/base/kernel/config/BaseTransform.cpp b/src/base/kernel/config/BaseTransform.cpp index 119fa679..bd4b3e97 100644 --- a/src/base/kernel/config/BaseTransform.cpp +++ b/src/base/kernel/config/BaseTransform.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -44,12 +44,12 @@ #include "core/config/Config_platform.h" -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include "base/net/tls/TlsConfig.h" #endif -void xmrig::BaseTransform::load(JsonChain &chain, Process *process, IConfigTransform &transform) +void xmlcore::BaseTransform::load(JsonChain &chain, Process *process, IConfigTransform &transform) { using namespace rapidjson; @@ -85,7 +85,7 @@ void xmrig::BaseTransform::load(JsonChain &chain, Process *process, IConfigTrans } -void xmrig::BaseTransform::finalize(rapidjson::Document &doc) +void xmlcore::BaseTransform::finalize(rapidjson::Document &doc) { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -114,7 +114,7 @@ void xmrig::BaseTransform::finalize(rapidjson::Document &doc) } -void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const char *arg) +void xmlcore::BaseTransform::transform(rapidjson::Document &doc, int key, const char *arg) { switch (key) { case IConfig::AlgorithmKey: /* --algo */ @@ -163,13 +163,13 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch array.PushBack(rapidjson::kObjectType, doc.GetAllocator()); } -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (key != IConfig::UrlKey) { set(doc, array[array.Size() - 1], Pool::kUrl, -# ifdef XMRIG_FEATURE_TLS - "stratum+ssl://randomx.xmrig.com:443" +# ifdef xmlcore_FEATURE_TLS + "stratum+ssl://randomx.xmlcore.com:443" # else - "randomx.xmrig.com:3333" + "randomx.xmlcore.com:3333" # endif ); } else @@ -221,7 +221,7 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch case IConfig::TitleKey: /* --title */ return set(doc, BaseConfig::kTitle, arg); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS case IConfig::TlsCertKey: /* --tls-cert */ return set(doc, BaseConfig::kTls, TlsConfig::kCert, arg); @@ -275,7 +275,7 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch } -void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, bool enable) +void xmlcore::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, bool enable) { switch (key) { case IConfig::BackgroundKey: /* --background */ @@ -290,12 +290,12 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b case IConfig::TlsKey: /* --tls */ return add(doc, Pools::kPools, Pool::kTls, enable); -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP case IConfig::DaemonKey: /* --daemon */ return add(doc, Pools::kPools, Pool::kDaemon, enable); # endif -# ifndef XMRIG_PROXY_PROJECT +# ifndef xmlcore_PROXY_PROJECT case IConfig::NicehashKey: /* --nicehash */ return add(doc, Pools::kPools, Pool::kNicehash, enable); # endif @@ -329,7 +329,7 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b } -void xmrig::BaseTransform::transformUint64(rapidjson::Document &doc, int key, uint64_t arg) +void xmlcore::BaseTransform::transformUint64(rapidjson::Document &doc, int key, uint64_t arg) { switch (key) { case IConfig::RetriesKey: /* --retries */ @@ -351,7 +351,7 @@ void xmrig::BaseTransform::transformUint64(rapidjson::Document &doc, int key, ui case IConfig::PrintTimeKey: /* --print-time */ return set(doc, BaseConfig::kPrintTime, arg); -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP case IConfig::DaemonPollKey: /* --daemon-poll-interval */ return add(doc, Pools::kPools, Pool::kDaemonPollInterval, arg); # endif diff --git a/src/base/kernel/config/BaseTransform.h b/src/base/kernel/config/BaseTransform.h index d6c08821..8bcecc33 100644 --- a/src/base/kernel/config/BaseTransform.h +++ b/src/base/kernel/config/BaseTransform.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BASETRANSFORM_H -#define XMRIG_BASETRANSFORM_H +#ifndef xmlcore_BASETRANSFORM_H +#define xmlcore_BASETRANSFORM_H #include "3rdparty/rapidjson/document.h" @@ -34,7 +34,7 @@ struct option; -namespace xmrig { +namespace xmlcore { class IConfigTransform; @@ -123,7 +123,7 @@ inline void BaseTransform::set(rapidjson::Document &doc, rapidjson::Value &obj, } -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_BASETRANSFORM_H */ +#endif /* xmlcore_BASETRANSFORM_H */ diff --git a/src/base/kernel/config/Title.cpp b/src/base/kernel/config/Title.cpp index 030aa727..0dec7779 100644 --- a/src/base/kernel/config/Title.cpp +++ b/src/base/kernel/config/Title.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +23,7 @@ #include "version.h" -xmrig::Title::Title(const rapidjson::Value &value) +xmlcore::Title::Title(const rapidjson::Value &value) { if (value.IsBool()) { m_enabled = value.GetBool(); @@ -34,7 +34,7 @@ xmrig::Title::Title(const rapidjson::Value &value) } -rapidjson::Value xmrig::Title::toJSON() const +rapidjson::Value xmlcore::Title::toJSON() const { if (isEnabled() && !m_value.isNull()) { return m_value.toJSON(); @@ -44,7 +44,7 @@ rapidjson::Value xmrig::Title::toJSON() const } -xmrig::String xmrig::Title::value() const +xmlcore::String xmlcore::Title::value() const { if (!isEnabled()) { return {}; diff --git a/src/base/kernel/config/Title.h b/src/base/kernel/config/Title.h index 452869dc..599e1303 100644 --- a/src/base/kernel/config/Title.h +++ b/src/base/kernel/config/Title.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TITLE_H -#define XMRIG_TITLE_H +#ifndef xmlcore_TITLE_H +#define xmlcore_TITLE_H #include "3rdparty/rapidjson/fwd.h" #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Title @@ -44,7 +44,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_TITLE_H */ +#endif /* xmlcore_TITLE_H */ diff --git a/src/base/kernel/constants.h b/src/base/kernel/constants.h index a76cee9a..f93f4944 100644 --- a/src/base/kernel/constants.h +++ b/src/base/kernel/constants.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONSTANTS_H -#define XMRIG_CONSTANTS_H +#ifndef xmlcore_CONSTANTS_H +#define xmlcore_CONSTANTS_H #include #include -constexpr size_t XMRIG_NET_BUFFER_CHUNK_SIZE = 64 * 1024; -constexpr size_t XMRIG_NET_BUFFER_INIT_CHUNKS = 4; +constexpr size_t xmlcore_NET_BUFFER_CHUNK_SIZE = 64 * 1024; +constexpr size_t xmlcore_NET_BUFFER_INIT_CHUNKS = 4; -#endif /* XMRIG_CONSTANTS_H */ +#endif /* xmlcore_CONSTANTS_H */ diff --git a/src/base/kernel/interfaces/IAsyncListener.h b/src/base/kernel/interfaces/IAsyncListener.h index 868646fe..b7e5c453 100644 --- a/src/base/kernel/interfaces/IAsyncListener.h +++ b/src/base/kernel/interfaces/IAsyncListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IASYNCLISTENER_H -#define XMRIG_IASYNCLISTENER_H +#ifndef xmlcore_IASYNCLISTENER_H +#define xmlcore_IASYNCLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Async; @@ -32,7 +32,7 @@ class Async; class IAsyncListener { public: - XMRIG_DISABLE_COPY_MOVE(IAsyncListener) + xmlcore_DISABLE_COPY_MOVE(IAsyncListener) IAsyncListener() = default; virtual ~IAsyncListener() = default; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IASYNCLISTENER_H +#endif // xmlcore_IASYNCLISTENER_H diff --git a/src/base/kernel/interfaces/IBaseListener.h b/src/base/kernel/interfaces/IBaseListener.h index 80120ab8..d9314c62 100644 --- a/src/base/kernel/interfaces/IBaseListener.h +++ b/src/base/kernel/interfaces/IBaseListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IBASELISTENER_H -#define XMRIG_IBASELISTENER_H +#ifndef xmlcore_IBASELISTENER_H +#define xmlcore_IBASELISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Config; @@ -32,7 +32,7 @@ class Config; class IBaseListener { public: - XMRIG_DISABLE_COPY_MOVE(IBaseListener) + xmlcore_DISABLE_COPY_MOVE(IBaseListener) IBaseListener() = default; virtual ~IBaseListener() = default; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IBASELISTENER_H +#endif // xmlcore_IBASELISTENER_H diff --git a/src/base/kernel/interfaces/IClient.h b/src/base/kernel/interfaces/IClient.h index 456d603d..c33cdcf7 100644 --- a/src/base/kernel/interfaces/IClient.h +++ b/src/base/kernel/interfaces/IClient.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICLIENT_H -#define XMRIG_ICLIENT_H +#ifndef xmlcore_ICLIENT_H +#define xmlcore_ICLIENT_H #include "3rdparty/rapidjson/fwd.h" @@ -32,7 +32,7 @@ #include -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -89,7 +89,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICLIENT_H +#endif // xmlcore_ICLIENT_H diff --git a/src/base/kernel/interfaces/IClientListener.h b/src/base/kernel/interfaces/IClientListener.h index 4f2be302..3bd7b358 100644 --- a/src/base/kernel/interfaces/IClientListener.h +++ b/src/base/kernel/interfaces/IClientListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICLIENTLISTENER_H -#define XMRIG_ICLIENTLISTENER_H +#ifndef xmlcore_ICLIENTLISTENER_H +#define xmlcore_ICLIENTLISTENER_H #include @@ -32,7 +32,7 @@ #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -55,7 +55,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICLIENTLISTENER_H +#endif // xmlcore_ICLIENTLISTENER_H diff --git a/src/base/kernel/interfaces/IConfig.h b/src/base/kernel/interfaces/IConfig.h index ba022fa3..28fce8ac 100644 --- a/src/base/kernel/interfaces/IConfig.h +++ b/src/base/kernel/interfaces/IConfig.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICONFIG_H -#define XMRIG_ICONFIG_H +#ifndef xmlcore_ICONFIG_H +#define xmlcore_ICONFIG_H #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class IJsonReader; @@ -87,12 +87,12 @@ public: DmiKey = 1049, HugePageSizeKey = 1050, - // xmrig common + // xmlcore common CPUPriorityKey = 1021, NicehashKey = 1006, PrintTimeKey = 1007, - // xmrig cpu + // xmlcore cpu CPUKey = 1024, AVKey = 'v', CPUAffinityKey = 1020, @@ -114,7 +114,7 @@ public: Argon2ImplKey = 1039, RandomXCacheQoSKey = 1040, - // xmrig amd + // xmlcore amd OclPlatformKey = 1400, OclAffinityKey = 1401, OclDevicesKey = 1402, @@ -128,7 +128,7 @@ public: OclCompModeKey = 1410, OclKey = 1411, - // xmrig-proxy + // xmlcore-proxy AccessLogFileKey = 'A', BindKey = 'b', CustomDiffKey = 1102, @@ -151,7 +151,7 @@ public: ProxyPasswordKey = 1116, LoginFileKey = 'L', - // xmrig nvidia + // xmlcore nvidia CudaMaxThreadsKey = 1200, CudaBFactorKey = 1201, CudaBSleepKey = 1202, @@ -176,7 +176,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICONFIG_H +#endif // xmlcore_ICONFIG_H diff --git a/src/base/kernel/interfaces/IConfigListener.h b/src/base/kernel/interfaces/IConfigListener.h index a6fa835f..bba531f9 100644 --- a/src/base/kernel/interfaces/IConfigListener.h +++ b/src/base/kernel/interfaces/IConfigListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICONFIGLISTENER_H -#define XMRIG_ICONFIGLISTENER_H +#ifndef xmlcore_ICONFIGLISTENER_H +#define xmlcore_ICONFIGLISTENER_H -namespace xmrig { +namespace xmlcore { class IConfig; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICONFIGLISTENER_H +#endif // xmlcore_ICONFIGLISTENER_H diff --git a/src/base/kernel/interfaces/IConfigTransform.h b/src/base/kernel/interfaces/IConfigTransform.h index c8ada0b8..8c3b7884 100644 --- a/src/base/kernel/interfaces/IConfigTransform.h +++ b/src/base/kernel/interfaces/IConfigTransform.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICONFIGTRANSFORM_H -#define XMRIG_ICONFIGTRANSFORM_H +#ifndef xmlcore_ICONFIGTRANSFORM_H +#define xmlcore_ICONFIGTRANSFORM_H #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class IJsonReader; @@ -46,7 +46,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICONFIGTRANSFORM_H +#endif // xmlcore_ICONFIGTRANSFORM_H diff --git a/src/base/kernel/interfaces/IConsoleListener.h b/src/base/kernel/interfaces/IConsoleListener.h index 69433210..c6d85406 100644 --- a/src/base/kernel/interfaces/IConsoleListener.h +++ b/src/base/kernel/interfaces/IConsoleListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ICONSOLELISTENER_H -#define XMRIG_ICONSOLELISTENER_H +#ifndef xmlcore_ICONSOLELISTENER_H +#define xmlcore_ICONSOLELISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class IConsoleListener { public: - XMRIG_DISABLE_COPY_MOVE(IConsoleListener) + xmlcore_DISABLE_COPY_MOVE(IConsoleListener) IConsoleListener() = default; virtual ~IConsoleListener() = default; @@ -38,7 +38,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ICONSOLELISTENER_H +#endif // xmlcore_ICONSOLELISTENER_H diff --git a/src/base/kernel/interfaces/IDnsListener.h b/src/base/kernel/interfaces/IDnsListener.h index 7d0e14e3..a9e0736b 100644 --- a/src/base/kernel/interfaces/IDnsListener.h +++ b/src/base/kernel/interfaces/IDnsListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IDNSLISTENER_H -#define XMRIG_IDNSLISTENER_H +#ifndef xmlcore_IDNSLISTENER_H +#define xmlcore_IDNSLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Dns; @@ -32,7 +32,7 @@ class Dns; class IDnsListener { public: - XMRIG_DISABLE_COPY_MOVE(IDnsListener) + xmlcore_DISABLE_COPY_MOVE(IDnsListener) IDnsListener() = default; virtual ~IDnsListener() = default; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IDNSLISTENER_H +#endif // xmlcore_IDNSLISTENER_H diff --git a/src/base/kernel/interfaces/IHttpListener.h b/src/base/kernel/interfaces/IHttpListener.h index 931d1933..c5a9b1f0 100644 --- a/src/base/kernel/interfaces/IHttpListener.h +++ b/src/base/kernel/interfaces/IHttpListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IHTTPLISTENER_H -#define XMRIG_IHTTPLISTENER_H +#ifndef xmlcore_IHTTPLISTENER_H +#define xmlcore_IHTTPLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class HttpData; @@ -33,7 +33,7 @@ class HttpResponse; class IHttpListener { public: - XMRIG_DISABLE_COPY_MOVE(IHttpListener) + xmlcore_DISABLE_COPY_MOVE(IHttpListener) IHttpListener() = default; virtual ~IHttpListener() = default; @@ -42,7 +42,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IHTTPLISTENER_H +#endif // xmlcore_IHTTPLISTENER_H diff --git a/src/base/kernel/interfaces/IJsonReader.h b/src/base/kernel/interfaces/IJsonReader.h index 044a291c..7f7ed50e 100644 --- a/src/base/kernel/interfaces/IJsonReader.h +++ b/src/base/kernel/interfaces/IJsonReader.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IJSONREADER_H -#define XMRIG_IJSONREADER_H +#ifndef xmlcore_IJSONREADER_H +#define xmlcore_IJSONREADER_H #include "3rdparty/rapidjson/fwd.h" @@ -25,13 +25,13 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class IJsonReader { public: - XMRIG_DISABLE_COPY_MOVE(IJsonReader) + xmlcore_DISABLE_COPY_MOVE(IJsonReader) IJsonReader() = default; virtual ~IJsonReader() = default; @@ -52,7 +52,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IJSONREADER_H +#endif // xmlcore_IJSONREADER_H diff --git a/src/base/kernel/interfaces/ILineListener.h b/src/base/kernel/interfaces/ILineListener.h index a7d34901..228c9228 100644 --- a/src/base/kernel/interfaces/ILineListener.h +++ b/src/base/kernel/interfaces/ILineListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ILINELISTENER_H -#define XMRIG_ILINELISTENER_H +#ifndef xmlcore_ILINELISTENER_H +#define xmlcore_ILINELISTENER_H #include "base/tools/Object.h" @@ -32,13 +32,13 @@ #include -namespace xmrig { +namespace xmlcore { class ILineListener { public: - XMRIG_DISABLE_COPY_MOVE(ILineListener) + xmlcore_DISABLE_COPY_MOVE(ILineListener) ILineListener() = default; virtual ~ILineListener() = default; @@ -47,7 +47,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ILINELISTENER_H +#endif // xmlcore_ILINELISTENER_H diff --git a/src/base/kernel/interfaces/ILogBackend.h b/src/base/kernel/interfaces/ILogBackend.h index 88137fd1..84ff87b1 100644 --- a/src/base/kernel/interfaces/ILogBackend.h +++ b/src/base/kernel/interfaces/ILogBackend.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ILOGBACKEND_H -#define XMRIG_ILOGBACKEND_H +#ifndef xmlcore_ILOGBACKEND_H +#define xmlcore_ILOGBACKEND_H #include "base/tools/Object.h" @@ -27,13 +27,13 @@ #include -namespace xmrig { +namespace xmlcore { class ILogBackend { public: - XMRIG_DISABLE_COPY_MOVE(ILogBackend) + xmlcore_DISABLE_COPY_MOVE(ILogBackend) ILogBackend() = default; virtual ~ILogBackend() = default; @@ -42,7 +42,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ILOGBACKEND_H +#endif // xmlcore_ILOGBACKEND_H diff --git a/src/base/kernel/interfaces/ISignalListener.h b/src/base/kernel/interfaces/ISignalListener.h index 75f47cf0..72ad33b7 100644 --- a/src/base/kernel/interfaces/ISignalListener.h +++ b/src/base/kernel/interfaces/ISignalListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ISIGNALLISTENER_H -#define XMRIG_ISIGNALLISTENER_H +#ifndef xmlcore_ISIGNALLISTENER_H +#define xmlcore_ISIGNALLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class String; @@ -32,7 +32,7 @@ class String; class ISignalListener { public: - XMRIG_DISABLE_COPY_MOVE(ISignalListener) + xmlcore_DISABLE_COPY_MOVE(ISignalListener) ISignalListener() = default; virtual ~ISignalListener() = default; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ISIGNALLISTENER_H +#endif // xmlcore_ISIGNALLISTENER_H diff --git a/src/base/kernel/interfaces/IStrategy.h b/src/base/kernel/interfaces/IStrategy.h index fc34521d..a9c4bb41 100644 --- a/src/base/kernel/interfaces/IStrategy.h +++ b/src/base/kernel/interfaces/IStrategy.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ISTRATEGY_H -#define XMRIG_ISTRATEGY_H +#ifndef xmlcore_ISTRATEGY_H +#define xmlcore_ISTRATEGY_H #include -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -55,7 +55,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ISTRATEGY_H +#endif // xmlcore_ISTRATEGY_H diff --git a/src/base/kernel/interfaces/IStrategyListener.h b/src/base/kernel/interfaces/IStrategyListener.h index 605d15a9..7fb2514f 100644 --- a/src/base/kernel/interfaces/IStrategyListener.h +++ b/src/base/kernel/interfaces/IStrategyListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,15 +22,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ISTRATEGYLISTENER_H -#define XMRIG_ISTRATEGYLISTENER_H +#ifndef xmlcore_ISTRATEGYLISTENER_H +#define xmlcore_ISTRATEGYLISTENER_H #include "3rdparty/rapidjson/fwd.h" #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Algorithm; @@ -43,7 +43,7 @@ class SubmitResult; class IStrategyListener { public: - XMRIG_DISABLE_COPY_MOVE(IStrategyListener); + xmlcore_DISABLE_COPY_MOVE(IStrategyListener); IStrategyListener() = default; virtual ~IStrategyListener() = default; @@ -57,7 +57,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ISTRATEGYLISTENER_H +#endif // xmlcore_ISTRATEGYLISTENER_H diff --git a/src/base/kernel/interfaces/ITcpServerListener.h b/src/base/kernel/interfaces/ITcpServerListener.h index 3cb1576e..b6b4c02a 100644 --- a/src/base/kernel/interfaces/ITcpServerListener.h +++ b/src/base/kernel/interfaces/ITcpServerListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ITCPSERVERLISTENER_H -#define XMRIG_ITCPSERVERLISTENER_H +#ifndef xmlcore_ITCPSERVERLISTENER_H +#define xmlcore_ITCPSERVERLISTENER_H #include @@ -32,7 +32,7 @@ typedef struct uv_stream_s uv_stream_t; -namespace xmrig { +namespace xmlcore { class String; @@ -47,7 +47,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ITCPSERVERLISTENER_H +#endif // xmlcore_ITCPSERVERLISTENER_H diff --git a/src/base/kernel/interfaces/ITimerListener.h b/src/base/kernel/interfaces/ITimerListener.h index d169b12e..1326c13b 100644 --- a/src/base/kernel/interfaces/ITimerListener.h +++ b/src/base/kernel/interfaces/ITimerListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ITIMERLISTENER_H -#define XMRIG_ITIMERLISTENER_H +#ifndef xmlcore_ITIMERLISTENER_H +#define xmlcore_ITIMERLISTENER_H #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Timer; @@ -32,7 +32,7 @@ class Timer; class ITimerListener { public: - XMRIG_DISABLE_COPY_MOVE(ITimerListener) + xmlcore_DISABLE_COPY_MOVE(ITimerListener) ITimerListener() = default; virtual ~ITimerListener() = default; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_ITIMERLISTENER_H +#endif // xmlcore_ITIMERLISTENER_H diff --git a/src/base/kernel/interfaces/IWatcherListener.h b/src/base/kernel/interfaces/IWatcherListener.h index a62b4b53..d2b29b1f 100644 --- a/src/base/kernel/interfaces/IWatcherListener.h +++ b/src/base/kernel/interfaces/IWatcherListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IWATCHERLISTENER_H -#define XMRIG_IWATCHERLISTENER_H +#ifndef xmlcore_IWATCHERLISTENER_H +#define xmlcore_IWATCHERLISTENER_H -namespace xmrig { +namespace xmlcore { class String; @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IWATCHERLISTENER_H +#endif // xmlcore_IWATCHERLISTENER_H diff --git a/src/base/net/dns/Dns.cpp b/src/base/net/dns/Dns.cpp index ef50b20d..a26b1888 100644 --- a/src/base/net/dns/Dns.cpp +++ b/src/base/net/dns/Dns.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 +21,13 @@ #include "base/kernel/interfaces/IDnsListener.h" -namespace xmrig { +namespace xmlcore { Storage Dns::m_storage; static const DnsRecord defaultRecord; } -xmrig::Dns::Dns(IDnsListener *listener) : +xmlcore::Dns::Dns(IDnsListener *listener) : m_listener(listener) { m_key = m_storage.add(this); @@ -41,7 +41,7 @@ xmrig::Dns::Dns(IDnsListener *listener) : } -xmrig::Dns::~Dns() +xmlcore::Dns::~Dns() { m_storage.release(m_key); @@ -49,7 +49,7 @@ xmrig::Dns::~Dns() } -bool xmrig::Dns::resolve(const String &host) +bool xmlcore::Dns::resolve(const String &host) { if (m_host != host) { m_host = host; @@ -63,13 +63,13 @@ bool xmrig::Dns::resolve(const String &host) } -const char *xmrig::Dns::error() const +const char *xmlcore::Dns::error() const { return uv_strerror(m_status); } -const xmrig::DnsRecord &xmrig::Dns::get(DnsRecord::Type prefered) const +const xmlcore::DnsRecord &xmlcore::Dns::get(DnsRecord::Type prefered) const { if (count() == 0) { return defaultRecord; @@ -90,7 +90,7 @@ const xmrig::DnsRecord &xmrig::Dns::get(DnsRecord::Type prefered) const } -size_t xmrig::Dns::count(DnsRecord::Type type) const +size_t xmlcore::Dns::count(DnsRecord::Type type) const { if (type == DnsRecord::A) { return m_ipv4.size(); @@ -104,14 +104,14 @@ size_t xmrig::Dns::count(DnsRecord::Type type) const } -void xmrig::Dns::clear() +void xmlcore::Dns::clear() { m_ipv4.clear(); m_ipv6.clear(); } -void xmrig::Dns::onResolved(int status, addrinfo *res) +void xmlcore::Dns::onResolved(int status, addrinfo *res) { m_status = status; @@ -142,7 +142,7 @@ void xmrig::Dns::onResolved(int status, addrinfo *res) } -void xmrig::Dns::onResolved(uv_getaddrinfo_t *req, int status, addrinfo *res) +void xmlcore::Dns::onResolved(uv_getaddrinfo_t *req, int status, addrinfo *res) { Dns *dns = m_storage.get(req->data); if (dns) { diff --git a/src/base/net/dns/Dns.h b/src/base/net/dns/Dns.h index 86f90145..23f7471f 100644 --- a/src/base/net/dns/Dns.h +++ b/src/base/net/dns/Dns.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DNS_H -#define XMRIG_DNS_H +#ifndef xmlcore_DNS_H +#define xmlcore_DNS_H #include @@ -30,7 +30,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class IDnsListener; @@ -39,7 +39,7 @@ class IDnsListener; class Dns { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Dns) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Dns) Dns(IDnsListener *listener); ~Dns(); @@ -72,7 +72,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DNS_H */ +#endif /* xmlcore_DNS_H */ diff --git a/src/base/net/dns/DnsRecord.cpp b/src/base/net/dns/DnsRecord.cpp index 1667c715..f1659977 100644 --- a/src/base/net/dns/DnsRecord.cpp +++ b/src/base/net/dns/DnsRecord.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +23,7 @@ #include "base/net/dns/DnsRecord.h" -xmrig::DnsRecord::DnsRecord(const addrinfo *addr) : +xmlcore::DnsRecord::DnsRecord(const addrinfo *addr) : m_type(addr->ai_family == AF_INET6 ? AAAA : A) { char *buf = nullptr; @@ -41,7 +41,7 @@ xmrig::DnsRecord::DnsRecord(const addrinfo *addr) : } -sockaddr *xmrig::DnsRecord::addr(uint16_t port) const +sockaddr *xmlcore::DnsRecord::addr(uint16_t port) const { if (m_type == A) { auto addr = new sockaddr_in(); diff --git a/src/base/net/dns/DnsRecord.h b/src/base/net/dns/DnsRecord.h index cf6c2598..66c6424f 100644 --- a/src/base/net/dns/DnsRecord.h +++ b/src/base/net/dns/DnsRecord.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DNSRECORD_H -#define XMRIG_DNSRECORD_H +#ifndef xmlcore_DNSRECORD_H +#define xmlcore_DNSRECORD_H struct addrinfo; @@ -27,7 +27,7 @@ struct sockaddr; #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class DnsRecord @@ -54,7 +54,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DNSRECORD_H */ +#endif /* xmlcore_DNSRECORD_H */ diff --git a/src/base/net/http/Fetch.cpp b/src/base/net/http/Fetch.cpp index 84ff715c..469cda89 100644 --- a/src/base/net/http/Fetch.cpp +++ b/src/base/net/http/Fetch.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,12 +25,12 @@ #include "base/net/http/HttpClient.h" -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include "base/net/https/HttpsClient.h" #endif -xmrig::FetchRequest::FetchRequest(http_method method, const String &host, uint16_t port, const String &path, bool tls, bool quiet, const char *data, size_t size, const char *contentType) : +xmlcore::FetchRequest::FetchRequest(http_method method, const String &host, uint16_t port, const String &path, bool tls, bool quiet, const char *data, size_t size, const char *contentType) : quiet(quiet), tls(tls), method(method), @@ -44,7 +44,7 @@ xmrig::FetchRequest::FetchRequest(http_method method, const String &host, uint16 } -xmrig::FetchRequest::FetchRequest(http_method method, const String &host, uint16_t port, const String &path, const rapidjson::Value &value, bool tls, bool quiet) : +xmlcore::FetchRequest::FetchRequest(http_method method, const String &host, uint16_t port, const String &path, const rapidjson::Value &value, bool tls, bool quiet) : quiet(quiet), tls(tls), method(method), @@ -58,7 +58,7 @@ xmrig::FetchRequest::FetchRequest(http_method method, const String &host, uint16 } -void xmrig::FetchRequest::setBody(const char *data, size_t size, const char *contentType) +void xmlcore::FetchRequest::setBody(const char *data, size_t size, const char *contentType) { if (!data) { return; @@ -77,7 +77,7 @@ void xmrig::FetchRequest::setBody(const char *data, size_t size, const char *con } -void xmrig::FetchRequest::setBody(const rapidjson::Value &value) +void xmlcore::FetchRequest::setBody(const rapidjson::Value &value) { assert(method != HTTP_GET && method != HTTP_HEAD); @@ -95,7 +95,7 @@ void xmrig::FetchRequest::setBody(const rapidjson::Value &value) } -void xmrig::fetch(const char *tag, FetchRequest &&req, const std::weak_ptr &listener, int type, uint64_t rpcId) +void xmlcore::fetch(const char *tag, FetchRequest &&req, const std::weak_ptr &listener, int type, uint64_t rpcId) { # ifdef APP_DEBUG LOG_DEBUG(CYAN("http%s://%s:%u ") MAGENTA_BOLD("\"%s %s\"") BLACK_BOLD(" body: ") CYAN_BOLD("%zu") BLACK_BOLD(" bytes"), @@ -107,7 +107,7 @@ void xmrig::fetch(const char *tag, FetchRequest &&req, const std::weak_ptr - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ */ -#ifndef XMRIG_FETCH_H -#define XMRIG_FETCH_H +#ifndef xmlcore_FETCH_H +#define xmlcore_FETCH_H #include "3rdparty/http-parser/http_parser.h" @@ -31,7 +31,7 @@ #include -namespace xmrig { +namespace xmlcore { class IHttpListener; @@ -65,8 +65,8 @@ public: void fetch(const char *tag, FetchRequest &&req, const std::weak_ptr &listener, int type = 0, uint64_t rpcId = 0); -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_FETCH_H +#endif // xmlcore_FETCH_H diff --git a/src/base/net/http/Http.cpp b/src/base/net/http/Http.cpp index 0aef85dc..d0ac255d 100644 --- a/src/base/net/http/Http.cpp +++ b/src/base/net/http/Http.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +28,7 @@ #include "base/io/json/Json.h" -namespace xmrig { +namespace xmlcore { const char *Http::kEnabled = "enabled"; @@ -42,13 +42,13 @@ const char *Http::kToken = "access-token"; } -xmrig::Http::Http() : +xmlcore::Http::Http() : m_host(kLocalhost) { } -bool xmrig::Http::isEqual(const Http &other) const +bool xmlcore::Http::isEqual(const Http &other) const { return other.m_enabled == m_enabled && other.m_restricted == m_restricted && @@ -58,7 +58,7 @@ bool xmrig::Http::isEqual(const Http &other) const } -rapidjson::Value xmrig::Http::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::Http::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -75,7 +75,7 @@ rapidjson::Value xmrig::Http::toJSON(rapidjson::Document &doc) const } -void xmrig::Http::load(const rapidjson::Value &http) +void xmlcore::Http::load(const rapidjson::Value &http) { if (!http.IsObject()) { return; @@ -90,7 +90,7 @@ void xmrig::Http::load(const rapidjson::Value &http) } -void xmrig::Http::setPort(int port) +void xmlcore::Http::setPort(int port) { if (port >= 0 && port <= 65536) { m_port = static_cast(port); diff --git a/src/base/net/http/Http.h b/src/base/net/http/Http.h index 7ee179cd..aaaa53ad 100644 --- a/src/base/net/http/Http.h +++ b/src/base/net/http/Http.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +23,14 @@ */ -#ifndef XMRIG_HTTP_H -#define XMRIG_HTTP_H +#ifndef xmlcore_HTTP_H +#define xmlcore_HTTP_H #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Http @@ -73,8 +73,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTP_H +#endif // xmlcore_HTTP_H diff --git a/src/base/net/http/HttpApiResponse.cpp b/src/base/net/http/HttpApiResponse.cpp index fed3df53..9a9a435e 100644 --- a/src/base/net/http/HttpApiResponse.cpp +++ b/src/base/net/http/HttpApiResponse.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2014-2019 heapwolf * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,22 +31,22 @@ #include "base/net/http/HttpData.h" -namespace xmrig { +namespace xmlcore { static const char *kError = "error"; static const char *kStatus = "status"; -} // namespace xmrig +} // namespace xmlcore -xmrig::HttpApiResponse::HttpApiResponse(uint64_t id) : +xmlcore::HttpApiResponse::HttpApiResponse(uint64_t id) : HttpResponse(id), m_doc(rapidjson::kObjectType) { } -xmrig::HttpApiResponse::HttpApiResponse(uint64_t id, int status) : +xmlcore::HttpApiResponse::HttpApiResponse(uint64_t id, int status) : HttpResponse(id), m_doc(rapidjson::kObjectType) { @@ -54,7 +54,7 @@ xmrig::HttpApiResponse::HttpApiResponse(uint64_t id, int status) : } -void xmrig::HttpApiResponse::end() +void xmlcore::HttpApiResponse::end() { using namespace rapidjson; diff --git a/src/base/net/http/HttpApiResponse.h b/src/base/net/http/HttpApiResponse.h index 8a782510..de69bb5a 100644 --- a/src/base/net/http/HttpApiResponse.h +++ b/src/base/net/http/HttpApiResponse.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2014-2019 heapwolf * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,15 +24,15 @@ */ -#ifndef XMRIG_HTTPAPIRESPONSE_H -#define XMRIG_HTTPAPIRESPONSE_H +#ifndef xmlcore_HTTPAPIRESPONSE_H +#define xmlcore_HTTPAPIRESPONSE_H #include "3rdparty/rapidjson/document.h" #include "base/net/http/HttpResponse.h" -namespace xmrig { +namespace xmlcore { class HttpApiResponse : public HttpResponse @@ -50,8 +50,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPAPIRESPONSE_H +#endif // xmlcore_HTTPAPIRESPONSE_H diff --git a/src/base/net/http/HttpClient.cpp b/src/base/net/http/HttpClient.cpp index 320f8ee4..544fc0fa 100644 --- a/src/base/net/http/HttpClient.cpp +++ b/src/base/net/http/HttpClient.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -30,16 +30,16 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kCRLF = "\r\n"; -} // namespace xmrig +} // namespace xmlcore -xmrig::HttpClient::HttpClient(const char *tag, FetchRequest &&req, const std::weak_ptr &listener) : +xmlcore::HttpClient::HttpClient(const char *tag, FetchRequest &&req, const std::weak_ptr &listener) : HttpContext(HTTP_RESPONSE, listener), m_tag(tag), m_req(std::move(req)) @@ -56,13 +56,13 @@ xmrig::HttpClient::HttpClient(const char *tag, FetchRequest &&req, const std::we } -bool xmrig::HttpClient::connect() +bool xmlcore::HttpClient::connect() { return m_dns->resolve(m_req.host); } -void xmrig::HttpClient::onResolved(const Dns &dns, int status) +void xmlcore::HttpClient::onResolved(const Dns &dns, int status) { this->status = status; @@ -85,13 +85,13 @@ void xmrig::HttpClient::onResolved(const Dns &dns, int status) } -void xmrig::HttpClient::onTimer(const Timer *) +void xmlcore::HttpClient::onTimer(const Timer *) { close(UV_ETIMEDOUT); } -void xmrig::HttpClient::handshake() +void xmlcore::HttpClient::handshake() { headers.insert({ "Host", host() }); headers.insert({ "Connection", "close" }); @@ -117,7 +117,7 @@ void xmrig::HttpClient::handshake() } -void xmrig::HttpClient::read(const char *data, size_t size) +void xmlcore::HttpClient::read(const char *data, size_t size) { if (parse(data, size) < size) { close(UV_EPROTO); @@ -125,7 +125,7 @@ void xmrig::HttpClient::read(const char *data, size_t size) } -void xmrig::HttpClient::onConnect(uv_connect_t *req, int status) +void xmlcore::HttpClient::onConnect(uv_connect_t *req, int status) { auto client = static_cast(req->data); delete req; diff --git a/src/base/net/http/HttpClient.h b/src/base/net/http/HttpClient.h index 2b9a314d..dc8af8c1 100644 --- a/src/base/net/http/HttpClient.h +++ b/src/base/net/http/HttpClient.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -18,8 +18,8 @@ */ -#ifndef XMRIG_HTTPCLIENT_H -#define XMRIG_HTTPCLIENT_H +#ifndef xmlcore_HTTPCLIENT_H +#define xmlcore_HTTPCLIENT_H #include "base/kernel/interfaces/IDnsListener.h" @@ -29,7 +29,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class String; @@ -38,7 +38,7 @@ class String; class HttpClient : public HttpContext, public IDnsListener, public ITimerListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpClient); + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpClient); HttpClient(const char *tag, FetchRequest &&req, const std::weak_ptr &listener); ~HttpClient() override = default; @@ -70,8 +70,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPCLIENT_H +#endif // xmlcore_HTTPCLIENT_H diff --git a/src/base/net/http/HttpContext.cpp b/src/base/net/http/HttpContext.cpp index 52739e4d..27eb8d38 100644 --- a/src/base/net/http/HttpContext.cpp +++ b/src/base/net/http/HttpContext.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +29,7 @@ #include -namespace xmrig { +namespace xmlcore { static http_parser_settings http_settings; @@ -40,7 +40,7 @@ static uint64_t SEQUENCE = 0; class HttpWriteBaton : public Baton { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpWriteBaton) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpWriteBaton) inline HttpWriteBaton(std::string &&body, HttpContext *ctx) : m_ctx(ctx), @@ -68,10 +68,10 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::HttpContext::HttpContext(int parser_type, const std::weak_ptr &listener) : +xmlcore::HttpContext::HttpContext(int parser_type, const std::weak_ptr &listener) : HttpData(SEQUENCE++), m_timestamp(Chrono::steadyMSecs()), m_listener(listener) @@ -94,14 +94,14 @@ xmrig::HttpContext::HttpContext(int parser_type, const std::weak_ptrtype == HTTP_REQUEST; } -size_t xmrig::HttpContext::parse(const char *data, size_t size) +size_t xmlcore::HttpContext::parse(const char *data, size_t size) { if (size == 0) { return size; @@ -128,7 +128,7 @@ size_t xmrig::HttpContext::parse(const char *data, size_t size) } -std::string xmrig::HttpContext::ip() const +std::string xmlcore::HttpContext::ip() const { char ip[46] = {}; sockaddr_storage addr = {}; @@ -146,13 +146,13 @@ std::string xmrig::HttpContext::ip() const } -uint64_t xmrig::HttpContext::elapsed() const +uint64_t xmlcore::HttpContext::elapsed() const { return Chrono::steadyMSecs() - m_timestamp; } -void xmrig::HttpContext::close(int status) +void xmlcore::HttpContext::close(int status) { if (!get(id())) { return; @@ -173,7 +173,7 @@ void xmrig::HttpContext::close(int status) } -xmrig::HttpContext *xmrig::HttpContext::get(uint64_t id) +xmlcore::HttpContext *xmlcore::HttpContext::get(uint64_t id) { if (storage.count(id) == 0) { return nullptr; @@ -183,7 +183,7 @@ xmrig::HttpContext *xmrig::HttpContext::get(uint64_t id) } -void xmrig::HttpContext::closeAll() +void xmlcore::HttpContext::closeAll() { for (auto &kv : storage) { if (!uv_is_closing(kv.second->handle())) { @@ -193,7 +193,7 @@ void xmrig::HttpContext::closeAll() } -int xmrig::HttpContext::onHeaderField(http_parser *parser, const char *at, size_t length) +int xmlcore::HttpContext::onHeaderField(http_parser *parser, const char *at, size_t length) { auto ctx = static_cast(parser->data); @@ -212,7 +212,7 @@ int xmrig::HttpContext::onHeaderField(http_parser *parser, const char *at, size_ } -int xmrig::HttpContext::onHeaderValue(http_parser *parser, const char *at, size_t length) +int xmlcore::HttpContext::onHeaderValue(http_parser *parser, const char *at, size_t length) { auto ctx = static_cast(parser->data); @@ -227,7 +227,7 @@ int xmrig::HttpContext::onHeaderValue(http_parser *parser, const char *at, size_ } -void xmrig::HttpContext::attach(http_parser_settings *settings) +void xmlcore::HttpContext::attach(http_parser_settings *settings) { settings->on_message_begin = nullptr; settings->on_status = nullptr; @@ -280,7 +280,7 @@ void xmrig::HttpContext::attach(http_parser_settings *settings) } -void xmrig::HttpContext::setHeader() +void xmlcore::HttpContext::setHeader() { std::transform(m_lastHeaderField.begin(), m_lastHeaderField.end(), m_lastHeaderField.begin(), ::tolower); headers.insert({ m_lastHeaderField, m_lastHeaderValue }); diff --git a/src/base/net/http/HttpContext.h b/src/base/net/http/HttpContext.h index 4202bfaf..7aa776fb 100644 --- a/src/base/net/http/HttpContext.h +++ b/src/base/net/http/HttpContext.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -18,8 +18,8 @@ */ -#ifndef XMRIG_HTTPCONTEXT_H -#define XMRIG_HTTPCONTEXT_H +#ifndef xmlcore_HTTPCONTEXT_H +#define xmlcore_HTTPCONTEXT_H using http_parser = struct http_parser; @@ -37,7 +37,7 @@ using uv_tcp_t = struct uv_tcp_s; #include -namespace xmrig { +namespace xmlcore { class IHttpListener; @@ -46,7 +46,7 @@ class IHttpListener; class HttpContext : public HttpData { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpContext) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpContext) HttpContext(int parser_type, const std::weak_ptr &listener); ~HttpContext() override; @@ -91,8 +91,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPCONTEXT_H +#endif // xmlcore_HTTPCONTEXT_H diff --git a/src/base/net/http/HttpData.cpp b/src/base/net/http/HttpData.cpp index 10eace46..ee483b49 100644 --- a/src/base/net/http/HttpData.cpp +++ b/src/base/net/http/HttpData.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +29,7 @@ #include -namespace xmrig { +namespace xmlcore { const std::string HttpData::kApplicationJson = "application/json"; @@ -38,10 +38,10 @@ const std::string HttpData::kContentTypeL = "content-type"; const std::string HttpData::kTextPlain = "text/plain"; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::HttpData::isJSON() const +bool xmlcore::HttpData::isJSON() const { if (!headers.count(kContentTypeL)) { return false; @@ -53,13 +53,13 @@ bool xmrig::HttpData::isJSON() const } -const char *xmrig::HttpData::methodName() const +const char *xmlcore::HttpData::methodName() const { return http_method_str(static_cast(method)); } -const char *xmrig::HttpData::statusName() const +const char *xmlcore::HttpData::statusName() const { if (status < 0) { return uv_strerror(status); @@ -69,7 +69,7 @@ const char *xmrig::HttpData::statusName() const } -rapidjson::Document xmrig::HttpData::json() const +rapidjson::Document xmlcore::HttpData::json() const { if (status < 0) { throw std::runtime_error(statusName()); diff --git a/src/base/net/http/HttpData.h b/src/base/net/http/HttpData.h index 392c8bc8..a2522c93 100644 --- a/src/base/net/http/HttpData.h +++ b/src/base/net/http/HttpData.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -18,8 +18,8 @@ */ -#ifndef XMRIG_HTTPDATA_H -#define XMRIG_HTTPDATA_H +#ifndef xmlcore_HTTPDATA_H +#define xmlcore_HTTPDATA_H #include "3rdparty/rapidjson/document.h" @@ -30,13 +30,13 @@ #include -namespace xmrig { +namespace xmlcore { class HttpData { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpData) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpData) static const std::string kApplicationJson; static const std::string kContentType; @@ -75,8 +75,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPDATA_H +#endif // xmlcore_HTTPDATA_H diff --git a/src/base/net/http/HttpListener.cpp b/src/base/net/http/HttpListener.cpp index ba9130ed..3746c640 100644 --- a/src/base/net/http/HttpListener.cpp +++ b/src/base/net/http/HttpListener.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +23,7 @@ #include "base/net/http/HttpData.h" -void xmrig::HttpListener::onHttpData(const HttpData &data) +void xmlcore::HttpListener::onHttpData(const HttpData &data) { # ifdef APP_DEBUG if (!data.isRequest()) { diff --git a/src/base/net/http/HttpListener.h b/src/base/net/http/HttpListener.h index 8f86d2ba..3e599a7b 100644 --- a/src/base/net/http/HttpListener.h +++ b/src/base/net/http/HttpListener.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HTTPLISTENER_H -#define XMRIG_HTTPLISTENER_H +#ifndef xmlcore_HTTPLISTENER_H +#define xmlcore_HTTPLISTENER_H #include "base/kernel/interfaces/IHttpListener.h" -namespace xmrig { +namespace xmlcore { class HttpListener : public IHttpListener @@ -47,7 +47,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_HTTPLISTENER_H +#endif // xmlcore_HTTPLISTENER_H diff --git a/src/base/net/http/HttpResponse.cpp b/src/base/net/http/HttpResponse.cpp index 89e22431..10093be0 100644 --- a/src/base/net/http/HttpResponse.cpp +++ b/src/base/net/http/HttpResponse.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2014-2019 heapwolf * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -36,24 +36,24 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kCRLF = "\r\n"; static const char *kUserAgent = "user-agent"; -} // namespace xmrig +} // namespace xmlcore -xmrig::HttpResponse::HttpResponse(uint64_t id, int statusCode) : +xmlcore::HttpResponse::HttpResponse(uint64_t id, int statusCode) : m_id(id), m_statusCode(statusCode) { } -bool xmrig::HttpResponse::isAlive() const +bool xmlcore::HttpResponse::isAlive() const { auto ctx = HttpContext::get(m_id); @@ -61,7 +61,7 @@ bool xmrig::HttpResponse::isAlive() const } -void xmrig::HttpResponse::end(const char *data, size_t size) +void xmlcore::HttpResponse::end(const char *data, size_t size) { if (!isAlive()) { return; diff --git a/src/base/net/http/HttpResponse.h b/src/base/net/http/HttpResponse.h index 1891ad7e..6d0a5728 100644 --- a/src/base/net/http/HttpResponse.h +++ b/src/base/net/http/HttpResponse.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2014-2019 heapwolf * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,15 +24,15 @@ */ -#ifndef XMRIG_HTTPRESPONSE_H -#define XMRIG_HTTPRESPONSE_H +#ifndef xmlcore_HTTPRESPONSE_H +#define xmlcore_HTTPRESPONSE_H #include #include -namespace xmrig { +namespace xmlcore { class HttpResponse @@ -54,8 +54,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPRESPONSE_H +#endif // xmlcore_HTTPRESPONSE_H diff --git a/src/base/net/http/HttpServer.cpp b/src/base/net/http/HttpServer.cpp index 80377f77..7e6b22d9 100644 --- a/src/base/net/http/HttpServer.cpp +++ b/src/base/net/http/HttpServer.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2014-2019 heapwolf * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -34,19 +34,19 @@ #include "base/net/tools/NetBuffer.h" -xmrig::HttpServer::HttpServer(const std::shared_ptr &listener) : +xmlcore::HttpServer::HttpServer(const std::shared_ptr &listener) : m_listener(listener) { } -xmrig::HttpServer::~HttpServer() +xmlcore::HttpServer::~HttpServer() { HttpContext::closeAll(); } -void xmrig::HttpServer::onConnection(uv_stream_t *stream, uint16_t) +void xmlcore::HttpServer::onConnection(uv_stream_t *stream, uint16_t) { auto ctx = new HttpContext(HTTP_REQUEST, m_listener); uv_accept(stream, ctx->stream()); diff --git a/src/base/net/http/HttpServer.h b/src/base/net/http/HttpServer.h index 2ced767f..3292c630 100644 --- a/src/base/net/http/HttpServer.h +++ b/src/base/net/http/HttpServer.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2014-2019 heapwolf * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,8 +24,8 @@ */ -#ifndef XMRIG_HTTPSERVER_H -#define XMRIG_HTTPSERVER_H +#ifndef xmlcore_HTTPSERVER_H +#define xmlcore_HTTPSERVER_H using http_parser = struct http_parser; @@ -39,7 +39,7 @@ using http_parser_settings = struct http_parser_settings; #include -namespace xmrig { +namespace xmlcore { class IHttpListener; @@ -48,7 +48,7 @@ class IHttpListener; class HttpServer : public ITcpServerListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpServer) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpServer) HttpServer(const std::shared_ptr &listener); ~HttpServer() override; @@ -61,8 +61,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPSERVER_H +#endif // xmlcore_HTTPSERVER_H diff --git a/src/base/net/https/HttpsClient.cpp b/src/base/net/https/HttpsClient.cpp index 8b414917..adf99d42 100644 --- a/src/base/net/https/HttpsClient.cpp +++ b/src/base/net/https/HttpsClient.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -33,7 +33,7 @@ #endif -xmrig::HttpsClient::HttpsClient(const char *tag, FetchRequest &&req, const std::weak_ptr &listener) : +xmlcore::HttpsClient::HttpsClient(const char *tag, FetchRequest &&req, const std::weak_ptr &listener) : HttpClient(tag, std::move(req), listener) { m_ctx = SSL_CTX_new(SSLv23_method()); @@ -49,7 +49,7 @@ xmrig::HttpsClient::HttpsClient(const char *tag, FetchRequest &&req, const std:: } -xmrig::HttpsClient::~HttpsClient() +xmlcore::HttpsClient::~HttpsClient() { if (m_ctx) { SSL_CTX_free(m_ctx); @@ -61,19 +61,19 @@ xmrig::HttpsClient::~HttpsClient() } -const char *xmrig::HttpsClient::tlsFingerprint() const +const char *xmlcore::HttpsClient::tlsFingerprint() const { return m_ready ? m_fingerprint : nullptr; } -const char *xmrig::HttpsClient::tlsVersion() const +const char *xmlcore::HttpsClient::tlsVersion() const { return m_ready ? SSL_get_version(m_ssl) : nullptr; } -void xmrig::HttpsClient::handshake() +void xmlcore::HttpsClient::handshake() { m_ssl = SSL_new(m_ctx); assert(m_ssl != nullptr); @@ -92,7 +92,7 @@ void xmrig::HttpsClient::handshake() } -void xmrig::HttpsClient::read(const char *data, size_t size) +void xmlcore::HttpsClient::read(const char *data, size_t size) { BIO_write(m_read, data, size); @@ -130,7 +130,7 @@ void xmrig::HttpsClient::read(const char *data, size_t size) } -void xmrig::HttpsClient::write(std::string &&data, bool close) +void xmlcore::HttpsClient::write(std::string &&data, bool close) { const std::string body = std::move(data); SSL_write(m_ssl, body.data(), body.size()); @@ -139,7 +139,7 @@ void xmrig::HttpsClient::write(std::string &&data, bool close) } -bool xmrig::HttpsClient::verify(X509 *cert) +bool xmlcore::HttpsClient::verify(X509 *cert) { if (cert == nullptr) { return false; @@ -162,7 +162,7 @@ bool xmrig::HttpsClient::verify(X509 *cert) } -bool xmrig::HttpsClient::verifyFingerprint(X509 *cert) +bool xmlcore::HttpsClient::verifyFingerprint(X509 *cert) { const EVP_MD *digest = EVP_get_digestbyname("sha256"); if (digest == nullptr) { @@ -182,7 +182,7 @@ bool xmrig::HttpsClient::verifyFingerprint(X509 *cert) } -void xmrig::HttpsClient::flush(bool close) +void xmlcore::HttpsClient::flush(bool close) { if (uv_is_writable(stream()) != 1) { return; diff --git a/src/base/net/https/HttpsClient.h b/src/base/net/https/HttpsClient.h index bd0c65ff..c4cb163e 100644 --- a/src/base/net/https/HttpsClient.h +++ b/src/base/net/https/HttpsClient.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2014-2019 heapwolf * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -18,8 +18,8 @@ */ -#ifndef XMRIG_HTTPSCLIENT_H -#define XMRIG_HTTPSCLIENT_H +#ifndef xmlcore_HTTPSCLIENT_H +#define xmlcore_HTTPSCLIENT_H using BIO = struct bio_st; @@ -32,13 +32,13 @@ using X509 = struct x509_st; #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class HttpsClient : public HttpClient { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpsClient) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpsClient) HttpsClient(const char *tag, FetchRequest &&req, const std::weak_ptr &listener); ~HttpsClient() override; @@ -66,7 +66,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPSCLIENT_H +#endif // xmlcore_HTTPSCLIENT_H diff --git a/src/base/net/https/HttpsContext.cpp b/src/base/net/https/HttpsContext.cpp index 8db31812..91db3a01 100644 --- a/src/base/net/https/HttpsContext.cpp +++ b/src/base/net/https/HttpsContext.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -26,7 +26,7 @@ #include -xmrig::HttpsContext::HttpsContext(TlsContext *tls, const std::weak_ptr &listener) : +xmlcore::HttpsContext::HttpsContext(TlsContext *tls, const std::weak_ptr &listener) : HttpContext(HTTP_REQUEST, listener), ServerTls(tls ? tls->ctx() : nullptr) { @@ -36,10 +36,10 @@ xmrig::HttpsContext::HttpsContext(TlsContext *tls, const std::weak_ptr - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ */ -#ifndef XMRIG_HTTPSCONTEXT_H -#define XMRIG_HTTPSCONTEXT_H +#ifndef xmlcore_HTTPSCONTEXT_H +#define xmlcore_HTTPSCONTEXT_H using BIO = struct bio_st; @@ -29,7 +29,7 @@ using SSL = struct ssl_st; #include "base/net/tls/ServerTls.h" -namespace xmrig { +namespace xmlcore { class TlsContext; @@ -38,7 +38,7 @@ class TlsContext; class HttpsContext : public HttpContext, public ServerTls { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpsContext) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpsContext) HttpsContext(TlsContext *tls, const std::weak_ptr &listener); ~HttpsContext() override; @@ -66,8 +66,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPSCONTEXT_H +#endif // xmlcore_HTTPSCONTEXT_H diff --git a/src/base/net/https/HttpsServer.cpp b/src/base/net/https/HttpsServer.cpp index 3a6fb080..a770af93 100644 --- a/src/base/net/https/HttpsServer.cpp +++ b/src/base/net/https/HttpsServer.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -26,13 +26,13 @@ #include "base/net/tools/NetBuffer.h" -xmrig::HttpsServer::HttpsServer(const std::shared_ptr &listener) : +xmlcore::HttpsServer::HttpsServer(const std::shared_ptr &listener) : m_listener(listener) { } -xmrig::HttpsServer::~HttpsServer() +xmlcore::HttpsServer::~HttpsServer() { HttpContext::closeAll(); @@ -40,7 +40,7 @@ xmrig::HttpsServer::~HttpsServer() } -bool xmrig::HttpsServer::setTls(const TlsConfig &config) +bool xmlcore::HttpsServer::setTls(const TlsConfig &config) { m_tls = TlsContext::create(config); @@ -48,7 +48,7 @@ bool xmrig::HttpsServer::setTls(const TlsConfig &config) } -void xmrig::HttpsServer::onConnection(uv_stream_t *stream, uint16_t) +void xmlcore::HttpsServer::onConnection(uv_stream_t *stream, uint16_t) { auto ctx = new HttpsContext(m_tls, m_listener); uv_accept(stream, ctx->stream()); @@ -57,7 +57,7 @@ void xmrig::HttpsServer::onConnection(uv_stream_t *stream, uint16_t) } -void xmrig::HttpsServer::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) +void xmlcore::HttpsServer::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { auto ctx = static_cast(stream->data); if (nread >= 0) { diff --git a/src/base/net/https/HttpsServer.h b/src/base/net/https/HttpsServer.h index 2b5ecd00..c618e82c 100644 --- a/src/base/net/https/HttpsServer.h +++ b/src/base/net/https/HttpsServer.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ */ -#ifndef XMRIG_HTTPSSERVER_H -#define XMRIG_HTTPSSERVER_H +#ifndef xmlcore_HTTPSSERVER_H +#define xmlcore_HTTPSSERVER_H using uv_tcp_t = struct uv_tcp_s; @@ -35,7 +35,7 @@ struct uv_buf_t; #include -namespace xmrig { +namespace xmlcore { class IHttpListener; @@ -46,7 +46,7 @@ class TlsConfig; class HttpsServer : public ITcpServerListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpsServer) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(HttpsServer) HttpsServer(const std::shared_ptr &listener); ~HttpsServer() override; @@ -64,8 +64,8 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif // XMRIG_HTTPSSERVER_H +#endif // xmlcore_HTTPSSERVER_H diff --git a/src/base/net/stratum/AutoClient.cpp b/src/base/net/stratum/AutoClient.cpp index 4a82b2bf..07546b8f 100644 --- a/src/base/net/stratum/AutoClient.cpp +++ b/src/base/net/stratum/AutoClient.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,13 +22,13 @@ #include "base/io/json/Json.h" -xmrig::AutoClient::AutoClient(int id, const char *agent, IClientListener *listener) : +xmlcore::AutoClient::AutoClient(int id, const char *agent, IClientListener *listener) : EthStratumClient(id, agent, listener) { } -bool xmrig::AutoClient::handleResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) +bool xmlcore::AutoClient::handleResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) { if (m_mode == DEFAULT_MODE) { return Client::handleResponse(id, result, error); @@ -38,7 +38,7 @@ bool xmrig::AutoClient::handleResponse(int64_t id, const rapidjson::Value &resul } -bool xmrig::AutoClient::parseLogin(const rapidjson::Value &result, int *code) +bool xmlcore::AutoClient::parseLogin(const rapidjson::Value &result, int *code) { if (result.HasMember("job")) { return Client::parseLogin(result, code); @@ -70,7 +70,7 @@ bool xmrig::AutoClient::parseLogin(const rapidjson::Value &result, int *code) } -int64_t xmrig::AutoClient::submit(const JobResult &result) +int64_t xmlcore::AutoClient::submit(const JobResult &result) { if (m_mode == DEFAULT_MODE) { return Client::submit(result); @@ -80,7 +80,7 @@ int64_t xmrig::AutoClient::submit(const JobResult &result) } -void xmrig::AutoClient::parseNotification(const char *method, const rapidjson::Value ¶ms, const rapidjson::Value &error) +void xmlcore::AutoClient::parseNotification(const char *method, const rapidjson::Value ¶ms, const rapidjson::Value &error) { if (m_mode == DEFAULT_MODE) { return Client::parseNotification(method, params, error); diff --git a/src/base/net/stratum/AutoClient.h b/src/base/net/stratum/AutoClient.h index a97700fb..5ca59a72 100644 --- a/src/base/net/stratum/AutoClient.h +++ b/src/base/net/stratum/AutoClient.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_AUTOCLIENT_H -#define XMRIG_AUTOCLIENT_H +#ifndef xmlcore_AUTOCLIENT_H +#define xmlcore_AUTOCLIENT_H #include "base/net/stratum/EthStratumClient.h" @@ -26,13 +26,13 @@ #include -namespace xmrig { +namespace xmlcore { class AutoClient : public EthStratumClient { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(AutoClient) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(AutoClient) AutoClient(int id, const char *agent, IClientListener *listener); ~AutoClient() override = default; @@ -55,7 +55,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_AUTOCLIENT_H */ +#endif /* xmlcore_AUTOCLIENT_H */ diff --git a/src/base/net/stratum/BaseClient.cpp b/src/base/net/stratum/BaseClient.cpp index 12b7ca76..3234d80b 100644 --- a/src/base/net/stratum/BaseClient.cpp +++ b/src/base/net/stratum/BaseClient.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -32,23 +32,23 @@ #include "base/net/stratum/SubmitResult.h" -namespace xmrig { +namespace xmlcore { int64_t BaseClient::m_sequence = 1; -} /* namespace xmrig */ +} /* namespace xmlcore */ -xmrig::BaseClient::BaseClient(int id, IClientListener *listener) : +xmlcore::BaseClient::BaseClient(int id, IClientListener *listener) : m_listener(listener), m_id(id) { } -void xmrig::BaseClient::setPool(const Pool &pool) +void xmlcore::BaseClient::setPool(const Pool &pool) { if (!pool.isValid()) { return; @@ -62,7 +62,7 @@ void xmrig::BaseClient::setPool(const Pool &pool) } -bool xmrig::BaseClient::handleResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) +bool xmlcore::BaseClient::handleResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) { if (id == 1) { return false; @@ -88,7 +88,7 @@ bool xmrig::BaseClient::handleResponse(int64_t id, const rapidjson::Value &resul } -bool xmrig::BaseClient::handleSubmitResponse(int64_t id, const char *error) +bool xmlcore::BaseClient::handleSubmitResponse(int64_t id, const char *error) { auto it = m_results.find(id); if (it != m_results.end()) { diff --git a/src/base/net/stratum/BaseClient.h b/src/base/net/stratum/BaseClient.h index 0a87fedb..d98250ca 100644 --- a/src/base/net/stratum/BaseClient.h +++ b/src/base/net/stratum/BaseClient.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BASECLIENT_H -#define XMRIG_BASECLIENT_H +#ifndef xmlcore_BASECLIENT_H +#define xmlcore_BASECLIENT_H #include @@ -35,7 +35,7 @@ #include "base/tools/Chrono.h" -namespace xmrig { +namespace xmlcore { class IClientListener; @@ -111,7 +111,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BASECLIENT_H */ +#endif /* xmlcore_BASECLIENT_H */ diff --git a/src/base/net/stratum/Client.cpp b/src/base/net/stratum/Client.cpp index 5327867e..05b2dd54 100644 --- a/src/base/net/stratum/Client.cpp +++ b/src/base/net/stratum/Client.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 jtgrassie * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include -#ifdef XMRIG_FEATURE_TLS +#ifdef xmlcore_FEATURE_TLS # include # include # include "base/net/stratum/Tls.h" @@ -60,11 +60,11 @@ #endif -namespace xmrig { +namespace xmlcore { Storage Client::m_storage; -} /* namespace xmrig */ +} /* namespace xmlcore */ #ifdef APP_DEBUG @@ -79,7 +79,7 @@ static const char *states[] = { #endif -xmrig::Client::Client(int id, const char *agent, IClientListener *listener) : +xmlcore::Client::Client(int id, const char *agent, IClientListener *listener) : BaseClient(id, listener), m_agent(agent), m_sendBuf(1024) @@ -90,14 +90,14 @@ xmrig::Client::Client(int id, const char *agent, IClientListener *listener) : } -xmrig::Client::~Client() +xmlcore::Client::~Client() { delete m_dns; delete m_socket; } -bool xmrig::Client::disconnect() +bool xmlcore::Client::disconnect() { m_keepAlive = 0; m_expire = 0; @@ -107,9 +107,9 @@ bool xmrig::Client::disconnect() } -bool xmrig::Client::isTLS() const +bool xmlcore::Client::isTLS() const { -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS return m_pool.isTLS() && m_tls; # else return false; @@ -117,9 +117,9 @@ bool xmrig::Client::isTLS() const } -const char *xmrig::Client::tlsFingerprint() const +const char *xmlcore::Client::tlsFingerprint() const { -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (isTLS() && m_pool.fingerprint() == nullptr) { return m_tls->fingerprint(); } @@ -129,9 +129,9 @@ const char *xmrig::Client::tlsFingerprint() const } -const char *xmrig::Client::tlsVersion() const +const char *xmlcore::Client::tlsVersion() const { -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (isTLS()) { return m_tls->version(); } @@ -141,7 +141,7 @@ const char *xmrig::Client::tlsVersion() const } -int64_t xmrig::Client::send(const rapidjson::Value &obj, Callback callback) +int64_t xmlcore::Client::send(const rapidjson::Value &obj, Callback callback) { assert(obj["id"] == sequence()); @@ -151,7 +151,7 @@ int64_t xmrig::Client::send(const rapidjson::Value &obj, Callback callback) } -int64_t xmrig::Client::send(const rapidjson::Value &obj) +int64_t xmlcore::Client::send(const rapidjson::Value &obj) { using namespace rapidjson; @@ -179,9 +179,9 @@ int64_t xmrig::Client::send(const rapidjson::Value &obj) } -int64_t xmrig::Client::submit(const JobResult &result) +int64_t xmlcore::Client::submit(const JobResult &result) { -# ifndef XMRIG_PROXY_PROJECT +# ifndef xmlcore_PROXY_PROJECT if (result.clientId != m_rpcId || m_rpcId.isNull() || m_state != ConnectedState) { return -1; } @@ -195,7 +195,7 @@ int64_t xmrig::Client::submit(const JobResult &result) using namespace rapidjson; -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT const char *nonce = result.nonce; const char *data = result.result; # else @@ -221,7 +221,7 @@ int64_t xmrig::Client::submit(const JobResult &result) JsonRequest::create(doc, m_sequence, "submit", params); -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff(), result.id, 0); # else m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff(), 0, result.backend); @@ -231,7 +231,7 @@ int64_t xmrig::Client::submit(const JobResult &result) } -void xmrig::Client::connect() +void xmlcore::Client::connect() { if (m_pool.proxy().isValid()) { m_socks5 = new Socks5(this); @@ -240,7 +240,7 @@ void xmrig::Client::connect() return; } -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (m_pool.isTLS()) { m_tls = new Tls(this); } @@ -250,14 +250,14 @@ void xmrig::Client::connect() } -void xmrig::Client::connect(const Pool &pool) +void xmlcore::Client::connect(const Pool &pool) { setPool(pool); connect(); } -void xmrig::Client::deleteLater() +void xmlcore::Client::deleteLater() { if (!m_listener) { return; @@ -271,7 +271,7 @@ void xmrig::Client::deleteLater() } -void xmrig::Client::tick(uint64_t now) +void xmlcore::Client::tick(uint64_t now) { if (m_state == ConnectedState) { if (m_expire && now > m_expire) { @@ -295,7 +295,7 @@ void xmrig::Client::tick(uint64_t now) } -void xmrig::Client::onResolved(const Dns &dns, int status) +void xmlcore::Client::onResolved(const Dns &dns, int status) { assert(m_listener != nullptr); if (!m_listener) { @@ -317,7 +317,7 @@ void xmrig::Client::onResolved(const Dns &dns, int status) } -bool xmrig::Client::close() +bool xmlcore::Client::close() { if (m_state == ClosingState) { return m_socket != nullptr; @@ -337,7 +337,7 @@ bool xmrig::Client::close() } -bool xmrig::Client::isCriticalError(const char *message) +bool xmlcore::Client::isCriticalError(const char *message) { if (!message) { return false; @@ -363,7 +363,7 @@ bool xmrig::Client::isCriticalError(const char *message) } -bool xmrig::Client::parseJob(const rapidjson::Value ¶ms, int *code) +bool xmlcore::Client::parseJob(const rapidjson::Value ¶ms, int *code) { if (!params.IsObject()) { *code = 2; @@ -377,7 +377,7 @@ bool xmrig::Client::parseJob(const rapidjson::Value ¶ms, int *code) return false; } -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP if (m_pool.mode() == Pool::MODE_SELF_SELECT) { job.setExtraNonce(Json::getString(params, "extra_nonce")); job.setPoolWallet(Json::getString(params, "pool_wallet")); @@ -429,7 +429,7 @@ bool xmrig::Client::parseJob(const rapidjson::Value ¶ms, int *code) return true; } - if (m_jobs == 0) { // https://github.com/xmrig/xmrig/issues/459 + if (m_jobs == 0) { // https://github.com/xmlcore/xmlcore/issues/459 return false; } @@ -442,9 +442,9 @@ bool xmrig::Client::parseJob(const rapidjson::Value ¶ms, int *code) } -bool xmrig::Client::send(BIO *bio) +bool xmlcore::Client::send(BIO *bio) { -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS uv_buf_t buf; buf.len = BIO_get_mem_data(bio, &buf.base); @@ -471,7 +471,7 @@ bool xmrig::Client::send(BIO *bio) } -bool xmrig::Client::verifyAlgorithm(const Algorithm &algorithm, const char *algo) const +bool xmlcore::Client::verifyAlgorithm(const Algorithm &algorithm, const char *algo) const { if (!algorithm.isValid()) { if (!isQuiet()) { @@ -497,7 +497,7 @@ bool xmrig::Client::verifyAlgorithm(const Algorithm &algorithm, const char *algo } -bool xmrig::Client::write(const uv_buf_t &buf) +bool xmlcore::Client::write(const uv_buf_t &buf) { const int rc = uv_try_write(stream(), &buf, 1); if (static_cast(rc) == buf.len) { @@ -514,7 +514,7 @@ bool xmrig::Client::write(const uv_buf_t &buf) } -int xmrig::Client::resolve(const String &host) +int xmlcore::Client::resolve(const String &host) { setState(HostLookupState); @@ -536,11 +536,11 @@ int xmrig::Client::resolve(const String &host) } -int64_t xmrig::Client::send(size_t size) +int64_t xmlcore::Client::send(size_t size) { LOG_DEBUG("[%s] send (%d bytes): \"%.*s\"", url(), size, static_cast(size) - 1, m_sendBuf.data()); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (isTLS()) { if (!m_tls->send(m_sendBuf.data(), size)) { return -1; @@ -566,7 +566,7 @@ int64_t xmrig::Client::send(size_t size) } -void xmrig::Client::connect(sockaddr *addr) +void xmlcore::Client::connect(sockaddr *addr) { setState(ConnectingState); @@ -589,13 +589,13 @@ void xmrig::Client::connect(sockaddr *addr) } -void xmrig::Client::handshake() +void xmlcore::Client::handshake() { if (m_socks5) { return m_socks5->handshake(); } -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (isTLS()) { m_expire = Chrono::steadyMSecs() + kResponseTimeout; @@ -609,7 +609,7 @@ void xmrig::Client::handshake() } -bool xmrig::Client::parseLogin(const rapidjson::Value &result, int *code) +bool xmlcore::Client::parseLogin(const rapidjson::Value &result, int *code) { setRpcId(Json::getString(result, "id")); if (rpcId().isNull()) { @@ -626,7 +626,7 @@ bool xmrig::Client::parseLogin(const rapidjson::Value &result, int *code) } -void xmrig::Client::login() +void xmlcore::Client::login() { using namespace rapidjson; m_results.clear(); @@ -651,14 +651,14 @@ void xmrig::Client::login() } -void xmrig::Client::onClose() +void xmlcore::Client::onClose() { delete m_socket; m_socket = nullptr; setState(UnconnectedState); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (m_tls) { delete m_tls; m_tls = nullptr; @@ -669,7 +669,7 @@ void xmrig::Client::onClose() } -void xmrig::Client::parse(char *line, size_t len) +void xmlcore::Client::parse(char *line, size_t len) { startTimeout(); @@ -721,7 +721,7 @@ void xmrig::Client::parse(char *line, size_t len) } -void xmrig::Client::parseExtensions(const rapidjson::Value &result) +void xmlcore::Client::parseExtensions(const rapidjson::Value &result) { m_extensions.reset(); @@ -754,7 +754,7 @@ void xmrig::Client::parseExtensions(const rapidjson::Value &result) setExtension(EXT_KEEPALIVE, true); startTimeout(); } -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS else if (strcmp(name, "tls") == 0) { setExtension(EXT_TLS, true); } @@ -763,7 +763,7 @@ void xmrig::Client::parseExtensions(const rapidjson::Value &result) } -void xmrig::Client::parseNotification(const char *method, const rapidjson::Value ¶ms, const rapidjson::Value &) +void xmlcore::Client::parseNotification(const char *method, const rapidjson::Value ¶ms, const rapidjson::Value &) { if (strcmp(method, "job") == 0) { int code = -1; @@ -779,7 +779,7 @@ void xmrig::Client::parseNotification(const char *method, const rapidjson::Value } -void xmrig::Client::parseResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) +void xmlcore::Client::parseResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) { if (handleResponse(id, result, error)) { return; @@ -828,7 +828,7 @@ void xmrig::Client::parseResponse(int64_t id, const rapidjson::Value &result, co } -void xmrig::Client::ping() +void xmlcore::Client::ping() { send(snprintf(m_sendBuf.data(), m_sendBuf.size(), "{\"id\":%" PRId64 ",\"jsonrpc\":\"2.0\",\"method\":\"keepalived\",\"params\":{\"id\":\"%s\"}}\n", m_sequence, m_rpcId.data())); @@ -836,7 +836,7 @@ void xmrig::Client::ping() } -void xmrig::Client::read(ssize_t nread, const uv_buf_t *buf) +void xmlcore::Client::read(ssize_t nread, const uv_buf_t *buf) { const auto size = static_cast(nread); if (nread < 0) { @@ -860,7 +860,7 @@ void xmrig::Client::read(ssize_t nread, const uv_buf_t *buf) delete m_socks5; m_socks5 = nullptr; -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (m_pool.isTLS() && !m_tls) { m_tls = new Tls(this); } @@ -872,7 +872,7 @@ void xmrig::Client::read(ssize_t nread, const uv_buf_t *buf) return; } -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (isTLS()) { LOG_DEBUG("[%s] TLS received (%d bytes)", url(), static_cast(nread)); @@ -886,7 +886,7 @@ void xmrig::Client::read(ssize_t nread, const uv_buf_t *buf) } -void xmrig::Client::reconnect() +void xmlcore::Client::reconnect() { if (!m_listener) { m_storage.remove(m_key); @@ -907,7 +907,7 @@ void xmrig::Client::reconnect() } -void xmrig::Client::setState(SocketState state) +void xmlcore::Client::setState(SocketState state) { LOG_DEBUG("[%s] state: \"%s\" -> \"%s\"", url(), states[m_state], states[state]); @@ -936,7 +936,7 @@ void xmrig::Client::setState(SocketState state) } -void xmrig::Client::startTimeout() +void xmlcore::Client::startTimeout() { m_expire = 0; @@ -948,7 +948,7 @@ void xmrig::Client::startTimeout() } -void xmrig::Client::onClose(uv_handle_t *handle) +void xmlcore::Client::onClose(uv_handle_t *handle) { auto client = getClient(handle->data); if (!client) { @@ -959,7 +959,7 @@ void xmrig::Client::onClose(uv_handle_t *handle) } -void xmrig::Client::onConnect(uv_connect_t *req, int status) +void xmlcore::Client::onConnect(uv_connect_t *req, int status) { auto client = getClient(req->data); delete req; @@ -997,7 +997,7 @@ void xmrig::Client::onConnect(uv_connect_t *req, int status) } -void xmrig::Client::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) +void xmlcore::Client::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { auto client = getClient(stream->data); if (client) { diff --git a/src/base/net/stratum/Client.h b/src/base/net/stratum/Client.h index 33e3fd8f..db69bc57 100644 --- a/src/base/net/stratum/Client.h +++ b/src/base/net/stratum/Client.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 jtgrassie * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CLIENT_H -#define XMRIG_CLIENT_H +#ifndef xmlcore_CLIENT_H +#define xmlcore_CLIENT_H #include @@ -47,7 +47,7 @@ using BIO = struct bio_st; -namespace xmrig { +namespace xmlcore { class IClientListener; @@ -57,7 +57,7 @@ class JobResult; class Client : public BaseClient, public IDnsListener, public ILineListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Client) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Client) constexpr static uint64_t kConnectTimeout = 20 * 1000; constexpr static uint64_t kResponseTimeout = 20 * 1000; @@ -152,7 +152,7 @@ template<> inline bool Client::has() const noexcept { ret template<> inline bool Client::has() const noexcept { return m_extensions.test(EXT_KEEPALIVE) || m_pool.keepAlive() > 0; } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CLIENT_H */ +#endif /* xmlcore_CLIENT_H */ diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp index 554ee8a8..f679bfaa 100644 --- a/src/base/net/stratum/DaemonClient.cpp +++ b/src/base/net/stratum/DaemonClient.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -45,7 +45,7 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kBlocktemplateBlob = "blocktemplate_blob"; static const char *kGetHeight = "/getheight"; @@ -59,7 +59,7 @@ static constexpr size_t kBlobReserveSize = 8; } -xmrig::DaemonClient::DaemonClient(int id, IClientListener *listener) : +xmlcore::DaemonClient::DaemonClient(int id, IClientListener *listener) : BaseClient(id, listener) { m_httpListener = std::make_shared(this); @@ -67,13 +67,13 @@ xmrig::DaemonClient::DaemonClient(int id, IClientListener *listener) : } -xmrig::DaemonClient::~DaemonClient() +xmlcore::DaemonClient::~DaemonClient() { delete m_timer; } -bool xmrig::DaemonClient::disconnect() +bool xmlcore::DaemonClient::disconnect() { if (m_state != UnconnectedState) { setState(UnconnectedState); @@ -83,9 +83,9 @@ bool xmrig::DaemonClient::disconnect() } -bool xmrig::DaemonClient::isTLS() const +bool xmlcore::DaemonClient::isTLS() const { -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS return m_pool.isTLS(); # else return false; @@ -93,7 +93,7 @@ bool xmrig::DaemonClient::isTLS() const } -int64_t xmrig::DaemonClient::submit(const JobResult &result) +int64_t xmlcore::DaemonClient::submit(const JobResult &result) { if (result.jobId != (m_blocktemplate.data() + m_blocktemplate.size() - 32)) { return -1; @@ -101,7 +101,7 @@ int64_t xmrig::DaemonClient::submit(const JobResult &result) char *data = (m_apiVersion == API_DERO) ? m_blockhashingblob.data() : m_blocktemplate.data(); -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT memcpy(data + 78, result.nonce, 8); # else Cvt::toHex(data + 78, 8, reinterpret_cast(&result.nonce), 4); @@ -121,7 +121,7 @@ int64_t xmrig::DaemonClient::submit(const JobResult &result) JsonRequest::create(doc, m_sequence, "submitblock", params); -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff(), result.id, 0); # else m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff(), 0, result.backend); @@ -131,7 +131,7 @@ int64_t xmrig::DaemonClient::submit(const JobResult &result) } -void xmrig::DaemonClient::connect() +void xmlcore::DaemonClient::connect() { if ((m_pool.algorithm() == Algorithm::ASTROBWT_DERO) || (m_pool.coin() == Coin::DERO)) { m_apiVersion = API_DERO; @@ -142,14 +142,14 @@ void xmrig::DaemonClient::connect() } -void xmrig::DaemonClient::connect(const Pool &pool) +void xmlcore::DaemonClient::connect(const Pool &pool) { setPool(pool); connect(); } -void xmrig::DaemonClient::onHttpData(const HttpData &data) +void xmlcore::DaemonClient::onHttpData(const HttpData &data) { if (data.status != HTTP_STATUS_OK) { return retry(); @@ -157,7 +157,7 @@ void xmrig::DaemonClient::onHttpData(const HttpData &data) m_ip = data.ip().c_str(); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS m_tlsVersion = data.tlsVersion(); m_tlsFingerprint = data.tlsFingerprint(); # endif @@ -196,7 +196,7 @@ void xmrig::DaemonClient::onHttpData(const HttpData &data) } -void xmrig::DaemonClient::onTimer(const Timer *) +void xmlcore::DaemonClient::onTimer(const Timer *) { if (m_state == ConnectingState) { getBlockTemplate(); @@ -212,13 +212,13 @@ void xmrig::DaemonClient::onTimer(const Timer *) } -bool xmrig::DaemonClient::isOutdated(uint64_t height, const char *hash) const +bool xmlcore::DaemonClient::isOutdated(uint64_t height, const char *hash) const { return m_job.height() != height || m_prevHash != hash; } -bool xmrig::DaemonClient::parseJob(const rapidjson::Value ¶ms, int *code) +bool xmlcore::DaemonClient::parseJob(const rapidjson::Value ¶ms, int *code) { Job job(false, m_pool.algorithm(), String()); @@ -264,7 +264,7 @@ bool xmrig::DaemonClient::parseJob(const rapidjson::Value ¶ms, int *code) } -bool xmrig::DaemonClient::parseResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) +bool xmlcore::DaemonClient::parseResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) { if (id == -1) { return false; @@ -306,7 +306,7 @@ bool xmrig::DaemonClient::parseResponse(int64_t id, const rapidjson::Value &resu } -int64_t xmrig::DaemonClient::getBlockTemplate() +int64_t xmlcore::DaemonClient::getBlockTemplate() { using namespace rapidjson; Document doc(kObjectType); @@ -327,7 +327,7 @@ int64_t xmrig::DaemonClient::getBlockTemplate() } -int64_t xmrig::DaemonClient::rpcSend(const rapidjson::Document &doc) +int64_t xmlcore::DaemonClient::rpcSend(const rapidjson::Document &doc) { FetchRequest req(HTTP_POST, m_pool.host(), m_pool.port(), kJsonRPC, doc, m_pool.isTLS(), isQuiet()); fetch(tag(), std::move(req), m_httpListener); @@ -336,7 +336,7 @@ int64_t xmrig::DaemonClient::rpcSend(const rapidjson::Document &doc) } -void xmrig::DaemonClient::retry() +void xmlcore::DaemonClient::retry() { m_failures++; m_listener->onClose(this, static_cast(m_failures)); @@ -354,14 +354,14 @@ void xmrig::DaemonClient::retry() } -void xmrig::DaemonClient::send(const char *path) +void xmlcore::DaemonClient::send(const char *path) { FetchRequest req(HTTP_GET, m_pool.host(), m_pool.port(), path, m_pool.isTLS(), isQuiet()); fetch(tag(), std::move(req), m_httpListener); } -void xmrig::DaemonClient::setState(SocketState state) +void xmlcore::DaemonClient::setState(SocketState state) { assert(m_state != state); if (m_state == state) { diff --git a/src/base/net/stratum/DaemonClient.h b/src/base/net/stratum/DaemonClient.h index 94858b50..9a2a4b98 100644 --- a/src/base/net/stratum/DaemonClient.h +++ b/src/base/net/stratum/DaemonClient.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DAEMONCLIENT_H -#define XMRIG_DAEMONCLIENT_H +#ifndef xmlcore_DAEMONCLIENT_H +#define xmlcore_DAEMONCLIENT_H #include "base/kernel/interfaces/IHttpListener.h" @@ -36,13 +36,13 @@ #include -namespace xmrig { +namespace xmlcore { class DaemonClient : public BaseClient, public ITimerListener, public IHttpListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(DaemonClient) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(DaemonClient) DaemonClient(int id, IClientListener *listener); ~DaemonClient() override; @@ -92,7 +92,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DAEMONCLIENT_H */ +#endif /* xmlcore_DAEMONCLIENT_H */ diff --git a/src/base/net/stratum/EthStratumClient.cpp b/src/base/net/stratum/EthStratumClient.cpp index 5e7edfd4..89e6c73a 100644 --- a/src/base/net/stratum/EthStratumClient.cpp +++ b/src/base/net/stratum/EthStratumClient.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -36,15 +36,15 @@ -xmrig::EthStratumClient::EthStratumClient(int id, const char *agent, IClientListener *listener) : +xmlcore::EthStratumClient::EthStratumClient(int id, const char *agent, IClientListener *listener) : Client(id, agent, listener) { } -int64_t xmrig::EthStratumClient::submit(const JobResult& result) +int64_t xmlcore::EthStratumClient::submit(const JobResult& result) { -# ifndef XMRIG_PROXY_PROJECT +# ifndef xmlcore_PROXY_PROJECT if ((m_state != ConnectedState) || !m_authorized) { return -1; } @@ -91,7 +91,7 @@ int64_t xmrig::EthStratumClient::submit(const JobResult& result) uint64_t actual_diff = ethash_swap_u64(*((uint64_t*)result.result())); actual_diff = actual_diff ? (uint64_t(-1) / actual_diff) : 0; -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_results[m_sequence] = SubmitResult(m_sequence, result.diff, actual_diff, result.id, 0); # else m_results[m_sequence] = SubmitResult(m_sequence, result.diff, actual_diff, 0, result.backend); @@ -101,7 +101,7 @@ int64_t xmrig::EthStratumClient::submit(const JobResult& result) } -void xmrig::EthStratumClient::login() +void xmlcore::EthStratumClient::login() { m_results.clear(); @@ -110,14 +110,14 @@ void xmrig::EthStratumClient::login() } -void xmrig::EthStratumClient::onClose() +void xmlcore::EthStratumClient::onClose() { m_authorized = false; Client::onClose(); } -bool xmrig::EthStratumClient::handleResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) +bool xmlcore::EthStratumClient::handleResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error) { auto it = m_callbacks.find(id); if (it != m_callbacks.end()) { @@ -139,7 +139,7 @@ bool xmrig::EthStratumClient::handleResponse(int64_t id, const rapidjson::Value } -void xmrig::EthStratumClient::parseNotification(const char *method, const rapidjson::Value ¶ms, const rapidjson::Value &) +void xmlcore::EthStratumClient::parseNotification(const char *method, const rapidjson::Value ¶ms, const rapidjson::Value &) { if (strcmp(method, "mining.set_target") == 0) { return; @@ -240,7 +240,7 @@ void xmrig::EthStratumClient::parseNotification(const char *method, const rapidj } -void xmrig::EthStratumClient::setExtraNonce(const rapidjson::Value &nonce) +void xmlcore::EthStratumClient::setExtraNonce(const rapidjson::Value &nonce) { if (!nonce.IsString()) { throw std::runtime_error("invalid mining.subscribe response: extra nonce is not a string"); @@ -272,7 +272,7 @@ void xmrig::EthStratumClient::setExtraNonce(const rapidjson::Value &nonce) } -const char *xmrig::EthStratumClient::errorMessage(const rapidjson::Value &error) const +const char *xmlcore::EthStratumClient::errorMessage(const rapidjson::Value &error) const { if (error.IsArray() && error.GetArray().Size() > 1) { auto &value = error.GetArray()[1]; @@ -293,7 +293,7 @@ const char *xmrig::EthStratumClient::errorMessage(const rapidjson::Value &error) } -void xmrig::EthStratumClient::authorize() +void xmlcore::EthStratumClient::authorize() { using namespace rapidjson; @@ -310,7 +310,7 @@ void xmrig::EthStratumClient::authorize() } -void xmrig::EthStratumClient::onAuthorizeResponse(const rapidjson::Value &result, bool success, uint64_t) +void xmlcore::EthStratumClient::onAuthorizeResponse(const rapidjson::Value &result, bool success, uint64_t) { try { if (!success) { @@ -345,7 +345,7 @@ void xmrig::EthStratumClient::onAuthorizeResponse(const rapidjson::Value &result } -void xmrig::EthStratumClient::onSubscribeResponse(const rapidjson::Value &result, bool success, uint64_t) +void xmlcore::EthStratumClient::onSubscribeResponse(const rapidjson::Value &result, bool success, uint64_t) { if (!success) { return; @@ -377,7 +377,7 @@ void xmrig::EthStratumClient::onSubscribeResponse(const rapidjson::Value &result } -void xmrig::EthStratumClient::subscribe() +void xmlcore::EthStratumClient::subscribe() { using namespace rapidjson; diff --git a/src/base/net/stratum/EthStratumClient.h b/src/base/net/stratum/EthStratumClient.h index c09f3ae8..2178c44e 100644 --- a/src/base/net/stratum/EthStratumClient.h +++ b/src/base/net/stratum/EthStratumClient.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ETHSTRATUMCLIENT_H -#define XMRIG_ETHSTRATUMCLIENT_H +#ifndef xmlcore_ETHSTRATUMCLIENT_H +#define xmlcore_ETHSTRATUMCLIENT_H #include "base/net/stratum/Client.h" @@ -26,13 +26,13 @@ #include -namespace xmrig { +namespace xmlcore { class EthStratumClient : public Client { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(EthStratumClient) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(EthStratumClient) EthStratumClient(int id, const char *agent, IClientListener *listener); ~EthStratumClient() override = default; @@ -59,7 +59,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_ETHSTRATUMCLIENT_H */ +#endif /* xmlcore_ETHSTRATUMCLIENT_H */ diff --git a/src/base/net/stratum/Job.cpp b/src/base/net/stratum/Job.cpp index acd5a0d6..fbcb0f80 100644 --- a/src/base/net/stratum/Job.cpp +++ b/src/base/net/stratum/Job.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -34,7 +34,7 @@ #include "base/tools/Cvt.h" -xmrig::Job::Job(bool nicehash, const Algorithm &algorithm, const String &clientId) : +xmlcore::Job::Job(bool nicehash, const Algorithm &algorithm, const String &clientId) : m_algorithm(algorithm), m_nicehash(nicehash), m_clientId(clientId) @@ -42,13 +42,13 @@ xmrig::Job::Job(bool nicehash, const Algorithm &algorithm, const String &clientI } -bool xmrig::Job::isEqual(const Job &other) const +bool xmlcore::Job::isEqual(const Job &other) const { return m_id == other.m_id && m_clientId == other.m_clientId && memcmp(m_blob, other.m_blob, sizeof(m_blob)) == 0; } -bool xmrig::Job::setBlob(const char *blob) +bool xmlcore::Job::setBlob(const char *blob) { if (!blob) { return false; @@ -74,7 +74,7 @@ bool xmrig::Job::setBlob(const char *blob) m_nicehash = true; } -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT memset(m_rawBlob, 0, sizeof(m_rawBlob)); memcpy(m_rawBlob, blob, m_size * 2); # endif @@ -83,13 +83,13 @@ bool xmrig::Job::setBlob(const char *blob) } -bool xmrig::Job::setSeedHash(const char *hash) +bool xmlcore::Job::setSeedHash(const char *hash) { if (!hash || (strlen(hash) != kMaxSeedSize * 2)) { return false; } -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_rawSeedHash = hash; # endif @@ -99,7 +99,7 @@ bool xmrig::Job::setSeedHash(const char *hash) } -bool xmrig::Job::setTarget(const char *target) +bool xmlcore::Job::setTarget(const char *target) { if (!target) { return false; @@ -118,7 +118,7 @@ bool xmrig::Job::setTarget(const char *target) return false; } -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT memset(m_rawTarget, 0, sizeof(m_rawTarget)); memcpy(m_rawTarget, target, len); # endif @@ -128,19 +128,19 @@ bool xmrig::Job::setTarget(const char *target) } -void xmrig::Job::setDiff(uint64_t diff) +void xmlcore::Job::setDiff(uint64_t diff) { m_diff = diff; m_target = toDiff(diff); -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT Buffer::toHex(reinterpret_cast(&m_target), 8, m_rawTarget); m_rawTarget[16] = '\0'; # endif } -void xmrig::Job::copy(const Job &other) +void xmlcore::Job::copy(const Job &other) { m_algorithm = other.m_algorithm; m_nicehash = other.m_nicehash; @@ -158,20 +158,20 @@ void xmrig::Job::copy(const Job &other) memcpy(m_blob, other.m_blob, sizeof(m_blob)); -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_rawSeedHash = other.m_rawSeedHash; memcpy(m_rawBlob, other.m_rawBlob, sizeof(m_rawBlob)); memcpy(m_rawTarget, other.m_rawTarget, sizeof(m_rawTarget)); # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK m_benchSize = other.m_benchSize; # endif } -void xmrig::Job::move(Job &&other) +void xmlcore::Job::move(Job &&other) { m_algorithm = other.m_algorithm; m_nicehash = other.m_nicehash; @@ -193,14 +193,14 @@ void xmrig::Job::move(Job &&other) other.m_diff = 0; other.m_algorithm = Algorithm::INVALID; -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_rawSeedHash = std::move(other.m_rawSeedHash); memcpy(m_rawBlob, other.m_rawBlob, sizeof(m_rawBlob)); memcpy(m_rawTarget, other.m_rawTarget, sizeof(m_rawTarget)); # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK m_benchSize = other.m_benchSize; # endif } diff --git a/src/base/net/stratum/Job.h b/src/base/net/stratum/Job.h index 5621cbc7..53cad842 100644 --- a/src/base/net/stratum/Job.h +++ b/src/base/net/stratum/Job.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,8 +24,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_JOB_H -#define XMRIG_JOB_H +#ifndef xmlcore_JOB_H +#define xmlcore_JOB_H #include @@ -37,14 +37,14 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Job { public: - // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk. - // SECOR increase requirements for blob size: https://github.com/xmrig/xmrig/issues/913 + // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmlcore/xmlcore/issues/1 Thanks fireice-uk. + // SECOR increase requirements for blob size: https://github.com/xmlcore/xmlcore/issues/913 // Haven (XHV) offshore increases requirements by adding pricing_record struct (192 bytes) to block_header. // Round it up to 408 (136*3) for a convenient keccak calculation in OpenCL static constexpr const size_t kMaxBlobSize = 408; @@ -97,7 +97,7 @@ public: inline void setIndex(uint8_t index) { m_index = index; } inline void setPoolWallet(const String &poolWallet) { m_poolWallet = poolWallet; } -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT inline char *rawBlob() { return m_rawBlob; } inline const char *rawBlob() const { return m_rawBlob; } inline const char *rawTarget() const { return m_rawTarget; } @@ -111,7 +111,7 @@ public: inline Job &operator=(const Job &other) { copy(other); return *this; } inline Job &operator=(Job &&other) noexcept { move(std::move(other)); return *this; } -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK inline uint32_t benchSize() const { return m_benchSize; } inline void setBenchSize(uint32_t size) { m_benchSize = size; } # endif @@ -135,19 +135,19 @@ private: uint8_t m_blob[kMaxBlobSize]{ 0 }; uint8_t m_index = 0; -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT char m_rawBlob[kMaxBlobSize * 2 + 8]{}; char m_rawTarget[24]{}; String m_rawSeedHash; # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK uint32_t m_benchSize = 0; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_JOB_H */ +#endif /* xmlcore_JOB_H */ diff --git a/src/base/net/stratum/NetworkState.cpp b/src/base/net/stratum/NetworkState.cpp index 9e788019..3b201950 100644 --- a/src/base/net/stratum/NetworkState.cpp +++ b/src/base/net/stratum/NetworkState.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -41,7 +41,7 @@ -namespace xmrig { +namespace xmlcore { inline static void printCount(uint64_t accepted, uint64_t rejected) @@ -111,17 +111,17 @@ inline static void printLatency(uint32_t latency) } -} // namespace xmrig +} // namespace xmlcore -xmrig::NetworkState::NetworkState(IStrategyListener *listener) : StrategyProxy(listener) +xmlcore::NetworkState::NetworkState(IStrategyListener *listener) : StrategyProxy(listener) { } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::NetworkState::getConnection(rapidjson::Document &doc, int version) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::NetworkState::getConnection(rapidjson::Document &doc, int version) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -152,7 +152,7 @@ rapidjson::Value xmrig::NetworkState::getConnection(rapidjson::Document &doc, in } -rapidjson::Value xmrig::NetworkState::getResults(rapidjson::Document &doc, int version) const +rapidjson::Value xmlcore::NetworkState::getResults(rapidjson::Document &doc, int version) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -184,7 +184,7 @@ rapidjson::Value xmrig::NetworkState::getResults(rapidjson::Document &doc, int v #endif -void xmrig::NetworkState::printConnection() const +void xmlcore::NetworkState::printConnection() const { if (!m_active) { LOG_NOTICE(YELLOW_BOLD_S "no active connection"); @@ -203,7 +203,7 @@ void xmrig::NetworkState::printConnection() const } -void xmrig::NetworkState::printResults() const +void xmlcore::NetworkState::printResults() const { if (!m_hashes) { LOG_NOTICE(YELLOW_BOLD_S "no any results yet"); @@ -230,7 +230,7 @@ void xmrig::NetworkState::printResults() const } -const char *xmrig::NetworkState::scaleDiff(uint64_t &diff) +const char *xmlcore::NetworkState::scaleDiff(uint64_t &diff) { if (diff >= 100000000000) { diff /= 1000000000; @@ -254,7 +254,7 @@ const char *xmrig::NetworkState::scaleDiff(uint64_t &diff) } -std::string xmrig::NetworkState::humanDiff(uint64_t diff) +std::string xmlcore::NetworkState::humanDiff(uint64_t diff) { const char *scale = scaleDiff(diff); @@ -262,7 +262,7 @@ std::string xmrig::NetworkState::humanDiff(uint64_t diff) } -void xmrig::NetworkState::onActive(IStrategy *strategy, IClient *client) +void xmlcore::NetworkState::onActive(IStrategy *strategy, IClient *client) { snprintf(m_pool, sizeof(m_pool) - 1, "%s:%d", client->pool().host().data(), client->pool().port()); @@ -276,7 +276,7 @@ void xmrig::NetworkState::onActive(IStrategy *strategy, IClient *client) } -void xmrig::NetworkState::onJob(IStrategy *strategy, IClient *client, const Job &job, const rapidjson::Value ¶ms) +void xmlcore::NetworkState::onJob(IStrategy *strategy, IClient *client, const Job &job, const rapidjson::Value ¶ms) { m_algorithm = job.algorithm(); m_diff = job.diff(); @@ -285,7 +285,7 @@ void xmrig::NetworkState::onJob(IStrategy *strategy, IClient *client, const Job } -void xmrig::NetworkState::onPause(IStrategy *strategy) +void xmlcore::NetworkState::onPause(IStrategy *strategy) { if (!strategy->isActive()) { stop(); @@ -295,7 +295,7 @@ void xmrig::NetworkState::onPause(IStrategy *strategy) } -void xmrig::NetworkState::onResultAccepted(IStrategy *strategy, IClient *client, const SubmitResult &result, const char *error) +void xmlcore::NetworkState::onResultAccepted(IStrategy *strategy, IClient *client, const SubmitResult &result, const char *error) { add(result, error); @@ -303,7 +303,7 @@ void xmrig::NetworkState::onResultAccepted(IStrategy *strategy, IClient *client, } -uint32_t xmrig::NetworkState::latency() const +uint32_t xmlcore::NetworkState::latency() const { const size_t calls = m_latency.size(); if (calls == 0) { @@ -317,7 +317,7 @@ uint32_t xmrig::NetworkState::latency() const } -uint64_t xmrig::NetworkState::avgTime() const +uint64_t xmlcore::NetworkState::avgTime() const { if (m_latency.empty()) { return 0; @@ -327,13 +327,13 @@ uint64_t xmrig::NetworkState::avgTime() const } -uint64_t xmrig::NetworkState::connectionTime() const +uint64_t xmlcore::NetworkState::connectionTime() const { return m_active ? ((Chrono::steadyMSecs() - m_connectionTime)) : 0; } -void xmrig::NetworkState::add(const SubmitResult &result, const char *error) +void xmlcore::NetworkState::add(const SubmitResult &result, const char *error) { if (error) { m_rejected++; @@ -353,7 +353,7 @@ void xmrig::NetworkState::add(const SubmitResult &result, const char *error) } -void xmrig::NetworkState::stop() +void xmlcore::NetworkState::stop() { m_active = false; m_diff = 0; diff --git a/src/base/net/stratum/NetworkState.h b/src/base/net/stratum/NetworkState.h index 8fa1fede..1e989014 100644 --- a/src/base/net/stratum/NetworkState.h +++ b/src/base/net/stratum/NetworkState.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NETWORKSTATE_H -#define XMRIG_NETWORKSTATE_H +#ifndef xmlcore_NETWORKSTATE_H +#define xmlcore_NETWORKSTATE_H #include "base/crypto/Algorithm.h" @@ -36,7 +36,7 @@ #include -namespace xmrig { +namespace xmlcore { class NetworkState : public StrategyProxy @@ -48,7 +48,7 @@ public: inline uint64_t accepted() const { return m_accepted; } inline uint64_t rejected() const { return m_rejected; } -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value getConnection(rapidjson::Document &doc, int version) const; rapidjson::Value getResults(rapidjson::Document &doc, int version) const; # endif @@ -89,7 +89,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_NETWORKSTATE_H */ +#endif /* xmlcore_NETWORKSTATE_H */ diff --git a/src/base/net/stratum/Pool.cpp b/src/base/net/stratum/Pool.cpp index f80f1f62..cfad1bdf 100644 --- a/src/base/net/stratum/Pool.cpp +++ b/src/base/net/stratum/Pool.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -38,19 +38,19 @@ #include "base/kernel/Platform.h" #include "base/net/stratum/Client.h" -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "base/net/stratum/AutoClient.h" # include "base/net/stratum/EthStratumClient.h" #endif -#ifdef XMRIG_FEATURE_HTTP +#ifdef xmlcore_FEATURE_HTTP # include "base/net/stratum/DaemonClient.h" # include "base/net/stratum/SelfSelectClient.h" #endif -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "base/net/stratum/benchmark/BenchClient.h" # include "base/net/stratum/benchmark/BenchConfig.h" #endif @@ -61,7 +61,7 @@ #endif -namespace xmrig { +namespace xmlcore { const String Pool::kDefaultPassword = "x"; @@ -89,7 +89,7 @@ const char *Pool::kNicehashHost = "nicehash.com"; } -xmrig::Pool::Pool(const char *url) : +xmlcore::Pool::Pool(const char *url) : m_flags(1 << FLAG_ENABLED), m_pollInterval(kDefaultPollInterval), m_url(url) @@ -97,7 +97,7 @@ xmrig::Pool::Pool(const char *url) : } -xmrig::Pool::Pool(const char *host, uint16_t port, const char *user, const char *password, int keepAlive, bool nicehash, bool tls, Mode mode) : +xmlcore::Pool::Pool(const char *host, uint16_t port, const char *user, const char *password, int keepAlive, bool nicehash, bool tls, Mode mode) : m_keepAlive(keepAlive), m_mode(mode), m_flags(1 << FLAG_ENABLED), @@ -111,7 +111,7 @@ xmrig::Pool::Pool(const char *host, uint16_t port, const char *user, const char } -xmrig::Pool::Pool(const rapidjson::Value &object) : +xmlcore::Pool::Pool(const rapidjson::Value &object) : m_flags(1 << FLAG_ENABLED), m_pollInterval(kDefaultPollInterval), m_url(Json::getString(object, kUrl)) @@ -145,8 +145,8 @@ xmrig::Pool::Pool(const rapidjson::Value &object) : } -#ifdef XMRIG_FEATURE_BENCHMARK -xmrig::Pool::Pool(const std::shared_ptr &benchmark) : +#ifdef xmlcore_FEATURE_BENCHMARK +xmlcore::Pool::Pool(const std::shared_ptr &benchmark) : m_mode(MODE_BENCHMARK), m_flags(1 << FLAG_ENABLED), m_url(BenchConfig::kBenchmark), @@ -155,7 +155,7 @@ xmrig::Pool::Pool(const std::shared_ptr &benchmark) : } -xmrig::BenchConfig *xmrig::Pool::benchmark() const +xmlcore::BenchConfig *xmlcore::Pool::benchmark() const { assert(m_mode == MODE_BENCHMARK && m_benchmark); @@ -163,28 +163,28 @@ xmrig::BenchConfig *xmrig::Pool::benchmark() const } -uint32_t xmrig::Pool::benchSize() const +uint32_t xmlcore::Pool::benchSize() const { return benchmark()->size(); } #endif -bool xmrig::Pool::isEnabled() const +bool xmlcore::Pool::isEnabled() const { -# ifndef XMRIG_FEATURE_TLS +# ifndef xmlcore_FEATURE_TLS if (isTLS()) { return false; } # endif -# ifndef XMRIG_FEATURE_HTTP +# ifndef xmlcore_FEATURE_HTTP if (m_mode == MODE_DAEMON) { return false; } # endif -# ifndef XMRIG_FEATURE_HTTP +# ifndef xmlcore_FEATURE_HTTP if (m_mode == MODE_SELF_SELECT) { return false; } @@ -198,7 +198,7 @@ bool xmrig::Pool::isEnabled() const } -bool xmrig::Pool::isEqual(const Pool &other) const +bool xmlcore::Pool::isEqual(const Pool &other) const { return (m_flags == other.m_flags && m_keepAlive == other.m_keepAlive @@ -217,12 +217,12 @@ bool xmrig::Pool::isEqual(const Pool &other) const } -xmrig::IClient *xmrig::Pool::createClient(int id, IClientListener *listener) const +xmlcore::IClient *xmlcore::Pool::createClient(int id, IClientListener *listener) const { IClient *client = nullptr; if (m_mode == MODE_POOL) { -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW if ((m_algorithm.family() == Algorithm::KAWPOW) || (m_coin == Coin::RAVEN)) { client = new EthStratumClient(id, Platform::userAgent(), listener); } @@ -232,7 +232,7 @@ xmrig::IClient *xmrig::Pool::createClient(int id, IClientListener *listener) con client = new Client(id, Platform::userAgent(), listener); } } -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP else if (m_mode == MODE_DAEMON) { client = new DaemonClient(id, listener); } @@ -240,12 +240,12 @@ xmrig::IClient *xmrig::Pool::createClient(int id, IClientListener *listener) con client = new SelfSelectClient(id, Platform::userAgent(), listener); } # endif -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW else if (m_mode == MODE_AUTO_ETH) { client = new AutoClient(id, Platform::userAgent(), listener); } # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK else if (m_mode == MODE_BENCHMARK) { client = new BenchClient(m_benchmark, listener); } @@ -261,7 +261,7 @@ xmrig::IClient *xmrig::Pool::createClient(int id, IClientListener *listener) con } -rapidjson::Value xmrig::Pool::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::Pool::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; @@ -278,7 +278,7 @@ rapidjson::Value xmrig::Pool::toJSON(rapidjson::Document &doc) const obj.AddMember(StringRef(kPass), m_password.toJSON(), allocator); obj.AddMember(StringRef(kRigId), m_rigId.toJSON(), allocator); -# ifndef XMRIG_PROXY_PROJECT +# ifndef xmlcore_PROXY_PROJECT obj.AddMember(StringRef(kNicehash), isNicehash(), allocator); # endif @@ -307,7 +307,7 @@ rapidjson::Value xmrig::Pool::toJSON(rapidjson::Document &doc) const } -std::string xmrig::Pool::printableName() const +std::string xmlcore::Pool::printableName() const { std::string out(CSI "1;" + std::to_string(isEnabled() ? (isTLS() ? 32 : 36) : 31) + "m" + url().data() + CLEAR); @@ -327,7 +327,7 @@ std::string xmrig::Pool::printableName() const #ifdef APP_DEBUG -void xmrig::Pool::print() const +void xmlcore::Pool::print() const { LOG_NOTICE("url: %s", url().data()); LOG_DEBUG ("host: %s", host().data()); @@ -342,7 +342,7 @@ void xmrig::Pool::print() const #endif -void xmrig::Pool::setKeepAlive(const rapidjson::Value &value) +void xmlcore::Pool::setKeepAlive(const rapidjson::Value &value) { if (value.IsInt()) { setKeepAlive(value.GetInt()); diff --git a/src/base/net/stratum/Pool.h b/src/base/net/stratum/Pool.h index dc0fec87..b8f162fb 100644 --- a/src/base/net/stratum/Pool.h +++ b/src/base/net/stratum/Pool.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_POOL_H -#define XMRIG_POOL_H +#ifndef xmlcore_POOL_H +#define xmlcore_POOL_H #include @@ -37,7 +37,7 @@ #include "base/net/stratum/ProxyUrl.h" -namespace xmrig { +namespace xmlcore { class BenchConfig; @@ -53,7 +53,7 @@ public: MODE_DAEMON, MODE_SELF_SELECT, MODE_AUTO_ETH, -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK MODE_BENCHMARK, # endif }; @@ -87,7 +87,7 @@ public: Pool(const char *url); Pool(const rapidjson::Value &object); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK Pool(const std::shared_ptr &benchmark); BenchConfig *benchmark() const; @@ -157,13 +157,13 @@ private: Url m_daemon; Url m_url; -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK std::shared_ptr m_benchmark; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_POOL_H */ +#endif /* xmlcore_POOL_H */ diff --git a/src/base/net/stratum/Pools.cpp b/src/base/net/stratum/Pools.cpp index d2ab3012..e4b772f4 100644 --- a/src/base/net/stratum/Pools.cpp +++ b/src/base/net/stratum/Pools.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -32,12 +32,12 @@ #include "donate.h" -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "base/net/stratum/benchmark/BenchConfig.h" #endif -namespace xmrig { +namespace xmlcore { const char *Pools::kDonateLevel = "donate-level"; @@ -47,20 +47,20 @@ const char *Pools::kRetries = "retries"; const char *Pools::kRetryPause = "retry-pause"; -} // namespace xmrig +} // namespace xmlcore -xmrig::Pools::Pools() : +xmlcore::Pools::Pools() : m_donateLevel(kDefaultDonateLevel) { -# ifdef XMRIG_PROXY_PROJECT +# ifdef xmlcore_PROXY_PROJECT m_retries = 2; m_retryPause = 1; # endif } -bool xmrig::Pools::isEqual(const Pools &other) const +bool xmlcore::Pools::isEqual(const Pools &other) const { if (m_data.size() != other.m_data.size() || m_retries != other.m_retries || m_retryPause != other.m_retryPause) { return false; @@ -70,9 +70,9 @@ bool xmrig::Pools::isEqual(const Pools &other) const } -int xmrig::Pools::donateLevel() const +int xmlcore::Pools::donateLevel() const { -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK return benchSize() || (m_benchmark && !m_benchmark->id().isEmpty()) ? 0 : m_donateLevel; # else return m_donateLevel; @@ -80,7 +80,7 @@ int xmrig::Pools::donateLevel() const } -xmrig::IStrategy *xmrig::Pools::createStrategy(IStrategyListener *listener) const +xmlcore::IStrategy *xmlcore::Pools::createStrategy(IStrategyListener *listener) const { if (active() == 1) { for (const Pool &pool : m_data) { @@ -101,7 +101,7 @@ xmrig::IStrategy *xmrig::Pools::createStrategy(IStrategyListener *listener) cons } -rapidjson::Value xmrig::Pools::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::Pools::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -116,7 +116,7 @@ rapidjson::Value xmrig::Pools::toJSON(rapidjson::Document &doc) const } -size_t xmrig::Pools::active() const +size_t xmlcore::Pools::active() const { size_t count = 0; for (const Pool &pool : m_data) { @@ -129,11 +129,11 @@ size_t xmrig::Pools::active() const } -void xmrig::Pools::load(const IJsonReader &reader) +void xmlcore::Pools::load(const IJsonReader &reader) { m_data.clear(); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK m_benchmark = std::shared_ptr(BenchConfig::create(reader.getObject(BenchConfig::kBenchmark), reader.getBool("dmi", true))); if (m_benchmark) { m_data.emplace_back(m_benchmark); @@ -165,9 +165,9 @@ void xmrig::Pools::load(const IJsonReader &reader) } -uint32_t xmrig::Pools::benchSize() const +uint32_t xmlcore::Pools::benchSize() const { -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK return m_benchmark ? m_benchmark->size() : 0; # else return 0; @@ -175,7 +175,7 @@ uint32_t xmrig::Pools::benchSize() const } -void xmrig::Pools::print() const +void xmlcore::Pools::print() const { size_t i = 1; for (const Pool &pool : m_data) { @@ -194,12 +194,12 @@ void xmrig::Pools::print() const } -void xmrig::Pools::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const +void xmlcore::Pools::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (m_benchmark) { out.AddMember(StringRef(BenchConfig::kBenchmark), m_benchmark->toJSON(doc), allocator); @@ -215,7 +215,7 @@ void xmrig::Pools::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const } -void xmrig::Pools::setDonateLevel(int level) +void xmlcore::Pools::setDonateLevel(int level) { if (level >= kMinimumDonateLevel && level <= 99) { m_donateLevel = level; @@ -223,7 +223,7 @@ void xmrig::Pools::setDonateLevel(int level) } -void xmrig::Pools::setProxyDonate(int value) +void xmlcore::Pools::setProxyDonate(int value) { switch (value) { case PROXY_DONATE_NONE: @@ -234,7 +234,7 @@ void xmrig::Pools::setProxyDonate(int value) } -void xmrig::Pools::setRetries(int retries) +void xmlcore::Pools::setRetries(int retries) { if (retries > 0 && retries <= 1000) { m_retries = retries; @@ -242,7 +242,7 @@ void xmrig::Pools::setRetries(int retries) } -void xmrig::Pools::setRetryPause(int retryPause) +void xmlcore::Pools::setRetryPause(int retryPause) { if (retryPause > 0 && retryPause <= 3600) { m_retryPause = retryPause; diff --git a/src/base/net/stratum/Pools.h b/src/base/net/stratum/Pools.h index 7fa6ec9d..2717189d 100644 --- a/src/base/net/stratum/Pools.h +++ b/src/base/net/stratum/Pools.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_POOLS_H -#define XMRIG_POOLS_H +#ifndef xmlcore_POOLS_H +#define xmlcore_POOLS_H #include @@ -32,7 +32,7 @@ #include "base/net/stratum/Pool.h" -namespace xmrig { +namespace xmlcore { class IJsonReader; @@ -87,13 +87,13 @@ private: ProxyDonate m_proxyDonate = PROXY_DONATE_AUTO; std::vector m_data; -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK std::shared_ptr m_benchmark; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_POOLS_H */ +#endif /* xmlcore_POOLS_H */ diff --git a/src/base/net/stratum/ProxyUrl.cpp b/src/base/net/stratum/ProxyUrl.cpp index ad4542bc..6328e18d 100644 --- a/src/base/net/stratum/ProxyUrl.cpp +++ b/src/base/net/stratum/ProxyUrl.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +21,14 @@ #include "3rdparty/rapidjson/document.h" -namespace xmrig { +namespace xmlcore { static const String kLocalhost = "127.0.0.1"; -} // namespace xmrig +} // namespace xmlcore -xmrig::ProxyUrl::ProxyUrl(const rapidjson::Value &value) +xmlcore::ProxyUrl::ProxyUrl(const rapidjson::Value &value) { m_port = 0; @@ -41,13 +41,13 @@ xmrig::ProxyUrl::ProxyUrl(const rapidjson::Value &value) } -const xmrig::String &xmrig::ProxyUrl::host() const +const xmlcore::String &xmlcore::ProxyUrl::host() const { return m_host.isNull() && isValid() ? kLocalhost : m_host; } -rapidjson::Value xmrig::ProxyUrl::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::ProxyUrl::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; if (!isValid()) { diff --git a/src/base/net/stratum/ProxyUrl.h b/src/base/net/stratum/ProxyUrl.h index 0604dd9d..1502bf40 100644 --- a/src/base/net/stratum/ProxyUrl.h +++ b/src/base/net/stratum/ProxyUrl.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_PROXYURL_H -#define XMRIG_PROXYURL_H +#ifndef xmlcore_PROXYURL_H +#define xmlcore_PROXYURL_H #include "base/net/stratum/Url.h" -namespace xmrig { +namespace xmlcore { class ProxyUrl : public Url @@ -40,7 +40,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_PROXYURL_H */ +#endif /* xmlcore_PROXYURL_H */ diff --git a/src/base/net/stratum/SelfSelectClient.cpp b/src/base/net/stratum/SelfSelectClient.cpp index fc4cea6e..b1ac0323 100644 --- a/src/base/net/stratum/SelfSelectClient.cpp +++ b/src/base/net/stratum/SelfSelectClient.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 jtgrassie * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -36,7 +36,7 @@ #include "base/net/stratum/Client.h" -namespace xmrig { +namespace xmlcore { static const char *kBlob = "blob"; static const char *kBlockhashingBlob = "blockhashing_blob"; @@ -51,10 +51,10 @@ static const char *kSeedHash = "seed_hash"; static const char * const required_fields[] = { kBlocktemplateBlob, kBlockhashingBlob, kHeight, kDifficulty, kPrevHash }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -xmrig::SelfSelectClient::SelfSelectClient(int id, const char *agent, IClientListener *listener) : +xmlcore::SelfSelectClient::SelfSelectClient(int id, const char *agent, IClientListener *listener) : m_listener(listener) { m_httpListener = std::make_shared(this); @@ -62,13 +62,13 @@ xmrig::SelfSelectClient::SelfSelectClient(int id, const char *agent, IClientList } -xmrig::SelfSelectClient::~SelfSelectClient() +xmlcore::SelfSelectClient::~SelfSelectClient() { delete m_client; } -void xmrig::SelfSelectClient::tick(uint64_t now) +void xmlcore::SelfSelectClient::tick(uint64_t now) { m_client->tick(now); @@ -82,7 +82,7 @@ void xmrig::SelfSelectClient::tick(uint64_t now) } -void xmrig::SelfSelectClient::onJobReceived(IClient *, const Job &job, const rapidjson::Value &) +void xmlcore::SelfSelectClient::onJobReceived(IClient *, const Job &job, const rapidjson::Value &) { m_job = job; @@ -90,7 +90,7 @@ void xmrig::SelfSelectClient::onJobReceived(IClient *, const Job &job, const rap } -void xmrig::SelfSelectClient::onLogin(IClient *, rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::SelfSelectClient::onLogin(IClient *, rapidjson::Document &doc, rapidjson::Value ¶ms) { params.AddMember("mode", "self-select", doc.GetAllocator()); @@ -98,7 +98,7 @@ void xmrig::SelfSelectClient::onLogin(IClient *, rapidjson::Document &doc, rapid } -bool xmrig::SelfSelectClient::parseResponse(int64_t id, rapidjson::Value &result, const rapidjson::Value &error) +bool xmlcore::SelfSelectClient::parseResponse(int64_t id, rapidjson::Value &result, const rapidjson::Value &error) { if (id == -1) { return false; @@ -139,7 +139,7 @@ bool xmrig::SelfSelectClient::parseResponse(int64_t id, rapidjson::Value &result } -void xmrig::SelfSelectClient::getBlockTemplate() +void xmlcore::SelfSelectClient::getBlockTemplate() { setState(WaitState); @@ -158,13 +158,13 @@ void xmrig::SelfSelectClient::getBlockTemplate() } -void xmrig::SelfSelectClient::retry() +void xmlcore::SelfSelectClient::retry() { setState(RetryState); } -void xmrig::SelfSelectClient::setState(State state) +void xmlcore::SelfSelectClient::setState(State state) { if (m_state == state) { return; @@ -195,7 +195,7 @@ void xmrig::SelfSelectClient::setState(State state) } -void xmrig::SelfSelectClient::submitBlockTemplate(rapidjson::Value &result) +void xmlcore::SelfSelectClient::submitBlockTemplate(rapidjson::Value &result) { using namespace rapidjson; Document doc(kObjectType); @@ -236,7 +236,7 @@ void xmrig::SelfSelectClient::submitBlockTemplate(rapidjson::Value &result) } -void xmrig::SelfSelectClient::onHttpData(const HttpData &data) +void xmlcore::SelfSelectClient::onHttpData(const HttpData &data) { if (data.status != HTTP_STATUS_OK) { return retry(); diff --git a/src/base/net/stratum/SelfSelectClient.h b/src/base/net/stratum/SelfSelectClient.h index b02e5212..288b96b4 100644 --- a/src/base/net/stratum/SelfSelectClient.h +++ b/src/base/net/stratum/SelfSelectClient.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 jtgrassie * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SELFSELECTCLIENT_H -#define XMRIG_SELFSELECTCLIENT_H +#ifndef xmlcore_SELFSELECTCLIENT_H +#define xmlcore_SELFSELECTCLIENT_H #include "base/kernel/interfaces/IClient.h" @@ -37,13 +37,13 @@ #include -namespace xmrig { +namespace xmlcore { class SelfSelectClient : public IClient, public IClientListener, public IHttpListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(SelfSelectClient) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(SelfSelectClient) SelfSelectClient(int id, const char *agent, IClientListener *listener); ~SelfSelectClient() override; @@ -121,7 +121,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_SELFSELECTCLIENT_H */ +#endif /* xmlcore_SELFSELECTCLIENT_H */ diff --git a/src/base/net/stratum/Socks5.cpp b/src/base/net/stratum/Socks5.cpp index 9577906f..6cf67b60 100644 --- a/src/base/net/stratum/Socks5.cpp +++ b/src/base/net/stratum/Socks5.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -20,13 +20,13 @@ #include "base/net/stratum/Socks5.h" -xmrig::Client::Socks5::Socks5(Client *client) : +xmlcore::Client::Socks5::Socks5(Client *client) : m_client(client) { } -bool xmrig::Client::Socks5::read(const char *data, size_t size) +bool xmlcore::Client::Socks5::read(const char *data, size_t size) { if (size < m_nextSize) { return false; @@ -48,7 +48,7 @@ bool xmrig::Client::Socks5::read(const char *data, size_t size) } -void xmrig::Client::Socks5::handshake() +void xmlcore::Client::Socks5::handshake() { m_nextSize = 2; m_state = SentInitialHandshake; @@ -59,19 +59,19 @@ void xmrig::Client::Socks5::handshake() } -bool xmrig::Client::Socks5::isIPv4(const String &host, sockaddr_storage *addr) const +bool xmlcore::Client::Socks5::isIPv4(const String &host, sockaddr_storage *addr) const { return uv_ip4_addr(host.data(), 0, reinterpret_cast(addr)) == 0; } -bool xmrig::Client::Socks5::isIPv6(const String &host, sockaddr_storage *addr) const +bool xmlcore::Client::Socks5::isIPv6(const String &host, sockaddr_storage *addr) const { return uv_ip6_addr(host.data(), 0, reinterpret_cast(addr)) == 0; } -void xmrig::Client::Socks5::connect() +void xmlcore::Client::Socks5::connect() { m_nextSize = 5; m_state = SentFinalHandshake; diff --git a/src/base/net/stratum/Socks5.h b/src/base/net/stratum/Socks5.h index 74ff6643..87c5223f 100644 --- a/src/base/net/stratum/Socks5.h +++ b/src/base/net/stratum/Socks5.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SOCKS5_H -#define XMRIG_SOCKS5_H +#ifndef xmlcore_SOCKS5_H +#define xmlcore_SOCKS5_H #include "base/net/stratum/Client.h" -namespace xmrig { +namespace xmlcore { class Client::Socks5 @@ -54,7 +54,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_SOCKS5_H */ +#endif /* xmlcore_SOCKS5_H */ diff --git a/src/base/net/stratum/SubmitResult.h b/src/base/net/stratum/SubmitResult.h index a180f6fa..88ab3c9b 100644 --- a/src/base/net/stratum/SubmitResult.h +++ b/src/base/net/stratum/SubmitResult.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SUBMITRESULT_H -#define XMRIG_SUBMITRESULT_H +#ifndef xmlcore_SUBMITRESULT_H +#define xmlcore_SUBMITRESULT_H #include "base/tools/Chrono.h" -namespace xmrig { +namespace xmlcore { class SubmitResult @@ -60,7 +60,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_SUBMITRESULT_H */ +#endif /* xmlcore_SUBMITRESULT_H */ diff --git a/src/base/net/stratum/Tls.cpp b/src/base/net/stratum/Tls.cpp index a4ccd853..96e15aa9 100644 --- a/src/base/net/stratum/Tls.cpp +++ b/src/base/net/stratum/Tls.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -39,7 +39,7 @@ #include -xmrig::Client::Tls::Tls(Client *client) : +xmlcore::Client::Tls::Tls(Client *client) : m_client(client) { m_ctx = SSL_CTX_new(SSLv23_method()); @@ -55,7 +55,7 @@ xmrig::Client::Tls::Tls(Client *client) : } -xmrig::Client::Tls::~Tls() +xmlcore::Client::Tls::~Tls() { if (m_ctx) { SSL_CTX_free(m_ctx); @@ -67,7 +67,7 @@ xmrig::Client::Tls::~Tls() } -bool xmrig::Client::Tls::handshake() +bool xmlcore::Client::Tls::handshake() { m_ssl = SSL_new(m_ctx); assert(m_ssl != nullptr); @@ -84,7 +84,7 @@ bool xmrig::Client::Tls::handshake() } -bool xmrig::Client::Tls::send(const char *data, size_t size) +bool xmlcore::Client::Tls::send(const char *data, size_t size) { SSL_write(m_ssl, data, size); @@ -92,19 +92,19 @@ bool xmrig::Client::Tls::send(const char *data, size_t size) } -const char *xmrig::Client::Tls::fingerprint() const +const char *xmlcore::Client::Tls::fingerprint() const { return m_ready ? m_fingerprint : nullptr; } -const char *xmrig::Client::Tls::version() const +const char *xmlcore::Client::Tls::version() const { return m_ready ? SSL_get_version(m_ssl) : nullptr; } -void xmrig::Client::Tls::read(const char *data, size_t size) +void xmlcore::Client::Tls::read(const char *data, size_t size) { BIO_write(m_read, data, size); @@ -139,13 +139,13 @@ void xmrig::Client::Tls::read(const char *data, size_t size) } -bool xmrig::Client::Tls::send() +bool xmlcore::Client::Tls::send() { return m_client->send(m_write); } -bool xmrig::Client::Tls::verify(X509 *cert) +bool xmlcore::Client::Tls::verify(X509 *cert) { if (cert == nullptr) { LOG_ERR("[%s] Failed to get server certificate", m_client->url()); @@ -169,7 +169,7 @@ bool xmrig::Client::Tls::verify(X509 *cert) } -bool xmrig::Client::Tls::verifyFingerprint(X509 *cert) +bool xmlcore::Client::Tls::verifyFingerprint(X509 *cert) { const EVP_MD *digest = EVP_get_digestbyname("sha256"); if (digest == nullptr) { diff --git a/src/base/net/stratum/Tls.h b/src/base/net/stratum/Tls.h index 38cf2f9e..fa4efb37 100644 --- a/src/base/net/stratum/Tls.h +++ b/src/base/net/stratum/Tls.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CLIENT_TLS_H -#define XMRIG_CLIENT_TLS_H +#ifndef xmlcore_CLIENT_TLS_H +#define xmlcore_CLIENT_TLS_H using BIO = struct bio_st; @@ -36,13 +36,13 @@ using X509 = struct x509_st; #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Client::Tls { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Tls) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Tls) Tls(Client *client); ~Tls(); @@ -68,7 +68,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CLIENT_TLS_H */ +#endif /* xmlcore_CLIENT_TLS_H */ diff --git a/src/base/net/stratum/Url.cpp b/src/base/net/stratum/Url.cpp index 5e2bdb9a..aeb7cbe9 100644 --- a/src/base/net/stratum/Url.cpp +++ b/src/base/net/stratum/Url.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -38,13 +38,13 @@ #endif -namespace xmrig { +namespace xmlcore { static const char kStratumTcp[] = "stratum+tcp://"; static const char kStratumSsl[] = "stratum+ssl://"; static const char kSOCKS5[] = "socks5://"; -#ifdef XMRIG_FEATURE_HTTP +#ifdef xmlcore_FEATURE_HTTP static const char kDaemonHttp[] = "daemon+http://"; static const char kDaemonHttps[] = "daemon+https://"; #endif @@ -52,13 +52,13 @@ static const char kDaemonHttps[] = "daemon+https://"; } -xmrig::Url::Url(const char *url) +xmlcore::Url::Url(const char *url) { parse(url); } -xmrig::Url::Url(const char *host, uint16_t port, bool tls, Scheme scheme) : +xmlcore::Url::Url(const char *host, uint16_t port, bool tls, Scheme scheme) : m_tls(tls), m_scheme(scheme), m_host(host), @@ -74,13 +74,13 @@ xmrig::Url::Url(const char *host, uint16_t port, bool tls, Scheme scheme) : } -bool xmrig::Url::isEqual(const Url &other) const +bool xmlcore::Url::isEqual(const Url &other) const { return (m_tls == other.m_tls && m_scheme == other.m_scheme && m_host == other.m_host && m_url == other.m_url && m_port == other.m_port); } -bool xmrig::Url::parse(const char *url) +bool xmlcore::Url::parse(const char *url) { if (url == nullptr) { return false; @@ -102,7 +102,7 @@ bool xmrig::Url::parse(const char *url) m_scheme = SOCKS5; m_tls = false; } -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP else if (strncasecmp(url, kDaemonHttps, sizeof(kDaemonHttps) - 1) == 0) { m_scheme = DAEMON; m_tls = true; @@ -145,7 +145,7 @@ bool xmrig::Url::parse(const char *url) } -bool xmrig::Url::parseIPv6(const char *addr) +bool xmlcore::Url::parseIPv6(const char *addr) { const char *end = strchr(addr, ']'); if (!end) { diff --git a/src/base/net/stratum/Url.h b/src/base/net/stratum/Url.h index 647612c1..9f150378 100644 --- a/src/base/net/stratum/Url.h +++ b/src/base/net/stratum/Url.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +23,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_URL_H -#define XMRIG_URL_H +#ifndef xmlcore_URL_H +#define xmlcore_URL_H #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Url @@ -71,7 +71,7 @@ protected: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_URL_H */ +#endif /* xmlcore_URL_H */ diff --git a/src/base/net/stratum/benchmark/BenchClient.cpp b/src/base/net/stratum/benchmark/BenchClient.cpp index 0e1093a1..84d7dd07 100644 --- a/src/base/net/stratum/benchmark/BenchClient.cpp +++ b/src/base/net/stratum/benchmark/BenchClient.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -34,12 +34,12 @@ #include "base/tools/Cvt.h" #include "version.h" -#ifdef XMRIG_FEATURE_DMI +#ifdef xmlcore_FEATURE_DMI # include "hw/dmi/DmiReader.h" #endif -xmrig::BenchClient::BenchClient(const std::shared_ptr &benchmark, IClientListener* listener) : +xmlcore::BenchClient::BenchClient(const std::shared_ptr &benchmark, IClientListener* listener) : m_listener(listener), m_benchmark(benchmark), m_hash(benchmark->hash()) @@ -58,7 +58,7 @@ xmrig::BenchClient::BenchClient(const std::shared_ptr &benchmark, I BenchState::init(this, m_benchmark->size()); -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP if (m_benchmark->isSubmit()) { m_mode = ONLINE_BENCH; @@ -85,21 +85,21 @@ xmrig::BenchClient::BenchClient(const std::shared_ptr &benchmark, I } -xmrig::BenchClient::~BenchClient() +xmlcore::BenchClient::~BenchClient() { BenchState::destroy(); } -const char *xmrig::BenchClient::tag() const +const char *xmlcore::BenchClient::tag() const { return Tags::bench(); } -void xmrig::BenchClient::connect() +void xmlcore::BenchClient::connect() { -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP if (m_mode == ONLINE_BENCH || m_mode == ONLINE_VERIFY) { return resolve(); } @@ -109,19 +109,19 @@ void xmrig::BenchClient::connect() } -void xmrig::BenchClient::setPool(const Pool &pool) +void xmlcore::BenchClient::setPool(const Pool &pool) { m_pool = pool; } -void xmrig::BenchClient::onBenchDone(uint64_t result, uint64_t diff, uint64_t ts) +void xmlcore::BenchClient::onBenchDone(uint64_t result, uint64_t diff, uint64_t ts) { m_result = result; m_diff = diff; m_doneTime = ts; -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP if (!m_token.isEmpty()) { send(DONE_BENCH); } @@ -139,13 +139,13 @@ void xmrig::BenchClient::onBenchDone(uint64_t result, uint64_t diff, uint64_t ts } -void xmrig::BenchClient::onBenchReady(uint64_t ts, uint32_t threads, const IBackend *backend) +void xmlcore::BenchClient::onBenchReady(uint64_t ts, uint32_t threads, const IBackend *backend) { m_readyTime = ts; m_threads = threads; m_backend = backend; -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP if (m_mode == ONLINE_BENCH) { send(CREATE_BENCH); } @@ -153,9 +153,9 @@ void xmrig::BenchClient::onBenchReady(uint64_t ts, uint32_t threads, const IBack } -void xmrig::BenchClient::onHttpData(const HttpData &data) +void xmlcore::BenchClient::onHttpData(const HttpData &data) { -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP rapidjson::Document doc; try { @@ -185,9 +185,9 @@ void xmrig::BenchClient::onHttpData(const HttpData &data) } -void xmrig::BenchClient::onResolved(const Dns &dns, int status) +void xmlcore::BenchClient::onResolved(const Dns &dns, int status) { -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP assert(!m_httpListener); if (status < 0) { @@ -207,7 +207,7 @@ void xmrig::BenchClient::onResolved(const Dns &dns, int status) } -bool xmrig::BenchClient::setSeed(const char *seed) +bool xmlcore::BenchClient::setSeed(const char *seed) { if (!seed) { return false; @@ -235,7 +235,7 @@ bool xmrig::BenchClient::setSeed(const char *seed) } -uint64_t xmrig::BenchClient::referenceHash() const +uint64_t xmlcore::BenchClient::referenceHash() const { if (m_hash || m_mode == ONLINE_BENCH) { return m_hash; @@ -245,13 +245,13 @@ uint64_t xmrig::BenchClient::referenceHash() const } -void xmrig::BenchClient::printExit() +void xmlcore::BenchClient::printExit() { LOG_INFO("%s " WHITE_BOLD("press ") MAGENTA_BOLD("Ctrl+C") WHITE_BOLD(" to exit"), tag()); } -void xmrig::BenchClient::start() +void xmlcore::BenchClient::start() { const uint32_t size = BenchState::size(); @@ -267,8 +267,8 @@ void xmrig::BenchClient::start() -#ifdef XMRIG_FEATURE_HTTP -void xmrig::BenchClient::onCreateReply(const rapidjson::Value &value) +#ifdef xmlcore_FEATURE_HTTP +void xmlcore::BenchClient::onCreateReply(const rapidjson::Value &value) { m_startTime = Chrono::steadyMSecs(); m_token = Json::getString(value, BenchConfig::kToken); @@ -282,14 +282,14 @@ void xmrig::BenchClient::onCreateReply(const rapidjson::Value &value) } -void xmrig::BenchClient::onDoneReply(const rapidjson::Value &) +void xmlcore::BenchClient::onDoneReply(const rapidjson::Value &) { - LOG_NOTICE("%s " WHITE_BOLD("benchmark submitted ") CYAN_BOLD("https://xmrig.com/benchmark/%s"), tag(), m_job.id().data()); + LOG_NOTICE("%s " WHITE_BOLD("benchmark submitted ") CYAN_BOLD("https://xmlcore.com/benchmark/%s"), tag(), m_job.id().data()); printExit(); } -void xmrig::BenchClient::onGetReply(const rapidjson::Value &value) +void xmlcore::BenchClient::onGetReply(const rapidjson::Value &value) { const char *hash = Json::getString(value, BenchConfig::kHash); if (hash) { @@ -305,7 +305,7 @@ void xmrig::BenchClient::onGetReply(const rapidjson::Value &value) } -void xmrig::BenchClient::resolve() +void xmlcore::BenchClient::resolve() { m_dns = std::make_shared(this); @@ -315,7 +315,7 @@ void xmrig::BenchClient::resolve() } -void xmrig::BenchClient::send(Request request) +void xmlcore::BenchClient::send(Request request) { using namespace rapidjson; @@ -340,7 +340,7 @@ void xmrig::BenchClient::send(Request request) doc.AddMember("steady_ready_ts", m_readyTime, allocator); doc.AddMember("cpu", Cpu::toJSON(doc), allocator); -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI if (m_benchmark->isDMI()) { DmiReader reader; if (reader.read()) { @@ -373,7 +373,7 @@ void xmrig::BenchClient::send(Request request) } -void xmrig::BenchClient::setError(const char *message, const char *label) +void xmlcore::BenchClient::setError(const char *message, const char *label) { LOG_ERR("%s " RED("%s: ") RED_BOLD("\"%s\""), tag(), label ? label : "benchmark failed", message); printExit(); @@ -382,7 +382,7 @@ void xmrig::BenchClient::setError(const char *message, const char *label) } -void xmrig::BenchClient::update(const rapidjson::Value &body) +void xmlcore::BenchClient::update(const rapidjson::Value &body) { assert(!m_token.isEmpty()); diff --git a/src/base/net/stratum/benchmark/BenchClient.h b/src/base/net/stratum/benchmark/BenchClient.h index 7eac1ee8..3bdcc21d 100644 --- a/src/base/net/stratum/benchmark/BenchClient.h +++ b/src/base/net/stratum/benchmark/BenchClient.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BENCHCLIENT_H -#define XMRIG_BENCHCLIENT_H +#ifndef xmlcore_BENCHCLIENT_H +#define xmlcore_BENCHCLIENT_H #include "backend/common/interfaces/IBenchListener.h" @@ -26,13 +26,13 @@ #include "base/net/stratum/Client.h" -namespace xmrig { +namespace xmlcore { class BenchClient : public IClient, public IHttpListener, public IBenchListener, public IDnsListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(BenchClient) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(BenchClient) BenchClient(const std::shared_ptr &benchmark, IClientListener* listener); ~BenchClient() override; @@ -93,7 +93,7 @@ private: void printExit(); void start(); -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP void onCreateReply(const rapidjson::Value &value); void onDoneReply(const rapidjson::Value &value); void onGetReply(const rapidjson::Value &value); @@ -124,7 +124,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BENCHCLIENT_H */ +#endif /* xmlcore_BENCHCLIENT_H */ diff --git a/src/base/net/stratum/benchmark/BenchConfig.cpp b/src/base/net/stratum/benchmark/BenchConfig.cpp index c81e0c17..58673e01 100644 --- a/src/base/net/stratum/benchmark/BenchConfig.cpp +++ b/src/base/net/stratum/benchmark/BenchConfig.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -30,7 +30,7 @@ #endif -namespace xmrig { +namespace xmlcore { const char *BenchConfig::kAlgo = "algo"; @@ -43,16 +43,16 @@ const char *BenchConfig::kSubmit = "submit"; const char *BenchConfig::kToken = "token"; const char *BenchConfig::kVerify = "verify"; -#ifndef XMRIG_DEBUG_BENCHMARK_API -const char *BenchConfig::kApiHost = "api.xmrig.com"; +#ifndef xmlcore_DEBUG_BENCHMARK_API +const char *BenchConfig::kApiHost = "api.xmlcore.com"; #else const char *BenchConfig::kApiHost = "127.0.0.1"; #endif -} // namespace xmrig +} // namespace xmlcore -xmrig::BenchConfig::BenchConfig(uint32_t size, const String &id, const rapidjson::Value &object, bool dmi) : +xmlcore::BenchConfig::BenchConfig(uint32_t size, const String &id, const rapidjson::Value &object, bool dmi) : m_algorithm(Json::getString(object, kAlgo)), m_dmi(dmi), m_submit(Json::getBool(object, kSubmit)), @@ -73,7 +73,7 @@ xmrig::BenchConfig::BenchConfig(uint32_t size, const String &id, const rapidjson } -xmrig::BenchConfig *xmrig::BenchConfig::create(const rapidjson::Value &object, bool dmi) +xmlcore::BenchConfig *xmlcore::BenchConfig::create(const rapidjson::Value &object, bool dmi) { if (!object.IsObject() || object.ObjectEmpty()) { return nullptr; @@ -90,7 +90,7 @@ xmrig::BenchConfig *xmrig::BenchConfig::create(const rapidjson::Value &object, b } -rapidjson::Value xmrig::BenchConfig::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::BenchConfig::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; Value out(kObjectType); @@ -123,7 +123,7 @@ rapidjson::Value xmrig::BenchConfig::toJSON(rapidjson::Document &doc) const } -uint32_t xmrig::BenchConfig::getSize(const char *benchmark) +uint32_t xmlcore::BenchConfig::getSize(const char *benchmark) { if (!benchmark) { return 0; diff --git a/src/base/net/stratum/benchmark/BenchConfig.h b/src/base/net/stratum/benchmark/BenchConfig.h index 87e54197..d4aab822 100644 --- a/src/base/net/stratum/benchmark/BenchConfig.h +++ b/src/base/net/stratum/benchmark/BenchConfig.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BENCHCONFIG_H -#define XMRIG_BENCHCONFIG_H +#ifndef xmlcore_BENCHCONFIG_H +#define xmlcore_BENCHCONFIG_H #include "base/crypto/Algorithm.h" #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class BenchConfig @@ -41,7 +41,7 @@ public: static const char *kToken; static const char *kVerify; -# ifndef XMRIG_DEBUG_BENCHMARK_API +# ifndef xmlcore_DEBUG_BENCHMARK_API static constexpr bool kApiTLS = true; static constexpr const uint16_t kApiPort = 443; # else @@ -78,7 +78,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BENCHCONFIG_H */ +#endif /* xmlcore_BENCHCONFIG_H */ diff --git a/src/base/net/stratum/strategies/FailoverStrategy.cpp b/src/base/net/stratum/strategies/FailoverStrategy.cpp index 604f5596..91524b81 100644 --- a/src/base/net/stratum/strategies/FailoverStrategy.cpp +++ b/src/base/net/stratum/strategies/FailoverStrategy.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -24,7 +24,7 @@ #include "base/kernel/Platform.h" -xmrig::FailoverStrategy::FailoverStrategy(const std::vector &pools, int retryPause, int retries, IStrategyListener *listener, bool quiet) : +xmlcore::FailoverStrategy::FailoverStrategy(const std::vector &pools, int retryPause, int retries, IStrategyListener *listener, bool quiet) : m_quiet(quiet), m_retries(retries), m_retryPause(retryPause), @@ -36,7 +36,7 @@ xmrig::FailoverStrategy::FailoverStrategy(const std::vector &pools, int re } -xmrig::FailoverStrategy::FailoverStrategy(int retryPause, int retries, IStrategyListener *listener, bool quiet) : +xmlcore::FailoverStrategy::FailoverStrategy(int retryPause, int retries, IStrategyListener *listener, bool quiet) : m_quiet(quiet), m_retries(retries), m_retryPause(retryPause), @@ -45,7 +45,7 @@ xmrig::FailoverStrategy::FailoverStrategy(int retryPause, int retries, IStrategy } -xmrig::FailoverStrategy::~FailoverStrategy() +xmlcore::FailoverStrategy::~FailoverStrategy() { for (IClient *client : m_pools) { client->deleteLater(); @@ -53,7 +53,7 @@ xmrig::FailoverStrategy::~FailoverStrategy() } -void xmrig::FailoverStrategy::add(const Pool &pool) +void xmlcore::FailoverStrategy::add(const Pool &pool) { IClient *client = pool.createClient(static_cast(m_pools.size()), this); @@ -65,7 +65,7 @@ void xmrig::FailoverStrategy::add(const Pool &pool) } -int64_t xmrig::FailoverStrategy::submit(const JobResult &result) +int64_t xmlcore::FailoverStrategy::submit(const JobResult &result) { if (!isActive()) { return -1; @@ -75,13 +75,13 @@ int64_t xmrig::FailoverStrategy::submit(const JobResult &result) } -void xmrig::FailoverStrategy::connect() +void xmlcore::FailoverStrategy::connect() { m_pools[m_index]->connect(); } -void xmrig::FailoverStrategy::resume() +void xmlcore::FailoverStrategy::resume() { if (!isActive()) { return; @@ -91,7 +91,7 @@ void xmrig::FailoverStrategy::resume() } -void xmrig::FailoverStrategy::setAlgo(const Algorithm &algo) +void xmlcore::FailoverStrategy::setAlgo(const Algorithm &algo) { for (IClient *client : m_pools) { client->setAlgo(algo); @@ -99,7 +99,7 @@ void xmrig::FailoverStrategy::setAlgo(const Algorithm &algo) } -void xmrig::FailoverStrategy::setProxy(const ProxyUrl &proxy) +void xmlcore::FailoverStrategy::setProxy(const ProxyUrl &proxy) { for (IClient *client : m_pools) { client->setProxy(proxy); @@ -107,7 +107,7 @@ void xmrig::FailoverStrategy::setProxy(const ProxyUrl &proxy) } -void xmrig::FailoverStrategy::stop() +void xmlcore::FailoverStrategy::stop() { for (auto &pool : m_pools) { pool->disconnect(); @@ -120,7 +120,7 @@ void xmrig::FailoverStrategy::stop() } -void xmrig::FailoverStrategy::tick(uint64_t now) +void xmlcore::FailoverStrategy::tick(uint64_t now) { for (IClient *client : m_pools) { client->tick(now); @@ -128,7 +128,7 @@ void xmrig::FailoverStrategy::tick(uint64_t now) } -void xmrig::FailoverStrategy::onClose(IClient *client, int failures) +void xmlcore::FailoverStrategy::onClose(IClient *client, int failures) { if (failures == -1) { return; @@ -149,13 +149,13 @@ void xmrig::FailoverStrategy::onClose(IClient *client, int failures) } -void xmrig::FailoverStrategy::onLogin(IClient *client, rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::FailoverStrategy::onLogin(IClient *client, rapidjson::Document &doc, rapidjson::Value ¶ms) { m_listener->onLogin(this, client, doc, params); } -void xmrig::FailoverStrategy::onJobReceived(IClient *client, const Job &job, const rapidjson::Value ¶ms) +void xmlcore::FailoverStrategy::onJobReceived(IClient *client, const Job &job, const rapidjson::Value ¶ms) { if (m_active == client->id()) { m_listener->onJob(this, client, job, params); @@ -163,7 +163,7 @@ void xmrig::FailoverStrategy::onJobReceived(IClient *client, const Job &job, con } -void xmrig::FailoverStrategy::onLoginSuccess(IClient *client) +void xmlcore::FailoverStrategy::onLoginSuccess(IClient *client) { int active = m_active; @@ -184,13 +184,13 @@ void xmrig::FailoverStrategy::onLoginSuccess(IClient *client) } -void xmrig::FailoverStrategy::onResultAccepted(IClient *client, const SubmitResult &result, const char *error) +void xmlcore::FailoverStrategy::onResultAccepted(IClient *client, const SubmitResult &result, const char *error) { m_listener->onResultAccepted(this, client, result, error); } -void xmrig::FailoverStrategy::onVerifyAlgorithm(const IClient *client, const Algorithm &algorithm, bool *ok) +void xmlcore::FailoverStrategy::onVerifyAlgorithm(const IClient *client, const Algorithm &algorithm, bool *ok) { m_listener->onVerifyAlgorithm(this, client, algorithm, ok); } diff --git a/src/base/net/stratum/strategies/FailoverStrategy.h b/src/base/net/stratum/strategies/FailoverStrategy.h index a25c82b7..55251ae2 100644 --- a/src/base/net/stratum/strategies/FailoverStrategy.h +++ b/src/base/net/stratum/strategies/FailoverStrategy.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_FAILOVERSTRATEGY_H -#define XMRIG_FAILOVERSTRATEGY_H +#ifndef xmlcore_FAILOVERSTRATEGY_H +#define xmlcore_FAILOVERSTRATEGY_H #include @@ -29,7 +29,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Client; @@ -39,7 +39,7 @@ class IStrategyListener; class FailoverStrategy : public IStrategy, public IClientListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(FailoverStrategy) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(FailoverStrategy) FailoverStrategy(const std::vector &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet = false); FailoverStrategy(int retryPause, int retries, IStrategyListener *listener, bool quiet = false); @@ -79,6 +79,6 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_FAILOVERSTRATEGY_H */ +#endif /* xmlcore_FAILOVERSTRATEGY_H */ diff --git a/src/base/net/stratum/strategies/SinglePoolStrategy.cpp b/src/base/net/stratum/strategies/SinglePoolStrategy.cpp index fc0fc562..97b2521e 100644 --- a/src/base/net/stratum/strategies/SinglePoolStrategy.cpp +++ b/src/base/net/stratum/strategies/SinglePoolStrategy.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "base/net/stratum/Pool.h" -xmrig::SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet) : +xmlcore::SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet) : m_active(false), m_listener(listener) { @@ -42,25 +42,25 @@ xmrig::SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, } -xmrig::SinglePoolStrategy::~SinglePoolStrategy() +xmlcore::SinglePoolStrategy::~SinglePoolStrategy() { m_client->deleteLater(); } -int64_t xmrig::SinglePoolStrategy::submit(const JobResult &result) +int64_t xmlcore::SinglePoolStrategy::submit(const JobResult &result) { return m_client->submit(result); } -void xmrig::SinglePoolStrategy::connect() +void xmlcore::SinglePoolStrategy::connect() { m_client->connect(); } -void xmrig::SinglePoolStrategy::resume() +void xmlcore::SinglePoolStrategy::resume() { if (!isActive()) { return; @@ -70,31 +70,31 @@ void xmrig::SinglePoolStrategy::resume() } -void xmrig::SinglePoolStrategy::setAlgo(const Algorithm &algo) +void xmlcore::SinglePoolStrategy::setAlgo(const Algorithm &algo) { m_client->setAlgo(algo); } -void xmrig::SinglePoolStrategy::setProxy(const ProxyUrl &proxy) +void xmlcore::SinglePoolStrategy::setProxy(const ProxyUrl &proxy) { m_client->setProxy(proxy); } -void xmrig::SinglePoolStrategy::stop() +void xmlcore::SinglePoolStrategy::stop() { m_client->disconnect(); } -void xmrig::SinglePoolStrategy::tick(uint64_t now) +void xmlcore::SinglePoolStrategy::tick(uint64_t now) { m_client->tick(now); } -void xmrig::SinglePoolStrategy::onClose(IClient *, int) +void xmlcore::SinglePoolStrategy::onClose(IClient *, int) { if (!isActive()) { return; @@ -105,32 +105,32 @@ void xmrig::SinglePoolStrategy::onClose(IClient *, int) } -void xmrig::SinglePoolStrategy::onJobReceived(IClient *client, const Job &job, const rapidjson::Value ¶ms) +void xmlcore::SinglePoolStrategy::onJobReceived(IClient *client, const Job &job, const rapidjson::Value ¶ms) { m_listener->onJob(this, client, job, params); } -void xmrig::SinglePoolStrategy::onLogin(IClient *client, rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::SinglePoolStrategy::onLogin(IClient *client, rapidjson::Document &doc, rapidjson::Value ¶ms) { m_listener->onLogin(this, client, doc, params); } -void xmrig::SinglePoolStrategy::onLoginSuccess(IClient *client) +void xmlcore::SinglePoolStrategy::onLoginSuccess(IClient *client) { m_active = true; m_listener->onActive(this, client); } -void xmrig::SinglePoolStrategy::onResultAccepted(IClient *client, const SubmitResult &result, const char *error) +void xmlcore::SinglePoolStrategy::onResultAccepted(IClient *client, const SubmitResult &result, const char *error) { m_listener->onResultAccepted(this, client, result, error); } -void xmrig::SinglePoolStrategy::onVerifyAlgorithm(const IClient *client, const Algorithm &algorithm, bool *ok) +void xmlcore::SinglePoolStrategy::onVerifyAlgorithm(const IClient *client, const Algorithm &algorithm, bool *ok) { m_listener->onVerifyAlgorithm(this, client, algorithm, ok); } diff --git a/src/base/net/stratum/strategies/SinglePoolStrategy.h b/src/base/net/stratum/strategies/SinglePoolStrategy.h index 90b85c7d..604ff3c6 100644 --- a/src/base/net/stratum/strategies/SinglePoolStrategy.h +++ b/src/base/net/stratum/strategies/SinglePoolStrategy.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_SINGLEPOOLSTRATEGY_H -#define XMRIG_SINGLEPOOLSTRATEGY_H +#ifndef xmlcore_SINGLEPOOLSTRATEGY_H +#define xmlcore_SINGLEPOOLSTRATEGY_H #include "base/kernel/interfaces/IClientListener.h" @@ -31,7 +31,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Client; @@ -42,7 +42,7 @@ class Pool; class SinglePoolStrategy : public IStrategy, public IClientListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(SinglePoolStrategy) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(SinglePoolStrategy) SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet = false); ~SinglePoolStrategy() override; @@ -73,7 +73,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_SINGLEPOOLSTRATEGY_H */ +#endif /* xmlcore_SINGLEPOOLSTRATEGY_H */ diff --git a/src/base/net/stratum/strategies/StrategyProxy.h b/src/base/net/stratum/strategies/StrategyProxy.h index 2c0fc235..579bfe79 100644 --- a/src/base/net/stratum/strategies/StrategyProxy.h +++ b/src/base/net/stratum/strategies/StrategyProxy.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_STRATEGYPROXY_H -#define XMRIG_STRATEGYPROXY_H +#ifndef xmlcore_STRATEGYPROXY_H +#define xmlcore_STRATEGYPROXY_H #include "base/kernel/interfaces/IStrategyListener.h" -namespace xmrig { +namespace xmlcore { class StrategyProxy : public IStrategyListener @@ -73,7 +73,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_STRATEGYPROXY_H */ +#endif /* xmlcore_STRATEGYPROXY_H */ diff --git a/src/base/net/tls/ServerTls.cpp b/src/base/net/tls/ServerTls.cpp index abae315d..d5a11161 100644 --- a/src/base/net/tls/ServerTls.cpp +++ b/src/base/net/tls/ServerTls.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -26,13 +26,13 @@ #include -xmrig::ServerTls::ServerTls(SSL_CTX *ctx) : +xmlcore::ServerTls::ServerTls(SSL_CTX *ctx) : m_ctx(ctx) { } -xmrig::ServerTls::~ServerTls() +xmlcore::ServerTls::~ServerTls() { if (m_ssl) { SSL_free(m_ssl); @@ -40,7 +40,7 @@ xmrig::ServerTls::~ServerTls() } -bool xmrig::ServerTls::isHTTP(const char *data, size_t size) +bool xmlcore::ServerTls::isHTTP(const char *data, size_t size) { assert(size > 0); @@ -50,7 +50,7 @@ bool xmrig::ServerTls::isHTTP(const char *data, size_t size) } -bool xmrig::ServerTls::isTLS(const char *data, size_t size) +bool xmlcore::ServerTls::isTLS(const char *data, size_t size) { assert(size > 0); @@ -60,7 +60,7 @@ bool xmrig::ServerTls::isTLS(const char *data, size_t size) } -bool xmrig::ServerTls::send(const char *data, size_t size) +bool xmlcore::ServerTls::send(const char *data, size_t size) { SSL_write(m_ssl, data, size); @@ -68,7 +68,7 @@ bool xmrig::ServerTls::send(const char *data, size_t size) } -void xmrig::ServerTls::read(const char *data, size_t size) +void xmlcore::ServerTls::read(const char *data, size_t size) { if (!m_ssl) { m_ssl = SSL_new(m_ctx); @@ -105,7 +105,7 @@ void xmrig::ServerTls::read(const char *data, size_t size) } -void xmrig::ServerTls::read() +void xmlcore::ServerTls::read() { static char buf[16384]{}; diff --git a/src/base/net/tls/ServerTls.h b/src/base/net/tls/ServerTls.h index 20337eb6..c5fbc0e2 100644 --- a/src/base/net/tls/ServerTls.h +++ b/src/base/net/tls/ServerTls.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ */ -#ifndef XMRIG_SERVERTLS_H -#define XMRIG_SERVERTLS_H +#ifndef xmlcore_SERVERTLS_H +#define xmlcore_SERVERTLS_H using BIO = struct bio_st; @@ -30,13 +30,13 @@ using SSL_CTX = struct ssl_ctx_st; #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class ServerTls { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(ServerTls) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(ServerTls) ServerTls(SSL_CTX *ctx); virtual ~ServerTls(); @@ -63,7 +63,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_SERVERTLS_H */ +#endif /* xmlcore_SERVERTLS_H */ diff --git a/src/base/net/tls/TlsConfig.cpp b/src/base/net/tls/TlsConfig.cpp index 2e3dc903..5894c490 100644 --- a/src/base/net/tls/TlsConfig.cpp +++ b/src/base/net/tls/TlsConfig.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "base/net/tls/TlsGen.h" -namespace xmrig { +namespace xmlcore { const char *TlsConfig::kCert = "cert"; @@ -49,7 +49,7 @@ static const char *kTLSv1_2 = "TLSv1.2"; static const char *kTLSv1_3 = "TLSv1.3"; -} // namespace xmrig +} // namespace xmlcore /** @@ -59,7 +59,7 @@ static const char *kTLSv1_3 = "TLSv1.3"; * "ciphersuites" set list of available TLSv1.3 ciphersuites. * "dhparam" load DH parameters for DHE ciphers from file. */ -xmrig::TlsConfig::TlsConfig(const rapidjson::Value &value) +xmlcore::TlsConfig::TlsConfig(const rapidjson::Value &value) { if (value.IsObject()) { m_enabled = Json::getBool(value, kEnabled, m_enabled); @@ -86,7 +86,7 @@ xmrig::TlsConfig::TlsConfig(const rapidjson::Value &value) generate(); } } -# ifdef XMRIG_FORCE_TLS +# ifdef xmlcore_FORCE_TLS else if (value.IsNull()) { generate(); } @@ -100,7 +100,7 @@ xmrig::TlsConfig::TlsConfig(const rapidjson::Value &value) } -bool xmrig::TlsConfig::generate(const char *commonName) +bool xmlcore::TlsConfig::generate(const char *commonName) { TlsGen gen; @@ -122,7 +122,7 @@ bool xmrig::TlsConfig::generate(const char *commonName) } -rapidjson::Value xmrig::TlsConfig::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::TlsConfig::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; @@ -165,7 +165,7 @@ rapidjson::Value xmrig::TlsConfig::toJSON(rapidjson::Document &doc) const } -void xmrig::TlsConfig::setProtocols(const char *protocols) +void xmlcore::TlsConfig::setProtocols(const char *protocols) { const std::vector vec = String(protocols).split(' '); @@ -186,7 +186,7 @@ void xmrig::TlsConfig::setProtocols(const char *protocols) } -void xmrig::TlsConfig::setProtocols(const rapidjson::Value &protocols) +void xmlcore::TlsConfig::setProtocols(const rapidjson::Value &protocols) { m_protocols = 0; diff --git a/src/base/net/tls/TlsConfig.h b/src/base/net/tls/TlsConfig.h index c5407f32..976f0ca3 100644 --- a/src/base/net/tls/TlsConfig.h +++ b/src/base/net/tls/TlsConfig.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,15 +23,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TLSCONFIG_H -#define XMRIG_TLSCONFIG_H +#ifndef xmlcore_TLSCONFIG_H +#define xmlcore_TLSCONFIG_H #include "3rdparty/rapidjson/fwd.h" #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class TlsConfig @@ -87,6 +87,6 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_TLSCONFIG_H */ +#endif /* xmlcore_TLSCONFIG_H */ diff --git a/src/base/net/tls/TlsContext.cpp b/src/base/net/tls/TlsContext.cpp index 03c79e65..92e4bbb3 100644 --- a/src/base/net/tls/TlsContext.cpp +++ b/src/base/net/tls/TlsContext.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -48,7 +48,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) #endif -namespace xmrig { +namespace xmlcore { // https://wiki.openssl.org/index.php/Diffie-Hellman_parameters @@ -104,16 +104,16 @@ static DH *get_dh2048() return dh; } -} // namespace xmrig +} // namespace xmlcore -xmrig::TlsContext::~TlsContext() +xmlcore::TlsContext::~TlsContext() { SSL_CTX_free(m_ctx); } -xmrig::TlsContext *xmrig::TlsContext::create(const TlsConfig &config) +xmlcore::TlsContext *xmlcore::TlsContext::create(const TlsConfig &config) { if (!config.isEnabled()) { return nullptr; @@ -130,7 +130,7 @@ xmrig::TlsContext *xmrig::TlsContext::create(const TlsConfig &config) } -bool xmrig::TlsContext::load(const TlsConfig &config) +bool xmlcore::TlsContext::load(const TlsConfig &config) { m_ctx = SSL_CTX_new(SSLv23_server_method()); if (m_ctx == nullptr) { @@ -166,7 +166,7 @@ bool xmrig::TlsContext::load(const TlsConfig &config) } -bool xmrig::TlsContext::setCiphers(const char *ciphers) +bool xmlcore::TlsContext::setCiphers(const char *ciphers) { if (ciphers == nullptr || SSL_CTX_set_cipher_list(m_ctx, ciphers) == 1) { return true; @@ -178,7 +178,7 @@ bool xmrig::TlsContext::setCiphers(const char *ciphers) } -bool xmrig::TlsContext::setCipherSuites(const char *ciphersuites) +bool xmlcore::TlsContext::setCipherSuites(const char *ciphersuites) { if (ciphersuites == nullptr) { return true; @@ -196,7 +196,7 @@ bool xmrig::TlsContext::setCipherSuites(const char *ciphersuites) } -bool xmrig::TlsContext::setDH(const char *dhparam) +bool xmlcore::TlsContext::setDH(const char *dhparam) { DH *dh = nullptr; @@ -237,7 +237,7 @@ bool xmrig::TlsContext::setDH(const char *dhparam) } -void xmrig::TlsContext::setProtocols(uint32_t protocols) +void xmlcore::TlsContext::setProtocols(uint32_t protocols) { if (protocols == 0) { return; diff --git a/src/base/net/tls/TlsContext.h b/src/base/net/tls/TlsContext.h index b87798c5..a22ce7fb 100644 --- a/src/base/net/tls/TlsContext.h +++ b/src/base/net/tls/TlsContext.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TLSCONTEXT_H -#define XMRIG_TLSCONTEXT_H +#ifndef xmlcore_TLSCONTEXT_H +#define xmlcore_TLSCONTEXT_H #include "base/tools/Object.h" @@ -36,7 +36,7 @@ using SSL_CTX = struct ssl_ctx_st; -namespace xmrig { +namespace xmlcore { class TlsConfig; @@ -45,7 +45,7 @@ class TlsConfig; class TlsContext { public: - XMRIG_DISABLE_COPY_MOVE(TlsContext) + xmlcore_DISABLE_COPY_MOVE(TlsContext) ~TlsContext(); @@ -66,6 +66,6 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_TLSCONTEXT_H */ +#endif /* xmlcore_TLSCONTEXT_H */ diff --git a/src/base/net/tls/TlsGen.cpp b/src/base/net/tls/TlsGen.cpp index c56ef2a2..f299ae26 100644 --- a/src/base/net/tls/TlsGen.cpp +++ b/src/base/net/tls/TlsGen.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kLocalhost = "localhost"; @@ -63,17 +63,17 @@ bool isFileExist(const char *fileName) } -} // namespace xmrig +} // namespace xmlcore -xmrig::TlsGen::~TlsGen() +xmlcore::TlsGen::~TlsGen() { EVP_PKEY_free(m_pkey); X509_free(m_x509); } -void xmrig::TlsGen::generate(const char *commonName) +void xmlcore::TlsGen::generate(const char *commonName) { if (isFileExist(m_cert) && isFileExist(m_certKey)) { return; @@ -94,7 +94,7 @@ void xmrig::TlsGen::generate(const char *commonName) } -bool xmrig::TlsGen::generate_x509(const char *commonName) +bool xmlcore::TlsGen::generate_x509(const char *commonName) { m_x509 = X509_new(); if (!m_x509) { @@ -118,7 +118,7 @@ bool xmrig::TlsGen::generate_x509(const char *commonName) } -bool xmrig::TlsGen::write() +bool xmlcore::TlsGen::write() { auto pkey_file = fopen(m_certKey, "wb"); if (!pkey_file) { diff --git a/src/base/net/tls/TlsGen.h b/src/base/net/tls/TlsGen.h index 9386e88c..31d815d4 100644 --- a/src/base/net/tls/TlsGen.h +++ b/src/base/net/tls/TlsGen.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TLSGEN_H -#define XMRIG_TLSGEN_H +#ifndef xmlcore_TLSGEN_H +#define xmlcore_TLSGEN_H #include "base/tools/Object.h" @@ -28,13 +28,13 @@ using EVP_PKEY = struct evp_pkey_st; using X509 = struct x509_st; -namespace xmrig { +namespace xmlcore { class TlsGen { public: - XMRIG_DISABLE_COPY_MOVE(TlsGen) + xmlcore_DISABLE_COPY_MOVE(TlsGen) TlsGen() : m_cert("cert.pem"), m_certKey("cert_key.pem") {} ~TlsGen(); @@ -55,7 +55,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_TLSGEN_H */ +#endif /* xmlcore_TLSGEN_H */ diff --git a/src/base/net/tools/LineReader.cpp b/src/base/net/tools/LineReader.cpp index 07d0f1dc..8867add8 100644 --- a/src/base/net/tools/LineReader.cpp +++ b/src/base/net/tools/LineReader.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2020 cohcho * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,13 +27,13 @@ #include -xmrig::LineReader::~LineReader() +xmlcore::LineReader::~LineReader() { NetBuffer::release(m_buf); } -void xmrig::LineReader::parse(char *data, size_t size) +void xmlcore::LineReader::parse(char *data, size_t size) { assert(m_listener != nullptr && size > 0); if (!m_listener || size == 0) { @@ -44,7 +44,7 @@ void xmrig::LineReader::parse(char *data, size_t size) } -void xmrig::LineReader::reset() +void xmlcore::LineReader::reset() { if (m_buf) { NetBuffer::release(m_buf); @@ -54,9 +54,9 @@ void xmrig::LineReader::reset() } -void xmrig::LineReader::add(const char *data, size_t size) +void xmlcore::LineReader::add(const char *data, size_t size) { - if (size + m_pos > XMRIG_NET_BUFFER_CHUNK_SIZE) { + if (size + m_pos > xmlcore_NET_BUFFER_CHUNK_SIZE) { // it breaks correctness silently for long lines return; } @@ -71,7 +71,7 @@ void xmrig::LineReader::add(const char *data, size_t size) } -void xmrig::LineReader::getline(char *data, size_t size) +void xmlcore::LineReader::getline(char *data, size_t size) { char *end = nullptr; char *start = data; diff --git a/src/base/net/tools/LineReader.h b/src/base/net/tools/LineReader.h index da6e6967..7fbd7c81 100644 --- a/src/base/net/tools/LineReader.h +++ b/src/base/net/tools/LineReader.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2020 cohcho * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_LINEREADER_H -#define XMRIG_LINEREADER_H +#ifndef xmlcore_LINEREADER_H +#define xmlcore_LINEREADER_H #include "base/tools/Object.h" @@ -27,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { class ILineListener; @@ -36,7 +36,7 @@ class ILineListener; class LineReader { public: - XMRIG_DISABLE_COPY_MOVE(LineReader) + xmlcore_DISABLE_COPY_MOVE(LineReader) LineReader() = default; LineReader(ILineListener *listener) : m_listener(listener) {} @@ -57,7 +57,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_NETBUFFER_H */ +#endif /* xmlcore_NETBUFFER_H */ diff --git a/src/base/net/tools/MemPool.h b/src/base/net/tools/MemPool.h index 8a0a126b..38e976cd 100644 --- a/src/base/net/tools/MemPool.h +++ b/src/base/net/tools/MemPool.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_MEMPOOL_H -#define XMRIG_MEMPOOL_H +#ifndef xmlcore_MEMPOOL_H +#define xmlcore_MEMPOOL_H #include @@ -27,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { template @@ -91,7 +91,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_MEMPOOL_H */ +#endif /* xmlcore_MEMPOOL_H */ diff --git a/src/base/net/tools/NetBuffer.cpp b/src/base/net/tools/NetBuffer.cpp index 8931f06e..b22a6636 100644 --- a/src/base/net/tools/NetBuffer.cpp +++ b/src/base/net/tools/NetBuffer.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -26,32 +26,32 @@ #include -namespace xmrig { +namespace xmlcore { -static MemPool *pool = nullptr; +static MemPool *pool = nullptr; -inline MemPool *getPool() +inline MemPool *getPool() { if (!pool) { - pool = new MemPool(); + pool = new MemPool(); } return pool; } -} // namespace xmrig +} // namespace xmlcore -char *xmrig::NetBuffer::allocate() +char *xmlcore::NetBuffer::allocate() { return getPool()->allocate(); } -void xmrig::NetBuffer::destroy() +void xmlcore::NetBuffer::destroy() { if (!pool) { return; @@ -64,14 +64,14 @@ void xmrig::NetBuffer::destroy() } -void xmrig::NetBuffer::onAlloc(uv_handle_t *, size_t, uv_buf_t *buf) +void xmlcore::NetBuffer::onAlloc(uv_handle_t *, size_t, uv_buf_t *buf) { buf->base = getPool()->allocate(); - buf->len = XMRIG_NET_BUFFER_CHUNK_SIZE; + buf->len = xmlcore_NET_BUFFER_CHUNK_SIZE; } -void xmrig::NetBuffer::release(const char *buf) +void xmlcore::NetBuffer::release(const char *buf) { if (buf == nullptr) { return; @@ -81,7 +81,7 @@ void xmrig::NetBuffer::release(const char *buf) } -void xmrig::NetBuffer::release(const uv_buf_t *buf) +void xmlcore::NetBuffer::release(const uv_buf_t *buf) { if (buf->base == nullptr) { return; diff --git a/src/base/net/tools/NetBuffer.h b/src/base/net/tools/NetBuffer.h index a7a2ee05..79b4dc6f 100644 --- a/src/base/net/tools/NetBuffer.h +++ b/src/base/net/tools/NetBuffer.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NETBUFFER_H -#define XMRIG_NETBUFFER_H +#ifndef xmlcore_NETBUFFER_H +#define xmlcore_NETBUFFER_H struct uv_buf_t; @@ -27,7 +27,7 @@ using uv_handle_t = struct uv_handle_s; #include -namespace xmrig { +namespace xmlcore { class NetBuffer @@ -41,7 +41,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_NETBUFFER_H */ +#endif /* xmlcore_NETBUFFER_H */ diff --git a/src/base/net/tools/Storage.h b/src/base/net/tools/Storage.h index e23e8666..eabbbc5e 100644 --- a/src/base/net/tools/Storage.h +++ b/src/base/net/tools/Storage.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_STORAGE_H -#define XMRIG_STORAGE_H +#ifndef xmlcore_STORAGE_H +#define xmlcore_STORAGE_H #include #include -namespace xmrig { +namespace xmlcore { template @@ -79,7 +79,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_STORAGE_H */ +#endif /* xmlcore_STORAGE_H */ diff --git a/src/base/net/tools/TcpServer.cpp b/src/base/net/tools/TcpServer.cpp index 06d4033a..ec09e650 100644 --- a/src/base/net/tools/TcpServer.cpp +++ b/src/base/net/tools/TcpServer.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,10 +29,10 @@ #include "base/tools/String.h" -static const xmrig::String kLocalHost("127.0.0.1"); +static const xmlcore::String kLocalHost("127.0.0.1"); -xmrig::TcpServer::TcpServer(const String &host, uint16_t port, ITcpServerListener *listener) : +xmlcore::TcpServer::TcpServer(const String &host, uint16_t port, ITcpServerListener *listener) : m_host(host.isNull() ? kLocalHost : host), m_listener(listener), m_port(port) @@ -54,13 +54,13 @@ xmrig::TcpServer::TcpServer(const String &host, uint16_t port, ITcpServerListene } -xmrig::TcpServer::~TcpServer() +xmlcore::TcpServer::~TcpServer() { Handle::close(m_tcp); } -int xmrig::TcpServer::bind() +int xmlcore::TcpServer::bind() { if (!m_version) { return UV_EAI_ADDRFAMILY; @@ -86,7 +86,7 @@ int xmrig::TcpServer::bind() } -void xmrig::TcpServer::create(uv_stream_t *stream, int status) +void xmlcore::TcpServer::create(uv_stream_t *stream, int status) { if (status < 0) { return; @@ -96,7 +96,7 @@ void xmrig::TcpServer::create(uv_stream_t *stream, int status) } -void xmrig::TcpServer::onConnection(uv_stream_t *stream, int status) +void xmlcore::TcpServer::onConnection(uv_stream_t *stream, int status) { static_cast(stream->data)->create(stream, status); } diff --git a/src/base/net/tools/TcpServer.h b/src/base/net/tools/TcpServer.h index de464d37..16f67b1b 100644 --- a/src/base/net/tools/TcpServer.h +++ b/src/base/net/tools/TcpServer.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TCPSERVER_H -#define XMRIG_TCPSERVER_H +#ifndef xmlcore_TCPSERVER_H +#define xmlcore_TCPSERVER_H #include @@ -32,7 +32,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class ITcpServerListener; @@ -42,7 +42,7 @@ class String; class TcpServer { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(TcpServer) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(TcpServer) TcpServer(const String &host, uint16_t port, ITcpServerListener *listener); ~TcpServer(); @@ -63,7 +63,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_TCPSERVER_H */ +#endif /* xmlcore_TCPSERVER_H */ diff --git a/src/base/tools/Arguments.cpp b/src/base/tools/Arguments.cpp index b6bcec8d..c3c0aa55 100644 --- a/src/base/tools/Arguments.cpp +++ b/src/base/tools/Arguments.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -24,7 +24,7 @@ #include "base/tools/Arguments.h" -xmrig::Arguments::Arguments(int argc, char **argv) : +xmlcore::Arguments::Arguments(int argc, char **argv) : m_argv(argv), m_argc(argc) { @@ -36,7 +36,7 @@ xmrig::Arguments::Arguments(int argc, char **argv) : } -bool xmrig::Arguments::hasArg(const char *name) const +bool xmlcore::Arguments::hasArg(const char *name) const { if (m_argc == 1) { return false; @@ -46,7 +46,7 @@ bool xmrig::Arguments::hasArg(const char *name) const } -const char *xmrig::Arguments::value(const char *key1, const char *key2) const +const char *xmlcore::Arguments::value(const char *key1, const char *key2) const { const size_t size = m_data.size(); if (size < 3) { @@ -63,7 +63,7 @@ const char *xmrig::Arguments::value(const char *key1, const char *key2) const } -void xmrig::Arguments::add(const char *arg) +void xmlcore::Arguments::add(const char *arg) { if (arg == nullptr) { return; diff --git a/src/base/tools/Arguments.h b/src/base/tools/Arguments.h index a65c4459..82b29933 100644 --- a/src/base/tools/Arguments.h +++ b/src/base/tools/Arguments.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ARGUMENTS_H -#define XMRIG_ARGUMENTS_H +#ifndef xmlcore_ARGUMENTS_H +#define xmlcore_ARGUMENTS_H #include @@ -26,7 +26,7 @@ #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { class Arguments @@ -50,7 +50,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_ARGUMENTS_H */ +#endif /* xmlcore_ARGUMENTS_H */ diff --git a/src/base/tools/Baton.h b/src/base/tools/Baton.h index accaf51c..233bd500 100644 --- a/src/base/tools/Baton.h +++ b/src/base/tools/Baton.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BATON_H -#define XMRIG_BATON_H +#ifndef xmlcore_BATON_H +#define xmlcore_BATON_H -namespace xmrig { +namespace xmlcore { template @@ -33,7 +33,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BATON_H */ +#endif /* xmlcore_BATON_H */ diff --git a/src/base/tools/Buffer.h b/src/base/tools/Buffer.h index 91c98e64..5dbee03c 100644 --- a/src/base/tools/Buffer.h +++ b/src/base/tools/Buffer.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -#ifndef XMRIG_BUFFER_H -#define XMRIG_BUFFER_H +#ifndef xmlcore_BUFFER_H +#define xmlcore_BUFFER_H #include #include -namespace xmrig { +namespace xmlcore { using Buffer = std::vector; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_BUFFER_H */ +#endif /* xmlcore_BUFFER_H */ diff --git a/src/base/tools/Chrono.h b/src/base/tools/Chrono.h index 99ad19cf..5285a2fe 100644 --- a/src/base/tools/Chrono.h +++ b/src/base/tools/Chrono.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CHRONO_H -#define XMRIG_CHRONO_H +#ifndef xmlcore_CHRONO_H +#define xmlcore_CHRONO_H #include -namespace xmrig { +namespace xmlcore { class Chrono @@ -57,6 +57,6 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CHRONO_H */ +#endif /* xmlcore_CHRONO_H */ diff --git a/src/base/tools/Cvt.cpp b/src/base/tools/Cvt.cpp index 18d5e627..847dd617 100644 --- a/src/base/tools/Cvt.cpp +++ b/src/base/tools/Cvt.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2013-2020 Frank Denis * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -26,12 +26,12 @@ #include -#ifdef XMRIG_SODIUM +#ifdef xmlcore_SODIUM # include #endif -namespace xmrig { +namespace xmlcore { static char *cvt_bin2hex(char *const hex, const size_t hex_maxlen, const unsigned char *const bin, const size_t bin_len) @@ -64,7 +64,7 @@ static char *cvt_bin2hex(char *const hex, const size_t hex_maxlen, const unsigne } -#ifndef XMRIG_SODIUM +#ifndef xmlcore_SODIUM static std::random_device randomDevice; static std::mt19937 randomEngine(randomDevice()); @@ -158,16 +158,16 @@ inline bool fromHexImpl(T &buf, const char *in, size_t size) } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::Cvt::fromHex(Buffer &buf, const char *in, size_t size) +bool xmlcore::Cvt::fromHex(Buffer &buf, const char *in, size_t size) { return fromHexImpl(buf, in, size); } -bool xmrig::Cvt::fromHex(Buffer &buf, const rapidjson::Value &value) +bool xmlcore::Cvt::fromHex(Buffer &buf, const rapidjson::Value &value) { if (!value.IsString()) { return false; @@ -177,13 +177,13 @@ bool xmrig::Cvt::fromHex(Buffer &buf, const rapidjson::Value &value) } -bool xmrig::Cvt::fromHex(std::string &buf, const char *in, size_t size) +bool xmlcore::Cvt::fromHex(std::string &buf, const char *in, size_t size) { return fromHexImpl(buf, in, size); } -bool xmrig::Cvt::fromHex(uint8_t *bin, size_t bin_maxlen, const char *hex, size_t hex_len) +bool xmlcore::Cvt::fromHex(uint8_t *bin, size_t bin_maxlen, const char *hex, size_t hex_len) { assert(hex != nullptr && hex_len > 0); if (hex == nullptr || hex_len == 0) { @@ -194,7 +194,7 @@ bool xmrig::Cvt::fromHex(uint8_t *bin, size_t bin_maxlen, const char *hex, size_ } -bool xmrig::Cvt::fromHex(uint8_t *bin, size_t max, const rapidjson::Value &value) +bool xmlcore::Cvt::fromHex(uint8_t *bin, size_t max, const rapidjson::Value &value) { if (!value.IsString()) { return false; @@ -204,7 +204,7 @@ bool xmrig::Cvt::fromHex(uint8_t *bin, size_t max, const rapidjson::Value &value } -xmrig::Buffer xmrig::Cvt::fromHex(const char *in, size_t size) +xmlcore::Buffer xmlcore::Cvt::fromHex(const char *in, size_t size) { Buffer buf; if (!fromHex(buf, in, size)) { @@ -215,17 +215,17 @@ xmrig::Buffer xmrig::Cvt::fromHex(const char *in, size_t size) } -bool xmrig::Cvt::toHex(char *hex, size_t hex_maxlen, const uint8_t *bin, size_t bin_len) +bool xmlcore::Cvt::toHex(char *hex, size_t hex_maxlen, const uint8_t *bin, size_t bin_len) { return cvt_bin2hex(hex, hex_maxlen, bin, bin_len) != nullptr; } -xmrig::Buffer xmrig::Cvt::randomBytes(const size_t size) +xmlcore::Buffer xmlcore::Cvt::randomBytes(const size_t size) { Buffer buf(size); -# ifndef XMRIG_SODIUM +# ifndef xmlcore_SODIUM std::uniform_int_distribution<> dis(0, 255); for (size_t i = 0; i < size; ++i) { @@ -239,25 +239,25 @@ xmrig::Buffer xmrig::Cvt::randomBytes(const size_t size) } -rapidjson::Value xmrig::Cvt::toHex(const Buffer &data, rapidjson::Document &doc) +rapidjson::Value xmlcore::Cvt::toHex(const Buffer &data, rapidjson::Document &doc) { return toHex(data.data(), data.size(), doc); } -rapidjson::Value xmrig::Cvt::toHex(const std::string &data, rapidjson::Document &doc) +rapidjson::Value xmlcore::Cvt::toHex(const std::string &data, rapidjson::Document &doc) { return toHex(reinterpret_cast(data.data()), data.size(), doc); } -rapidjson::Value xmrig::Cvt::toHex(const uint8_t *in, size_t size, rapidjson::Document &doc) +rapidjson::Value xmlcore::Cvt::toHex(const uint8_t *in, size_t size, rapidjson::Document &doc) { return toHex(in, size).toJSON(doc); } -xmrig::String xmrig::Cvt::toHex(const uint8_t *in, size_t size) +xmlcore::String xmlcore::Cvt::toHex(const uint8_t *in, size_t size) { assert(in != nullptr && size > 0); if (in == nullptr || size == 0) { @@ -277,9 +277,9 @@ xmrig::String xmrig::Cvt::toHex(const uint8_t *in, size_t size) } -void xmrig::Cvt::randomBytes(void *buf, size_t size) +void xmlcore::Cvt::randomBytes(void *buf, size_t size) { -# ifndef XMRIG_SODIUM +# ifndef xmlcore_SODIUM std::uniform_int_distribution<> dis(0, 255); for (size_t i = 0; i < size; ++i) { diff --git a/src/base/tools/Cvt.h b/src/base/tools/Cvt.h index e7507aaf..182e06f9 100644 --- a/src/base/tools/Cvt.h +++ b/src/base/tools/Cvt.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CVT_H -#define XMRIG_CVT_H +#ifndef xmlcore_CVT_H +#define xmlcore_CVT_H #include "3rdparty/rapidjson/fwd.h" @@ -28,7 +28,7 @@ #include -namespace xmrig { +namespace xmlcore { class Cvt @@ -56,7 +56,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CVT_H */ +#endif /* xmlcore_CVT_H */ diff --git a/src/base/tools/Handle.h b/src/base/tools/Handle.h index a25381d8..70dce356 100644 --- a/src/base/tools/Handle.h +++ b/src/base/tools/Handle.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HANDLE_H -#define XMRIG_HANDLE_H +#ifndef xmlcore_HANDLE_H +#define xmlcore_HANDLE_H #include -namespace xmrig { +namespace xmlcore { class Handle @@ -80,7 +80,7 @@ inline void Handle::close(uv_fs_event_t *handle) } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_HANDLE_H */ +#endif /* xmlcore_HANDLE_H */ diff --git a/src/base/tools/Object.h b/src/base/tools/Object.h index 412ae6ff..06195717 100644 --- a/src/base/tools/Object.h +++ b/src/base/tools/Object.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,24 +16,24 @@ * along with this program. If not, see . */ -#ifndef XMRIG_OBJECT_H -#define XMRIG_OBJECT_H +#ifndef xmlcore_OBJECT_H +#define xmlcore_OBJECT_H #include -namespace xmrig { +namespace xmlcore { -#define XMRIG_DISABLE_COPY_MOVE(X) \ +#define xmlcore_DISABLE_COPY_MOVE(X) \ X(const X &other) = delete; \ X(X &&other) = delete; \ X &operator=(const X &other) = delete; \ X &operator=(X &&other) = delete; -#define XMRIG_DISABLE_COPY_MOVE_DEFAULT(X) \ +#define xmlcore_DISABLE_COPY_MOVE_DEFAULT(X) \ X() = delete; \ X(const X &other) = delete; \ X(X &&other) = delete; \ @@ -41,6 +41,6 @@ namespace xmrig { X &operator=(X &&other) = delete; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_OBJECT_H */ +#endif /* xmlcore_OBJECT_H */ diff --git a/src/base/tools/String.cpp b/src/base/tools/String.cpp index f001ff8f..48492b50 100644 --- a/src/base/tools/String.cpp +++ b/src/base/tools/String.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -24,7 +24,7 @@ #include -xmrig::String::String(const char *str, size_t size) : +xmlcore::String::String(const char *str, size_t size) : m_size(size) { if (str == nullptr) { @@ -39,7 +39,7 @@ xmrig::String::String(const char *str, size_t size) : } -xmrig::String::String(const char *str) : +xmlcore::String::String(const char *str) : m_size(str == nullptr ? 0 : strlen(str)) { if (str == nullptr) { @@ -51,7 +51,7 @@ xmrig::String::String(const char *str) : } -xmrig::String::String(const rapidjson::Value &value) +xmlcore::String::String(const rapidjson::Value &value) { if (!value.IsString()) { return; @@ -67,7 +67,7 @@ xmrig::String::String(const rapidjson::Value &value) } -xmrig::String::String(const String &other) : +xmlcore::String::String(const String &other) : m_size(other.m_size) { if (other.m_data == nullptr) { @@ -79,13 +79,13 @@ xmrig::String::String(const String &other) : } -bool xmrig::String::isEqual(const char *str) const +bool xmlcore::String::isEqual(const char *str) const { return (m_data != nullptr && str != nullptr && strcmp(m_data, str) == 0) || (m_data == nullptr && str == nullptr); } -bool xmrig::String::isEqual(const String &other) const +bool xmlcore::String::isEqual(const String &other) const { if (m_size != other.m_size) { return false; @@ -95,7 +95,7 @@ bool xmrig::String::isEqual(const String &other) const } -rapidjson::Value xmrig::String::toJSON() const +rapidjson::Value xmlcore::String::toJSON() const { using namespace rapidjson; @@ -103,7 +103,7 @@ rapidjson::Value xmrig::String::toJSON() const } -rapidjson::Value xmrig::String::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::String::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; @@ -111,7 +111,7 @@ rapidjson::Value xmrig::String::toJSON(rapidjson::Document &doc) const } -std::vector xmrig::String::split(char sep) const +std::vector xmlcore::String::split(char sep) const { std::vector out; if (m_size == 0) { @@ -141,7 +141,7 @@ std::vector xmrig::String::split(char sep) const } -xmrig::String &xmrig::String::toLower() +xmlcore::String &xmlcore::String::toLower() { if (isNull() || isEmpty()) { return *this; @@ -155,7 +155,7 @@ xmrig::String &xmrig::String::toLower() } -xmrig::String &xmrig::String::toUpper() +xmlcore::String &xmlcore::String::toUpper() { if (isNull() || isEmpty()) { return *this; @@ -169,7 +169,7 @@ xmrig::String &xmrig::String::toUpper() } -xmrig::String xmrig::String::join(const std::vector &vec, char sep) +xmlcore::String xmlcore::String::join(const std::vector &vec, char sep) { if (vec.empty()) { return String(); @@ -199,7 +199,7 @@ xmrig::String xmrig::String::join(const std::vector &vec, char se } -void xmrig::String::copy(const char *str) +void xmlcore::String::copy(const char *str) { delete [] m_data; @@ -217,7 +217,7 @@ void xmrig::String::copy(const char *str) } -void xmrig::String::copy(const String &other) +void xmlcore::String::copy(const String &other) { if (m_size > 0 && m_size == other.m_size) { memcpy(m_data, other.m_data, m_size + 1); @@ -241,7 +241,7 @@ void xmrig::String::copy(const String &other) } -void xmrig::String::move(char *str) +void xmlcore::String::move(char *str) { delete [] m_data; @@ -250,7 +250,7 @@ void xmrig::String::move(char *str) } -void xmrig::String::move(String &&other) +void xmlcore::String::move(String &&other) { delete [] m_data; diff --git a/src/base/tools/String.h b/src/base/tools/String.h index 4ba603ce..a0a0edb4 100644 --- a/src/base/tools/String.h +++ b/src/base/tools/String.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_STRING_H -#define XMRIG_STRING_H +#ifndef xmlcore_STRING_H +#define xmlcore_STRING_H #include "3rdparty/rapidjson/fwd.h" @@ -27,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { /** @@ -98,7 +98,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_STRING_H */ +#endif /* xmlcore_STRING_H */ diff --git a/src/base/tools/Timer.cpp b/src/base/tools/Timer.cpp index 858d1219..32cde03c 100644 --- a/src/base/tools/Timer.cpp +++ b/src/base/tools/Timer.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ #include "base/tools/Handle.h" -xmrig::Timer::Timer(ITimerListener *listener) : +xmlcore::Timer::Timer(ITimerListener *listener) : m_listener(listener) { init(); } -xmrig::Timer::Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat) : +xmlcore::Timer::Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat) : m_listener(listener) { init(); @@ -37,25 +37,25 @@ xmrig::Timer::Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat) } -xmrig::Timer::~Timer() +xmlcore::Timer::~Timer() { Handle::close(m_timer); } -uint64_t xmrig::Timer::repeat() const +uint64_t xmlcore::Timer::repeat() const { return uv_timer_get_repeat(m_timer); } -void xmrig::Timer::setRepeat(uint64_t repeat) +void xmlcore::Timer::setRepeat(uint64_t repeat) { uv_timer_set_repeat(m_timer, repeat); } -void xmrig::Timer::singleShot(uint64_t timeout, int id) +void xmlcore::Timer::singleShot(uint64_t timeout, int id) { m_id = id; @@ -64,20 +64,20 @@ void xmrig::Timer::singleShot(uint64_t timeout, int id) } -void xmrig::Timer::start(uint64_t timeout, uint64_t repeat) +void xmlcore::Timer::start(uint64_t timeout, uint64_t repeat) { uv_timer_start(m_timer, onTimer, timeout, repeat); } -void xmrig::Timer::stop() +void xmlcore::Timer::stop() { setRepeat(0); uv_timer_stop(m_timer); } -void xmrig::Timer::init() +void xmlcore::Timer::init() { m_timer = new uv_timer_t; m_timer->data = this; @@ -85,7 +85,7 @@ void xmrig::Timer::init() } -void xmrig::Timer::onTimer(uv_timer_t *handle) +void xmlcore::Timer::onTimer(uv_timer_t *handle) { const auto timer = static_cast(handle->data); diff --git a/src/base/tools/Timer.h b/src/base/tools/Timer.h index 8fd040f8..0587bb4b 100644 --- a/src/base/tools/Timer.h +++ b/src/base/tools/Timer.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_TIMER_H -#define XMRIG_TIMER_H +#ifndef xmlcore_TIMER_H +#define xmlcore_TIMER_H using uv_timer_t = struct uv_timer_s; @@ -29,7 +29,7 @@ using uv_timer_t = struct uv_timer_s; #include -namespace xmrig { +namespace xmlcore { class ITimerListener; @@ -38,7 +38,7 @@ class ITimerListener; class Timer { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Timer); + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Timer); Timer(ITimerListener *listener); Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat); @@ -63,7 +63,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_TIMER_H */ +#endif /* xmlcore_TIMER_H */ diff --git a/src/config.json b/src/config.json index 8b5532d5..b7a82305 100644 --- a/src/config.json +++ b/src/config.json @@ -64,7 +64,7 @@ { "algo": null, "coin": null, - "url": "donate.v2.xmrig.com:3333", + "url": "donate.v2.xmlcore.com:3333", "user": "YOUR_WALLET_ADDRESS", "pass": "x", "rig-id": null, diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 9242b6ee..fd0a26bf 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include "net/Network.h" -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/Api.h" # include "hw/api/HwApi.h" #endif @@ -34,19 +34,19 @@ #include -xmrig::Controller::Controller(Process *process) : +xmlcore::Controller::Controller(Process *process) : Base(process) { } -xmrig::Controller::~Controller() +xmlcore::Controller::~Controller() { VirtualMemory::destroy(); } -int xmrig::Controller::init() +int xmlcore::Controller::init() { Base::init(); @@ -54,7 +54,7 @@ int xmrig::Controller::init() m_network = std::make_shared(this); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API m_hwApi = std::make_shared(); api()->addListener(m_hwApi.get()); # endif @@ -63,7 +63,7 @@ int xmrig::Controller::init() } -void xmrig::Controller::start() +void xmlcore::Controller::start() { Base::start(); @@ -73,7 +73,7 @@ void xmrig::Controller::start() } -void xmrig::Controller::stop() +void xmlcore::Controller::stop() { Base::stop(); @@ -84,7 +84,7 @@ void xmrig::Controller::stop() } -xmrig::Miner *xmrig::Controller::miner() const +xmlcore::Miner *xmlcore::Controller::miner() const { assert(m_miner); @@ -92,7 +92,7 @@ xmrig::Miner *xmrig::Controller::miner() const } -xmrig::Network *xmrig::Controller::network() const +xmlcore::Network *xmlcore::Controller::network() const { assert(m_network); @@ -100,7 +100,7 @@ xmrig::Network *xmrig::Controller::network() const } -void xmrig::Controller::execCommand(char command) +void xmlcore::Controller::execCommand(char command) { miner()->execCommand(command); network()->execCommand(command); diff --git a/src/core/Controller.h b/src/core/Controller.h index 13704f15..b188749d 100644 --- a/src/core/Controller.h +++ b/src/core/Controller.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONTROLLER_H -#define XMRIG_CONTROLLER_H +#ifndef xmlcore_CONTROLLER_H +#define xmlcore_CONTROLLER_H #include "base/kernel/Base.h" @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { class HwApi; @@ -38,7 +38,7 @@ class Network; class Controller : public Base { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Controller) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Controller) Controller(Process *process); ~Controller() override; @@ -55,13 +55,13 @@ private: std::shared_ptr m_miner; std::shared_ptr m_network; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API std::shared_ptr m_hwApi; # endif }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CONTROLLER_H */ +#endif /* xmlcore_CONTROLLER_H */ diff --git a/src/core/Miner.cpp b/src/core/Miner.cpp index 8d0263e2..ff1ab3ae 100644 --- a/src/core/Miner.cpp +++ b/src/core/Miner.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -45,35 +45,35 @@ #include "version.h" -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/Api.h" # include "base/api/interfaces/IApiRequest.h" #endif -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL # include "backend/opencl/OclBackend.h" #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA # include "backend/cuda/CudaBackend.h" #endif -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "crypto/rx/Profiler.h" # include "crypto/rx/Rx.h" # include "crypto/rx/RxConfig.h" #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "crypto/astrobwt/AstroBWT.h" #endif -namespace xmrig { +namespace xmlcore { static std::mutex mutex; @@ -82,7 +82,7 @@ static std::mutex mutex; class MinerPrivate { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(MinerPrivate) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(MinerPrivate) inline MinerPrivate(Controller *controller) : controller(controller) {} @@ -96,7 +96,7 @@ public: delete backend; } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX Rx::destroy(); # endif } @@ -155,7 +155,7 @@ public: } -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void getMiner(rapidjson::Value &reply, rapidjson::Document &doc, int) const { using namespace rapidjson; @@ -244,7 +244,7 @@ public: static inline void printProfile() { -# ifdef XMRIG_FEATURE_PROFILING +# ifdef xmlcore_FEATURE_PROFILING ProfileScopeData* data[ProfileScopeData::MAX_DATA_COUNT]; const uint32_t n = std::min(ProfileScopeData::s_dataCount, ProfileScopeData::MAX_DATA_COUNT); @@ -335,7 +335,7 @@ public: Hashrate::format(maxHashrate[algorithm] * scale, num + 16 * 3, sizeof(num) / 4), h ); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK for (auto backend : backends) { backend->printBenchProgress(); } @@ -343,7 +343,7 @@ public: } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX inline bool initRX() { return Rx::init(job, controller->config()->rx(), controller->config()->cpu()); } # endif @@ -364,11 +364,11 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::Miner::Miner(Controller *controller) +xmlcore::Miner::Miner(Controller *controller) : d_ptr(new MinerPrivate(controller)) { const int priority = controller->config()->cpu().priority(); @@ -377,21 +377,21 @@ xmrig::Miner::Miner(Controller *controller) Platform::setThreadPriority(std::min(priority + 1, 5)); } -# ifdef XMRIG_FEATURE_PROFILING +# ifdef xmlcore_FEATURE_PROFILING ProfileScopeData::Init(); # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX Rx::init(this); # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT astrobwt::init(); # endif controller->addListener(this); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API controller->api()->addListener(this); # endif @@ -400,11 +400,11 @@ xmrig::Miner::Miner(Controller *controller) d_ptr->backends.reserve(3); d_ptr->backends.push_back(new CpuBackend(controller)); -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL d_ptr->backends.push_back(new OclBackend(controller)); # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA d_ptr->backends.push_back(new CudaBackend(controller)); # endif @@ -412,37 +412,37 @@ xmrig::Miner::Miner(Controller *controller) } -xmrig::Miner::~Miner() +xmlcore::Miner::~Miner() { delete d_ptr; } -bool xmrig::Miner::isEnabled() const +bool xmlcore::Miner::isEnabled() const { return d_ptr->enabled; } -bool xmrig::Miner::isEnabled(const Algorithm &algorithm) const +bool xmlcore::Miner::isEnabled(const Algorithm &algorithm) const { return std::find(d_ptr->algorithms.begin(), d_ptr->algorithms.end(), algorithm) != d_ptr->algorithms.end(); } -const xmrig::Algorithms &xmrig::Miner::algorithms() const +const xmlcore::Algorithms &xmlcore::Miner::algorithms() const { return d_ptr->algorithms; } -const std::vector &xmrig::Miner::backends() const +const std::vector &xmlcore::Miner::backends() const { return d_ptr->backends; } -xmrig::Job xmrig::Miner::job() const +xmlcore::Job xmlcore::Miner::job() const { std::lock_guard lock(mutex); @@ -450,7 +450,7 @@ xmrig::Job xmrig::Miner::job() const } -void xmrig::Miner::execCommand(char command) +void xmlcore::Miner::execCommand(char command) { switch (command) { case 'h': @@ -485,7 +485,7 @@ void xmrig::Miner::execCommand(char command) } -void xmrig::Miner::pause() +void xmlcore::Miner::pause() { d_ptr->active = false; @@ -494,7 +494,7 @@ void xmrig::Miner::pause() } -void xmrig::Miner::setEnabled(bool enabled) +void xmlcore::Miner::setEnabled(bool enabled) { if (d_ptr->enabled == enabled) { return; @@ -529,13 +529,13 @@ void xmrig::Miner::setEnabled(bool enabled) } -void xmrig::Miner::setJob(const Job &job, bool donate) +void xmlcore::Miner::setJob(const Job &job, bool donate) { for (IBackend *backend : d_ptr->backends) { backend->prepare(job); } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (job.algorithm().family() == Algorithm::RANDOM_X && !Rx::isReady(job)) { stop(); } @@ -555,7 +555,7 @@ void xmrig::Miner::setJob(const Job &job, bool donate) d_ptr->userJobId = job.id(); } -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX const bool ready = d_ptr->initRX(); # else constexpr const bool ready = true; @@ -571,7 +571,7 @@ void xmrig::Miner::setJob(const Job &job, bool donate) } -void xmrig::Miner::stop() +void xmlcore::Miner::stop() { Nonce::stop(); @@ -581,7 +581,7 @@ void xmrig::Miner::stop() } -void xmrig::Miner::onConfigChanged(Config *config, Config *previousConfig) +void xmlcore::Miner::onConfigChanged(Config *config, Config *previousConfig) { d_ptr->rebuild(); @@ -597,7 +597,7 @@ void xmrig::Miner::onConfigChanged(Config *config, Config *previousConfig) } -void xmrig::Miner::onTimer(const Timer *) +void xmlcore::Miner::onTimer(const Timer *) { double maxHashrate = 0.0; const auto healthPrintTime = d_ptr->controller->config()->healthPrintTime(); @@ -647,8 +647,8 @@ void xmrig::Miner::onTimer(const Timer *) } -#ifdef XMRIG_FEATURE_API -void xmrig::Miner::onRequest(IApiRequest &request) +#ifdef xmlcore_FEATURE_API +void xmlcore::Miner::onRequest(IApiRequest &request) { if (request.method() == IApiRequest::METHOD_GET) { if (request.type() == IApiRequest::REQ_SUMMARY) { @@ -688,8 +688,8 @@ void xmrig::Miner::onRequest(IApiRequest &request) #endif -#ifdef XMRIG_ALGO_RANDOMX -void xmrig::Miner::onDatasetReady() +#ifdef xmlcore_ALGO_RANDOMX +void xmlcore::Miner::onDatasetReady() { if (!Rx::isReady(job())) { return; diff --git a/src/core/Miner.h b/src/core/Miner.h index 1de19c4a..d4122f2c 100644 --- a/src/core/Miner.h +++ b/src/core/Miner.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_MINER_H -#define XMRIG_MINER_H +#ifndef xmlcore_MINER_H +#define xmlcore_MINER_H #include @@ -37,7 +37,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Controller; @@ -49,7 +49,7 @@ class IBackend; class Miner : public ITimerListener, public IBaseListener, public IApiListener, public IRxListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Miner) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Miner) Miner(Controller *controller); ~Miner() override; @@ -69,11 +69,11 @@ protected: void onConfigChanged(Config *config, Config *previousConfig) override; void onTimer(const Timer *timer) override; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void onRequest(IApiRequest &request) override; # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX void onDatasetReady() override; # endif @@ -82,7 +82,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_MINER_H */ +#endif /* xmlcore_MINER_H */ diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index f8b7bb85..c887d1b3 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -36,37 +36,37 @@ #include "crypto/common/Assembly.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "crypto/rx/RxConfig.h" #endif -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL # include "backend/opencl/OclConfig.h" #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA # include "backend/cuda/CudaConfig.h" #endif -namespace xmrig { +namespace xmlcore { -#ifdef XMRIG_FEATURE_OPENCL +#ifdef xmlcore_FEATURE_OPENCL const char *Config::kOcl = "opencl"; #endif -#ifdef XMRIG_FEATURE_CUDA +#ifdef xmlcore_FEATURE_CUDA const char *Config::kCuda = "cuda"; #endif -#if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +#if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) const char *Config::kHealthPrintTime = "health-print-time"; #endif -#ifdef XMRIG_FEATURE_DMI +#ifdef xmlcore_FEATURE_DMI const char *Config::kDMI = "dmi"; #endif @@ -76,23 +76,23 @@ class ConfigPrivate public: CpuConfig cpu; -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX RxConfig rx; # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL OclConfig cl; # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA CudaConfig cuda; # endif -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) uint32_t healthPrintTime = 60; # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI bool dmi = true; # endif }; @@ -100,77 +100,77 @@ public: } -xmrig::Config::Config() : +xmlcore::Config::Config() : d_ptr(new ConfigPrivate()) { } -xmrig::Config::~Config() +xmlcore::Config::~Config() { delete d_ptr; } -const xmrig::CpuConfig &xmrig::Config::cpu() const +const xmlcore::CpuConfig &xmlcore::Config::cpu() const { return d_ptr->cpu; } -#ifdef XMRIG_FEATURE_OPENCL -const xmrig::OclConfig &xmrig::Config::cl() const +#ifdef xmlcore_FEATURE_OPENCL +const xmlcore::OclConfig &xmlcore::Config::cl() const { return d_ptr->cl; } #endif -#ifdef XMRIG_FEATURE_CUDA -const xmrig::CudaConfig &xmrig::Config::cuda() const +#ifdef xmlcore_FEATURE_CUDA +const xmlcore::CudaConfig &xmlcore::Config::cuda() const { return d_ptr->cuda; } #endif -#ifdef XMRIG_ALGO_RANDOMX -const xmrig::RxConfig &xmrig::Config::rx() const +#ifdef xmlcore_ALGO_RANDOMX +const xmlcore::RxConfig &xmlcore::Config::rx() const { return d_ptr->rx; } #endif -#if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) -uint32_t xmrig::Config::healthPrintTime() const +#if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) +uint32_t xmlcore::Config::healthPrintTime() const { return d_ptr->healthPrintTime; } #endif -#ifdef XMRIG_FEATURE_DMI -bool xmrig::Config::isDMI() const +#ifdef xmlcore_FEATURE_DMI +bool xmlcore::Config::isDMI() const { return d_ptr->dmi; } #endif -bool xmrig::Config::isShouldSave() const +bool xmlcore::Config::isShouldSave() const { if (!isAutoSave()) { return false; } -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL if (cl().isShouldSave()) { return true; } # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA if (cuda().isShouldSave()) { return true; } @@ -180,7 +180,7 @@ bool xmrig::Config::isShouldSave() const } -bool xmrig::Config::read(const IJsonReader &reader, const char *fileName) +bool xmlcore::Config::read(const IJsonReader &reader, const char *fileName) { if (!BaseConfig::read(reader, fileName)) { return false; @@ -188,25 +188,25 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName) d_ptr->cpu.read(reader.getValue(CpuConfig::kField)); -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX if (!d_ptr->rx.read(reader.getValue(RxConfig::kField))) { m_upgrade = true; } # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL d_ptr->cl.read(reader.getValue(kOcl)); # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA d_ptr->cuda.read(reader.getValue(kCuda)); # endif -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) d_ptr->healthPrintTime = reader.getUint(kHealthPrintTime, d_ptr->healthPrintTime); # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI d_ptr->dmi = reader.getBool(kDMI, d_ptr->dmi); # endif @@ -214,7 +214,7 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName) } -void xmrig::Config::getJSON(rapidjson::Document &doc) const +void xmlcore::Config::getJSON(rapidjson::Document &doc) const { using namespace rapidjson; @@ -233,17 +233,17 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const doc.AddMember(StringRef(kColors), Log::isColors(), allocator); doc.AddMember(StringRef(kTitle), title().toJSON(), allocator); -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX doc.AddMember(StringRef(RxConfig::kField), rx().toJSON(doc), allocator); # endif doc.AddMember(StringRef(CpuConfig::kField), cpu().toJSON(doc), allocator); -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL doc.AddMember(StringRef(kOcl), cl().toJSON(doc), allocator); # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA doc.AddMember(StringRef(kCuda), cuda().toJSON(doc), allocator); # endif @@ -252,17 +252,17 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const m_pools.toJSON(doc, doc); doc.AddMember(StringRef(kPrintTime), printTime(), allocator); -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) doc.AddMember(StringRef(kHealthPrintTime), healthPrintTime(), allocator); # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI doc.AddMember(StringRef(kDMI), isDMI(), allocator); # endif doc.AddMember(StringRef(kSyslog), isSyslog(), allocator); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS doc.AddMember(StringRef(kTls), m_tls.toJSON(doc), allocator); # endif diff --git a/src/core/config/Config.h b/src/core/config/Config.h index d8433beb..6bd6bb74 100644 --- a/src/core/config/Config.h +++ b/src/core/config/Config.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONFIG_H -#define XMRIG_CONFIG_H +#ifndef xmlcore_CONFIG_H +#define xmlcore_CONFIG_H #include @@ -35,7 +35,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class ConfigPrivate; @@ -48,21 +48,21 @@ class RxConfig; class Config : public BaseConfig { public: - XMRIG_DISABLE_COPY_MOVE(Config); + xmlcore_DISABLE_COPY_MOVE(Config); -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL static const char *kOcl; # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA static const char *kCuda; # endif -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) static const char *kHealthPrintTime; # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI static const char *kDMI; # endif @@ -71,25 +71,25 @@ public: const CpuConfig &cpu() const; -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL const OclConfig &cl() const; # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA const CudaConfig &cuda() const; # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX const RxConfig &rx() const; # endif -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) uint32_t healthPrintTime() const; # else uint32_t healthPrintTime() const { return 0; } # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI bool isDMI() const; # else static constexpr inline bool isDMI() { return false; } @@ -104,7 +104,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CONFIG_H */ +#endif /* xmlcore_CONFIG_H */ diff --git a/src/core/config/ConfigTransform.cpp b/src/core/config/ConfigTransform.cpp index 7140837a..bb9c7df0 100644 --- a/src/core/config/ConfigTransform.cpp +++ b/src/core/config/ConfigTransform.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 @@ -31,17 +31,17 @@ #include "crypto/cn/CnHash.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "crypto/rx/RxConfig.h" #endif -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "base/net/stratum/benchmark/BenchConfig.h" #endif -namespace xmrig +namespace xmlcore { @@ -89,10 +89,10 @@ static inline bool isHwAes(uint64_t av) } -} // namespace xmrig +} // namespace xmlcore -void xmrig::ConfigTransform::finalize(rapidjson::Document &doc) +void xmlcore::ConfigTransform::finalize(rapidjson::Document &doc) { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -112,7 +112,7 @@ void xmrig::ConfigTransform::finalize(rapidjson::Document &doc) doc[CpuConfig::kField].AddMember(StringRef(kAsterisk), profile, doc.GetAllocator()); } -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL if (m_opencl) { set(doc, Config::kOcl, kEnabled, true); } @@ -120,7 +120,7 @@ void xmrig::ConfigTransform::finalize(rapidjson::Document &doc) } -void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const char *arg) +void xmlcore::ConfigTransform::transform(rapidjson::Document &doc, int key, const char *arg) { BaseTransform::transform(doc, key, arg); @@ -150,17 +150,17 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const case IConfig::YieldKey: /* --cpu-no-yield */ return set(doc, CpuConfig::kField, CpuConfig::kYield, false); -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 case IConfig::Argon2ImplKey: /* --argon2-impl */ return set(doc, CpuConfig::kField, CpuConfig::kArgon2Impl, arg); # endif -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM case IConfig::AssemblyKey: /* --asm */ return set(doc, CpuConfig::kField, CpuConfig::kAsm, arg); # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT case IConfig::AstroBWTMaxSizeKey: /* --astrobwt-max-size */ return set(doc, CpuConfig::kField, CpuConfig::kAstroBWTMaxSize, static_cast(strtol(arg, nullptr, 10))); @@ -168,11 +168,11 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const return set(doc, CpuConfig::kField, CpuConfig::kAstroBWTAVX2, true); # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX case IConfig::RandomXInitKey: /* --randomx-init */ return set(doc, RxConfig::kField, RxConfig::kInit, static_cast(strtol(arg, nullptr, 10))); -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC case IConfig::RandomXNumaKey: /* --randomx-no-numa */ return set(doc, RxConfig::kField, RxConfig::kNUMA, false); # endif @@ -197,7 +197,7 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const return set(doc, RxConfig::kField, RxConfig::kCacheQoS, true); # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL case IConfig::OclKey: /* --opencl */ m_opencl = true; break; @@ -220,7 +220,7 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const return set(doc, Config::kOcl, "platform", arg); # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA case IConfig::CudaKey: /* --cuda */ return set(doc, Config::kCuda, kEnabled, true); @@ -238,22 +238,22 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const return set(doc, Config::kCuda, "bsleep-hint", static_cast(strtol(arg, nullptr, 10))); # endif -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML case IConfig::NvmlKey: /* --no-nvml */ return set(doc, Config::kCuda, "nvml", false); # endif -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) case IConfig::HealthPrintTimeKey: /* --health-print-time */ return set(doc, Config::kHealthPrintTime, static_cast(strtol(arg, nullptr, 10))); # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI case IConfig::DmiKey: /* --no-dmi */ return set(doc, Config::kDMI, false); # endif -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK case IConfig::AlgorithmKey: /* --algo */ case IConfig::BenchKey: /* --bench */ case IConfig::StressKey: /* --stress */ @@ -271,7 +271,7 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const } -void xmrig::ConfigTransform::transformBoolean(rapidjson::Document &doc, int key, bool enable) +void xmlcore::ConfigTransform::transformBoolean(rapidjson::Document &doc, int key, bool enable) { switch (key) { case IConfig::HugePagesKey: /* --no-huge-pages */ @@ -286,7 +286,7 @@ void xmrig::ConfigTransform::transformBoolean(rapidjson::Document &doc, int key, } -void xmrig::ConfigTransform::transformUint64(rapidjson::Document &doc, int key, uint64_t arg) +void xmlcore::ConfigTransform::transformUint64(rapidjson::Document &doc, int key, uint64_t arg) { using namespace rapidjson; @@ -316,8 +316,8 @@ void xmrig::ConfigTransform::transformUint64(rapidjson::Document &doc, int key, } -#ifdef XMRIG_FEATURE_BENCHMARK -void xmrig::ConfigTransform::transformBenchmark(rapidjson::Document &doc, int key, const char *arg) +#ifdef xmlcore_FEATURE_BENCHMARK +void xmlcore::ConfigTransform::transformBenchmark(rapidjson::Document &doc, int key, const char *arg) { set(doc, CpuConfig::kField, CpuConfig::kHugePagesJit, true); set(doc, CpuConfig::kField, CpuConfig::kPriority, 2); diff --git a/src/core/config/ConfigTransform.h b/src/core/config/ConfigTransform.h index 8fd2505c..906f91a2 100644 --- a/src/core/config/ConfigTransform.h +++ b/src/core/config/ConfigTransform.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONFIGTRANSFORM_H -#define XMRIG_CONFIGTRANSFORM_H +#ifndef xmlcore_CONFIGTRANSFORM_H +#define xmlcore_CONFIGTRANSFORM_H #include "base/kernel/config/BaseTransform.h" -namespace xmrig { +namespace xmlcore { class ConfigTransform : public BaseTransform @@ -42,7 +42,7 @@ private: void transformBoolean(rapidjson::Document &doc, int key, bool enable); void transformUint64(rapidjson::Document &doc, int key, uint64_t arg); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK void transformBenchmark(rapidjson::Document &doc, int key, const char *arg); # endif @@ -53,7 +53,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CONFIGTRANSFORM_H */ +#endif /* xmlcore_CONFIGTRANSFORM_H */ diff --git a/src/core/config/Config_default.h b/src/core/config/Config_default.h index dd7a2083..f8221eda 100644 --- a/src/core/config/Config_default.h +++ b/src/core/config/Config_default.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -17,15 +17,15 @@ */ -#ifndef XMRIG_CONFIG_DEFAULT_H -#define XMRIG_CONFIG_DEFAULT_H +#ifndef xmlcore_CONFIG_DEFAULT_H +#define xmlcore_CONFIG_DEFAULT_H -namespace xmrig { +namespace xmlcore { // This feature require CMake option: -DWITH_EMBEDDED_CONFIG=ON -#ifdef XMRIG_FEATURE_EMBEDDED_CONFIG +#ifdef xmlcore_FEATURE_EMBEDDED_CONFIG const static char *default_config = R"===( { @@ -94,7 +94,7 @@ R"===( { "algo": null, "coin": null, - "url": "donate.v2.xmrig.com:3333", + "url": "donate.v2.xmlcore.com:3333", "user": "YOUR_WALLET_ADDRESS", "pass": "x", "rig-id": null, @@ -132,7 +132,7 @@ R"===( #endif -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CONFIG_DEFAULT_H */ +#endif /* xmlcore_CONFIG_DEFAULT_H */ diff --git a/src/core/config/Config_platform.h b/src/core/config/Config_platform.h index 28b1e2bd..dd57c900 100644 --- a/src/core/config/Config_platform.h +++ b/src/core/config/Config_platform.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CONFIG_PLATFORM_H -#define XMRIG_CONFIG_PLATFORM_H +#ifndef xmlcore_CONFIG_PLATFORM_H +#define xmlcore_CONFIG_PLATFORM_H #ifdef _MSC_VER @@ -37,7 +37,7 @@ #include "version.h" -namespace xmrig { +namespace xmlcore { static const char short_options[] = "a:c:kBp:Px:r:R:s:t:T:o:u:O:v:l:Sx:"; @@ -46,7 +46,7 @@ static const char short_options[] = "a:c:kBp:Px:r:R:s:t:T:o:u:O:v:l:Sx:"; static const option options[] = { { "algo", 1, nullptr, IConfig::AlgorithmKey }, { "coin", 1, nullptr, IConfig::CoinKey }, -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP { "api-worker-id", 1, nullptr, IConfig::ApiWorkerIdKey }, { "api-id", 1, nullptr, IConfig::ApiIdKey }, { "http-enabled", 0, nullptr, IConfig::HttpEnabledKey }, @@ -98,11 +98,11 @@ static const option options[] = { { "title", 1, nullptr, IConfig::TitleKey }, { "no-title", 0, nullptr, IConfig::NoTitleKey }, { "pause-on-battery", 0, nullptr, IConfig::PauseOnBatteryKey }, -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK { "stress", 0, nullptr, IConfig::StressKey }, { "bench", 1, nullptr, IConfig::BenchKey }, { "benchmark", 1, nullptr, IConfig::BenchKey }, -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP { "submit", 0, nullptr, IConfig::BenchSubmitKey }, { "verify", 1, nullptr, IConfig::BenchVerifyKey }, { "token", 1, nullptr, IConfig::BenchTokenKey }, @@ -110,7 +110,7 @@ static const option options[] = { { "seed", 1, nullptr, IConfig::BenchSeedKey }, { "hash", 1, nullptr, IConfig::BenchHashKey }, # endif -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS { "tls", 0, nullptr, IConfig::TlsKey }, { "tls-fingerprint", 1, nullptr, IConfig::FingerprintKey }, { "tls-cert", 1, nullptr, IConfig::TlsCertKey }, @@ -121,10 +121,10 @@ static const option options[] = { { "tls-ciphersuites", 1, nullptr, IConfig::TlsCipherSuitesKey }, { "tls-gen", 1, nullptr, IConfig::TlsGenKey }, # endif -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM { "asm", 1, nullptr, IConfig::AssemblyKey }, # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX { "randomx-init", 1, nullptr, IConfig::RandomXInitKey }, { "randomx-no-numa", 0, nullptr, IConfig::RandomXNumaKey }, { "randomx-mode", 1, nullptr, IConfig::RandomXModeKey }, @@ -137,38 +137,38 @@ static const option options[] = { { "randomx-cache-qos", 0, nullptr, IConfig::RandomXCacheQoSKey }, { "cache-qos", 0, nullptr, IConfig::RandomXCacheQoSKey }, # endif - #ifdef XMRIG_ALGO_ASTROBWT + #ifdef xmlcore_ALGO_ASTROBWT { "astrobwt-max-size", 1, nullptr, IConfig::AstroBWTMaxSizeKey }, { "astrobwt-avx2", 0, nullptr, IConfig::AstroBWTAVX2Key }, #endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL { "opencl", 0, nullptr, IConfig::OclKey }, { "opencl-devices", 1, nullptr, IConfig::OclDevicesKey }, { "opencl-platform", 1, nullptr, IConfig::OclPlatformKey }, { "opencl-loader", 1, nullptr, IConfig::OclLoaderKey }, { "opencl-no-cache", 0, nullptr, IConfig::OclCacheKey }, # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA { "cuda", 0, nullptr, IConfig::CudaKey }, { "cuda-loader", 1, nullptr, IConfig::CudaLoaderKey }, { "cuda-devices", 1, nullptr, IConfig::CudaDevicesKey }, { "cuda-bfactor-hint", 1, nullptr, IConfig::CudaBFactorKey }, { "cuda-bsleep-hint", 1, nullptr, IConfig::CudaBSleepKey }, # endif -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML { "no-nvml", 0, nullptr, IConfig::NvmlKey }, # endif -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) { "health-print-time", 1, nullptr, IConfig::HealthPrintTimeKey }, # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI { "no-dmi", 0, nullptr, IConfig::DmiKey }, # endif { nullptr, 0, nullptr, 0 } }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CONFIG_PLATFORM_H */ +#endif /* xmlcore_CONFIG_PLATFORM_H */ diff --git a/src/core/config/usage.h b/src/core/config/usage.h index a30ea133..3069f3e5 100644 --- a/src/core/config/usage.h +++ b/src/core/config/usage.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_USAGE_H -#define XMRIG_USAGE_H +#ifndef xmlcore_USAGE_H +#define xmlcore_USAGE_H #include "version.h" @@ -32,7 +32,7 @@ #include -namespace xmrig { +namespace xmlcore { static inline const std::string &usage() @@ -45,7 +45,7 @@ static inline const std::string &usage() u += "Usage: " APP_ID " [OPTIONS]\n\nNetwork:\n"; u += " -o, --url=URL URL of mining server\n"; - u += " -a, --algo=ALGO mining algorithm https://xmrig.com/docs/algorithms\n"; + u += " -a, --algo=ALGO mining algorithm https://xmlcore.com/docs/algorithms\n"; u += " --coin=COIN specify coin instead of algorithm\n"; u += " -u, --user=USERNAME username for mining server\n"; u += " -p, --pass=PASSWORD password for mining server\n"; @@ -55,12 +55,12 @@ static inline const std::string &usage() u += " --nicehash enable nicehash.com support\n"; u += " --rig-id=ID rig identifier for pool-side statistics (needs pool support)\n"; -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS u += " --tls enable SSL/TLS support (needs pool support)\n"; u += " --tls-fingerprint=HEX pool TLS certificate fingerprint for strict certificate pinning\n"; # endif -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP u += " --daemon use daemon RPC instead of pool for solo mining\n"; u += " --daemon-poll-interval=N daemon poll interval in milliseconds (default: 1000)\n"; u += " --self-select=URL self-select block templates from URL\n"; @@ -70,7 +70,7 @@ static inline const std::string &usage() u += " -R, --retry-pause=N time to pause between retries (default: 5)\n"; u += " --user-agent set custom user-agent string for pool\n"; u += " --donate-level=N donate level, default 1%% (1 minute in 100 minutes)\n"; - u += " --donate-over-proxy=N control donate over xmrig-proxy feature\n"; + u += " --donate-over-proxy=N control donate over xmlcore-proxy feature\n"; u += "\nCPU backend:\n"; @@ -83,7 +83,7 @@ static inline const std::string &usage() u += " --cpu-memory-pool=N number of 2 MB pages for persistent memory pool, -1 (auto), 0 (disable)\n"; u += " --cpu-no-yield prefer maximum hashrate rather than system response/stability\n"; u += " --no-huge-pages disable huge pages support\n"; -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX u += " --hugepage-size=N custom hugepage size in kB\n"; # endif u += " --asm=ASM ASM optimizations, possible values: auto, none, intel, ryzen, bulldozer\n"; @@ -92,7 +92,7 @@ static inline const std::string &usage() u += " --argon2-impl=IMPL argon2 implementation: x86_64, SSE2, SSSE3, XOP, AVX2, AVX-512F\n"; # endif -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX u += " --randomx-init=N threads count to initialize RandomX dataset\n"; u += " --randomx-no-numa disable NUMA support for RandomX\n"; u += " --randomx-mode=MODE RandomX mode: auto, fast, light\n"; @@ -102,12 +102,12 @@ static inline const std::string &usage() u += " --randomx-cache-qos enable Cache QoS\n"; # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT u += " --astrobwt-max-size=N skip hashes with large stage 2 size, default: 550, min: 400, max: 1200\n"; u += " --astrobwt-avx2 enable AVX2 optimizations for AstroBWT algorithm"; # endif -# ifdef XMRIG_FEATURE_OPENCL +# ifdef xmlcore_FEATURE_OPENCL u += "\nOpenCL backend:\n"; u += " --opencl enable OpenCL mining backend\n"; u += " --opencl-devices=N comma separated list of OpenCL devices to use\n"; @@ -117,19 +117,19 @@ static inline const std::string &usage() u += " --print-platforms print available OpenCL platforms and exit\n"; # endif -# ifdef XMRIG_FEATURE_CUDA +# ifdef xmlcore_FEATURE_CUDA u += "\nCUDA backend:\n"; u += " --cuda enable CUDA mining backend\n"; - u += " --cuda-loader=PATH path to CUDA plugin (xmrig-cuda.dll or libxmrig-cuda.so)\n"; + u += " --cuda-loader=PATH path to CUDA plugin (xmlcore-cuda.dll or libxmlcore-cuda.so)\n"; u += " --cuda-devices=N comma separated list of CUDA devices to use\n"; u += " --cuda-bfactor-hint=N bfactor hint for autoconfig (0-12)\n"; u += " --cuda-bsleep-hint=N bsleep hint for autoconfig\n"; # endif -# ifdef XMRIG_FEATURE_NVML +# ifdef xmlcore_FEATURE_NVML u += " --no-nvml disable NVML (NVIDIA Management Library) support\n"; # endif -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP u += "\nAPI:\n"; u += " --api-worker-id=ID custom worker-id for API\n"; u += " --api-id=ID custom instance ID for API\n"; @@ -139,7 +139,7 @@ static inline const std::string &usage() u += " --http-no-restricted enable full remote access to HTTP API (only if access token set)\n"; # endif -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS u += "\nTLS:\n"; u += " --tls-gen=HOSTNAME generate TLS certificate for specific hostname\n"; u += " --tls-cert=FILE load TLS certificate chain from a file in the PEM format\n"; @@ -158,7 +158,7 @@ static inline const std::string &usage() u += " -l, --log-file=FILE log all output to a file\n"; u += " --print-time=N print hashrate report every N seconds\n"; -# if defined(XMRIG_FEATURE_NVML) || defined(XMRIG_FEATURE_ADL) +# if defined(xmlcore_FEATURE_NVML) || defined(xmlcore_FEATURE_ADL) u += " --health-print-time=N print health report every N seconds\n"; # endif u += " --no-color disable colored output\n"; @@ -172,20 +172,20 @@ static inline const std::string &usage() u += " -h, --help display this help and exit\n"; u += " --dry-run test configuration and exit\n"; -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC u += " --export-topology export hwloc topology to a XML file and exit\n"; # endif -# ifdef XMRIG_OS_WIN +# ifdef xmlcore_OS_WIN u += " --title set custom console window title\n"; u += " --no-title disable setting console window title\n"; # endif u += " --pause-on-battery pause mine on battery power\n"; -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK u += " --stress run continuous stress test to check system stability\n"; u += " --bench=N run benchmark, N can be between 1M and 10M\n"; -# ifdef XMRIG_FEATURE_HTTP +# ifdef xmlcore_FEATURE_HTTP u += " --submit perform an online benchmark and submit result for sharing\n"; u += " --verify=ID verify submitted benchmark by ID\n"; # endif @@ -193,7 +193,7 @@ static inline const std::string &usage() u += " --hash=HASH compare benchmark result with specified hash\n"; # endif -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI u += " --no-dmi disable DMI/SMBIOS reader\n"; # endif @@ -201,6 +201,6 @@ static inline const std::string &usage() } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_USAGE_H */ +#endif /* xmlcore_USAGE_H */ diff --git a/src/crypto/argon2/Hash.h b/src/crypto/argon2/Hash.h index a726e452..2e78d270 100644 --- a/src/crypto/argon2/Hash.h +++ b/src/crypto/argon2/Hash.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ARGON2_HASH_H -#define XMRIG_ARGON2_HASH_H +#ifndef xmlcore_ARGON2_HASH_H +#define xmlcore_ARGON2_HASH_H #include "3rdparty/argon2.h" @@ -31,7 +31,7 @@ #include "crypto/cn/CryptoNight.h" -namespace xmrig { namespace argon2 { +namespace xmlcore { namespace argon2 { template @@ -49,7 +49,7 @@ inline void single_hash(const uint8_t *__restrict__ input, size_t size, uint8_t } -}} // namespace xmrig::argon2 +}} // namespace xmlcore::argon2 -#endif /* XMRIG_ARGON2_HASH_H */ +#endif /* xmlcore_ARGON2_HASH_H */ diff --git a/src/crypto/argon2/Impl.cpp b/src/crypto/argon2/Impl.cpp index 42bd5587..a88affb6 100644 --- a/src/crypto/argon2/Impl.cpp +++ b/src/crypto/argon2/Impl.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,45 +29,45 @@ -namespace xmrig { +namespace xmlcore { static bool selected = false; static String implName; -} // namespace xmrig +} // namespace xmlcore extern "C" { -extern int xmrig_ar2_check_avx512f(); -extern int xmrig_ar2_check_avx2(); -extern int xmrig_ar2_check_ssse3(); -extern int xmrig_ar2_check_sse2(); +extern int xmlcore_ar2_check_avx512f(); +extern int xmlcore_ar2_check_avx2(); +extern int xmlcore_ar2_check_ssse3(); +extern int xmlcore_ar2_check_sse2(); } -bool xmrig::argon2::Impl::select(const String &nameHint, bool benchmark) +bool xmlcore::argon2::Impl::select(const String &nameHint, bool benchmark) { if (!selected) { # if defined(__x86_64__) || defined(_M_AMD64) auto hint = nameHint; if (hint.isEmpty() && !benchmark) { - if (xmrig_ar2_check_avx512f()) { + if (xmlcore_ar2_check_avx512f()) { hint = "AVX-512F"; } - else if (xmrig_ar2_check_avx2()) { + else if (xmlcore_ar2_check_avx2()) { hint = "AVX2"; } - else if (xmrig_ar2_check_ssse3()) { + else if (xmlcore_ar2_check_ssse3()) { hint = "SSSE3"; } - else if (xmrig_ar2_check_sse2()) { + else if (xmlcore_ar2_check_sse2()) { hint = "SSE2"; } } @@ -87,7 +87,7 @@ bool xmrig::argon2::Impl::select(const String &nameHint, bool benchmark) } -const xmrig::String &xmrig::argon2::Impl::name() +const xmlcore::String &xmlcore::argon2::Impl::name() { return implName; } diff --git a/src/crypto/argon2/Impl.h b/src/crypto/argon2/Impl.h index aaedec02..9a38cd06 100644 --- a/src/crypto/argon2/Impl.h +++ b/src/crypto/argon2/Impl.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ARGON2_IMPL_H -#define XMRIG_ARGON2_IMPL_H +#ifndef xmlcore_ARGON2_IMPL_H +#define xmlcore_ARGON2_IMPL_H -namespace xmrig { +namespace xmlcore { class String; @@ -43,7 +43,7 @@ public: }; -}} // namespace xmrig::argon2 +}} // namespace xmlcore::argon2 -#endif /* XMRIG_ARGON2_IMPL_H */ +#endif /* xmlcore_ARGON2_IMPL_H */ diff --git a/src/crypto/astrobwt/AstroBWT.cpp b/src/crypto/astrobwt/AstroBWT.cpp index 2286a5fe..38d504f5 100644 --- a/src/crypto/astrobwt/AstroBWT.cpp +++ b/src/crypto/astrobwt/AstroBWT.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -10,7 +10,7 @@ * Copyright 2000 Transmeta Corporation * Copyright 2004-2008 H. Peter Anvin * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -69,7 +69,7 @@ void SHA3_256_AVX2_ASM(const void* in, size_t inBytes, void* out); #endif -#ifdef XMRIG_ARM +#ifdef xmlcore_ARM extern "C" { #include "salsa20_ref/ecrypt-sync.h" } @@ -171,7 +171,7 @@ void sort_indices(int N, const uint8_t* v, uint64_t* indices, uint64_t* tmp_indi } } -bool xmrig::astrobwt::astrobwt_dero(const void* input_data, uint32_t input_size, void* scratchpad, uint8_t* output_hash, int stage2_max_size, bool avx2) +bool xmlcore::astrobwt::astrobwt_dero(const void* input_data, uint32_t input_size, void* scratchpad, uint8_t* output_hash, int stage2_max_size, bool avx2) { alignas(8) uint8_t key[32]; uint8_t* scratchpad_ptr = (uint8_t*)(scratchpad) + 64; @@ -240,7 +240,7 @@ bool xmrig::astrobwt::astrobwt_dero(const void* input_data, uint32_t input_size, } -void xmrig::astrobwt::init() +void xmlcore::astrobwt::init() { if (!astrobwtInitialized) { # ifdef ASTROBWT_AVX2 @@ -253,7 +253,7 @@ void xmrig::astrobwt::init() template<> -void xmrig::astrobwt::single_hash(const uint8_t* input, size_t size, uint8_t* output, cryptonight_ctx** ctx, uint64_t) +void xmlcore::astrobwt::single_hash(const uint8_t* input, size_t size, uint8_t* output, cryptonight_ctx** ctx, uint64_t) { astrobwt_dero(input, static_cast(size), ctx[0]->memory, output, std::numeric_limits::max(), true); } diff --git a/src/crypto/astrobwt/AstroBWT.h b/src/crypto/astrobwt/AstroBWT.h index 4e526060..65f2b0a5 100644 --- a/src/crypto/astrobwt/AstroBWT.h +++ b/src/crypto/astrobwt/AstroBWT.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -10,7 +10,7 @@ * Copyright 2000 Transmeta Corporation * Copyright 2004-2008 H. Peter Anvin * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -33,7 +33,7 @@ struct cryptonight_ctx; -namespace xmrig { +namespace xmlcore { namespace astrobwt { @@ -48,4 +48,4 @@ template<> void single_hash(const uint8_t* input, size_t size, uint8_t* output, cryptonight_ctx** ctx, uint64_t); -}} // namespace xmrig::astrobwt +}} // namespace xmlcore::astrobwt diff --git a/src/crypto/astrobwt/sha3_256_avx2.S b/src/crypto/astrobwt/sha3_256_avx2.S index f1d4e3ee..63d2595a 100644 --- a/src/crypto/astrobwt/sha3_256_avx2.S +++ b/src/crypto/astrobwt/sha3_256_avx2.S @@ -1,4 +1,4 @@ -;# XMRig +;# xmlcore ;# Copyright 2010 Jeff Garzik ;# Copyright 2012-2014 pooler ;# Copyright 2014 Lucas Jones @@ -10,7 +10,7 @@ ;# Copyright 2000 Transmeta Corporation ;# Copyright 2004-2008 H. Peter Anvin ;# Copyright 2018-2020 SChernykh -;# Copyright 2016-2020 XMRig , +;# Copyright 2016-2020 xmlcore , ;# ;# 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 diff --git a/src/crypto/astrobwt/sha3_256_avx2.asm b/src/crypto/astrobwt/sha3_256_avx2.asm index f38e09f1..0eb0e533 100644 --- a/src/crypto/astrobwt/sha3_256_avx2.asm +++ b/src/crypto/astrobwt/sha3_256_avx2.asm @@ -1,4 +1,4 @@ -;# XMRig +;# xmlcore ;# Copyright 2010 Jeff Garzik ;# Copyright 2012-2014 pooler ;# Copyright 2014 Lucas Jones @@ -10,7 +10,7 @@ ;# Copyright 2000 Transmeta Corporation ;# Copyright 2004-2008 H. Peter Anvin ;# Copyright 2018-2020 SChernykh -;# Copyright 2016-2020 XMRig , +;# Copyright 2016-2020 xmlcore , ;# ;# 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 diff --git a/src/crypto/astrobwt/sha3_256_avx2.inc b/src/crypto/astrobwt/sha3_256_avx2.inc index 81753dba..2a16457d 100644 --- a/src/crypto/astrobwt/sha3_256_avx2.inc +++ b/src/crypto/astrobwt/sha3_256_avx2.inc @@ -1,4 +1,4 @@ -;# XMRig +;# xmlcore ;# Copyright 2010 Jeff Garzik ;# Copyright 2012-2014 pooler ;# Copyright 2014 Lucas Jones @@ -10,7 +10,7 @@ ;# Copyright 2000 Transmeta Corporation ;# Copyright 2004-2008 H. Peter Anvin ;# Copyright 2018-2020 SChernykh -;# Copyright 2016-2020 XMRig , +;# Copyright 2016-2020 xmlcore , ;# ;# 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 diff --git a/src/crypto/astrobwt/sha3_256_keccakf1600_avx2.inc b/src/crypto/astrobwt/sha3_256_keccakf1600_avx2.inc index a9bae47a..5ef4e74e 100644 --- a/src/crypto/astrobwt/sha3_256_keccakf1600_avx2.inc +++ b/src/crypto/astrobwt/sha3_256_keccakf1600_avx2.inc @@ -1,4 +1,4 @@ -;# XMRig +;# xmlcore ;# Copyright 2010 Jeff Garzik ;# Copyright 2012-2014 pooler ;# Copyright 2014 Lucas Jones @@ -10,7 +10,7 @@ ;# Copyright 2000 Transmeta Corporation ;# Copyright 2004-2008 H. Peter Anvin ;# Copyright 2018-2020 SChernykh -;# Copyright 2016-2020 XMRig , +;# Copyright 2016-2020 xmlcore , ;# ;# 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 diff --git a/src/crypto/cn/CnAlgo.h b/src/crypto/cn/CnAlgo.h index 5bca1283..6a5e1fbb 100644 --- a/src/crypto/cn/CnAlgo.h +++ b/src/crypto/cn/CnAlgo.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CN_ALGO_H -#define XMRIG_CN_ALGO_H +#ifndef xmlcore_CN_ALGO_H +#define xmlcore_CN_ALGO_H #include @@ -34,7 +34,7 @@ #include "base/crypto/Algorithm.h" -namespace xmrig +namespace xmlcore { @@ -70,11 +70,11 @@ public: case Algorithm::CN_FAST: case Algorithm::CN_HALF: -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE case Algorithm::CN_LITE_0: case Algorithm::CN_LITE_1: # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY case Algorithm::CN_HEAVY_0: case Algorithm::CN_HEAVY_TUBE: case Algorithm::CN_HEAVY_XHV: @@ -90,7 +90,7 @@ public: case Algorithm::CN_DOUBLE: return CN_ITER * 2; -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO case Algorithm::CN_PICO_0: case Algorithm::CN_PICO_TLO: return CN_ITER / 8; @@ -105,7 +105,7 @@ public: inline static uint32_t mask(Algorithm::Id algo) { -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO if (algo == Algorithm::CN_PICO_0) { return 0x1FFF0; } @@ -119,10 +119,10 @@ public: switch (algo) { case Algorithm::CN_0: case Algorithm::CN_XAO: -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE case Algorithm::CN_LITE_0: # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY case Algorithm::CN_HEAVY_0: case Algorithm::CN_HEAVY_XHV: # endif @@ -132,10 +132,10 @@ public: case Algorithm::CN_1: case Algorithm::CN_FAST: case Algorithm::CN_RTO: -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE case Algorithm::CN_LITE_1: # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY case Algorithm::CN_HEAVY_TUBE: return Algorithm::CN_1; # endif @@ -146,7 +146,7 @@ public: case Algorithm::CN_RWZ: case Algorithm::CN_ZLS: case Algorithm::CN_DOUBLE: -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO case Algorithm::CN_PICO_0: case Algorithm::CN_PICO_TLO: # endif @@ -206,7 +206,7 @@ template<> constexpr inline size_t CnAlgo::memory() cons template<> constexpr inline uint32_t CnAlgo::mask() const { return 0x1FFF0; } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CN_ALGO_H */ +#endif /* xmlcore_CN_ALGO_H */ diff --git a/src/crypto/cn/CnCtx.cpp b/src/crypto/cn/CnCtx.cpp index e92fe22e..0c15c930 100644 --- a/src/crypto/cn/CnCtx.cpp +++ b/src/crypto/cn/CnCtx.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -33,7 +33,7 @@ #include "crypto/common/VirtualMemory.h" -void xmrig::CnCtx::create(cryptonight_ctx **ctx, uint8_t *memory, size_t size, size_t count) +void xmlcore::CnCtx::create(cryptonight_ctx **ctx, uint8_t *memory, size_t size, size_t count) { for (size_t i = 0; i < count; ++i) { cryptonight_ctx *c = static_cast(_mm_malloc(sizeof(cryptonight_ctx), 4096)); @@ -48,7 +48,7 @@ void xmrig::CnCtx::create(cryptonight_ctx **ctx, uint8_t *memory, size_t size, s } -void xmrig::CnCtx::release(cryptonight_ctx **ctx, size_t count) +void xmlcore::CnCtx::release(cryptonight_ctx **ctx, size_t count) { if (ctx[0] == nullptr) { return; diff --git a/src/crypto/cn/CnCtx.h b/src/crypto/cn/CnCtx.h index 7939bf4e..cab5812f 100644 --- a/src/crypto/cn/CnCtx.h +++ b/src/crypto/cn/CnCtx.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CN_CTX_H -#define XMRIG_CN_CTX_H +#ifndef xmlcore_CN_CTX_H +#define xmlcore_CN_CTX_H #include @@ -34,7 +34,7 @@ struct cryptonight_ctx; -namespace xmrig +namespace xmlcore { @@ -46,7 +46,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CN_CTX_H */ +#endif /* xmlcore_CN_CTX_H */ diff --git a/src/crypto/cn/CnHash.cpp b/src/crypto/cn/CnHash.cpp index 89caa1b0..e24a6fe7 100644 --- a/src/crypto/cn/CnHash.cpp +++ b/src/crypto/cn/CnHash.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,19 +31,19 @@ #include "crypto/common/VirtualMemory.h" -#if defined(XMRIG_ARM) +#if defined(xmlcore_ARM) # include "crypto/cn/CryptoNight_arm.h" #else # include "crypto/cn/CryptoNight_x86.h" #endif -#ifdef XMRIG_ALGO_ARGON2 +#ifdef xmlcore_ALGO_ARGON2 # include "crypto/argon2/Hash.h" #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT # include "crypto/astrobwt/AstroBWT.h" #endif @@ -61,7 +61,7 @@ m_map[algo][AV_PENTA_SOFT][Assembly::NONE] = cryptonight_penta_hash; -#ifdef XMRIG_FEATURE_ASM +#ifdef xmlcore_FEATURE_ASM # define ADD_FN_ASM(algo) \ m_map[algo][AV_SINGLE][Assembly::INTEL] = cryptonight_single_hash_asm; \ m_map[algo][AV_SINGLE][Assembly::RYZEN] = cryptonight_single_hash_asm; \ @@ -71,7 +71,7 @@ m_map[algo][AV_DOUBLE][Assembly::BULLDOZER] = cryptonight_double_hash_asm; -namespace xmrig { +namespace xmlcore { cn_mainloop_fun cn_half_mainloop_ivybridge_asm = nullptr; @@ -146,7 +146,7 @@ static void patchAsmVariants() cn_half_mainloop_bulldozer_asm = reinterpret_cast (base + 0x2000); cn_half_double_mainloop_sandybridge_asm = reinterpret_cast (base + 0x3000); -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO cn_trtl_mainloop_ivybridge_asm = reinterpret_cast (base + 0x4000); cn_trtl_mainloop_ryzen_asm = reinterpret_cast (base + 0x5000); cn_trtl_mainloop_bulldozer_asm = reinterpret_cast (base + 0x6000); @@ -163,7 +163,7 @@ static void patchAsmVariants() cn_double_mainloop_bulldozer_asm = reinterpret_cast (base + 0xE000); cn_double_double_mainloop_sandybridge_asm = reinterpret_cast (base + 0xF000); -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO cn_tlo_mainloop_ivybridge_asm = reinterpret_cast (base + 0x10000); cn_tlo_mainloop_ryzen_asm = reinterpret_cast (base + 0x11000); cn_tlo_mainloop_bulldozer_asm = reinterpret_cast (base + 0x12000); @@ -179,7 +179,7 @@ static void patchAsmVariants() patchCode(cn_half_double_mainloop_sandybridge_asm, cnv2_double_mainloop_sandybridge_asm, ITER); } -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO { constexpr uint32_t ITER = CnAlgo().iterations(); constexpr uint32_t MASK = CnAlgo().mask(); @@ -222,16 +222,16 @@ static void patchAsmVariants() VirtualMemory::protectRX(base, allocation_size); VirtualMemory::flushInstructionCache(base, allocation_size); } -} // namespace xmrig +} // namespace xmlcore #else # define ADD_FN_ASM(algo) #endif -static const xmrig::CnHash cnHash; +static const xmlcore::CnHash cnHash; -xmrig::CnHash::CnHash() +xmlcore::CnHash::CnHash() { ADD_FN(Algorithm::CN_0); ADD_FN(Algorithm::CN_1); @@ -252,18 +252,18 @@ xmrig::CnHash::CnHash() ADD_FN_ASM(Algorithm::CN_ZLS); ADD_FN_ASM(Algorithm::CN_DOUBLE); -# ifdef XMRIG_ALGO_CN_LITE +# ifdef xmlcore_ALGO_CN_LITE ADD_FN(Algorithm::CN_LITE_0); ADD_FN(Algorithm::CN_LITE_1); # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY ADD_FN(Algorithm::CN_HEAVY_0); ADD_FN(Algorithm::CN_HEAVY_TUBE); ADD_FN(Algorithm::CN_HEAVY_XHV); # endif -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO ADD_FN(Algorithm::CN_PICO_0); ADD_FN_ASM(Algorithm::CN_PICO_0); ADD_FN(Algorithm::CN_PICO_TLO); @@ -272,7 +272,7 @@ xmrig::CnHash::CnHash() ADD_FN(Algorithm::CN_CCX); -# ifdef XMRIG_ALGO_ARGON2 +# ifdef xmlcore_ALGO_ARGON2 m_map[Algorithm::AR2_CHUKWA][AV_SINGLE][Assembly::NONE] = argon2::single_hash; m_map[Algorithm::AR2_CHUKWA][AV_SINGLE_SOFT][Assembly::NONE] = argon2::single_hash; m_map[Algorithm::AR2_CHUKWA_V2][AV_SINGLE][Assembly::NONE] = argon2::single_hash; @@ -281,40 +281,40 @@ xmrig::CnHash::CnHash() m_map[Algorithm::AR2_WRKZ][AV_SINGLE_SOFT][Assembly::NONE] = argon2::single_hash; # endif -# ifdef XMRIG_ALGO_ASTROBWT +# ifdef xmlcore_ALGO_ASTROBWT m_map[Algorithm::ASTROBWT_DERO][AV_SINGLE][Assembly::NONE] = astrobwt::single_hash; m_map[Algorithm::ASTROBWT_DERO][AV_SINGLE_SOFT][Assembly::NONE] = astrobwt::single_hash; # endif -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM patchAsmVariants(); # endif } -xmrig::cn_hash_fun xmrig::CnHash::fn(const Algorithm &algorithm, AlgoVariant av, Assembly::Id assembly) +xmlcore::cn_hash_fun xmlcore::CnHash::fn(const Algorithm &algorithm, AlgoVariant av, Assembly::Id assembly) { if (!algorithm.isValid()) { return nullptr; } -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY // cn-heavy optimization for Zen3 CPUs - if ((av == AV_SINGLE) && (xmrig::Cpu::info()->arch() == xmrig::ICpuInfo::ARCH_ZEN3)) { + if ((av == AV_SINGLE) && (xmlcore::Cpu::info()->arch() == xmlcore::ICpuInfo::ARCH_ZEN3)) { switch (algorithm.id()) { - case xmrig::Algorithm::CN_HEAVY_0: - return cryptonight_single_hash; - case xmrig::Algorithm::CN_HEAVY_TUBE: - return cryptonight_single_hash; - case xmrig::Algorithm::CN_HEAVY_XHV: - return cryptonight_single_hash; + case xmlcore::Algorithm::CN_HEAVY_0: + return cryptonight_single_hash; + case xmlcore::Algorithm::CN_HEAVY_TUBE: + return cryptonight_single_hash; + case xmlcore::Algorithm::CN_HEAVY_XHV: + return cryptonight_single_hash; default: break; } } # endif -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM cn_hash_fun fun = cnHash.m_map[algorithm][av][Cpu::assembly(assembly)]; if (fun) { return fun; diff --git a/src/crypto/cn/CnHash.h b/src/crypto/cn/CnHash.h index 9c898619..bab1c26e 100644 --- a/src/crypto/cn/CnHash.h +++ b/src/crypto/cn/CnHash.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CN_HASH_H -#define XMRIG_CN_HASH_H +#ifndef xmlcore_CN_HASH_H +#define xmlcore_CN_HASH_H #include @@ -38,7 +38,7 @@ struct cryptonight_ctx; -namespace xmrig +namespace xmlcore { using cn_hash_fun = void (*)(const uint8_t *, size_t, uint8_t *, cryptonight_ctx **, uint64_t); @@ -72,7 +72,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CN_HASH_H */ +#endif /* xmlcore_CN_HASH_H */ diff --git a/src/crypto/cn/CryptoNight.h b/src/crypto/cn/CryptoNight.h index 434c34f8..ea768d62 100644 --- a/src/crypto/cn/CryptoNight.h +++ b/src/crypto/cn/CryptoNight.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh - * Copyright 2016-2018 XMRig , + * Copyright 2016-2018 xmlcore , * * 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,14 +23,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CRYPTONIGHT_H -#define XMRIG_CRYPTONIGHT_H +#ifndef xmlcore_CRYPTONIGHT_H +#define xmlcore_CRYPTONIGHT_H #include #include -#if defined _MSC_VER || defined XMRIG_ARM +#if defined _MSC_VER || defined xmlcore_ARM # define ABI_ATTRIBUTE #else # define ABI_ATTRIBUTE __attribute__((ms_abi)) @@ -61,4 +61,4 @@ struct cryptonight_ctx { }; -#endif /* XMRIG_CRYPTONIGHT_H */ +#endif /* xmlcore_CRYPTONIGHT_H */ diff --git a/src/crypto/cn/CryptoNight_arm.h b/src/crypto/cn/CryptoNight_arm.h index e8a91c35..5a5a7a78 100644 --- a/src/crypto/cn/CryptoNight_arm.h +++ b/src/crypto/cn/CryptoNight_arm.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,8 +24,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CRYPTONIGHT_ARM_H -#define XMRIG_CRYPTONIGHT_ARM_H +#ifndef xmlcore_CRYPTONIGHT_ARM_H +#define xmlcore_CRYPTONIGHT_ARM_H #include "base/crypto/keccak.h" @@ -197,7 +197,7 @@ inline void mix_and_propagate(__m128i& x0, __m128i& x1, __m128i& x2, __m128i& x3 } -namespace xmrig { +namespace xmlcore { template @@ -359,7 +359,7 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output) } -} /* namespace xmrig */ +} /* namespace xmlcore */ static inline __m128i aes_round_tweak_div(const __m128i &in, const __m128i &key) @@ -384,7 +384,7 @@ static inline __m128i aes_round_tweak_div(const __m128i &in, const __m128i &key) } -namespace xmrig { +namespace xmlcore { template @@ -438,7 +438,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; # else constexpr bool IS_CN_HEAVY_TUBE = false; @@ -549,7 +549,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si ah0 ^= ch; idx0 = al0; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (props.isHeavy()) { const int64x2_t x = vld1q_s64(reinterpret_cast(&l0[idx0 & MASK])); const int64_t n = vgetq_lane_s64(x, 0); @@ -587,7 +587,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; # else constexpr bool IS_CN_HEAVY_TUBE = false; @@ -725,7 +725,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si ah0 ^= ch; idx0 = al0; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (props.isHeavy()) { const int64x2_t x = vld1q_s64(reinterpret_cast(&l0[idx0 & MASK])); const int64_t n = vgetq_lane_s64(x, 0); @@ -785,7 +785,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si ah1 ^= ch; idx1 = al1; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (props.isHeavy()) { const int64x2_t x = vld1q_s64(reinterpret_cast(&l1[idx1 & MASK])); const int64_t n = vgetq_lane_s64(x, 0); @@ -841,7 +841,7 @@ inline void cryptonight_penta_hash(const uint8_t *__restrict__ input, size_t siz } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CRYPTONIGHT_ARM_H */ +#endif /* xmlcore_CRYPTONIGHT_ARM_H */ diff --git a/src/crypto/cn/CryptoNight_monero.h b/src/crypto/cn/CryptoNight_monero.h index 8b192083..fcb1f995 100644 --- a/src/crypto/cn/CryptoNight_monero.h +++ b/src/crypto/cn/CryptoNight_monero.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,14 +23,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CRYPTONIGHT_MONERO_H -#define XMRIG_CRYPTONIGHT_MONERO_H +#ifndef xmlcore_CRYPTONIGHT_MONERO_H +#define xmlcore_CRYPTONIGHT_MONERO_H #include #include // VARIANT ALTERATIONS -#ifndef XMRIG_ARM +#ifndef xmlcore_ARM # define VARIANT1_INIT(part) \ uint64_t tweak1_2_##part = 0; \ if (BASE == Algorithm::CN_1) { \ @@ -60,7 +60,7 @@ } -#ifndef XMRIG_ARM +#ifndef xmlcore_ARM # define VARIANT2_INIT(part) \ __m128i division_result_xmm_##part = _mm_cvtsi64_si128(static_cast(h##part[12])); \ __m128i sqrt_result_xmm_##part = _mm_cvtsi64_si128(static_cast(h##part[13])); @@ -204,4 +204,4 @@ v4_random_math(code##part, r##part); \ } -#endif /* XMRIG_CRYPTONIGHT_MONERO_H */ +#endif /* xmlcore_CRYPTONIGHT_MONERO_H */ diff --git a/src/crypto/cn/CryptoNight_test.h b/src/crypto/cn/CryptoNight_test.h index 48955b22..77f6d95d 100644 --- a/src/crypto/cn/CryptoNight_test.h +++ b/src/crypto/cn/CryptoNight_test.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +23,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CRYPTONIGHT_TEST_H -#define XMRIG_CRYPTONIGHT_TEST_H +#ifndef xmlcore_CRYPTONIGHT_TEST_H +#define xmlcore_CRYPTONIGHT_TEST_H #include -namespace xmrig { +namespace xmlcore { const static uint8_t test_input[380] = { @@ -259,7 +259,7 @@ const static uint8_t test_output_double[160] = { 0x5E, 0x2E, 0xC1, 0x80, 0x89, 0x39, 0xB3, 0x54, 0x39, 0x52, 0x0E, 0x69, 0x3D, 0xF6, 0xC5, 0x4A }; -#ifdef XMRIG_ALGO_CN_LITE +#ifdef xmlcore_ALGO_CN_LITE // "cn-lite/0" const static uint8_t test_output_v0_lite[160] = { 0x36, 0x95, 0xB4, 0xB5, 0x3B, 0xB0, 0x03, 0x58, 0xB0, 0xAD, 0x38, 0xDC, 0x16, 0x0F, 0xEB, 0x9E, @@ -291,7 +291,7 @@ const static uint8_t test_output_v1_lite[160] = { #endif -#ifdef XMRIG_ALGO_CN_HEAVY +#ifdef xmlcore_ALGO_CN_HEAVY // "cn-heavy/0" const static uint8_t test_output_v0_heavy[160] = { 0x99, 0x83, 0xF2, 0x1B, 0xDF, 0x20, 0x10, 0xA8, 0xD7, 0x07, 0xBB, 0x2F, 0x14, 0xD7, 0x86, 0x64, @@ -338,7 +338,7 @@ const static uint8_t test_output_tube_heavy[160] = { #endif -#ifdef XMRIG_ALGO_CN_PICO +#ifdef xmlcore_ALGO_CN_PICO // "cn-pico/trtl" const static uint8_t test_output_pico_trtl[160] = { 0x08, 0xF4, 0x21, 0xD7, 0x83, 0x31, 0x17, 0x30, 0x0E, 0xDA, 0x66, 0xE9, 0x8F, 0x4A, 0x25, 0x69, @@ -370,7 +370,7 @@ const static uint8_t test_output_pico_tlo[160] = { #endif -#ifdef XMRIG_ALGO_ARGON2 +#ifdef xmlcore_ALGO_ARGON2 // "argon2/chukwa" const static uint8_t argon2_chukwa_test_out[160] = { 0xC1, 0x58, 0xA1, 0x05, 0xAE, 0x75, 0xC7, 0x56, 0x1C, 0xFD, 0x02, 0x90, 0x83, 0xA4, 0x7A, 0x87, @@ -415,7 +415,7 @@ const static uint8_t argon2_wrkz_test_out[160] = { #endif -#ifdef XMRIG_ALGO_ASTROBWT +#ifdef xmlcore_ALGO_ASTROBWT // "astrobwt" const static uint8_t astrobwt_dero_test_out[160] = { 0x7E, 0x88, 0x44, 0xF2, 0xD6, 0xB7, 0xA4, 0x34, 0x98, 0xFE, 0x6D, 0x22, 0x65, 0x27, 0x68, 0x90, @@ -433,7 +433,7 @@ const static uint8_t astrobwt_dero_test_out[160] = { #endif -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_CRYPTONIGHT_TEST_H */ +#endif /* xmlcore_CRYPTONIGHT_TEST_H */ diff --git a/src/crypto/cn/CryptoNight_x86.h b/src/crypto/cn/CryptoNight_x86.h index 7cc4e062..b3021245 100644 --- a/src/crypto/cn/CryptoNight_x86.h +++ b/src/crypto/cn/CryptoNight_x86.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_CRYPTONIGHT_X86_H -#define XMRIG_CRYPTONIGHT_X86_H +#ifndef xmlcore_CRYPTONIGHT_X86_H +#define xmlcore_CRYPTONIGHT_X86_H #ifdef __GNUC__ @@ -303,7 +303,7 @@ inline void mix_and_propagate(__m128i& x0, __m128i& x1, __m128i& x2, __m128i& x3 } -namespace xmrig { +namespace xmlcore { template @@ -506,7 +506,7 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output) } -} /* namespace xmrig */ +} /* namespace xmlcore */ static inline __m128i aes_round_tweak_div(const __m128i &in, const __m128i &key) @@ -551,10 +551,10 @@ static inline __m128i int_sqrt_v2(const uint64_t n0) } -void v4_soft_aes_compile_code(const V4_Instruction *code, int code_size, void *machine_code, xmrig::Assembly ASM); +void v4_soft_aes_compile_code(const V4_Instruction *code, int code_size, void *machine_code, xmlcore::Assembly ASM); -namespace xmrig { +namespace xmlcore { template @@ -606,7 +606,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; # else constexpr bool IS_CN_HEAVY_TUBE = false; @@ -623,7 +623,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si uint64_t *h0 = reinterpret_cast(ctx[0]->state); uint8_t *l0 = ctx[0]->memory; -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM if (SOFT_AES && props.isR()) { if (!ctx[0]->generated_code_data.match(ALGO, height)) { V4_Instruction code[256]; @@ -736,7 +736,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si ah0 ^= ch; idx0 = al0; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (props.isHeavy()) { int64_t n = ((int64_t*)&l0[interleaved_index(idx0 & MASK)])[0]; int32_t d = ((int32_t*)&l0[interleaved_index(idx0 & MASK)])[2]; @@ -759,7 +759,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si bx0 = cx; } -# ifdef XMRIG_FEATURE_ASM +# ifdef xmlcore_FEATURE_ASM } # endif @@ -769,10 +769,10 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#ifdef XMRIG_FEATURE_ASM +#ifdef xmlcore_FEATURE_ASM extern "C" void cnv2_mainloop_ivybridge_asm(cryptonight_ctx **ctx); extern "C" void cnv2_mainloop_ryzen_asm(cryptonight_ctx **ctx); extern "C" void cnv2_mainloop_bulldozer_asm(cryptonight_ctx **ctx); @@ -781,7 +781,7 @@ extern "C" void cnv2_rwz_mainloop_asm(cryptonight_ctx **ctx); extern "C" void cnv2_rwz_double_mainloop_asm(cryptonight_ctx **ctx); -namespace xmrig { +namespace xmlcore { typedef void (*cn_mainloop_fun)(cryptonight_ctx **ctx); @@ -813,28 +813,28 @@ extern cn_mainloop_fun cn_double_mainloop_bulldozer_asm; extern cn_mainloop_fun cn_double_double_mainloop_sandybridge_asm; -} // namespace xmrig +} // namespace xmlcore -void v4_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM); -void v4_compile_code_double(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM); +void v4_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM); +void v4_compile_code_double(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM); -template -void cn_r_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM) +template +void cn_r_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM) { v4_compile_code(code, code_size, machine_code, ASM); } -template -void cn_r_compile_code_double(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM) +template +void cn_r_compile_code_double(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM) { v4_compile_code_double(code, code_size, machine_code, ASM); } -namespace xmrig { +namespace xmlcore { template @@ -875,7 +875,7 @@ inline void cryptonight_single_hash_asm(const uint8_t *__restrict__ input, size_ cn_half_mainloop_bulldozer_asm(ctx); } } -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO else if (ALGO == Algorithm::CN_PICO_0) { if (ASM == Assembly::INTEL) { cn_trtl_mainloop_ivybridge_asm(ctx); @@ -959,7 +959,7 @@ inline void cryptonight_double_hash_asm(const uint8_t *__restrict__ input, size_ else if (ALGO == Algorithm::CN_HALF) { cn_half_double_mainloop_sandybridge_asm(ctx); } -# ifdef XMRIG_ALGO_CN_PICO +# ifdef xmlcore_ALGO_CN_PICO else if (ALGO == Algorithm::CN_PICO_0) { cn_trtl_double_mainloop_sandybridge_asm(ctx); } @@ -991,11 +991,11 @@ inline void cryptonight_double_hash_asm(const uint8_t *__restrict__ input, size_ } -} /* namespace xmrig */ +} /* namespace xmlcore */ #endif -namespace xmrig { +namespace xmlcore { template @@ -1005,7 +1005,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; # else constexpr bool IS_CN_HEAVY_TUBE = false; @@ -1145,7 +1145,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si ah0 ^= ch; idx0 = al0; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (props.isHeavy()) { int64_t n = ((int64_t*)&l0[idx0 & MASK])[0]; int32_t d = ((int32_t*)&l0[idx0 & MASK])[2]; @@ -1203,7 +1203,7 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si ah1 ^= ch; idx1 = al1; -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (props.isHeavy()) { int64_t n = ((int64_t*)&l1[idx1 & MASK])[0]; int32_t d = ((int32_t*)&l1[idx1 & MASK])[2]; @@ -1359,7 +1359,7 @@ inline void cryptonight_triple_hash(const uint8_t *__restrict__ input, size_t si constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; constexpr bool IS_CN_HEAVY_XHV = ALGO == Algorithm::CN_HEAVY_XHV; # else @@ -1433,7 +1433,7 @@ inline void cryptonight_quad_hash(const uint8_t *__restrict__ input, size_t size constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; constexpr bool IS_CN_HEAVY_XHV = ALGO == Algorithm::CN_HEAVY_XHV; # else @@ -1515,7 +1515,7 @@ inline void cryptonight_penta_hash(const uint8_t *__restrict__ input, size_t siz constexpr size_t MASK = props.mask(); constexpr Algorithm::Id BASE = props.base(); -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY constexpr bool IS_CN_HEAVY_TUBE = ALGO == Algorithm::CN_HEAVY_TUBE; constexpr bool IS_CN_HEAVY_XHV = ALGO == Algorithm::CN_HEAVY_XHV; # else @@ -1598,7 +1598,7 @@ inline void cryptonight_penta_hash(const uint8_t *__restrict__ input, size_t siz } -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_CRYPTONIGHT_X86_H */ +#endif /* xmlcore_CRYPTONIGHT_X86_H */ diff --git a/src/crypto/cn/r/CryptonightR_gen.cpp b/src/crypto/cn/r/CryptonightR_gen.cpp index e6a61967..6e311829 100644 --- a/src/crypto/cn/r/CryptonightR_gen.cpp +++ b/src/crypto/cn/r/CryptonightR_gen.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -42,7 +42,7 @@ static inline void add_code(uint8_t* &p, void (*p1)(), void (*p2)()) } } -static inline void add_random_math(uint8_t* &p, const V4_Instruction* code, int code_size, const void_func* instructions, const void_func* instructions_mov, bool is_64_bit, xmrig::Assembly::Id ASM) +static inline void add_random_math(uint8_t* &p, const V4_Instruction* code, int code_size, const void_func* instructions, const void_func* instructions_mov, bool is_64_bit, xmlcore::Assembly::Id ASM) { uint32_t prev_rot_src = (uint32_t)(-1); @@ -76,7 +76,7 @@ static inline void add_random_math(uint8_t* &p, const V4_Instruction* code, int void_func begin = instructions[c]; - if ((ASM == xmrig::Assembly::BULLDOZER) && (inst.opcode == MUL) && !is_64_bit) { + if ((ASM == xmlcore::Assembly::BULLDOZER) && (inst.opcode == MUL) && !is_64_bit) { // AMD Bulldozer has latency 4 for 32-bit IMUL and 6 for 64-bit IMUL // Always use 32-bit IMUL for AMD Bulldozer in 32-bit mode - skip prefix 0x48 and change 0x49 to 0x41 uint8_t* prefix = reinterpret_cast(begin); @@ -99,7 +99,7 @@ static inline void add_random_math(uint8_t* &p, const V4_Instruction* code, int } } -void v4_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM) +void v4_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM) { uint8_t* p0 = reinterpret_cast(machine_code); uint8_t* p = p0; @@ -110,10 +110,10 @@ void v4_compile_code(const V4_Instruction* code, int code_size, void* machine_co *(int*)(p - 4) = static_cast((((const uint8_t*)CryptonightR_template_mainloop) - ((const uint8_t*)CryptonightR_template_part1)) - (p - p0)); add_code(p, CryptonightR_template_part3, CryptonightR_template_end); - xmrig::VirtualMemory::flushInstructionCache(machine_code, p - p0); + xmlcore::VirtualMemory::flushInstructionCache(machine_code, p - p0); } -void v4_compile_code_double(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM) +void v4_compile_code_double(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM) { uint8_t* p0 = reinterpret_cast(machine_code); uint8_t* p = p0; @@ -126,10 +126,10 @@ void v4_compile_code_double(const V4_Instruction* code, int code_size, void* mac *(int*)(p - 4) = static_cast((((const uint8_t*)CryptonightR_template_double_mainloop) - ((const uint8_t*)CryptonightR_template_double_part1)) - (p - p0)); add_code(p, CryptonightR_template_double_part4, CryptonightR_template_double_end); - xmrig::VirtualMemory::flushInstructionCache(machine_code, p - p0); + xmlcore::VirtualMemory::flushInstructionCache(machine_code, p - p0); } -void v4_soft_aes_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmrig::Assembly ASM) +void v4_soft_aes_compile_code(const V4_Instruction* code, int code_size, void* machine_code, xmlcore::Assembly ASM) { uint8_t* p0 = reinterpret_cast(machine_code); uint8_t* p = p0; @@ -140,5 +140,5 @@ void v4_soft_aes_compile_code(const V4_Instruction* code, int code_size, void* m *(int*)(p - 4) = static_cast((((const uint8_t*)CryptonightR_soft_aes_template_mainloop) - ((const uint8_t*)CryptonightR_soft_aes_template_part1)) - (p - p0)); add_code(p, CryptonightR_soft_aes_template_part3, CryptonightR_soft_aes_template_end); - xmrig::VirtualMemory::flushInstructionCache(machine_code, p - p0); + xmlcore::VirtualMemory::flushInstructionCache(machine_code, p - p0); } diff --git a/src/crypto/cn/r/variant4_random_math.h b/src/crypto/cn/r/variant4_random_math.h index f8dfb274..d721ec65 100644 --- a/src/crypto/cn/r/variant4_random_math.h +++ b/src/crypto/cn/r/variant4_random_math.h @@ -189,7 +189,7 @@ static FORCEINLINE void check_data(size_t* data_index, const size_t bytes_needed // Generates as many random math operations as possible with given latency and ALU restrictions // "code" array must have space for NUM_INSTRUCTIONS_MAX+1 instructions -template +template static int v4_random_math_init(struct V4_Instruction* code, const uint64_t height) { // MUL is 3 cycles, 3-way addition and rotations are 2 cycles, SUB/XOR are 1 cycle @@ -211,7 +211,7 @@ static int v4_random_math_init(struct V4_Instruction* code, const uint64_t heigh memset(data, 0, sizeof(data)); uint64_t tmp = SWAP64LE(height); memcpy(data, &tmp, sizeof(uint64_t)); - if (ALGO == xmrig::Algorithm::CN_R) { + if (ALGO == xmlcore::Algorithm::CN_R) { data[20] = -38; } diff --git a/src/crypto/cn/soft_aes.h b/src/crypto/cn/soft_aes.h index f38b56e9..faa80e07 100644 --- a/src/crypto/cn/soft_aes.h +++ b/src/crypto/cn/soft_aes.h @@ -27,7 +27,7 @@ #pragma once -#if defined(XMRIG_ARM) +#if defined(xmlcore_ARM) # include "crypto/cn/sse2neon.h" #elif defined(__GNUC__) # include diff --git a/src/crypto/common/Assembly.cpp b/src/crypto/common/Assembly.cpp index eb6b8537..ccda2c25 100644 --- a/src/crypto/common/Assembly.cpp +++ b/src/crypto/common/Assembly.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -30,7 +30,7 @@ #include "3rdparty/rapidjson/document.h" -namespace xmrig { +namespace xmlcore { static const char *asmNames[] = { @@ -42,10 +42,10 @@ static const char *asmNames[] = { }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -xmrig::Assembly::Id xmrig::Assembly::parse(const char *assembly, Id defaultValue) +xmlcore::Assembly::Id xmlcore::Assembly::parse(const char *assembly, Id defaultValue) { constexpr size_t const size = sizeof(asmNames) / sizeof((asmNames)[0]); static_assert(size == MAX, "asmNames size mismatch"); @@ -64,7 +64,7 @@ xmrig::Assembly::Id xmrig::Assembly::parse(const char *assembly, Id defaultValue } -xmrig::Assembly::Id xmrig::Assembly::parse(const rapidjson::Value &value, Id defaultValue) +xmlcore::Assembly::Id xmlcore::Assembly::parse(const rapidjson::Value &value, Id defaultValue) { if (value.IsBool()) { return value.GetBool() ? AUTO : NONE; @@ -78,13 +78,13 @@ xmrig::Assembly::Id xmrig::Assembly::parse(const rapidjson::Value &value, Id def } -const char *xmrig::Assembly::toString() const +const char *xmlcore::Assembly::toString() const { return asmNames[m_id]; } -rapidjson::Value xmrig::Assembly::toJSON() const +rapidjson::Value xmlcore::Assembly::toJSON() const { using namespace rapidjson; diff --git a/src/crypto/common/Assembly.h b/src/crypto/common/Assembly.h index 8d7ba43c..1f1a496a 100644 --- a/src/crypto/common/Assembly.h +++ b/src/crypto/common/Assembly.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_ASSEMBLY_H -#define XMRIG_ASSEMBLY_H +#ifndef xmlcore_ASSEMBLY_H +#define xmlcore_ASSEMBLY_H #include "3rdparty/rapidjson/fwd.h" -namespace xmrig { +namespace xmlcore { class Assembly @@ -64,7 +64,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_ASSEMBLY_H */ +#endif /* xmlcore_ASSEMBLY_H */ diff --git a/src/crypto/common/HugePagesInfo.cpp b/src/crypto/common/HugePagesInfo.cpp index 0a134156..2424daa4 100644 --- a/src/crypto/common/HugePagesInfo.cpp +++ b/src/crypto/common/HugePagesInfo.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +21,7 @@ #include "crypto/common/VirtualMemory.h" -xmrig::HugePagesInfo::HugePagesInfo(const VirtualMemory *memory) +xmlcore::HugePagesInfo::HugePagesInfo(const VirtualMemory *memory) { if (memory->isOneGbPages()) { size = VirtualMemory::align(memory->size(), VirtualMemory::kOneGiB); diff --git a/src/crypto/common/HugePagesInfo.h b/src/crypto/common/HugePagesInfo.h index 295817e3..4e7f05d9 100644 --- a/src/crypto/common/HugePagesInfo.h +++ b/src/crypto/common/HugePagesInfo.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HUGEPAGESINFO_H -#define XMRIG_HUGEPAGESINFO_H +#ifndef xmlcore_HUGEPAGESINFO_H +#define xmlcore_HUGEPAGESINFO_H #include #include -namespace xmrig { +namespace xmlcore { class VirtualMemory; @@ -55,7 +55,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_HUGEPAGESINFO_H */ +#endif /* xmlcore_HUGEPAGESINFO_H */ diff --git a/src/crypto/common/LinuxMemory.cpp b/src/crypto/common/LinuxMemory.cpp index 8a00e1c3..560af8a2 100644 --- a/src/crypto/common/LinuxMemory.cpp +++ b/src/crypto/common/LinuxMemory.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { static std::mutex mutex; @@ -46,10 +46,10 @@ static inline int64_t free_hugepages(uint32_t node, size_t hugePageSize) static inline int64_t nr_hugepages(uint32_t node, size_t hugePageSize) { return LinuxMemory::read(sysfs_path(node, hugePageSize, true).c_str()); } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::LinuxMemory::reserve(size_t size, uint32_t node, size_t hugePageSize) +bool xmlcore::LinuxMemory::reserve(size_t size, uint32_t node, size_t hugePageSize) { std::lock_guard lock(mutex); @@ -64,7 +64,7 @@ bool xmrig::LinuxMemory::reserve(size_t size, uint32_t node, size_t hugePageSize } -bool xmrig::LinuxMemory::write(const char *path, uint64_t value) +bool xmlcore::LinuxMemory::write(const char *path, uint64_t value) { std::ofstream file(path, std::ios::out | std::ios::binary | std::ios::trunc); if (!file.is_open()) { @@ -78,7 +78,7 @@ bool xmrig::LinuxMemory::write(const char *path, uint64_t value) } -int64_t xmrig::LinuxMemory::read(const char *path) +int64_t xmlcore::LinuxMemory::read(const char *path) { std::ifstream file(path); if (!file.is_open()) { diff --git a/src/crypto/common/LinuxMemory.h b/src/crypto/common/LinuxMemory.h index 0d71af24..a83837e0 100644 --- a/src/crypto/common/LinuxMemory.h +++ b/src/crypto/common/LinuxMemory.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_LINUXMEMORY_H -#define XMRIG_LINUXMEMORY_H +#ifndef xmlcore_LINUXMEMORY_H +#define xmlcore_LINUXMEMORY_H #include #include -namespace xmrig { +namespace xmlcore { class LinuxMemory @@ -37,7 +37,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_LINUXMEMORY_H */ +#endif /* xmlcore_LINUXMEMORY_H */ diff --git a/src/crypto/common/MemoryPool.cpp b/src/crypto/common/MemoryPool.cpp index e99757ee..54e3de59 100644 --- a/src/crypto/common/MemoryPool.cpp +++ b/src/crypto/common/MemoryPool.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2018-2019 tevador - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -32,16 +32,16 @@ #include -namespace xmrig { +namespace xmlcore { constexpr size_t pageSize = 2 * 1024 * 1024; -} // namespace xmrig +} // namespace xmlcore -xmrig::MemoryPool::MemoryPool(size_t size, bool hugePages, uint32_t node) +xmlcore::MemoryPool::MemoryPool(size_t size, bool hugePages, uint32_t node) { if (!size) { return; @@ -55,19 +55,19 @@ xmrig::MemoryPool::MemoryPool(size_t size, bool hugePages, uint32_t node) } -xmrig::MemoryPool::~MemoryPool() +xmlcore::MemoryPool::~MemoryPool() { delete m_memory; } -bool xmrig::MemoryPool::isHugePages(uint32_t) const +bool xmlcore::MemoryPool::isHugePages(uint32_t) const { return m_memory && m_memory->isHugePages(); } -uint8_t *xmrig::MemoryPool::get(size_t size, uint32_t) +uint8_t *xmlcore::MemoryPool::get(size_t size, uint32_t) { assert(!(size % pageSize)); @@ -84,7 +84,7 @@ uint8_t *xmrig::MemoryPool::get(size_t size, uint32_t) } -void xmrig::MemoryPool::release(uint32_t) +void xmlcore::MemoryPool::release(uint32_t) { assert(m_refs > 0); diff --git a/src/crypto/common/MemoryPool.h b/src/crypto/common/MemoryPool.h index c6b4691b..6c8c29c2 100644 --- a/src/crypto/common/MemoryPool.h +++ b/src/crypto/common/MemoryPool.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2018-2019 tevador - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -24,15 +24,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_MEMORYPOOL_H -#define XMRIG_MEMORYPOOL_H +#ifndef xmlcore_MEMORYPOOL_H +#define xmlcore_MEMORYPOOL_H #include "backend/common/interfaces/IMemoryPool.h" #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class VirtualMemory; @@ -41,7 +41,7 @@ class VirtualMemory; class MemoryPool : public IMemoryPool { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(MemoryPool) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(MemoryPool) MemoryPool(size_t size, bool hugePages, uint32_t node = 0); ~MemoryPool() override; @@ -59,8 +59,8 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_MEMORYPOOL_H */ +#endif /* xmlcore_MEMORYPOOL_H */ diff --git a/src/crypto/common/NUMAMemoryPool.cpp b/src/crypto/common/NUMAMemoryPool.cpp index 72670024..8513eef9 100644 --- a/src/crypto/common/NUMAMemoryPool.cpp +++ b/src/crypto/common/NUMAMemoryPool.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2018-2019 tevador - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -34,7 +34,7 @@ #include -xmrig::NUMAMemoryPool::NUMAMemoryPool(size_t size, bool hugePages) : +xmlcore::NUMAMemoryPool::NUMAMemoryPool(size_t size, bool hugePages) : m_hugePages(hugePages), m_nodeSize(std::max(size / Cpu::info()->nodes(), 1)), m_size(size) @@ -42,7 +42,7 @@ xmrig::NUMAMemoryPool::NUMAMemoryPool(size_t size, bool hugePages) : } -xmrig::NUMAMemoryPool::~NUMAMemoryPool() +xmlcore::NUMAMemoryPool::~NUMAMemoryPool() { for (auto kv : m_map) { delete kv.second; @@ -50,7 +50,7 @@ xmrig::NUMAMemoryPool::~NUMAMemoryPool() } -bool xmrig::NUMAMemoryPool::isHugePages(uint32_t node) const +bool xmlcore::NUMAMemoryPool::isHugePages(uint32_t node) const { if (!m_size) { return false; @@ -60,7 +60,7 @@ bool xmrig::NUMAMemoryPool::isHugePages(uint32_t node) const } -uint8_t *xmrig::NUMAMemoryPool::get(size_t size, uint32_t node) +uint8_t *xmlcore::NUMAMemoryPool::get(size_t size, uint32_t node) { if (!m_size) { return nullptr; @@ -70,7 +70,7 @@ uint8_t *xmrig::NUMAMemoryPool::get(size_t size, uint32_t node) } -void xmrig::NUMAMemoryPool::release(uint32_t node) +void xmlcore::NUMAMemoryPool::release(uint32_t node) { const auto pool = get(node); if (pool) { @@ -79,13 +79,13 @@ void xmrig::NUMAMemoryPool::release(uint32_t node) } -xmrig::IMemoryPool *xmrig::NUMAMemoryPool::get(uint32_t node) const +xmlcore::IMemoryPool *xmlcore::NUMAMemoryPool::get(uint32_t node) const { return m_map.count(node) ? m_map.at(node) : nullptr; } -xmrig::IMemoryPool *xmrig::NUMAMemoryPool::getOrCreate(uint32_t node) const +xmlcore::IMemoryPool *xmlcore::NUMAMemoryPool::getOrCreate(uint32_t node) const { auto pool = get(node); if (!pool) { diff --git a/src/crypto/common/NUMAMemoryPool.h b/src/crypto/common/NUMAMemoryPool.h index 4e030494..f9890db2 100644 --- a/src/crypto/common/NUMAMemoryPool.h +++ b/src/crypto/common/NUMAMemoryPool.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2018-2019 tevador - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -24,8 +24,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NUMAMEMORYPOOL_H -#define XMRIG_NUMAMEMORYPOOL_H +#ifndef xmlcore_NUMAMEMORYPOOL_H +#define xmlcore_NUMAMEMORYPOOL_H #include "backend/common/interfaces/IMemoryPool.h" @@ -35,7 +35,7 @@ #include -namespace xmrig { +namespace xmlcore { class IMemoryPool; @@ -44,7 +44,7 @@ class IMemoryPool; class NUMAMemoryPool : public IMemoryPool { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(NUMAMemoryPool) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(NUMAMemoryPool) NUMAMemoryPool(size_t size, bool hugePages); ~NUMAMemoryPool() override; @@ -65,8 +65,8 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_NUMAMEMORYPOOL_H */ +#endif /* xmlcore_NUMAMEMORYPOOL_H */ diff --git a/src/crypto/common/Nonce.cpp b/src/crypto/common/Nonce.cpp index bd23e54c..da028025 100644 --- a/src/crypto/common/Nonce.cpp +++ b/src/crypto/common/Nonce.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -26,17 +26,17 @@ #include "crypto/common/Nonce.h" -namespace xmrig { +namespace xmlcore { std::atomic Nonce::m_paused = {true}; std::atomic Nonce::m_sequence[Nonce::MAX] = { {1}, {1}, {1} }; std::atomic Nonce::m_nonces[2] = { {0}, {0} }; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask) +bool xmlcore::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask) { mask &= 0x7FFFFFFFFFFFFFFFULL; if (reserveCount == 0 || mask < reserveCount - 1) { @@ -67,7 +67,7 @@ bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, u } -void xmrig::Nonce::stop() +void xmlcore::Nonce::stop() { pause(false); @@ -77,7 +77,7 @@ void xmrig::Nonce::stop() } -void xmrig::Nonce::touch() +void xmlcore::Nonce::touch() { for (auto &i : m_sequence) { i++; diff --git a/src/crypto/common/Nonce.h b/src/crypto/common/Nonce.h index 7c0e6d49..d337d926 100644 --- a/src/crypto/common/Nonce.h +++ b/src/crypto/common/Nonce.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NONCE_H -#define XMRIG_NONCE_H +#ifndef xmlcore_NONCE_H +#define xmlcore_NONCE_H #include -namespace xmrig { +namespace xmlcore { class Nonce @@ -62,7 +62,7 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_NONCE_H */ +#endif /* xmlcore_NONCE_H */ diff --git a/src/crypto/common/VirtualMemory.cpp b/src/crypto/common/VirtualMemory.cpp index e425750d..4545b5f9 100644 --- a/src/crypto/common/VirtualMemory.cpp +++ b/src/crypto/common/VirtualMemory.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include "crypto/common/portable/mm_malloc.h" -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC # include "crypto/common/NUMAMemoryPool.h" #endif @@ -34,7 +34,7 @@ #include -namespace xmrig { +namespace xmlcore { size_t VirtualMemory::m_hugePageSize = VirtualMemory::kDefaultHugePageSize; @@ -42,10 +42,10 @@ static IMemoryPool *pool = nullptr; static std::mutex mutex; -} // namespace xmrig +} // namespace xmlcore -xmrig::VirtualMemory::VirtualMemory(size_t size, bool hugePages, bool oneGbPages, bool usePool, uint32_t node, size_t alignSize) : +xmlcore::VirtualMemory::VirtualMemory(size_t size, bool hugePages, bool oneGbPages, bool usePool, uint32_t node, size_t alignSize) : m_size(alignToHugePageSize(size)), m_node(node), m_capacity(m_size) @@ -78,7 +78,7 @@ xmrig::VirtualMemory::VirtualMemory(size_t size, bool hugePages, bool oneGbPages } -xmrig::VirtualMemory::~VirtualMemory() +xmlcore::VirtualMemory::~VirtualMemory() { if (!m_scratchpad) { return; @@ -97,33 +97,33 @@ xmrig::VirtualMemory::~VirtualMemory() } -xmrig::HugePagesInfo xmrig::VirtualMemory::hugePages() const +xmlcore::HugePagesInfo xmlcore::VirtualMemory::hugePages() const { return { this }; } -#ifndef XMRIG_FEATURE_HWLOC -uint32_t xmrig::VirtualMemory::bindToNUMANode(int64_t) +#ifndef xmlcore_FEATURE_HWLOC +uint32_t xmlcore::VirtualMemory::bindToNUMANode(int64_t) { return 0; } #endif -void xmrig::VirtualMemory::destroy() +void xmlcore::VirtualMemory::destroy() { delete pool; } -void xmrig::VirtualMemory::init(size_t poolSize, size_t hugePageSize) +void xmlcore::VirtualMemory::init(size_t poolSize, size_t hugePageSize) { if (!pool) { osInit(hugePageSize); } -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC if (Cpu::info()->nodes() > 1) { pool = new NUMAMemoryPool(align(poolSize, Cpu::info()->nodes()), hugePageSize > 0); } else diff --git a/src/crypto/common/VirtualMemory.h b/src/crypto/common/VirtualMemory.h index 3056cbae..103f7109 100644 --- a/src/crypto/common/VirtualMemory.h +++ b/src/crypto/common/VirtualMemory.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_VIRTUALMEMORY_H -#define XMRIG_VIRTUALMEMORY_H +#ifndef xmlcore_VIRTUALMEMORY_H +#define xmlcore_VIRTUALMEMORY_H #include "base/tools/Object.h" @@ -31,13 +31,13 @@ #include -namespace xmrig { +namespace xmlcore { class VirtualMemory { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(VirtualMemory) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(VirtualMemory) constexpr static size_t kDefaultHugePageSize = 2U * 1024U * 1024U; constexpr static size_t kOneGiB = 1024U * 1024U * 1024U; @@ -99,8 +99,8 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_VIRTUALMEMORY_H */ +#endif /* xmlcore_VIRTUALMEMORY_H */ diff --git a/src/crypto/common/VirtualMemory_hwloc.cpp b/src/crypto/common/VirtualMemory_hwloc.cpp index e9e23aa9..bcb1cadf 100644 --- a/src/crypto/common/VirtualMemory_hwloc.cpp +++ b/src/crypto/common/VirtualMemory_hwloc.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 SChernykh * Copyright 2018-2019 tevador - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -34,7 +34,7 @@ #include -uint32_t xmrig::VirtualMemory::bindToNUMANode(int64_t affinity) +uint32_t xmlcore::VirtualMemory::bindToNUMANode(int64_t affinity) { if (affinity < 0 || Cpu::info()->nodes() < 2) { return 0; diff --git a/src/crypto/common/VirtualMemory_unix.cpp b/src/crypto/common/VirtualMemory_unix.cpp index edda231f..49557c80 100644 --- a/src/crypto/common/VirtualMemory_unix.cpp +++ b/src/crypto/common/VirtualMemory_unix.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,12 +28,12 @@ #include -#ifdef XMRIG_OS_APPLE +#ifdef xmlcore_OS_APPLE # include # include # include # include -# ifdef XMRIG_ARM +# ifdef xmlcore_ARM # define MEXTRA MAP_JIT # else # define MEXTRA 0 @@ -43,7 +43,7 @@ #endif -#ifdef XMRIG_OS_LINUX +#ifdef xmlcore_OS_LINUX # include "crypto/common/LinuxMemory.h" #endif @@ -58,14 +58,14 @@ #endif -#ifdef XMRIG_SECURE_JIT +#ifdef xmlcore_SECURE_JIT # define SECURE_PROT_EXEC 0 #else # define SECURE_PROT_EXEC PROT_EXEC #endif -#if defined(XMRIG_OS_LINUX) || (!defined(XMRIG_OS_APPLE) && !defined(__FreeBSD__)) +#if defined(xmlcore_OS_LINUX) || (!defined(xmlcore_OS_APPLE) && !defined(__FreeBSD__)) static inline int hugePagesFlag(size_t size) { return (static_cast(log2(size)) & MAP_HUGE_MASK) << MAP_HUGE_SHIFT; @@ -73,9 +73,9 @@ static inline int hugePagesFlag(size_t size) #endif -bool xmrig::VirtualMemory::isHugepagesAvailable() +bool xmlcore::VirtualMemory::isHugepagesAvailable() { -# if defined(XMRIG_OS_MACOS) && defined(XMRIG_ARM) +# if defined(xmlcore_OS_MACOS) && defined(xmlcore_ARM) return false; # else return true; @@ -83,9 +83,9 @@ bool xmrig::VirtualMemory::isHugepagesAvailable() } -bool xmrig::VirtualMemory::isOneGbPagesAvailable() +bool xmlcore::VirtualMemory::isOneGbPagesAvailable() { -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX return Cpu::info()->hasOneGbPages(); # else return false; @@ -93,9 +93,9 @@ bool xmrig::VirtualMemory::isOneGbPagesAvailable() } -bool xmrig::VirtualMemory::protectRW(void *p, size_t size) +bool xmlcore::VirtualMemory::protectRW(void *p, size_t size) { -# if defined(XMRIG_OS_APPLE) && defined(XMRIG_ARM) +# if defined(xmlcore_OS_APPLE) && defined(xmlcore_ARM) pthread_jit_write_protect_np(false); return true; # else @@ -104,15 +104,15 @@ bool xmrig::VirtualMemory::protectRW(void *p, size_t size) } -bool xmrig::VirtualMemory::protectRWX(void *p, size_t size) +bool xmlcore::VirtualMemory::protectRWX(void *p, size_t size) { return mprotect(p, size, PROT_READ | PROT_WRITE | PROT_EXEC) == 0; } -bool xmrig::VirtualMemory::protectRX(void *p, size_t size) +bool xmlcore::VirtualMemory::protectRX(void *p, size_t size) { -# if defined(XMRIG_OS_APPLE) && defined(XMRIG_ARM) +# if defined(xmlcore_OS_APPLE) && defined(xmlcore_ARM) pthread_jit_write_protect_np(true); flushInstructionCache(p, size); return true; @@ -122,11 +122,11 @@ bool xmrig::VirtualMemory::protectRX(void *p, size_t size) } -void *xmrig::VirtualMemory::allocateExecutableMemory(size_t size, bool hugePages) +void *xmlcore::VirtualMemory::allocateExecutableMemory(size_t size, bool hugePages) { -# if defined(XMRIG_OS_APPLE) +# if defined(xmlcore_OS_APPLE) void *mem = mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON | MEXTRA, -1, 0); -# ifdef XMRIG_ARM +# ifdef xmlcore_ARM pthread_jit_write_protect_np(false); # endif # elif defined(__FreeBSD__) @@ -158,9 +158,9 @@ void *xmrig::VirtualMemory::allocateExecutableMemory(size_t size, bool hugePages } -void *xmrig::VirtualMemory::allocateLargePagesMemory(size_t size) +void *xmlcore::VirtualMemory::allocateLargePagesMemory(size_t size) { -# if defined(XMRIG_OS_APPLE) +# if defined(xmlcore_OS_APPLE) void *mem = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, VM_FLAGS_SUPERPAGE_SIZE_2MB, 0); # elif defined(__FreeBSD__) void *mem = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_ALIGNED_SUPER | MAP_PREFAULT_READ, -1, 0); @@ -172,9 +172,9 @@ void *xmrig::VirtualMemory::allocateLargePagesMemory(size_t size) } -void *xmrig::VirtualMemory::allocateOneGbPagesMemory(size_t size) +void *xmlcore::VirtualMemory::allocateOneGbPagesMemory(size_t size) { -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX if (isOneGbPagesAvailable()) { void *mem = mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE | hugePagesFlag(kOneGiB), 0, 0); @@ -186,9 +186,9 @@ void *xmrig::VirtualMemory::allocateOneGbPagesMemory(size_t size) } -void xmrig::VirtualMemory::flushInstructionCache(void *p, size_t size) +void xmlcore::VirtualMemory::flushInstructionCache(void *p, size_t size) { -# if defined(XMRIG_OS_APPLE) +# if defined(xmlcore_OS_APPLE) sys_icache_invalidate(p, size); # elif defined (HAVE_BUILTIN_CLEAR_CACHE) || defined (__GNUC__) __builtin___clear_cache(reinterpret_cast(p), reinterpret_cast(p) + size); @@ -196,13 +196,13 @@ void xmrig::VirtualMemory::flushInstructionCache(void *p, size_t size) } -void xmrig::VirtualMemory::freeLargePagesMemory(void *p, size_t size) +void xmlcore::VirtualMemory::freeLargePagesMemory(void *p, size_t size) { munmap(p, size); } -void xmrig::VirtualMemory::osInit(size_t hugePageSize) +void xmlcore::VirtualMemory::osInit(size_t hugePageSize) { if (hugePageSize) { m_hugePageSize = hugePageSize; @@ -210,9 +210,9 @@ void xmrig::VirtualMemory::osInit(size_t hugePageSize) } -bool xmrig::VirtualMemory::allocateLargePagesMemory() +bool xmlcore::VirtualMemory::allocateLargePagesMemory() { -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX LinuxMemory::reserve(m_size, m_node, hugePageSize()); # endif @@ -233,9 +233,9 @@ bool xmrig::VirtualMemory::allocateLargePagesMemory() } -bool xmrig::VirtualMemory::allocateOneGbPagesMemory() +bool xmlcore::VirtualMemory::allocateOneGbPagesMemory() { -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX LinuxMemory::reserve(m_size, m_node, kOneGiB); # endif @@ -256,7 +256,7 @@ bool xmrig::VirtualMemory::allocateOneGbPagesMemory() } -void xmrig::VirtualMemory::freeLargePagesMemory() +void xmlcore::VirtualMemory::freeLargePagesMemory() { if (m_flags.test(FLAG_LOCK)) { munlock(m_scratchpad, m_size); diff --git a/src/crypto/common/VirtualMemory_win.cpp b/src/crypto/common/VirtualMemory_win.cpp index acf8119f..205e342e 100644 --- a/src/crypto/common/VirtualMemory_win.cpp +++ b/src/crypto/common/VirtualMemory_win.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,14 +29,14 @@ #include "crypto/common/portable/mm_malloc.h" -#ifdef XMRIG_SECURE_JIT +#ifdef xmlcore_SECURE_JIT # define SECURE_PAGE_EXECUTE_READWRITE PAGE_READWRITE #else # define SECURE_PAGE_EXECUTE_READWRITE PAGE_EXECUTE_READWRITE #endif -namespace xmrig { +namespace xmlcore { static bool hugepagesAvailable = false; @@ -147,22 +147,22 @@ static BOOL TrySetLockPagesPrivilege() { } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::VirtualMemory::isHugepagesAvailable() +bool xmlcore::VirtualMemory::isHugepagesAvailable() { return hugepagesAvailable; } -bool xmrig::VirtualMemory::isOneGbPagesAvailable() +bool xmlcore::VirtualMemory::isOneGbPagesAvailable() { return false; } -bool xmrig::VirtualMemory::protectRW(void *p, size_t size) +bool xmlcore::VirtualMemory::protectRW(void *p, size_t size) { DWORD oldProtect; @@ -170,7 +170,7 @@ bool xmrig::VirtualMemory::protectRW(void *p, size_t size) } -bool xmrig::VirtualMemory::protectRWX(void *p, size_t size) +bool xmlcore::VirtualMemory::protectRWX(void *p, size_t size) { DWORD oldProtect; @@ -178,7 +178,7 @@ bool xmrig::VirtualMemory::protectRWX(void *p, size_t size) } -bool xmrig::VirtualMemory::protectRX(void *p, size_t size) +bool xmlcore::VirtualMemory::protectRX(void *p, size_t size) { DWORD oldProtect; @@ -186,7 +186,7 @@ bool xmrig::VirtualMemory::protectRX(void *p, size_t size) } -void *xmrig::VirtualMemory::allocateExecutableMemory(size_t size, bool hugePages) +void *xmlcore::VirtualMemory::allocateExecutableMemory(size_t size, bool hugePages) { void* result = nullptr; @@ -202,7 +202,7 @@ void *xmrig::VirtualMemory::allocateExecutableMemory(size_t size, bool hugePages } -void *xmrig::VirtualMemory::allocateLargePagesMemory(size_t size) +void *xmlcore::VirtualMemory::allocateLargePagesMemory(size_t size) { const size_t min = GetLargePageMinimum(); void *mem = nullptr; @@ -215,25 +215,25 @@ void *xmrig::VirtualMemory::allocateLargePagesMemory(size_t size) } -void *xmrig::VirtualMemory::allocateOneGbPagesMemory(size_t) +void *xmlcore::VirtualMemory::allocateOneGbPagesMemory(size_t) { return nullptr; } -void xmrig::VirtualMemory::flushInstructionCache(void *p, size_t size) +void xmlcore::VirtualMemory::flushInstructionCache(void *p, size_t size) { ::FlushInstructionCache(GetCurrentProcess(), p, size); } -void xmrig::VirtualMemory::freeLargePagesMemory(void *p, size_t) +void xmlcore::VirtualMemory::freeLargePagesMemory(void *p, size_t) { VirtualFree(p, 0, MEM_RELEASE); } -void xmrig::VirtualMemory::osInit(size_t hugePageSize) +void xmlcore::VirtualMemory::osInit(size_t hugePageSize) { if (hugePageSize) { hugepagesAvailable = TrySetLockPagesPrivilege(); @@ -241,7 +241,7 @@ void xmrig::VirtualMemory::osInit(size_t hugePageSize) } -bool xmrig::VirtualMemory::allocateLargePagesMemory() +bool xmlcore::VirtualMemory::allocateLargePagesMemory() { m_scratchpad = static_cast(allocateLargePagesMemory(m_size)); if (m_scratchpad) { @@ -253,14 +253,14 @@ bool xmrig::VirtualMemory::allocateLargePagesMemory() return false; } -bool xmrig::VirtualMemory::allocateOneGbPagesMemory() +bool xmlcore::VirtualMemory::allocateOneGbPagesMemory() { m_scratchpad = nullptr; return false; } -void xmrig::VirtualMemory::freeLargePagesMemory() +void xmlcore::VirtualMemory::freeLargePagesMemory() { freeLargePagesMemory(m_scratchpad, m_size); } diff --git a/src/crypto/common/portable/mm_malloc.h b/src/crypto/common/portable/mm_malloc.h index 34ca7d48..a5124635 100644 --- a/src/crypto/common/portable/mm_malloc.h +++ b/src/crypto/common/portable/mm_malloc.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_MM_MALLOC_PORTABLE_H -#define XMRIG_MM_MALLOC_PORTABLE_H +#ifndef xmlcore_MM_MALLOC_PORTABLE_H +#define xmlcore_MM_MALLOC_PORTABLE_H -#if defined(XMRIG_ARM) && !defined(__clang__) +#if defined(xmlcore_ARM) && !defined(__clang__) #include @@ -68,4 +68,4 @@ static __inline__ void __attribute__((__always_inline__)) _mm_free(void *__p) #endif -#endif /* XMRIG_MM_MALLOC_PORTABLE_H */ +#endif /* xmlcore_MM_MALLOC_PORTABLE_H */ diff --git a/src/crypto/kawpow/KPCache.cpp b/src/crypto/kawpow/KPCache.cpp index 2a60a787..d8b6b9fa 100644 --- a/src/crypto/kawpow/KPCache.cpp +++ b/src/crypto/kawpow/KPCache.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include "crypto/common/VirtualMemory.h" -namespace xmrig { +namespace xmlcore { std::mutex KPCache::s_cacheMutex; @@ -176,4 +176,4 @@ void KPCache::calculate_fast_mod_data(uint32_t divisor, uint32_t& reciprocal, ui } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/crypto/kawpow/KPCache.h b/src/crypto/kawpow/KPCache.h index 6f998af3..abd4bf7a 100644 --- a/src/crypto/kawpow/KPCache.h +++ b/src/crypto/kawpow/KPCache.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_KP_CACHE_H -#define XMRIG_KP_CACHE_H +#ifndef xmlcore_KP_CACHE_H +#define xmlcore_KP_CACHE_H #include "base/tools/Object.h" @@ -25,7 +25,7 @@ #include -namespace xmrig +namespace xmlcore { @@ -39,7 +39,7 @@ public: static constexpr size_t l1_cache_num_items = l1_cache_size / sizeof(uint32_t); static constexpr uint32_t num_dataset_parents = 512; - XMRIG_DISABLE_COPY_MOVE(KPCache) + xmlcore_DISABLE_COPY_MOVE(KPCache) KPCache(); ~KPCache(); @@ -68,7 +68,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_KP_CACHE_H */ +#endif /* xmlcore_KP_CACHE_H */ diff --git a/src/crypto/kawpow/KPHash.cpp b/src/crypto/kawpow/KPHash.cpp index de0238b4..bd20ffae 100644 --- a/src/crypto/kawpow/KPHash.cpp +++ b/src/crypto/kawpow/KPHash.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -36,7 +36,7 @@ #include #endif -namespace xmrig { +namespace xmlcore { static const uint32_t ravencoin_kawpow[15] = { @@ -368,4 +368,4 @@ void KPHash::calculate(const KPCache& light_cache, uint32_t block_height, const } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/crypto/kawpow/KPHash.h b/src/crypto/kawpow/KPHash.h index 15bb1902..d8108b04 100644 --- a/src/crypto/kawpow/KPHash.h +++ b/src/crypto/kawpow/KPHash.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2020 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -24,14 +24,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_KP_HASH_H -#define XMRIG_KP_HASH_H +#ifndef xmlcore_KP_HASH_H +#define xmlcore_KP_HASH_H #include -namespace xmrig +namespace xmlcore { @@ -52,7 +52,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_KP_HASH_H */ +#endif /* xmlcore_KP_HASH_H */ diff --git a/src/crypto/randomx/aes_hash.cpp b/src/crypto/randomx/aes_hash.cpp index 2383dab4..a88bb137 100644 --- a/src/crypto/randomx/aes_hash.cpp +++ b/src/crypto/randomx/aes_hash.cpp @@ -382,7 +382,7 @@ void SelectSoftAESImpl(size_t threadsCount) double fast_speed = 0.0; for (size_t run = 0; run < 3; ++run) { for (size_t i = 0; i < impl.size(); ++i) { - const uint64_t t1 = xmrig::Chrono::highResolutionMSecs(); + const uint64_t t1 = xmlcore::Chrono::highResolutionMSecs(); std::vector count(threadsCount, 0); std::vector threads; for (size_t t = 0; t < threadsCount; ++t) { @@ -393,7 +393,7 @@ void SelectSoftAESImpl(size_t threadsCount) do { (*impl[i])(scratchpad.data(), scratchpad.size(), hash, state); ++count[t]; - } while (xmrig::Chrono::highResolutionMSecs() - t1 < test_length_ms); + } while (xmlcore::Chrono::highResolutionMSecs() - t1 < test_length_ms); }); } uint32_t total = 0; @@ -401,7 +401,7 @@ void SelectSoftAESImpl(size_t threadsCount) threads[t].join(); total += count[t]; } - const uint64_t t2 = xmrig::Chrono::highResolutionMSecs(); + const uint64_t t2 = xmlcore::Chrono::highResolutionMSecs(); const double speed = total * 1e3 / (t2 - t1); if (speed > fast_speed) { fast_idx = i; diff --git a/src/crypto/randomx/blake2/blake2b.c b/src/crypto/randomx/blake2/blake2b.c index 49329e46..a6caf89b 100644 --- a/src/crypto/randomx/blake2/blake2b.c +++ b/src/crypto/randomx/blake2/blake2b.c @@ -237,7 +237,7 @@ static void rx_blake2b_compress_integer(blake2b_state *S, const uint8_t *block) #undef ROUND } -#if defined(XMRIG_FEATURE_SSE4_1) +#if defined(xmlcore_FEATURE_SSE4_1) uint32_t rx_blake2b_use_sse41 = 0; void rx_blake2b_compress_sse41(blake2b_state* S, const uint8_t* block); diff --git a/src/crypto/randomx/blake2/blake2b_sse41.c b/src/crypto/randomx/blake2/blake2b_sse41.c index c8f88735..2d48962c 100644 --- a/src/crypto/randomx/blake2/blake2b_sse41.c +++ b/src/crypto/randomx/blake2/blake2b_sse41.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2018-2019, tevador * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , All rights reserved. diff --git a/src/crypto/randomx/dataset.cpp b/src/crypto/randomx/dataset.cpp index f03cd3c0..b1b92312 100644 --- a/src/crypto/randomx/dataset.cpp +++ b/src/crypto/randomx/dataset.cpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. @@ -104,7 +104,7 @@ namespace randomx { void initCacheCompile(randomx_cache* cache, const void* key, size_t keySize) { initCache(cache, key, keySize); -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT cache->jit->enableWriting(); # endif @@ -112,7 +112,7 @@ namespace randomx { cache->jit->generateDatasetInitCode(); cache->datasetInit = cache->jit->getDatasetInitFunc(); -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT cache->jit->enableExecution(); # endif } diff --git a/src/crypto/randomx/jit_compiler_a64.cpp b/src/crypto/randomx/jit_compiler_a64.cpp index c4f0f002..58d160b2 100644 --- a/src/crypto/randomx/jit_compiler_a64.cpp +++ b/src/crypto/randomx/jit_compiler_a64.cpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. @@ -120,7 +120,7 @@ void JitCompilerA64::generateProgram(Program& program, ProgramConfiguration& con if (!allocatedSize) { allocate(CodeSize); } -#ifdef XMRIG_SECURE_JIT +#ifdef xmlcore_SECURE_JIT else { enableWriting(); } @@ -170,8 +170,8 @@ void JitCompilerA64::generateProgram(Program& program, ProgramConfiguration& con codePos = ((uint8_t*)randomx_program_aarch64_update_spMix1) - ((uint8_t*)randomx_program_aarch64); emit32(ARMV8A::EOR | 10 | (IntRegMap[config.readReg0] << 5) | (IntRegMap[config.readReg1] << 16), code, codePos); -# ifndef XMRIG_OS_APPLE - xmrig::VirtualMemory::flushInstructionCache(reinterpret_cast(code + MainLoopBegin), codePos - MainLoopBegin); +# ifndef xmlcore_OS_APPLE + xmlcore::VirtualMemory::flushInstructionCache(reinterpret_cast(code + MainLoopBegin), codePos - MainLoopBegin); # endif } @@ -180,7 +180,7 @@ void JitCompilerA64::generateProgramLight(Program& program, ProgramConfiguration if (!allocatedSize) { allocate(CodeSize); } -#ifdef XMRIG_SECURE_JIT +#ifdef xmlcore_SECURE_JIT else { enableWriting(); } @@ -236,8 +236,8 @@ void JitCompilerA64::generateProgramLight(Program& program, ProgramConfiguration emit32(ARMV8A::ADD_IMM_LO | 2 | (2 << 5) | (imm_lo << 10), code, codePos); emit32(ARMV8A::ADD_IMM_HI | 2 | (2 << 5) | (imm_hi << 10), code, codePos); -# ifndef XMRIG_OS_APPLE - xmrig::VirtualMemory::flushInstructionCache(reinterpret_cast(code + MainLoopBegin), codePos - MainLoopBegin); +# ifndef xmlcore_OS_APPLE + xmlcore::VirtualMemory::flushInstructionCache(reinterpret_cast(code + MainLoopBegin), codePos - MainLoopBegin); # endif } @@ -247,7 +247,7 @@ void JitCompilerA64::generateSuperscalarHash(SuperscalarProgram(&programs)[N]) if (!allocatedSize) { allocate(CodeSize + CalcDatasetItemSize()); } -#ifdef XMRIG_SECURE_JIT +#ifdef xmlcore_SECURE_JIT else { enableWriting(); } @@ -363,8 +363,8 @@ void JitCompilerA64::generateSuperscalarHash(SuperscalarProgram(&programs)[N]) memcpy(code + codePos, p1, p2 - p1); codePos += p2 - p1; -# ifndef XMRIG_OS_APPLE - xmrig::VirtualMemory::flushInstructionCache(reinterpret_cast(code + CodeSize), codePos - MainLoopBegin); +# ifndef xmlcore_OS_APPLE + xmlcore::VirtualMemory::flushInstructionCache(reinterpret_cast(code + CodeSize), codePos - MainLoopBegin); # endif } @@ -372,7 +372,7 @@ template void JitCompilerA64::generateSuperscalarHash(SuperscalarProgram(&progra DatasetInitFunc* JitCompilerA64::getDatasetInitFunc() const { -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT enableExecution(); # endif @@ -386,12 +386,12 @@ size_t JitCompilerA64::getCodeSize() void JitCompilerA64::enableWriting() const { - xmrig::VirtualMemory::protectRW(code, allocatedSize); + xmlcore::VirtualMemory::protectRW(code, allocatedSize); } void JitCompilerA64::enableExecution() const { - xmrig::VirtualMemory::protectRX(code, allocatedSize); + xmlcore::VirtualMemory::protectRX(code, allocatedSize); } @@ -402,8 +402,8 @@ void JitCompilerA64::allocate(size_t size) memcpy(code, reinterpret_cast(randomx_program_aarch64), CodeSize); -# ifndef XMRIG_OS_APPLE - xmrig::VirtualMemory::flushInstructionCache(reinterpret_cast(code), CodeSize); +# ifndef xmlcore_OS_APPLE + xmlcore::VirtualMemory::flushInstructionCache(reinterpret_cast(code), CodeSize); # endif } diff --git a/src/crypto/randomx/jit_compiler_a64.hpp b/src/crypto/randomx/jit_compiler_a64.hpp index 32ff5166..a978f8ff 100644 --- a/src/crypto/randomx/jit_compiler_a64.hpp +++ b/src/crypto/randomx/jit_compiler_a64.hpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. @@ -60,7 +60,7 @@ namespace randomx { void generateDatasetInitCode() {} inline ProgramFunc *getProgramFunc() const { -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT enableExecution(); # endif diff --git a/src/crypto/randomx/jit_compiler_fallback.cpp b/src/crypto/randomx/jit_compiler_fallback.cpp index 369458a4..d2cdd116 100644 --- a/src/crypto/randomx/jit_compiler_fallback.cpp +++ b/src/crypto/randomx/jit_compiler_fallback.cpp @@ -1,7 +1,7 @@ /* * Copyright 2018-2019, tevador * Copyright 2018-2020, SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , All rights reserved. diff --git a/src/crypto/randomx/jit_compiler_fallback.hpp b/src/crypto/randomx/jit_compiler_fallback.hpp index cdf87cba..2af6445b 100644 --- a/src/crypto/randomx/jit_compiler_fallback.hpp +++ b/src/crypto/randomx/jit_compiler_fallback.hpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. diff --git a/src/crypto/randomx/jit_compiler_x86.cpp b/src/crypto/randomx/jit_compiler_x86.cpp index aec051ed..4b875d47 100644 --- a/src/crypto/randomx/jit_compiler_x86.cpp +++ b/src/crypto/randomx/jit_compiler_x86.cpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2021, SChernykh -Copyright (c) 2019-2021, XMRig , +Copyright (c) 2019-2021, xmlcore , All rights reserved. @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "crypto/randomx/virtual_memory.hpp" #include "crypto/rx/Profiler.h" -#ifdef XMRIG_FIX_RYZEN +#ifdef xmlcore_FIX_RYZEN # include "crypto/rx/RxFix.h" #endif @@ -198,13 +198,13 @@ namespace randomx { void JitCompilerX86::enableWriting() const { uint8_t* p1 = alignToPage(code, 4096); uint8_t* p2 = code + CodeSize; - xmrig::VirtualMemory::protectRW(p1, p2 - p1); + xmlcore::VirtualMemory::protectRW(p1, p2 - p1); } void JitCompilerX86::enableExecution() const { uint8_t* p1 = alignToPage(code, 4096); uint8_t* p2 = code + CodeSize; - xmrig::VirtualMemory::protectRX(p1, p2 - p1); + xmlcore::VirtualMemory::protectRX(p1, p2 - p1); } # ifdef _MSC_VER @@ -217,10 +217,10 @@ namespace randomx { constexpr size_t codeOffsetIncrement = 59 * 64; JitCompilerX86::JitCompilerX86(bool hugePagesEnable, bool optimizedInitDatasetEnable) { - BranchesWithin32B = xmrig::Cpu::info()->jccErratum(); + BranchesWithin32B = xmlcore::Cpu::info()->jccErratum(); - hasAVX = xmrig::Cpu::info()->hasAVX(); - hasAVX2 = xmrig::Cpu::info()->hasAVX2(); + hasAVX = xmlcore::Cpu::info()->hasAVX(); + hasAVX2 = xmlcore::Cpu::info()->hasAVX2(); // Disable by default initDatasetAVX2 = false; @@ -234,27 +234,27 @@ namespace randomx { initDatasetAVX2 = true; } else if (optimizedDatasetInit < 0) { - xmrig::ICpuInfo::Vendor vendor = xmrig::Cpu::info()->vendor(); - xmrig::ICpuInfo::Arch arch = xmrig::Cpu::info()->arch(); + xmlcore::ICpuInfo::Vendor vendor = xmlcore::Cpu::info()->vendor(); + xmlcore::ICpuInfo::Arch arch = xmlcore::Cpu::info()->arch(); - if (vendor == xmrig::ICpuInfo::VENDOR_INTEL) { + if (vendor == xmlcore::ICpuInfo::VENDOR_INTEL) { // AVX2 init is faster on Intel CPUs without HT - initDatasetAVX2 = (xmrig::Cpu::info()->cores() == xmrig::Cpu::info()->threads()); + initDatasetAVX2 = (xmlcore::Cpu::info()->cores() == xmlcore::Cpu::info()->threads()); } - else if (vendor == xmrig::ICpuInfo::VENDOR_AMD) { + else if (vendor == xmlcore::ICpuInfo::VENDOR_AMD) { switch (arch) { - case xmrig::ICpuInfo::ARCH_ZEN: - case xmrig::ICpuInfo::ARCH_ZEN_PLUS: + case xmlcore::ICpuInfo::ARCH_ZEN: + case xmlcore::ICpuInfo::ARCH_ZEN_PLUS: default: // AVX2 init is slower on Zen/Zen+ // Also disable it for other unknown architectures initDatasetAVX2 = false; break; - case xmrig::ICpuInfo::ARCH_ZEN2: + case xmlcore::ICpuInfo::ARCH_ZEN2: // AVX2 init is faster on Zen2 without SMT (mobile CPUs) - initDatasetAVX2 = (xmrig::Cpu::info()->cores() == xmrig::Cpu::info()->threads()); + initDatasetAVX2 = (xmlcore::Cpu::info()->cores() == xmlcore::Cpu::info()->threads()); break; - case xmrig::ICpuInfo::ARCH_ZEN3: + case xmlcore::ICpuInfo::ARCH_ZEN3: // AVX2 init is faster on Zen3 initDatasetAVX2 = true; break; @@ -268,11 +268,11 @@ namespace randomx { initDatasetAVX2 = false; } - hasXOP = xmrig::Cpu::info()->hasXOP(); + hasXOP = xmlcore::Cpu::info()->hasXOP(); allocatedSize = initDatasetAVX2 ? (CodeSize * 4) : (CodeSize * 2); allocatedCode = static_cast(allocExecutableMemory(allocatedSize, -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT false # else hugePagesJIT && hugePagesEnable @@ -293,7 +293,7 @@ namespace randomx { codePosFirst = prologueSize + (hasXOP ? loopLoadXOPSize : loopLoadSize); -# ifdef XMRIG_FIX_RYZEN +# ifdef xmlcore_FIX_RYZEN mainLoopBounds.first = code + prologueSize; mainLoopBounds.second = code + epilogueOffset; # endif @@ -314,7 +314,7 @@ namespace randomx { void JitCompilerX86::generateProgram(Program& prog, ProgramConfiguration& pcfg, uint32_t flags) { PROFILE_SCOPE(RandomX_JIT_compile); -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT enableWriting(); # endif @@ -424,8 +424,8 @@ namespace randomx { *p = (*p & 0xFF000000U) | 0x0077F8C5U; } -# ifdef XMRIG_FIX_RYZEN - xmrig::RxFix::setMainLoopBounds(mainLoopBounds); +# ifdef xmlcore_FIX_RYZEN + xmlcore::RxFix::setMainLoopBounds(mainLoopBounds); # endif memcpy(code + prologueSize - 48, &pcfg.eMask, sizeof(pcfg.eMask)); diff --git a/src/crypto/randomx/jit_compiler_x86.hpp b/src/crypto/randomx/jit_compiler_x86.hpp index 0d2b4321..1db09a16 100644 --- a/src/crypto/randomx/jit_compiler_x86.hpp +++ b/src/crypto/randomx/jit_compiler_x86.hpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. @@ -59,7 +59,7 @@ namespace randomx { void generateDatasetInitCode(); inline ProgramFunc *getProgramFunc() const { -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT enableExecution(); # endif @@ -67,7 +67,7 @@ namespace randomx { } inline DatasetInitFunc *getDatasetInitFunc() const { -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT enableExecution(); # endif @@ -91,7 +91,7 @@ namespace randomx { uint32_t vm_flags = 0; uint32_t prevCFROUND = 0; -# ifdef XMRIG_FIX_RYZEN +# ifdef xmlcore_FIX_RYZEN std::pair mainLoopBounds; # endif diff --git a/src/crypto/randomx/randomx.cpp b/src/crypto/randomx/randomx.cpp index 9986a33f..cf4a41a7 100644 --- a/src/crypto/randomx/randomx.cpp +++ b/src/crypto/randomx/randomx.cpp @@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if defined(_M_X64) || defined(__x86_64__) #include "crypto/randomx/jit_compiler_x86_static.hpp" -#elif defined(XMRIG_ARMv8) +#elif defined(xmlcore_ARMv8) #include "crypto/randomx/jit_compiler_a64_static.hpp" #endif @@ -190,7 +190,7 @@ RandomX_ConfigurationBase::RandomX_ConfigurationBase() # endif } -#ifdef XMRIG_ARMv8 +#ifdef xmlcore_ARMv8 static uint32_t Log2(size_t value) { return (value > 1) ? (Log2(value / 2) + 1) : 0; } #endif @@ -262,7 +262,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(p)); \ } while (0) -#elif defined(XMRIG_ARMv8) +#elif defined(xmlcore_ARMv8) Log2_ScratchpadL1 = Log2(ScratchpadL1_Size); Log2_ScratchpadL2 = Log2(ScratchpadL2_Size); @@ -295,7 +295,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx INST_HANDLE(IMUL_M, IMUL_R); #if defined(_M_X64) || defined(__x86_64__) - if (xmrig::Cpu::info()->hasBMI2()) { + if (xmlcore::Cpu::info()->hasBMI2()) { INST_HANDLE2(IMULH_R, IMULH_R_BMI2, IMUL_M); INST_HANDLE2(IMULH_M, IMULH_M_BMI2, IMULH_R); } @@ -326,7 +326,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx INST_HANDLE(FSQRT_R, FDIV_M); #if defined(_M_X64) || defined(__x86_64__) - if (xmrig::Cpu::info()->jccErratum()) { + if (xmlcore::Cpu::info()->jccErratum()) { INST_HANDLE2(CBRANCH, CBRANCH, FSQRT_R); } else { @@ -337,7 +337,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx #endif #if defined(_M_X64) || defined(__x86_64__) - if (xmrig::Cpu::info()->hasBMI2()) { + if (xmlcore::Cpu::info()->hasBMI2()) { INST_HANDLE2(CFROUND, CFROUND_BMI2, CBRANCH); } else @@ -464,7 +464,7 @@ extern "C" { } if (!vm_pool[node]) { - vm_pool[node] = (uint8_t*) xmrig::VirtualMemory::allocateLargePagesMemory(VM_POOL_SIZE); + vm_pool[node] = (uint8_t*) xmlcore::VirtualMemory::allocateLargePagesMemory(VM_POOL_SIZE); if (!vm_pool[node]) { vm_pool[node] = (uint8_t*) rx_aligned_alloc(VM_POOL_SIZE, 4096); } diff --git a/src/crypto/randomx/randomx.h b/src/crypto/randomx/randomx.h index f81df9db..45a0e0f4 100644 --- a/src/crypto/randomx/randomx.h +++ b/src/crypto/randomx/randomx.h @@ -136,7 +136,7 @@ struct RandomX_ConfigurationBase uint32_t ScratchpadL3Mask_Calculated; uint32_t ScratchpadL3Mask64_Calculated; -#if defined(XMRIG_ARMv8) +#if defined(xmlcore_ARMv8) uint32_t Log2_ScratchpadL1; uint32_t Log2_ScratchpadL2; uint32_t Log2_ScratchpadL3; diff --git a/src/crypto/randomx/virtual_memory.cpp b/src/crypto/randomx/virtual_memory.cpp index 1d3825ff..429c5898 100644 --- a/src/crypto/randomx/virtual_memory.cpp +++ b/src/crypto/randomx/virtual_memory.cpp @@ -34,7 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. void* allocExecutableMemory(std::size_t bytes, bool hugePages) { - void *mem = xmrig::VirtualMemory::allocateExecutableMemory(bytes, hugePages); + void *mem = xmlcore::VirtualMemory::allocateExecutableMemory(bytes, hugePages); if (mem == nullptr) { throw std::runtime_error("Failed to allocate executable memory"); } @@ -44,7 +44,7 @@ void* allocExecutableMemory(std::size_t bytes, bool hugePages) { void* allocLargePagesMemory(std::size_t bytes) { - void *mem = xmrig::VirtualMemory::allocateLargePagesMemory(bytes); + void *mem = xmlcore::VirtualMemory::allocateLargePagesMemory(bytes); if (mem == nullptr) { throw std::runtime_error("Failed to allocate large pages memory"); } @@ -54,5 +54,5 @@ void* allocLargePagesMemory(std::size_t bytes) { void freePagedMemory(void* ptr, std::size_t bytes) { - xmrig::VirtualMemory::freeLargePagesMemory(ptr, bytes); + xmlcore::VirtualMemory::freeLargePagesMemory(ptr, bytes); } diff --git a/src/crypto/randomx/vm_compiled.cpp b/src/crypto/randomx/vm_compiled.cpp index 842bfe65..a82ca80f 100644 --- a/src/crypto/randomx/vm_compiled.cpp +++ b/src/crypto/randomx/vm_compiled.cpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. @@ -58,7 +58,7 @@ namespace randomx { void CompiledVm::execute() { PROFILE_SCOPE(RandomX_JIT_execute); -# ifdef XMRIG_ARM +# ifdef xmlcore_ARM memcpy(reg.f, config.eMask, sizeof(config.eMask)); # endif compiler.getProgramFunc()(reg, mem, scratchpad, RandomX_CurrentConfig.ProgramIterations); diff --git a/src/crypto/randomx/vm_compiled_light.cpp b/src/crypto/randomx/vm_compiled_light.cpp index e7fdd7e9..83a038eb 100644 --- a/src/crypto/randomx/vm_compiled_light.cpp +++ b/src/crypto/randomx/vm_compiled_light.cpp @@ -1,7 +1,7 @@ /* Copyright (c) 2018-2020, tevador Copyright (c) 2019-2020, SChernykh -Copyright (c) 2019-2020, XMRig , +Copyright (c) 2019-2020, xmlcore , All rights reserved. @@ -39,7 +39,7 @@ namespace randomx { cachePtr = cache; mem.memory = cache->memory; -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT compiler.enableWriting(); # endif @@ -51,7 +51,7 @@ namespace randomx { VmBase::generateProgram(seed); randomx_vm::initialize(); -# ifdef XMRIG_SECURE_JIT +# ifdef xmlcore_SECURE_JIT compiler.enableWriting(); # endif diff --git a/src/crypto/rx/Profiler.cpp b/src/crypto/rx/Profiler.cpp index 9cfe72a0..203740a4 100644 --- a/src/crypto/rx/Profiler.cpp +++ b/src/crypto/rx/Profiler.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +29,7 @@ #include -#ifdef XMRIG_FEATURE_PROFILING +#ifdef xmlcore_FEATURE_PROFILING ProfileScopeData* ProfileScopeData::s_data[MAX_DATA_COUNT] = {}; @@ -93,11 +93,11 @@ NOINLINE void ProfileScopeData::Init() if (t2 - t1 > 1000000000) { s_tscSpeed = (count2 - count1) * 1e9 / (t2 - t1); - LOG_INFO("%s TSC speed = %.3f GHz", xmrig::Tags::profiler(), s_tscSpeed / 1e9); + LOG_INFO("%s TSC speed = %.3f GHz", xmlcore::Tags::profiler(), s_tscSpeed / 1e9); return; } } } -#endif /* XMRIG_FEATURE_PROFILING */ +#endif /* xmlcore_FEATURE_PROFILING */ diff --git a/src/crypto/rx/Profiler.h b/src/crypto/rx/Profiler.h index ca7d29db..56d2d84c 100644 --- a/src/crypto/rx/Profiler.h +++ b/src/crypto/rx/Profiler.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_PROFILER_H -#define XMRIG_PROFILER_H +#ifndef xmlcore_PROFILER_H +#define xmlcore_PROFILER_H #ifndef FORCE_INLINE @@ -33,7 +33,7 @@ #endif -#ifdef XMRIG_FEATURE_PROFILING +#ifdef xmlcore_FEATURE_PROFILING #include @@ -112,9 +112,9 @@ private: #define PROFILE_SCOPE(x) static thread_local ProfileScopeData x##_data{#x}; ProfileScope x(x##_data); -#else /* XMRIG_FEATURE_PROFILING */ +#else /* xmlcore_FEATURE_PROFILING */ #define PROFILE_SCOPE(x) -#endif /* XMRIG_FEATURE_PROFILING */ +#endif /* xmlcore_FEATURE_PROFILING */ #include "crypto/randomx/blake2/blake2.h" @@ -130,4 +130,4 @@ struct rx_blake2b_wrapper }; -#endif /* XMRIG_PROFILER_H */ +#endif /* xmlcore_PROFILER_H */ diff --git a/src/crypto/rx/Rx.cpp b/src/crypto/rx/Rx.cpp index 19523abe..580265e7 100644 --- a/src/crypto/rx/Rx.cpp +++ b/src/crypto/rx/Rx.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,13 +27,13 @@ #include "crypto/randomx/aes_hash.hpp" -#ifdef XMRIG_FEATURE_MSR +#ifdef xmlcore_FEATURE_MSR # include "crypto/rx/RxFix.h" # include "crypto/rx/RxMsr.h" #endif -namespace xmrig { +namespace xmlcore { class RxPrivate; @@ -52,24 +52,24 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::HugePagesInfo xmrig::Rx::hugePages() +xmlcore::HugePagesInfo xmlcore::Rx::hugePages() { return d_ptr->queue.hugePages(); } -xmrig::RxDataset *xmrig::Rx::dataset(const Job &job, uint32_t nodeId) +xmlcore::RxDataset *xmlcore::Rx::dataset(const Job &job, uint32_t nodeId) { return d_ptr->queue.dataset(job, nodeId); } -void xmrig::Rx::destroy() +void xmlcore::Rx::destroy() { -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR RxMsr::destroy(); # endif @@ -79,35 +79,35 @@ void xmrig::Rx::destroy() } -void xmrig::Rx::init(IRxListener *listener) +void xmlcore::Rx::init(IRxListener *listener) { d_ptr = new RxPrivate(listener); } template -bool xmrig::Rx::init(const T &seed, const RxConfig &config, const CpuConfig &cpu) +bool xmlcore::Rx::init(const T &seed, const RxConfig &config, const CpuConfig &cpu) { const Algorithm::Family f = seed.algorithm().family(); if ((f != Algorithm::RANDOM_X) -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY && (f != Algorithm::CN_HEAVY) # endif ) { -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR RxMsr::destroy(); # endif return true; } -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR if (!RxMsr::isInitialized()) { RxMsr::init(config, cpu.threads().get(seed.algorithm()).data()); } # endif -# ifdef XMRIG_ALGO_CN_HEAVY +# ifdef xmlcore_ALGO_CN_HEAVY if (f == Algorithm::CN_HEAVY) { return true; } @@ -118,7 +118,7 @@ bool xmrig::Rx::init(const T &seed, const RxConfig &config, const CpuConfig &cpu randomx_set_optimized_dataset_init(config.initDatasetAVX2()); if (!osInitialized) { -# ifdef XMRIG_FIX_RYZEN +# ifdef xmlcore_FIX_RYZEN RxFix::setupMainLoopExceptionFrame(); # endif @@ -139,21 +139,21 @@ bool xmrig::Rx::init(const T &seed, const RxConfig &config, const CpuConfig &cpu template -bool xmrig::Rx::isReady(const T &seed) +bool xmlcore::Rx::isReady(const T &seed) { return d_ptr->queue.isReady(seed); } -#ifdef XMRIG_FEATURE_MSR -bool xmrig::Rx::isMSR() +#ifdef xmlcore_FEATURE_MSR +bool xmlcore::Rx::isMSR() { return RxMsr::isEnabled(); } #endif -namespace xmrig { +namespace xmlcore { template bool Rx::init(const RxSeed &seed, const RxConfig &config, const CpuConfig &cpu); @@ -162,4 +162,4 @@ template bool Rx::init(const Job &seed, const RxConfig &config, const CpuConfig template bool Rx::isReady(const Job &seed); -} // namespace xmrig +} // namespace xmlcore diff --git a/src/crypto/rx/Rx.h b/src/crypto/rx/Rx.h index af804706..2727f946 100644 --- a/src/crypto/rx/Rx.h +++ b/src/crypto/rx/Rx.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_H -#define XMRIG_RX_H +#ifndef xmlcore_RX_H +#define xmlcore_RX_H #include @@ -29,7 +29,7 @@ #include "crypto/common/HugePagesInfo.h" -namespace xmrig +namespace xmlcore { @@ -52,7 +52,7 @@ public: template static bool init(const T &seed, const RxConfig &config, const CpuConfig &cpu); template static bool isReady(const T &seed); -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR static bool isMSR(); # else static constexpr bool isMSR() { return false; } @@ -60,7 +60,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_H */ +#endif /* xmlcore_RX_H */ diff --git a/src/crypto/rx/RxAlgo.cpp b/src/crypto/rx/RxAlgo.cpp index b7d2b083..cd079382 100644 --- a/src/crypto/rx/RxAlgo.cpp +++ b/src/crypto/rx/RxAlgo.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +22,7 @@ #include "crypto/rx/RxAlgo.h" -xmrig::Algorithm::Id xmrig::RxAlgo::apply(Algorithm::Id algorithm) +xmlcore::Algorithm::Id xmlcore::RxAlgo::apply(Algorithm::Id algorithm) { randomx_apply_config(*base(algorithm)); @@ -30,7 +30,7 @@ xmrig::Algorithm::Id xmrig::RxAlgo::apply(Algorithm::Id algorithm) } -const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm) +const RandomX_ConfigurationBase *xmlcore::RxAlgo::base(Algorithm::Id algorithm) { switch (algorithm) { case Algorithm::RX_WOW: @@ -53,25 +53,25 @@ const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm) } -uint32_t xmrig::RxAlgo::version(Algorithm::Id algorithm) +uint32_t xmlcore::RxAlgo::version(Algorithm::Id algorithm) { return algorithm == Algorithm::RX_WOW ? 103 : 104; } -uint32_t xmrig::RxAlgo::programCount(Algorithm::Id algorithm) +uint32_t xmlcore::RxAlgo::programCount(Algorithm::Id algorithm) { return base(algorithm)->ProgramCount; } -uint32_t xmrig::RxAlgo::programIterations(Algorithm::Id algorithm) +uint32_t xmlcore::RxAlgo::programIterations(Algorithm::Id algorithm) { return base(algorithm)->ProgramIterations; } -uint32_t xmrig::RxAlgo::programSize(Algorithm::Id algorithm) +uint32_t xmlcore::RxAlgo::programSize(Algorithm::Id algorithm) { return base(algorithm)->ProgramSize; } diff --git a/src/crypto/rx/RxAlgo.h b/src/crypto/rx/RxAlgo.h index 0cbbbd35..eef3be76 100644 --- a/src/crypto/rx/RxAlgo.h +++ b/src/crypto/rx/RxAlgo.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_ALGO_H -#define XMRIG_RX_ALGO_H +#ifndef xmlcore_RX_ALGO_H +#define xmlcore_RX_ALGO_H #include @@ -31,7 +31,7 @@ struct RandomX_ConfigurationBase; -namespace xmrig +namespace xmlcore { @@ -56,7 +56,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_ALGO_H */ +#endif /* xmlcore_RX_ALGO_H */ diff --git a/src/crypto/rx/RxBasicStorage.cpp b/src/crypto/rx/RxBasicStorage.cpp index eacb6295..405f3f44 100644 --- a/src/crypto/rx/RxBasicStorage.cpp +++ b/src/crypto/rx/RxBasicStorage.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,7 +29,7 @@ #include "crypto/rx/RxSeed.h" -namespace xmrig { +namespace xmlcore { constexpr size_t oneMiB = 1024 * 1024; @@ -38,7 +38,7 @@ constexpr size_t oneMiB = 1024 * 1024; class RxBasicStoragePrivate { public: - XMRIG_DISABLE_COPY_MOVE(RxBasicStoragePrivate) + xmlcore_DISABLE_COPY_MOVE(RxBasicStoragePrivate) inline RxBasicStoragePrivate() = default; inline ~RxBasicStoragePrivate() { deleteDataset(); } @@ -122,28 +122,28 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::RxBasicStorage::RxBasicStorage() : +xmlcore::RxBasicStorage::RxBasicStorage() : d_ptr(new RxBasicStoragePrivate()) { } -xmrig::RxBasicStorage::~RxBasicStorage() +xmlcore::RxBasicStorage::~RxBasicStorage() { delete d_ptr; } -bool xmrig::RxBasicStorage::isAllocated() const +bool xmlcore::RxBasicStorage::isAllocated() const { return d_ptr->dataset() && d_ptr->dataset()->cache() && d_ptr->dataset()->cache()->get(); } -xmrig::HugePagesInfo xmrig::RxBasicStorage::hugePages() const +xmlcore::HugePagesInfo xmlcore::RxBasicStorage::hugePages() const { if (!d_ptr->dataset()) { return {}; @@ -153,7 +153,7 @@ xmrig::HugePagesInfo xmrig::RxBasicStorage::hugePages() const } -xmrig::RxDataset *xmrig::RxBasicStorage::dataset(const Job &job, uint32_t) const +xmlcore::RxDataset *xmlcore::RxBasicStorage::dataset(const Job &job, uint32_t) const { if (!d_ptr->isReady(job)) { return nullptr; @@ -163,7 +163,7 @@ xmrig::RxDataset *xmrig::RxBasicStorage::dataset(const Job &job, uint32_t) const } -void xmrig::RxBasicStorage::init(const RxSeed &seed, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode mode, int priority) +void xmlcore::RxBasicStorage::init(const RxSeed &seed, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode mode, int priority) { d_ptr->setSeed(seed); diff --git a/src/crypto/rx/RxBasicStorage.h b/src/crypto/rx/RxBasicStorage.h index 463b479e..2abd22fc 100644 --- a/src/crypto/rx/RxBasicStorage.h +++ b/src/crypto/rx/RxBasicStorage.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_BASICSTORAGE_H -#define XMRIG_RX_BASICSTORAGE_H +#ifndef xmlcore_RX_BASICSTORAGE_H +#define xmlcore_RX_BASICSTORAGE_H #include "backend/common/interfaces/IRxStorage.h" -namespace xmrig +namespace xmlcore { @@ -34,7 +34,7 @@ class RxBasicStoragePrivate; class RxBasicStorage : public IRxStorage { public: - XMRIG_DISABLE_COPY_MOVE(RxBasicStorage); + xmlcore_DISABLE_COPY_MOVE(RxBasicStorage); RxBasicStorage(); ~RxBasicStorage() override; @@ -50,7 +50,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_BASICSTORAGE_H */ +#endif /* xmlcore_RX_BASICSTORAGE_H */ diff --git a/src/crypto/rx/RxCache.cpp b/src/crypto/rx/RxCache.cpp index b262c599..e0d08b59 100644 --- a/src/crypto/rx/RxCache.cpp +++ b/src/crypto/rx/RxCache.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -33,7 +33,7 @@ static_assert(RANDOMX_FLAG_JIT == 8, "RANDOMX_FLAG_JIT flag mismatch"); -xmrig::RxCache::RxCache(bool hugePages, uint32_t nodeId) +xmlcore::RxCache::RxCache(bool hugePages, uint32_t nodeId) { m_memory = new VirtualMemory(maxSize(), hugePages, false, false, nodeId); @@ -41,13 +41,13 @@ xmrig::RxCache::RxCache(bool hugePages, uint32_t nodeId) } -xmrig::RxCache::RxCache(uint8_t *memory) +xmlcore::RxCache::RxCache(uint8_t *memory) { create(memory); } -xmrig::RxCache::~RxCache() +xmlcore::RxCache::~RxCache() { randomx_release_cache(m_cache); @@ -55,7 +55,7 @@ xmrig::RxCache::~RxCache() } -bool xmrig::RxCache::init(const Buffer &seed) +bool xmlcore::RxCache::init(const Buffer &seed) { if (m_seed == seed) { return false; @@ -73,13 +73,13 @@ bool xmrig::RxCache::init(const Buffer &seed) } -xmrig::HugePagesInfo xmrig::RxCache::hugePages() const +xmlcore::HugePagesInfo xmlcore::RxCache::hugePages() const { return m_memory ? m_memory->hugePages() : HugePagesInfo(); } -void xmrig::RxCache::create(uint8_t *memory) +void xmlcore::RxCache::create(uint8_t *memory) { if (!memory) { return; diff --git a/src/crypto/rx/RxCache.h b/src/crypto/rx/RxCache.h index d1822b30..337af061 100644 --- a/src/crypto/rx/RxCache.h +++ b/src/crypto/rx/RxCache.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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 @@ -24,8 +24,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_CACHE_H -#define XMRIG_RX_CACHE_H +#ifndef xmlcore_RX_CACHE_H +#define xmlcore_RX_CACHE_H #include @@ -40,14 +40,14 @@ struct randomx_cache; -namespace xmrig +namespace xmlcore { class RxCache { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(RxCache) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(RxCache) RxCache(bool hugePages, uint32_t nodeId); RxCache(uint8_t *memory); @@ -73,7 +73,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_CACHE_H */ +#endif /* xmlcore_RX_CACHE_H */ diff --git a/src/crypto/rx/RxConfig.cpp b/src/crypto/rx/RxConfig.cpp index ae6215df..352e0da9 100644 --- a/src/crypto/rx/RxConfig.cpp +++ b/src/crypto/rx/RxConfig.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,7 +29,7 @@ #include "base/io/json/Json.h" -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC # include "backend/cpu/platform/HwlocCpuInfo.h" #endif @@ -44,7 +44,7 @@ #endif -namespace xmrig { +namespace xmlcore { const char *RxConfig::kInit = "init"; const char *RxConfig::kInitAVX2 = "init-avx2"; @@ -56,7 +56,7 @@ const char *RxConfig::kWrmsr = "wrmsr"; const char *RxConfig::kScratchpadPrefetchMode = "scratchpad_prefetch_mode"; const char *RxConfig::kCacheQoS = "cache_qos"; -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC const char *RxConfig::kNUMA = "numa"; #endif @@ -64,7 +64,7 @@ const char *RxConfig::kNUMA = "numa"; static const std::array modeNames = { "auto", "fast", "light" }; -#ifdef XMRIG_FEATURE_MSR +#ifdef xmlcore_FEATURE_MSR constexpr size_t kMsrArraySize = 5; static const std::array msrPresets = { @@ -84,7 +84,7 @@ static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MO } -bool xmrig::RxConfig::read(const rapidjson::Value &value) +bool xmlcore::RxConfig::read(const rapidjson::Value &value) { if (value.IsObject()) { m_threads = Json::getInt(value, kInit, m_threads); @@ -92,17 +92,17 @@ bool xmrig::RxConfig::read(const rapidjson::Value &value) m_mode = readMode(Json::getValue(value, kMode)); m_rdmsr = Json::getBool(value, kRdmsr, m_rdmsr); -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR readMSR(Json::getValue(value, kWrmsr)); # endif m_cacheQoS = Json::getBool(value, kCacheQoS, m_cacheQoS); -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX m_oneGbPages = Json::getBool(value, kOneGbPages, m_oneGbPages); # endif -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC if (m_mode == LightMode) { m_numa = false; @@ -136,7 +136,7 @@ bool xmrig::RxConfig::read(const rapidjson::Value &value) } -rapidjson::Value xmrig::RxConfig::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::RxConfig::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -148,7 +148,7 @@ rapidjson::Value xmrig::RxConfig::toJSON(rapidjson::Document &doc) const obj.AddMember(StringRef(kOneGbPages), m_oneGbPages, allocator); obj.AddMember(StringRef(kRdmsr), m_rdmsr, allocator); -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR if (!m_msrPreset.empty()) { Value wrmsr(kArrayType); wrmsr.Reserve(m_msrPreset.size(), allocator); @@ -168,7 +168,7 @@ rapidjson::Value xmrig::RxConfig::toJSON(rapidjson::Document &doc) const obj.AddMember(StringRef(kCacheQoS), m_cacheQoS, allocator); -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC if (!m_nodeset.empty()) { Value numa(kArrayType); @@ -189,8 +189,8 @@ rapidjson::Value xmrig::RxConfig::toJSON(rapidjson::Document &doc) const } -#ifdef XMRIG_FEATURE_HWLOC -std::vector xmrig::RxConfig::nodeset() const +#ifdef xmlcore_FEATURE_HWLOC +std::vector xmlcore::RxConfig::nodeset() const { if (!m_nodeset.empty()) { return m_nodeset; @@ -201,13 +201,13 @@ std::vector xmrig::RxConfig::nodeset() const #endif -const char *xmrig::RxConfig::modeName() const +const char *xmlcore::RxConfig::modeName() const { return modeNames[m_mode]; } -uint32_t xmrig::RxConfig::threads(uint32_t limit) const +uint32_t xmlcore::RxConfig::threads(uint32_t limit) const { if (m_threads > 0) { return m_threads; @@ -221,14 +221,14 @@ uint32_t xmrig::RxConfig::threads(uint32_t limit) const } -#ifdef XMRIG_FEATURE_MSR -const char *xmrig::RxConfig::msrPresetName() const +#ifdef xmlcore_FEATURE_MSR +const char *xmlcore::RxConfig::msrPresetName() const { return modNames[msrMod()]; } -const xmrig::MsrItems &xmrig::RxConfig::msrPreset() const +const xmlcore::MsrItems &xmlcore::RxConfig::msrPreset() const { const auto mod = msrMod(); @@ -240,7 +240,7 @@ const xmrig::MsrItems &xmrig::RxConfig::msrPreset() const } -uint32_t xmrig::RxConfig::msrMod() const +uint32_t xmlcore::RxConfig::msrMod() const { if (!wrmsr()) { return ICpuInfo::MSR_MOD_NONE; @@ -254,7 +254,7 @@ uint32_t xmrig::RxConfig::msrMod() const } -void xmrig::RxConfig::readMSR(const rapidjson::Value &value) +void xmlcore::RxConfig::readMSR(const rapidjson::Value &value) { if (value.IsBool()) { m_wrmsr = value.GetBool(); @@ -286,7 +286,7 @@ void xmrig::RxConfig::readMSR(const rapidjson::Value &value) #endif -xmrig::RxConfig::Mode xmrig::RxConfig::readMode(const rapidjson::Value &value) const +xmlcore::RxConfig::Mode xmlcore::RxConfig::readMode(const rapidjson::Value &value) const { if (value.IsUint()) { return static_cast(std::min(value.GetUint(), ModeMax - 1)); diff --git a/src/crypto/rx/RxConfig.h b/src/crypto/rx/RxConfig.h index ea1bf685..cdfe4943 100644 --- a/src/crypto/rx/RxConfig.h +++ b/src/crypto/rx/RxConfig.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,14 +22,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RXCONFIG_H -#define XMRIG_RXCONFIG_H +#ifndef xmlcore_RXCONFIG_H +#define xmlcore_RXCONFIG_H #include "3rdparty/rapidjson/fwd.h" -#ifdef XMRIG_FEATURE_MSR +#ifdef xmlcore_FEATURE_MSR # include "hw/msr/MsrItem.h" #endif @@ -37,7 +37,7 @@ #include -namespace xmrig { +namespace xmlcore { class RxConfig @@ -68,14 +68,14 @@ public: static const char *kScratchpadPrefetchMode; static const char *kWrmsr; -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC static const char *kNUMA; # endif bool read(const rapidjson::Value &value); rapidjson::Value toJSON(rapidjson::Document &doc) const; -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC std::vector nodeset() const; # else inline std::vector nodeset() const { return std::vector(); } @@ -93,13 +93,13 @@ public: inline ScratchpadPrefetchMode scratchpadPrefetchMode() const { return m_scratchpadPrefetchMode; } -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR const char *msrPresetName() const; const MsrItems &msrPreset() const; # endif private: -# ifdef XMRIG_FEATURE_MSR +# ifdef xmlcore_FEATURE_MSR uint32_t msrMod() const; void readMSR(const rapidjson::Value &value); @@ -121,7 +121,7 @@ private: ScratchpadPrefetchMode m_scratchpadPrefetchMode = ScratchpadPrefetchT0; -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC bool m_numa = true; std::vector m_nodeset; # endif @@ -129,7 +129,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RXCONFIG_H */ +#endif /* xmlcore_RXCONFIG_H */ diff --git a/src/crypto/rx/RxDataset.cpp b/src/crypto/rx/RxDataset.cpp index b47285a3..ab547c89 100644 --- a/src/crypto/rx/RxDataset.cpp +++ b/src/crypto/rx/RxDataset.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -33,7 +33,7 @@ #include -namespace xmrig { +namespace xmlcore { static void init_dataset_wrapper(randomx_dataset *dataset, randomx_cache *cache, unsigned long startItem, unsigned long itemCount, int priority) @@ -50,10 +50,10 @@ static void init_dataset_wrapper(randomx_dataset *dataset, randomx_cache *cache, } -} // namespace xmrig +} // namespace xmlcore -xmrig::RxDataset::RxDataset(bool hugePages, bool oneGbPages, bool cache, RxConfig::Mode mode, uint32_t node) : +xmlcore::RxDataset::RxDataset(bool hugePages, bool oneGbPages, bool cache, RxConfig::Mode mode, uint32_t node) : m_mode(mode), m_node(node) { @@ -71,14 +71,14 @@ xmrig::RxDataset::RxDataset(bool hugePages, bool oneGbPages, bool cache, RxConfi } -xmrig::RxDataset::RxDataset(RxCache *cache) : +xmlcore::RxDataset::RxDataset(RxCache *cache) : m_node(0), m_cache(cache) { } -xmrig::RxDataset::~RxDataset() +xmlcore::RxDataset::~RxDataset() { randomx_release_dataset(m_dataset); @@ -87,7 +87,7 @@ xmrig::RxDataset::~RxDataset() } -bool xmrig::RxDataset::init(const Buffer &seed, uint32_t numThreads, int priority) +bool xmlcore::RxDataset::init(const Buffer &seed, uint32_t numThreads, int priority) { if (!m_cache || !m_cache->get()) { return false; @@ -123,19 +123,19 @@ bool xmrig::RxDataset::init(const Buffer &seed, uint32_t numThreads, int priorit } -bool xmrig::RxDataset::isHugePages() const +bool xmlcore::RxDataset::isHugePages() const { return m_memory && m_memory->isHugePages(); } -bool xmrig::RxDataset::isOneGbPages() const +bool xmlcore::RxDataset::isOneGbPages() const { return m_memory && m_memory->isOneGbPages(); } -xmrig::HugePagesInfo xmrig::RxDataset::hugePages(bool cache) const +xmlcore::HugePagesInfo xmlcore::RxDataset::hugePages(bool cache) const { auto pages = m_memory ? m_memory->hugePages() : HugePagesInfo(); @@ -147,7 +147,7 @@ xmrig::HugePagesInfo xmrig::RxDataset::hugePages(bool cache) const } -size_t xmrig::RxDataset::size(bool cache) const +size_t xmlcore::RxDataset::size(bool cache) const { size_t size = 0; @@ -163,7 +163,7 @@ size_t xmrig::RxDataset::size(bool cache) const } -uint8_t *xmrig::RxDataset::tryAllocateScrathpad() +uint8_t *xmlcore::RxDataset::tryAllocateScrathpad() { auto p = reinterpret_cast(raw()); if (!p) { @@ -179,13 +179,13 @@ uint8_t *xmrig::RxDataset::tryAllocateScrathpad() } -void *xmrig::RxDataset::raw() const +void *xmlcore::RxDataset::raw() const { return m_dataset ? randomx_get_dataset_memory(m_dataset) : nullptr; } -void xmrig::RxDataset::setRaw(const void *raw) +void xmlcore::RxDataset::setRaw(const void *raw) { if (!m_dataset) { return; @@ -196,7 +196,7 @@ void xmrig::RxDataset::setRaw(const void *raw) } -void xmrig::RxDataset::allocate(bool hugePages, bool oneGbPages) +void xmlcore::RxDataset::allocate(bool hugePages, bool oneGbPages) { if (m_mode == RxConfig::LightMode) { LOG_ERR(CLEAR "%s" RED_BOLD_S "fast RandomX mode disabled by config", Tags::randomx()); @@ -219,7 +219,7 @@ void xmrig::RxDataset::allocate(bool hugePages, bool oneGbPages) m_dataset = randomx_create_dataset(m_memory->raw()); -# ifdef XMRIG_OS_LINUX +# ifdef xmlcore_OS_LINUX if (oneGbPages && !isOneGbPages()) { LOG_ERR(CLEAR "%s" RED_BOLD_S "failed to allocate RandomX dataset using 1GB pages", Tags::randomx()); } diff --git a/src/crypto/rx/RxDataset.h b/src/crypto/rx/RxDataset.h index 1621cae1..53bb6fb0 100644 --- a/src/crypto/rx/RxDataset.h +++ b/src/crypto/rx/RxDataset.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_DATASET_H -#define XMRIG_RX_DATASET_H +#ifndef xmlcore_RX_DATASET_H +#define xmlcore_RX_DATASET_H #include "base/tools/Buffer.h" @@ -33,7 +33,7 @@ struct randomx_dataset; -namespace xmrig +namespace xmlcore { @@ -44,7 +44,7 @@ class VirtualMemory; class RxDataset { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(RxDataset) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(RxDataset) RxDataset(bool hugePages, bool oneGbPages, bool cache, RxConfig::Mode mode, uint32_t node); RxDataset(RxCache *cache); @@ -78,7 +78,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_DATASET_H */ +#endif /* xmlcore_RX_DATASET_H */ diff --git a/src/crypto/rx/RxFix.h b/src/crypto/rx/RxFix.h index 66d2e7d9..041ee04c 100644 --- a/src/crypto/rx/RxFix.h +++ b/src/crypto/rx/RxFix.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RXFIX_H -#define XMRIG_RXFIX_H +#ifndef xmlcore_RXFIX_H +#define xmlcore_RXFIX_H #include -namespace xmrig +namespace xmlcore { @@ -36,7 +36,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RXFIX_H */ +#endif /* xmlcore_RXFIX_H */ diff --git a/src/crypto/rx/RxFix_linux.cpp b/src/crypto/rx/RxFix_linux.cpp index 1a3743c7..93a8e9ef 100644 --- a/src/crypto/rx/RxFix_linux.cpp +++ b/src/crypto/rx/RxFix_linux.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +27,7 @@ #include -namespace xmrig { +namespace xmlcore { static thread_local std::pair mainLoopBounds = { nullptr, nullptr }; @@ -51,17 +51,17 @@ static void MainLoopHandler(int sig, siginfo_t *info, void *ucontext) } -} // namespace xmrig +} // namespace xmlcore -void xmrig::RxFix::setMainLoopBounds(const std::pair &bounds) +void xmlcore::RxFix::setMainLoopBounds(const std::pair &bounds) { mainLoopBounds = bounds; } -void xmrig::RxFix::setupMainLoopExceptionFrame() +void xmlcore::RxFix::setupMainLoopExceptionFrame() { struct sigaction act = {}; act.sa_sigaction = MainLoopHandler; diff --git a/src/crypto/rx/RxFix_win.cpp b/src/crypto/rx/RxFix_win.cpp index 75538be4..a3d184c9 100644 --- a/src/crypto/rx/RxFix_win.cpp +++ b/src/crypto/rx/RxFix_win.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { static thread_local std::pair mainLoopBounds = { nullptr, nullptr }; @@ -59,16 +59,16 @@ static LONG WINAPI MainLoopHandler(_EXCEPTION_POINTERS *ExceptionInfo) } -} // namespace xmrig +} // namespace xmlcore -void xmrig::RxFix::setMainLoopBounds(const std::pair &bounds) +void xmlcore::RxFix::setMainLoopBounds(const std::pair &bounds) { mainLoopBounds = bounds; } -void xmrig::RxFix::setupMainLoopExceptionFrame() +void xmlcore::RxFix::setupMainLoopExceptionFrame() { AddVectoredExceptionHandler(1, MainLoopHandler); } diff --git a/src/crypto/rx/RxMsr.cpp b/src/crypto/rx/RxMsr.cpp index 171579e9..8b046afd 100644 --- a/src/crypto/rx/RxMsr.cpp +++ b/src/crypto/rx/RxMsr.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -31,7 +31,7 @@ #include -namespace xmrig { +namespace xmlcore { bool RxMsr::m_cacheQoS = false; @@ -42,7 +42,7 @@ bool RxMsr::m_initialized = false; static MsrItems items; -#ifdef XMRIG_OS_WIN +#ifdef xmlcore_OS_WIN static constexpr inline int32_t get_cpu(int32_t) { return -1; } #else static constexpr inline int32_t get_cpu(int32_t cpu) { return cpu; } @@ -125,10 +125,10 @@ static bool wrmsr(const MsrItems &preset, const std::vector &threads, } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::RxMsr::init(const RxConfig &config, const std::vector &threads) +bool xmlcore::RxMsr::init(const RxConfig &config, const std::vector &threads) { if (isInitialized()) { return isEnabled(); @@ -162,7 +162,7 @@ bool xmrig::RxMsr::init(const RxConfig &config, const std::vector &th } -void xmrig::RxMsr::destroy() +void xmlcore::RxMsr::destroy() { if (!isInitialized()) { return; diff --git a/src/crypto/rx/RxMsr.h b/src/crypto/rx/RxMsr.h index 8e1bf954..4e4fb2f5 100644 --- a/src/crypto/rx/RxMsr.h +++ b/src/crypto/rx/RxMsr.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RXMSR_H -#define XMRIG_RXMSR_H +#ifndef xmlcore_RXMSR_H +#define xmlcore_RXMSR_H #include -namespace xmrig +namespace xmlcore { @@ -48,7 +48,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RXMSR_H */ +#endif /* xmlcore_RXMSR_H */ diff --git a/src/crypto/rx/RxNUMAStorage.cpp b/src/crypto/rx/RxNUMAStorage.cpp index 6bd5627f..6bf14cdb 100644 --- a/src/crypto/rx/RxNUMAStorage.cpp +++ b/src/crypto/rx/RxNUMAStorage.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -37,7 +37,7 @@ #include -namespace xmrig { +namespace xmlcore { constexpr size_t oneMiB = 1024 * 1024; @@ -77,7 +77,7 @@ static inline void printDatasetReady(uint32_t nodeId, uint64_t ts) class RxNUMAStoragePrivate { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(RxNUMAStoragePrivate) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(RxNUMAStoragePrivate) inline RxNUMAStoragePrivate(const std::vector &nodeset) : m_nodeset(nodeset) @@ -332,28 +332,28 @@ private: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::RxNUMAStorage::RxNUMAStorage(const std::vector &nodeset) : +xmlcore::RxNUMAStorage::RxNUMAStorage(const std::vector &nodeset) : d_ptr(new RxNUMAStoragePrivate(nodeset)) { } -xmrig::RxNUMAStorage::~RxNUMAStorage() +xmlcore::RxNUMAStorage::~RxNUMAStorage() { delete d_ptr; } -bool xmrig::RxNUMAStorage::isAllocated() const +bool xmlcore::RxNUMAStorage::isAllocated() const { return d_ptr->isAllocated(); } -xmrig::HugePagesInfo xmrig::RxNUMAStorage::hugePages() const +xmlcore::HugePagesInfo xmlcore::RxNUMAStorage::hugePages() const { if (!d_ptr->isAllocated()) { return {}; @@ -363,7 +363,7 @@ xmrig::HugePagesInfo xmrig::RxNUMAStorage::hugePages() const } -xmrig::RxDataset *xmrig::RxNUMAStorage::dataset(const Job &job, uint32_t nodeId) const +xmlcore::RxDataset *xmlcore::RxNUMAStorage::dataset(const Job &job, uint32_t nodeId) const { if (!d_ptr->isReady(job)) { return nullptr; @@ -373,7 +373,7 @@ xmrig::RxDataset *xmrig::RxNUMAStorage::dataset(const Job &job, uint32_t nodeId) } -void xmrig::RxNUMAStorage::init(const RxSeed &seed, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode, int priority) +void xmlcore::RxNUMAStorage::init(const RxSeed &seed, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode, int priority) { d_ptr->setSeed(seed); diff --git a/src/crypto/rx/RxNUMAStorage.h b/src/crypto/rx/RxNUMAStorage.h index 29ec5fb0..fc226a58 100644 --- a/src/crypto/rx/RxNUMAStorage.h +++ b/src/crypto/rx/RxNUMAStorage.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_NUMASTORAGE_H -#define XMRIG_RX_NUMASTORAGE_H +#ifndef xmlcore_RX_NUMASTORAGE_H +#define xmlcore_RX_NUMASTORAGE_H #include "backend/common/interfaces/IRxStorage.h" @@ -27,7 +27,7 @@ #include -namespace xmrig +namespace xmlcore { @@ -37,7 +37,7 @@ class RxNUMAStoragePrivate; class RxNUMAStorage : public IRxStorage { public: - XMRIG_DISABLE_COPY_MOVE(RxNUMAStorage); + xmlcore_DISABLE_COPY_MOVE(RxNUMAStorage); RxNUMAStorage(const std::vector &nodeset); ~RxNUMAStorage() override; @@ -53,7 +53,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_NUMASTORAGE_H */ +#endif /* xmlcore_RX_NUMASTORAGE_H */ diff --git a/src/crypto/rx/RxQueue.cpp b/src/crypto/rx/RxQueue.cpp index 0c55434d..7debdc96 100644 --- a/src/crypto/rx/RxQueue.cpp +++ b/src/crypto/rx/RxQueue.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -34,12 +34,12 @@ #include "crypto/rx/RxBasicStorage.h" -#ifdef XMRIG_FEATURE_HWLOC +#ifdef xmlcore_FEATURE_HWLOC # include "crypto/rx/RxNUMAStorage.h" #endif -xmrig::RxQueue::RxQueue(IRxListener *listener) : +xmlcore::RxQueue::RxQueue(IRxListener *listener) : m_listener(listener) { m_async = std::make_shared(this); @@ -47,7 +47,7 @@ xmrig::RxQueue::RxQueue(IRxListener *listener) : } -xmrig::RxQueue::~RxQueue() +xmlcore::RxQueue::~RxQueue() { std::unique_lock lock(m_mutex); m_state = STATE_SHUTDOWN; @@ -61,7 +61,7 @@ xmrig::RxQueue::~RxQueue() } -xmrig::RxDataset *xmrig::RxQueue::dataset(const Job &job, uint32_t nodeId) +xmlcore::RxDataset *xmlcore::RxQueue::dataset(const Job &job, uint32_t nodeId) { std::lock_guard lock(m_mutex); @@ -73,7 +73,7 @@ xmrig::RxDataset *xmrig::RxQueue::dataset(const Job &job, uint32_t nodeId) } -xmrig::HugePagesInfo xmrig::RxQueue::hugePages() +xmlcore::HugePagesInfo xmlcore::RxQueue::hugePages() { std::lock_guard lock(m_mutex); @@ -82,7 +82,7 @@ xmrig::HugePagesInfo xmrig::RxQueue::hugePages() template -bool xmrig::RxQueue::isReady(const T &seed) +bool xmlcore::RxQueue::isReady(const T &seed) { std::lock_guard lock(m_mutex); @@ -90,12 +90,12 @@ bool xmrig::RxQueue::isReady(const T &seed) } -void xmrig::RxQueue::enqueue(const RxSeed &seed, const std::vector &nodeset, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode mode, int priority) +void xmlcore::RxQueue::enqueue(const RxSeed &seed, const std::vector &nodeset, uint32_t threads, bool hugePages, bool oneGbPages, RxConfig::Mode mode, int priority) { std::unique_lock lock(m_mutex); if (!m_storage) { -# ifdef XMRIG_FEATURE_HWLOC +# ifdef xmlcore_FEATURE_HWLOC if (!nodeset.empty()) { m_storage = new RxNUMAStorage(nodeset); } @@ -121,13 +121,13 @@ void xmrig::RxQueue::enqueue(const RxSeed &seed, const std::vector &no template -bool xmrig::RxQueue::isReadyUnsafe(const T &seed) const +bool xmlcore::RxQueue::isReadyUnsafe(const T &seed) const { return m_storage != nullptr && m_storage->isAllocated() && m_state == STATE_IDLE && m_seed == seed; } -void xmrig::RxQueue::backgroundInit() +void xmlcore::RxQueue::backgroundInit() { while (m_state != STATE_SHUTDOWN) { std::unique_lock lock(m_mutex); @@ -167,7 +167,7 @@ void xmrig::RxQueue::backgroundInit() } -void xmrig::RxQueue::onReady() +void xmlcore::RxQueue::onReady() { std::unique_lock lock(m_mutex); const bool ready = m_listener && m_state == STATE_IDLE; @@ -179,11 +179,11 @@ void xmrig::RxQueue::onReady() } -namespace xmrig { +namespace xmlcore { template bool RxQueue::isReady(const Job &); template bool RxQueue::isReady(const RxSeed &); -} // namespace xmrig +} // namespace xmlcore diff --git a/src/crypto/rx/RxQueue.h b/src/crypto/rx/RxQueue.h index 7b462cf4..6eddf3cf 100644 --- a/src/crypto/rx/RxQueue.h +++ b/src/crypto/rx/RxQueue.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,8 +24,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_QUEUE_H -#define XMRIG_RX_QUEUE_H +#ifndef xmlcore_RX_QUEUE_H +#define xmlcore_RX_QUEUE_H #include "base/kernel/interfaces/IAsyncListener.h" @@ -40,7 +40,7 @@ #include -namespace xmrig +namespace xmlcore { @@ -75,7 +75,7 @@ public: class RxQueue : public IAsyncListener { public: - XMRIG_DISABLE_COPY_MOVE(RxQueue); + xmlcore_DISABLE_COPY_MOVE(RxQueue); RxQueue(IRxListener *listener); ~RxQueue() override; @@ -111,7 +111,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_QUEUE_H */ +#endif /* xmlcore_RX_QUEUE_H */ diff --git a/src/crypto/rx/RxSeed.h b/src/crypto/rx/RxSeed.h index f30fbfb7..19d20176 100644 --- a/src/crypto/rx/RxSeed.h +++ b/src/crypto/rx/RxSeed.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -8,7 +8,7 @@ * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -24,15 +24,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_SEED_H -#define XMRIG_RX_SEED_H +#ifndef xmlcore_RX_SEED_H +#define xmlcore_RX_SEED_H #include "base/net/stratum/Job.h" #include "base/tools/Buffer.h" -namespace xmrig +namespace xmlcore { @@ -63,7 +63,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_CACHE_H */ +#endif /* xmlcore_RX_CACHE_H */ diff --git a/src/crypto/rx/RxVm.cpp b/src/crypto/rx/RxVm.cpp index f4b37375..e474b32f 100644 --- a/src/crypto/rx/RxVm.cpp +++ b/src/crypto/rx/RxVm.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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,12 +25,12 @@ #include "crypto/rx/RxVm.h" -#if defined(XMRIG_FEATURE_SSE4_1) +#if defined(xmlcore_FEATURE_SSE4_1) extern "C" uint32_t rx_blake2b_use_sse41; #endif -randomx_vm *xmrig::RxVm::create(RxDataset *dataset, uint8_t *scratchpad, bool softAes, const Assembly &assembly, uint32_t node) +randomx_vm *xmlcore::RxVm::create(RxDataset *dataset, uint8_t *scratchpad, bool softAes, const Assembly &assembly, uint32_t node) { int flags = 0; @@ -51,7 +51,7 @@ randomx_vm *xmrig::RxVm::create(RxDataset *dataset, uint8_t *scratchpad, bool so flags |= RANDOMX_FLAG_AMD; } -# if defined(XMRIG_FEATURE_SSE4_1) +# if defined(xmlcore_FEATURE_SSE4_1) rx_blake2b_use_sse41 = Cpu::info()->has(ICpuInfo::FLAG_SSE41) ? 1 : 0; # endif @@ -59,7 +59,7 @@ randomx_vm *xmrig::RxVm::create(RxDataset *dataset, uint8_t *scratchpad, bool so } -void xmrig::RxVm::destroy(randomx_vm* vm) +void xmlcore::RxVm::destroy(randomx_vm* vm) { if (vm) { randomx_destroy_vm(vm); diff --git a/src/crypto/rx/RxVm.h b/src/crypto/rx/RxVm.h index 424da209..52ed7d65 100644 --- a/src/crypto/rx/RxVm.h +++ b/src/crypto/rx/RxVm.h @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2019 tevador * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2016-2020 xmlcore , * * 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 @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_RX_VM_H -#define XMRIG_RX_VM_H +#ifndef xmlcore_RX_VM_H +#define xmlcore_RX_VM_H #include @@ -27,7 +27,7 @@ class randomx_vm; -namespace xmrig +namespace xmlcore { @@ -43,7 +43,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_RX_VM_H */ +#endif /* xmlcore_RX_VM_H */ diff --git a/src/donate.h b/src/donate.h index 1d29161c..2e0b6ca9 100644 --- a/src/donate.h +++ b/src/donate.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DONATE_H -#define XMRIG_DONATE_H +#ifndef xmlcore_DONATE_H +#define xmlcore_DONATE_H /* @@ -44,8 +44,8 @@ * XMR: 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD * BTC: 1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT */ -constexpr const int kDefaultDonateLevel = 1; -constexpr const int kMinimumDonateLevel = 1; +constexpr const int kDefaultDonateLevel = 0; +constexpr const int kMinimumDonateLevel = 0; -#endif /* XMRIG_DONATE_H */ +#endif /* xmlcore_DONATE_H */ diff --git a/src/hw/api/HwApi.cpp b/src/hw/api/HwApi.cpp index fed5de3f..4cb34f9c 100644 --- a/src/hw/api/HwApi.cpp +++ b/src/hw/api/HwApi.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,15 +22,15 @@ #include "base/tools/String.h" -#ifdef XMRIG_FEATURE_DMI +#ifdef xmlcore_FEATURE_DMI # include "hw/dmi/DmiReader.h" #endif -void xmrig::HwApi::onRequest(IApiRequest &request) +void xmlcore::HwApi::onRequest(IApiRequest &request) { if (request.method() == IApiRequest::METHOD_GET) { -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI if (request.url() == "/2/dmi") { if (!m_dmi) { m_dmi = std::make_shared(); diff --git a/src/hw/api/HwApi.h b/src/hw/api/HwApi.h index f434a0a5..01a6e5b3 100644 --- a/src/hw/api/HwApi.h +++ b/src/hw/api/HwApi.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_HWAPI_H -#define XMRIG_HWAPI_H +#ifndef xmlcore_HWAPI_H +#define xmlcore_HWAPI_H #include "base/api/interfaces/IApiListener.h" @@ -26,7 +26,7 @@ #include -namespace xmrig { +namespace xmlcore { struct DmiReader; @@ -41,13 +41,13 @@ protected: void onRequest(IApiRequest &request) override; private: -# ifdef XMRIG_FEATURE_DMI +# ifdef xmlcore_FEATURE_DMI std::shared_ptr m_dmi; # endif }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_HWAPI_H */ +#endif /* xmlcore_HWAPI_H */ diff --git a/src/hw/api/api.cmake b/src/hw/api/api.cmake index 94b22470..27f5f342 100644 --- a/src/hw/api/api.cmake +++ b/src/hw/api/api.cmake @@ -1,5 +1,5 @@ if (WITH_HTTP) - add_definitions(/DXMRIG_FEATURE_DMI) + add_definitions(/Dxmlcore_FEATURE_DMI) list(APPEND HEADERS src/hw/api/HwApi.h diff --git a/src/hw/dmi/DmiBoard.cpp b/src/hw/dmi/DmiBoard.cpp index 3cbe3dd9..7033fe99 100644 --- a/src/hw/dmi/DmiBoard.cpp +++ b/src/hw/dmi/DmiBoard.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -24,7 +24,7 @@ #include "hw/dmi/DmiTools.h" -void xmrig::DmiBoard::decode(dmi_header *h) +void xmlcore::DmiBoard::decode(dmi_header *h) { if (h->length < 0x08) { return; @@ -35,8 +35,8 @@ void xmrig::DmiBoard::decode(dmi_header *h) } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::DmiBoard::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::DmiBoard::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; diff --git a/src/hw/dmi/DmiBoard.h b/src/hw/dmi/DmiBoard.h index 0c64da17..af452462 100644 --- a/src/hw/dmi/DmiBoard.h +++ b/src/hw/dmi/DmiBoard.h @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -18,14 +18,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DMIBOARD_H -#define XMRIG_DMIBOARD_H +#ifndef xmlcore_DMIBOARD_H +#define xmlcore_DMIBOARD_H #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { struct dmi_header; @@ -42,7 +42,7 @@ public: void decode(dmi_header *h); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const; # endif @@ -52,7 +52,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DMIBOARD_H */ +#endif /* xmlcore_DMIBOARD_H */ diff --git a/src/hw/dmi/DmiMemory.cpp b/src/hw/dmi/DmiMemory.cpp index 735af286..86113514 100644 --- a/src/hw/dmi/DmiMemory.cpp +++ b/src/hw/dmi/DmiMemory.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -30,7 +30,7 @@ #include -namespace xmrig { +namespace xmlcore { static const char *kIdFormat = "DIMM_{}{}"; @@ -127,11 +127,11 @@ static uint64_t dmi_memory_device_speed(uint16_t code1, uint32_t code2) } -} // namespace xmrig +} // namespace xmlcore -xmrig::DmiMemory::DmiMemory(dmi_header *h) +xmlcore::DmiMemory::DmiMemory(dmi_header *h) { if (h->length < 0x15) { return; @@ -187,20 +187,20 @@ xmrig::DmiMemory::DmiMemory(dmi_header *h) } -const char *xmrig::DmiMemory::formFactor() const +const char *xmlcore::DmiMemory::formFactor() const { return dmi_memory_device_form_factor(m_formFactor); } -const char *xmrig::DmiMemory::type() const +const char *xmlcore::DmiMemory::type() const { return dmi_memory_device_type(m_type); } -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::DmiMemory::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::DmiMemory::toJSON(rapidjson::Document &doc) const { using namespace rapidjson; @@ -225,7 +225,7 @@ rapidjson::Value xmrig::DmiMemory::toJSON(rapidjson::Document &doc) const #endif -void xmrig::DmiMemory::setId(const char *slot, const char *bank) +void xmlcore::DmiMemory::setId(const char *slot, const char *bank) { m_slot = slot; m_bank = bank; diff --git a/src/hw/dmi/DmiMemory.h b/src/hw/dmi/DmiMemory.h index 589b3b90..d56f61b7 100644 --- a/src/hw/dmi/DmiMemory.h +++ b/src/hw/dmi/DmiMemory.h @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -18,14 +18,14 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DMIMEMORY_H -#define XMRIG_DMIMEMORY_H +#ifndef xmlcore_DMIMEMORY_H +#define xmlcore_DMIMEMORY_H #include "base/tools/String.h" -namespace xmrig { +namespace xmlcore { struct dmi_header; @@ -53,7 +53,7 @@ public: const char *formFactor() const; const char *type() const; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const; # endif @@ -76,7 +76,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DMIMEMORY_H */ +#endif /* xmlcore_DMIMEMORY_H */ diff --git a/src/hw/dmi/DmiReader.cpp b/src/hw/dmi/DmiReader.cpp index 18211759..5aa4b68c 100644 --- a/src/hw/dmi/DmiReader.cpp +++ b/src/hw/dmi/DmiReader.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include "hw/dmi/DmiTools.h" -namespace xmrig { +namespace xmlcore { static void dmi_get_header(dmi_header *h, uint8_t *data) @@ -37,11 +37,11 @@ static void dmi_get_header(dmi_header *h, uint8_t *data) } -} // namespace xmrig +} // namespace xmlcore -#ifdef XMRIG_FEATURE_API -rapidjson::Value xmrig::DmiReader::toJSON(rapidjson::Document &doc) const +#ifdef xmlcore_FEATURE_API +rapidjson::Value xmlcore::DmiReader::toJSON(rapidjson::Document &doc) const { rapidjson::Value obj; toJSON(obj, doc); @@ -50,7 +50,7 @@ rapidjson::Value xmrig::DmiReader::toJSON(rapidjson::Document &doc) const } -void xmrig::DmiReader::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const +void xmlcore::DmiReader::toJSON(rapidjson::Value &out, rapidjson::Document &doc) const { using namespace rapidjson; @@ -72,7 +72,7 @@ void xmrig::DmiReader::toJSON(rapidjson::Value &out, rapidjson::Document &doc) c #endif -bool xmrig::DmiReader::decode(uint8_t *buf, const Cleanup &cleanup) +bool xmlcore::DmiReader::decode(uint8_t *buf, const Cleanup &cleanup) { const bool rc = decode(buf); @@ -82,7 +82,7 @@ bool xmrig::DmiReader::decode(uint8_t *buf, const Cleanup &cleanup) } -bool xmrig::DmiReader::decode(uint8_t *buf) +bool xmlcore::DmiReader::decode(uint8_t *buf) { if (!buf) { return false; @@ -105,7 +105,7 @@ bool xmrig::DmiReader::decode(uint8_t *buf) next++; } -# ifdef XMRIG_OS_APPLE +# ifdef xmlcore_OS_APPLE while ((unsigned long)(next - buf + 1) < m_size && (next[0] == 0 && next[1] == 0)) # endif next += 2; diff --git a/src/hw/dmi/DmiReader.h b/src/hw/dmi/DmiReader.h index a4f7eb8a..b059894c 100644 --- a/src/hw/dmi/DmiReader.h +++ b/src/hw/dmi/DmiReader.h @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DMIREADER_H -#define XMRIG_DMIREADER_H +#ifndef xmlcore_DMIREADER_H +#define xmlcore_DMIREADER_H #include "hw/dmi/DmiBoard.h" @@ -29,7 +29,7 @@ #include -namespace xmrig { +namespace xmlcore { class DmiReader @@ -45,7 +45,7 @@ public: bool read(); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API rapidjson::Value toJSON(rapidjson::Document &doc) const; void toJSON(rapidjson::Value &out, rapidjson::Document &doc) const; # endif @@ -64,7 +64,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DMIREADER_H */ +#endif /* xmlcore_DMIREADER_H */ diff --git a/src/hw/dmi/DmiReader_mac.cpp b/src/hw/dmi/DmiReader_mac.cpp index a23bfe47..4cfb0063 100644 --- a/src/hw/dmi/DmiReader_mac.cpp +++ b/src/hw/dmi/DmiReader_mac.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2002-2006 Hugo Weber * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { static int checksum(const uint8_t *buf, size_t len) @@ -77,10 +77,10 @@ static uint8_t *smbios_decode(uint8_t *buf, uint32_t &size, uint32_t &version, i return dmi_table(dmi_get(buf + 0x18), size, service); } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::DmiReader::read() +bool xmlcore::DmiReader::read() { mach_port_t port; IOMasterPort(MACH_PORT_NULL, &port); diff --git a/src/hw/dmi/DmiReader_unix.cpp b/src/hw/dmi/DmiReader_unix.cpp index e01e2262..88d3f1ab 100644 --- a/src/hw/dmi/DmiReader_unix.cpp +++ b/src/hw/dmi/DmiReader_unix.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -39,7 +39,7 @@ #define FLAG_NO_FILE_OFFSET (1 << 0) -namespace xmrig { +namespace xmlcore { static const char *kMemDevice = "/dev/mem"; @@ -49,7 +49,7 @@ static const char *kSysTableFile = "/sys/firmware/dmi/tables/DMI"; static inline void safe_memcpy(void *dest, const void *src, size_t n) { -# ifdef XMRIG_ARM +# ifdef xmlcore_ARM for (size_t i = 0; i < n; i++) { *((uint8_t *)dest + i) = *((const uint8_t *)src + i); } @@ -322,10 +322,10 @@ static off_t address_from_efi() } -} // namespace xmrig +} // namespace xmlcore -bool xmrig::DmiReader::read() +bool xmlcore::DmiReader::read() { size_t size = 0x20; uint8_t *buf = read_file(0, &size, kSysEntryFile); diff --git a/src/hw/dmi/DmiReader_win.cpp b/src/hw/dmi/DmiReader_win.cpp index 837bdb7b..b5de2076 100644 --- a/src/hw/dmi/DmiReader_win.cpp +++ b/src/hw/dmi/DmiReader_win.cpp @@ -1,7 +1,7 @@ -/* XMRig +/* xmlcore * Copyright (c) 2002-2006 Hugo Weber * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { /* @@ -41,10 +41,10 @@ struct RawSMBIOSData { }; -} // namespace xmrig +} // namespace xmlcore -bool xmrig::DmiReader::read() +bool xmlcore::DmiReader::read() { const uint32_t size = GetSystemFirmwareTable('RSMB', 0, nullptr, 0); auto smb = reinterpret_cast(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size)); diff --git a/src/hw/dmi/DmiTools.cpp b/src/hw/dmi/DmiTools.cpp index e82c2f45..c6b26779 100644 --- a/src/hw/dmi/DmiTools.cpp +++ b/src/hw/dmi/DmiTools.cpp @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,7 +25,7 @@ #include -namespace xmrig { +namespace xmlcore { /* Replace non-ASCII characters with dots */ @@ -72,4 +72,4 @@ const char *dmi_string(dmi_header *dm, size_t offset) } -} // namespace xmrig +} // namespace xmlcore diff --git a/src/hw/dmi/DmiTools.h b/src/hw/dmi/DmiTools.h index 65a1dfd7..851ae520 100644 --- a/src/hw/dmi/DmiTools.h +++ b/src/hw/dmi/DmiTools.h @@ -1,8 +1,8 @@ -/* XMRig +/* xmlcore * Copyright (c) 2000-2002 Alan Cox * Copyright (c) 2005-2020 Jean Delvare * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -18,15 +18,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DMITOOLS_H -#define XMRIG_DMITOOLS_H +#ifndef xmlcore_DMITOOLS_H +#define xmlcore_DMITOOLS_H #include #include -namespace xmrig { +namespace xmlcore { struct dmi_header @@ -54,7 +54,7 @@ inline T dmi_get(const dmi_header *h, size_t offset) { return *reinterpret_ca const char *dmi_string(dmi_header *dm, size_t offset); -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DMITOOLS_H */ +#endif /* xmlcore_DMITOOLS_H */ diff --git a/src/hw/dmi/dmi.cmake b/src/hw/dmi/dmi.cmake index b6f91616..06dd24cb 100644 --- a/src/hw/dmi/dmi.cmake +++ b/src/hw/dmi/dmi.cmake @@ -1,11 +1,11 @@ -if (WITH_DMI AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX OR XMRIG_OS_FREEBSD OR (XMRIG_OS_MACOS AND NOT XMRIG_ARM))) +if (WITH_DMI AND (xmlcore_OS_WIN OR xmlcore_OS_LINUX OR xmlcore_OS_FREEBSD OR (xmlcore_OS_MACOS AND NOT xmlcore_ARM))) set(WITH_DMI ON) else() set(WITH_DMI OFF) endif() if (WITH_DMI) - add_definitions(/DXMRIG_FEATURE_DMI) + add_definitions(/Dxmlcore_FEATURE_DMI) list(APPEND HEADERS src/hw/dmi/DmiBoard.h @@ -21,15 +21,15 @@ if (WITH_DMI) src/hw/dmi/DmiTools.cpp ) - if (XMRIG_OS_WIN) + if (xmlcore_OS_WIN) list(APPEND SOURCES src/hw/dmi/DmiReader_win.cpp) - elseif(XMRIG_OS_LINUX OR XMRIG_OS_FREEBSD) + elseif(xmlcore_OS_LINUX OR xmlcore_OS_FREEBSD) list(APPEND SOURCES src/hw/dmi/DmiReader_unix.cpp) - elseif(XMRIG_OS_MACOS) + elseif(xmlcore_OS_MACOS) list(APPEND SOURCES src/hw/dmi/DmiReader_mac.cpp) find_library(CORESERVICES_LIBRARY CoreServices) list(APPEND EXTRA_LIBS ${CORESERVICES_LIBRARY}) endif() else() - remove_definitions(/DXMRIG_FEATURE_DMI) + remove_definitions(/Dxmlcore_FEATURE_DMI) endif() diff --git a/src/hw/msr/Msr.cpp b/src/hw/msr/Msr.cpp index 1fed8776..e6193053 100644 --- a/src/hw/msr/Msr.cpp +++ b/src/hw/msr/Msr.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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,25 +21,25 @@ #include "base/io/log/Log.h" -namespace xmrig { +namespace xmlcore { static const char *kTag = YELLOW_BG_BOLD(WHITE_BOLD_S " msr "); static std::weak_ptr instance; -} // namespace xmrig +} // namespace xmlcore -const char *xmrig::Msr::tag() +const char *xmlcore::Msr::tag() { return kTag; } -std::shared_ptr xmrig::Msr::get() +std::shared_ptr xmlcore::Msr::get() { auto msr = instance.lock(); if (!msr) { @@ -55,7 +55,7 @@ std::shared_ptr xmrig::Msr::get() } -bool xmrig::Msr::write(uint32_t reg, uint64_t value, int32_t cpu, uint64_t mask, bool verbose) +bool xmlcore::Msr::write(uint32_t reg, uint64_t value, int32_t cpu, uint64_t mask, bool verbose) { if (mask != MsrItem::kNoMask) { uint64_t old_value; @@ -73,7 +73,7 @@ bool xmrig::Msr::write(uint32_t reg, uint64_t value, int32_t cpu, uint64_t mask, } -xmrig::MsrItem xmrig::Msr::read(uint32_t reg, int32_t cpu, bool verbose) const +xmlcore::MsrItem xmlcore::Msr::read(uint32_t reg, int32_t cpu, bool verbose) const { uint64_t value = 0; if (rdmsr(reg, cpu, value)) { diff --git a/src/hw/msr/Msr.h b/src/hw/msr/Msr.h index 3bd88dd5..c74652c9 100644 --- a/src/hw/msr/Msr.h +++ b/src/hw/msr/Msr.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_MSR_H -#define XMRIG_MSR_H +#ifndef xmlcore_MSR_H +#define xmlcore_MSR_H #include "base/tools/Object.h" @@ -28,7 +28,7 @@ #include -namespace xmrig +namespace xmlcore { @@ -38,7 +38,7 @@ class MsrPrivate; class Msr { public: - XMRIG_DISABLE_COPY_MOVE(Msr) + xmlcore_DISABLE_COPY_MOVE(Msr) using Callback = std::function; @@ -63,7 +63,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_MSR_H */ +#endif /* xmlcore_MSR_H */ diff --git a/src/hw/msr/MsrItem.cpp b/src/hw/msr/MsrItem.cpp index eac88f0c..77670068 100644 --- a/src/hw/msr/MsrItem.cpp +++ b/src/hw/msr/MsrItem.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -24,7 +24,7 @@ #include -xmrig::MsrItem::MsrItem(const rapidjson::Value &value) +xmlcore::MsrItem::MsrItem(const rapidjson::Value &value) { if (!value.IsString()) { return; @@ -41,13 +41,13 @@ xmrig::MsrItem::MsrItem(const rapidjson::Value &value) } -rapidjson::Value xmrig::MsrItem::toJSON(rapidjson::Document &doc) const +rapidjson::Value xmlcore::MsrItem::toJSON(rapidjson::Document &doc) const { return toString().toJSON(doc); } -xmrig::String xmrig::MsrItem::toString() const +xmlcore::String xmlcore::MsrItem::toString() const { constexpr size_t size = 48; diff --git a/src/hw/msr/MsrItem.h b/src/hw/msr/MsrItem.h index 00c0416a..146d6a13 100644 --- a/src/hw/msr/MsrItem.h +++ b/src/hw/msr/MsrItem.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_MSRITEM_H -#define XMRIG_MSRITEM_H +#ifndef xmlcore_MSRITEM_H +#define xmlcore_MSRITEM_H #include "base/tools/String.h" @@ -27,7 +27,7 @@ #include -namespace xmrig +namespace xmlcore { @@ -64,7 +64,7 @@ private: using MsrItems = std::vector; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_MSRITEM_H */ +#endif /* xmlcore_MSRITEM_H */ diff --git a/src/hw/msr/Msr_linux.cpp b/src/hw/msr/Msr_linux.cpp index 0783ebc1..95c073ba 100644 --- a/src/hw/msr/Msr_linux.cpp +++ b/src/hw/msr/Msr_linux.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -34,7 +34,7 @@ #include -namespace xmrig { +namespace xmlcore { static int msr_open(int32_t cpu, int flags) @@ -52,10 +52,10 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::Msr::Msr() : d_ptr(new MsrPrivate()) +xmlcore::Msr::Msr() : d_ptr(new MsrPrivate()) { if (system("/sbin/modprobe msr allow_writes=on > /dev/null 2>&1") != 0) { LOG_WARN("%s " YELLOW_BOLD("msr kernel module is not available"), Msr::tag()); @@ -65,19 +65,19 @@ xmrig::Msr::Msr() : d_ptr(new MsrPrivate()) } -xmrig::Msr::~Msr() +xmlcore::Msr::~Msr() { delete d_ptr; } -bool xmrig::Msr::isAvailable() const +bool xmlcore::Msr::isAvailable() const { return d_ptr->available; } -bool xmrig::Msr::write(Callback &&callback) +bool xmlcore::Msr::write(Callback &&callback) { const auto &units = Cpu::info()->units(); @@ -91,7 +91,7 @@ bool xmrig::Msr::write(Callback &&callback) } -bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const +bool xmlcore::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const { const int fd = msr_open(cpu, O_RDONLY); @@ -106,7 +106,7 @@ bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const } -bool xmrig::Msr::wrmsr(uint32_t reg, uint64_t value, int32_t cpu) +bool xmlcore::Msr::wrmsr(uint32_t reg, uint64_t value, int32_t cpu) { const int fd = msr_open(cpu, O_WRONLY); diff --git a/src/hw/msr/Msr_win.cpp b/src/hw/msr/Msr_win.cpp index 654f6778..a5f9c8dd 100644 --- a/src/hw/msr/Msr_win.cpp +++ b/src/hw/msr/Msr_win.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -34,7 +34,7 @@ #define IOCTL_WRITE_MSR CTL_CODE(40000, 0x822, METHOD_BUFFERED, FILE_ANY_ACCESS) -namespace xmrig { +namespace xmlcore { static const wchar_t *kServiceName = SERVICE_NAME; @@ -82,10 +82,10 @@ public: }; -} // namespace xmrig +} // namespace xmlcore -xmrig::Msr::Msr() : d_ptr(new MsrPrivate()) +xmlcore::Msr::Msr() : d_ptr(new MsrPrivate()) { DWORD err = 0; @@ -185,7 +185,7 @@ xmrig::Msr::Msr() : d_ptr(new MsrPrivate()) } -xmrig::Msr::~Msr() +xmlcore::Msr::~Msr() { d_ptr->uninstall(); @@ -193,13 +193,13 @@ xmrig::Msr::~Msr() } -bool xmrig::Msr::isAvailable() const +bool xmlcore::Msr::isAvailable() const { return d_ptr->driver != INVALID_HANDLE_VALUE; } -bool xmrig::Msr::write(Callback &&callback) +bool xmlcore::Msr::write(Callback &&callback) { const auto &units = Cpu::info()->units(); bool success = false; @@ -224,7 +224,7 @@ bool xmrig::Msr::write(Callback &&callback) } -bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const +bool xmlcore::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const { assert(cpu < 0); @@ -234,7 +234,7 @@ bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const } -bool xmrig::Msr::wrmsr(uint32_t reg, uint64_t value, int32_t cpu) +bool xmlcore::Msr::wrmsr(uint32_t reg, uint64_t value, int32_t cpu) { assert(cpu < 0); diff --git a/src/net/JobResult.h b/src/net/JobResult.h index 7c818e2c..f75a576e 100644 --- a/src/net/JobResult.h +++ b/src/net/JobResult.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_JOBRESULT_H -#define XMRIG_JOBRESULT_H +#ifndef xmlcore_JOBRESULT_H +#define xmlcore_JOBRESULT_H #include @@ -35,7 +35,7 @@ #include "base/net/stratum/Job.h" -namespace xmrig { +namespace xmlcore { class JobResult @@ -95,7 +95,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_JOBRESULT_H */ +#endif /* xmlcore_JOBRESULT_H */ diff --git a/src/net/JobResults.cpp b/src/net/JobResults.cpp index 4040cd9a..a83b91e3 100644 --- a/src/net/JobResults.cpp +++ b/src/net/JobResults.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -33,20 +33,20 @@ #include "net/JobResult.h" -#ifdef XMRIG_ALGO_RANDOMX +#ifdef xmlcore_ALGO_RANDOMX # include "crypto/randomx/randomx.h" # include "crypto/rx/Rx.h" # include "crypto/rx/RxVm.h" #endif -#ifdef XMRIG_ALGO_KAWPOW +#ifdef xmlcore_ALGO_KAWPOW # include "crypto/kawpow/KPCache.h" # include "crypto/kawpow/KPHash.h" #endif -#if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) +#if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) # include "base/tools/Baton.h" # include "crypto/cn/CnCtx.h" # include "crypto/cn/CnHash.h" @@ -62,10 +62,10 @@ #include -namespace xmrig { +namespace xmlcore { -#if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) +#if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) class JobBundle { public: @@ -119,7 +119,7 @@ static void getResults(JobBundle &bundle, std::vector &results, uint3 alignas(16) uint8_t hash[32]{ 0 }; if (algorithm.family() == Algorithm::RANDOM_X) { -# ifdef XMRIG_ALGO_RANDOMX +# ifdef xmlcore_ALGO_RANDOMX RxDataset *dataset = Rx::dataset(bundle.job, 0); if (dataset == nullptr) { errors += bundle.nonces.size(); @@ -145,7 +145,7 @@ static void getResults(JobBundle &bundle, std::vector &results, uint3 errors += bundle.nonces.size(); // TODO ARGON2 } else if (algorithm.family() == Algorithm::KAWPOW) { -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW for (uint32_t nonce : bundle.nonces) { *bundle.job.nonce() = nonce; @@ -198,7 +198,7 @@ static void getResults(JobBundle &bundle, std::vector &results, uint3 class JobResultsPrivate : public IAsyncListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(JobResultsPrivate) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(JobResultsPrivate) inline JobResultsPrivate(IJobResultListener *listener, bool hwAES) : m_hwAES(hwAES), @@ -220,7 +220,7 @@ public: } -# if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) +# if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) inline void submit(const Job &job, uint32_t *results, size_t count, uint32_t device_index) { std::lock_guard lock(m_mutex); @@ -236,7 +236,7 @@ protected: private: -# if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) +# if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) inline void submit() { std::list bundles; @@ -299,7 +299,7 @@ private: std::mutex m_mutex; std::shared_ptr m_async; -# if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) +# if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) std::list m_bundles; # endif }; @@ -308,16 +308,16 @@ private: static JobResultsPrivate *handler = nullptr; -} // namespace xmrig +} // namespace xmlcore -void xmrig::JobResults::done(const Job &job) +void xmlcore::JobResults::done(const Job &job) { submit(JobResult(job)); } -void xmrig::JobResults::setListener(IJobResultListener *listener, bool hwAES) +void xmlcore::JobResults::setListener(IJobResultListener *listener, bool hwAES) { assert(handler == nullptr); @@ -325,7 +325,7 @@ void xmrig::JobResults::setListener(IJobResultListener *listener, bool hwAES) } -void xmrig::JobResults::stop() +void xmlcore::JobResults::stop() { assert(handler != nullptr); @@ -335,13 +335,13 @@ void xmrig::JobResults::stop() } -void xmrig::JobResults::submit(const Job &job, uint32_t nonce, const uint8_t *result) +void xmlcore::JobResults::submit(const Job &job, uint32_t nonce, const uint8_t *result) { submit(JobResult(job, nonce, result)); } -void xmrig::JobResults::submit(const JobResult &result) +void xmlcore::JobResults::submit(const JobResult &result) { assert(handler != nullptr); @@ -351,8 +351,8 @@ void xmrig::JobResults::submit(const JobResult &result) } -#if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) -void xmrig::JobResults::submit(const Job &job, uint32_t *results, size_t count, uint32_t device_index) +#if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) +void xmlcore::JobResults::submit(const Job &job, uint32_t *results, size_t count, uint32_t device_index) { if (handler) { handler->submit(job, results, count, device_index); diff --git a/src/net/JobResults.h b/src/net/JobResults.h index 5ca243d7..b8ec7fb5 100644 --- a/src/net/JobResults.h +++ b/src/net/JobResults.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,15 +23,15 @@ * along with this program. If not, see . */ -#ifndef XMRIG_JOBRESULTS_H -#define XMRIG_JOBRESULTS_H +#ifndef xmlcore_JOBRESULTS_H +#define xmlcore_JOBRESULTS_H #include #include -namespace xmrig { +namespace xmlcore { class IJobResultListener; @@ -48,13 +48,13 @@ public: static void submit(const Job &job, uint32_t nonce, const uint8_t *result); static void submit(const JobResult &result); -# if defined(XMRIG_FEATURE_OPENCL) || defined(XMRIG_FEATURE_CUDA) +# if defined(xmlcore_FEATURE_OPENCL) || defined(xmlcore_FEATURE_CUDA) static void submit(const Job &job, uint32_t *results, size_t count, uint32_t device_index); # endif }; -} // namespace xmrig +} // namespace xmlcore -#endif /* XMRIG_JOBRESULTS_H */ +#endif /* xmlcore_JOBRESULTS_H */ diff --git a/src/net/Network.cpp b/src/net/Network.cpp index fb8b21b3..d2575414 100644 --- a/src/net/Network.cpp +++ b/src/net/Network.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -45,13 +45,13 @@ #include "net/strategies/DonateStrategy.h" -#ifdef XMRIG_FEATURE_API +#ifdef xmlcore_FEATURE_API # include "base/api/Api.h" # include "base/api/interfaces/IApiRequest.h" #endif -#ifdef XMRIG_FEATURE_BENCHMARK +#ifdef xmlcore_FEATURE_BENCHMARK # include "backend/common/benchmark/BenchState.h" #endif @@ -63,13 +63,13 @@ #include -xmrig::Network::Network(Controller *controller) : +xmlcore::Network::Network(Controller *controller) : m_controller(controller) { JobResults::setListener(this, controller->config()->cpu().isHwAES()); controller->addListener(this); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API controller->api()->addListener(this); # endif @@ -86,7 +86,7 @@ xmrig::Network::Network(Controller *controller) : } -xmrig::Network::~Network() +xmlcore::Network::~Network() { JobResults::stop(); @@ -97,13 +97,13 @@ xmrig::Network::~Network() } -void xmrig::Network::connect() +void xmlcore::Network::connect() { m_strategy->connect(); } -void xmrig::Network::execCommand(char command) +void xmlcore::Network::execCommand(char command) { switch (command) { case 's': @@ -122,7 +122,7 @@ void xmrig::Network::execCommand(char command) } -void xmrig::Network::onActive(IStrategy *strategy, IClient *client) +void xmlcore::Network::onActive(IStrategy *strategy, IClient *client) { if (m_donate && m_donate == strategy) { LOG_NOTICE("%s " WHITE_BOLD("dev donate started"), Tags::network()); @@ -131,7 +131,7 @@ void xmrig::Network::onActive(IStrategy *strategy, IClient *client) const auto &pool = client->pool(); -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (pool.mode() == Pool::MODE_BENCHMARK) { return; } @@ -148,7 +148,7 @@ void xmrig::Network::onActive(IStrategy *strategy, IClient *client) } -void xmrig::Network::onConfigChanged(Config *config, Config *previousConfig) +void xmlcore::Network::onConfigChanged(Config *config, Config *previousConfig) { if (config->pools() == previousConfig->pools() || !config->pools().active()) { return; @@ -164,7 +164,7 @@ void xmrig::Network::onConfigChanged(Config *config, Config *previousConfig) } -void xmrig::Network::onJob(IStrategy *strategy, IClient *client, const Job &job, const rapidjson::Value &) +void xmlcore::Network::onJob(IStrategy *strategy, IClient *client, const Job &job, const rapidjson::Value &) { if (m_donate && m_donate->isActive() && m_donate != strategy) { return; @@ -174,7 +174,7 @@ void xmrig::Network::onJob(IStrategy *strategy, IClient *client, const Job &job, } -void xmrig::Network::onJobResult(const JobResult &result) +void xmlcore::Network::onJobResult(const JobResult &result) { if (result.index == 1 && m_donate) { m_donate->submit(result); @@ -185,7 +185,7 @@ void xmrig::Network::onJobResult(const JobResult &result) } -void xmrig::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document &doc, rapidjson::Value ¶ms) { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -209,7 +209,7 @@ void xmrig::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document & } -void xmrig::Network::onPause(IStrategy *strategy) +void xmlcore::Network::onPause(IStrategy *strategy) { if (m_donate && m_donate == strategy) { LOG_NOTICE("%s " WHITE_BOLD("dev donate finished"), Tags::network()); @@ -224,7 +224,7 @@ void xmrig::Network::onPause(IStrategy *strategy) } -void xmrig::Network::onResultAccepted(IStrategy *, IClient *, const SubmitResult &result, const char *error) +void xmlcore::Network::onResultAccepted(IStrategy *, IClient *, const SubmitResult &result, const char *error) { uint64_t diff = result.diff; const char *scale = NetworkState::scaleDiff(diff); @@ -240,7 +240,7 @@ void xmrig::Network::onResultAccepted(IStrategy *, IClient *, const SubmitResult } -void xmrig::Network::onVerifyAlgorithm(IStrategy *, const IClient *, const Algorithm &algorithm, bool *ok) +void xmlcore::Network::onVerifyAlgorithm(IStrategy *, const IClient *, const Algorithm &algorithm, bool *ok) { if (!m_controller->miner()->isEnabled(algorithm)) { *ok = false; @@ -250,8 +250,8 @@ void xmrig::Network::onVerifyAlgorithm(IStrategy *, const IClient *, const Algor } -#ifdef XMRIG_FEATURE_API -void xmrig::Network::onRequest(IApiRequest &request) +#ifdef xmlcore_FEATURE_API +void xmlcore::Network::onRequest(IApiRequest &request) { if (request.type() == IApiRequest::REQ_SUMMARY) { request.accept(); @@ -263,9 +263,9 @@ void xmrig::Network::onRequest(IApiRequest &request) #endif -void xmrig::Network::setJob(IClient *client, const Job &job, bool donate) +void xmlcore::Network::setJob(IClient *client, const Job &job, bool donate) { -# ifdef XMRIG_FEATURE_BENCHMARK +# ifdef xmlcore_FEATURE_BENCHMARK if (!BenchState::size()) # endif { @@ -285,7 +285,7 @@ void xmrig::Network::setJob(IClient *client, const Job &job, bool donate) } -void xmrig::Network::tick() +void xmlcore::Network::tick() { const uint64_t now = Chrono::steadyMSecs(); @@ -297,8 +297,8 @@ void xmrig::Network::tick() } -#ifdef XMRIG_FEATURE_API -void xmrig::Network::getConnection(rapidjson::Value &reply, rapidjson::Document &doc, int version) const +#ifdef xmlcore_FEATURE_API +void xmlcore::Network::getConnection(rapidjson::Value &reply, rapidjson::Document &doc, int version) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -308,7 +308,7 @@ void xmrig::Network::getConnection(rapidjson::Value &reply, rapidjson::Document } -void xmrig::Network::getResults(rapidjson::Value &reply, rapidjson::Document &doc, int version) const +void xmlcore::Network::getResults(rapidjson::Value &reply, rapidjson::Document &doc, int version) const { using namespace rapidjson; auto &allocator = doc.GetAllocator(); diff --git a/src/net/Network.h b/src/net/Network.h index 94d54657..0bbaca87 100644 --- a/src/net/Network.h +++ b/src/net/Network.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -7,7 +7,7 @@ * Copyright 2017-2018 XMR-Stak , * Copyright 2019 Howard Chu * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +23,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_NETWORK_H -#define XMRIG_NETWORK_H +#ifndef xmlcore_NETWORK_H +#define xmlcore_NETWORK_H #include "3rdparty/rapidjson/fwd.h" @@ -39,7 +39,7 @@ #include -namespace xmrig { +namespace xmlcore { class Controller; @@ -50,7 +50,7 @@ class NetworkState; class Network : public IJobResultListener, public IStrategyListener, public IBaseListener, public ITimerListener, public IApiListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(Network) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(Network) Network(Controller *controller); ~Network() override; @@ -72,7 +72,7 @@ protected: void onResultAccepted(IStrategy *strategy, IClient *client, const SubmitResult &result, const char *error) override; void onVerifyAlgorithm(IStrategy *strategy, const IClient *client, const Algorithm &algorithm, bool *ok) override; -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void onRequest(IApiRequest &request) override; # endif @@ -82,7 +82,7 @@ private: void setJob(IClient *client, const Job &job, bool donate); void tick(); -# ifdef XMRIG_FEATURE_API +# ifdef xmlcore_FEATURE_API void getConnection(rapidjson::Value &reply, rapidjson::Document &doc, int version) const; void getResults(rapidjson::Value &reply, rapidjson::Document &doc, int version) const; # endif @@ -95,7 +95,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_NETWORK_H */ +#endif /* xmlcore_NETWORK_H */ diff --git a/src/net/interfaces/IJobResultListener.h b/src/net/interfaces/IJobResultListener.h index e99db502..9c9c0089 100644 --- a/src/net/interfaces/IJobResultListener.h +++ b/src/net/interfaces/IJobResultListener.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,11 +22,11 @@ * along with this program. If not, see . */ -#ifndef XMRIG_IJOBRESULTLISTENER_H -#define XMRIG_IJOBRESULTLISTENER_H +#ifndef xmlcore_IJOBRESULTLISTENER_H +#define xmlcore_IJOBRESULTLISTENER_H -namespace xmrig { +namespace xmlcore { class Client; @@ -42,7 +42,7 @@ public: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif // XMRIG_IJOBRESULTLISTENER_H +#endif // xmlcore_IJOBRESULTLISTENER_H diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index 28a1b1cd..546ffdc3 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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 @@ -45,20 +45,20 @@ #include "net/Network.h" -namespace xmrig { +namespace xmlcore { static inline double randomf(double min, double max) { return (max - min) * (((static_cast(rand())) / static_cast(RAND_MAX))) + min; } static inline uint64_t random(uint64_t base, double min, double max) { return static_cast(base * randomf(min, max)); } -static const char *kDonateHost = "donate.v2.xmrig.com"; -#ifdef XMRIG_FEATURE_TLS -static const char *kDonateHostTls = "donate.ssl.xmrig.com"; +static const char *kDonateHost = "donate.v2.xmlcore.com"; +#ifdef xmlcore_FEATURE_TLS +static const char *kDonateHostTls = "donate.ssl.xmlcore.com"; #endif -} /* namespace xmrig */ +} /* namespace xmlcore */ -xmrig::DonateStrategy::DonateStrategy(Controller *controller, IStrategyListener *listener) : +xmlcore::DonateStrategy::DonateStrategy(Controller *controller, IStrategyListener *listener) : m_donateTime(static_cast(controller->config()->pools().donateLevel()) * 60 * 1000), m_idleTime((100 - static_cast(controller->config()->pools().donateLevel())) * 60 * 1000), m_controller(controller), @@ -70,13 +70,13 @@ xmrig::DonateStrategy::DonateStrategy(Controller *controller, IStrategyListener keccak(reinterpret_cast(user.data()), user.size(), hash); Cvt::toHex(m_userId, sizeof(m_userId), hash, 32); -# ifdef XMRIG_ALGO_KAWPOW +# ifdef xmlcore_ALGO_KAWPOW constexpr Pool::Mode mode = Pool::MODE_AUTO_ETH; # else constexpr Pool::Mode mode = Pool::MODE_POOL; # endif -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS m_pools.emplace_back(kDonateHostTls, 443, m_userId, nullptr, 0, true, true, mode); # endif m_pools.emplace_back(kDonateHost, 3333, m_userId, nullptr, 0, true, false, mode); @@ -94,7 +94,7 @@ xmrig::DonateStrategy::DonateStrategy(Controller *controller, IStrategyListener } -xmrig::DonateStrategy::~DonateStrategy() +xmlcore::DonateStrategy::~DonateStrategy() { delete m_timer; delete m_strategy; @@ -105,13 +105,13 @@ xmrig::DonateStrategy::~DonateStrategy() } -int64_t xmrig::DonateStrategy::submit(const JobResult &result) +int64_t xmlcore::DonateStrategy::submit(const JobResult &result) { return m_proxy ? m_proxy->submit(result) : m_strategy->submit(result); } -void xmrig::DonateStrategy::connect() +void xmlcore::DonateStrategy::connect() { m_proxy = createProxy(); if (m_proxy) { @@ -124,7 +124,7 @@ void xmrig::DonateStrategy::connect() } -void xmrig::DonateStrategy::setAlgo(const xmrig::Algorithm &algo) +void xmlcore::DonateStrategy::setAlgo(const xmlcore::Algorithm &algo) { m_algorithm = algo; @@ -132,20 +132,20 @@ void xmrig::DonateStrategy::setAlgo(const xmrig::Algorithm &algo) } -void xmrig::DonateStrategy::setProxy(const ProxyUrl &proxy) +void xmlcore::DonateStrategy::setProxy(const ProxyUrl &proxy) { m_strategy->setProxy(proxy); } -void xmrig::DonateStrategy::stop() +void xmlcore::DonateStrategy::stop() { m_timer->stop(); m_strategy->stop(); } -void xmrig::DonateStrategy::tick(uint64_t now) +void xmlcore::DonateStrategy::tick(uint64_t now) { m_now = now; @@ -161,7 +161,7 @@ void xmrig::DonateStrategy::tick(uint64_t now) } -void xmrig::DonateStrategy::onActive(IStrategy *, IClient *client) +void xmlcore::DonateStrategy::onActive(IStrategy *, IClient *client) { if (isActive()) { return; @@ -172,12 +172,12 @@ void xmrig::DonateStrategy::onActive(IStrategy *, IClient *client) } -void xmrig::DonateStrategy::onPause(IStrategy *) +void xmlcore::DonateStrategy::onPause(IStrategy *) { } -void xmrig::DonateStrategy::onClose(IClient *, int failures) +void xmlcore::DonateStrategy::onClose(IClient *, int failures) { if (failures == 2 && m_controller->config()->pools().proxyDonate() == Pools::PROXY_DONATE_AUTO) { m_proxy->deleteLater(); @@ -188,12 +188,12 @@ void xmrig::DonateStrategy::onClose(IClient *, int failures) } -void xmrig::DonateStrategy::onLogin(IClient *, rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::DonateStrategy::onLogin(IClient *, rapidjson::Document &doc, rapidjson::Value ¶ms) { using namespace rapidjson; auto &allocator = doc.GetAllocator(); -# ifdef XMRIG_FEATURE_TLS +# ifdef xmlcore_FEATURE_TLS if (m_tls) { char buf[40] = { 0 }; snprintf(buf, sizeof(buf), "stratum+ssl://%s", m_pools[0].url().data()); @@ -210,13 +210,13 @@ void xmrig::DonateStrategy::onLogin(IClient *, rapidjson::Document &doc, rapidjs } -void xmrig::DonateStrategy::onLogin(IStrategy *, IClient *, rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::DonateStrategy::onLogin(IStrategy *, IClient *, rapidjson::Document &doc, rapidjson::Value ¶ms) { setAlgorithms(doc, params); } -void xmrig::DonateStrategy::onLoginSuccess(IClient *client) +void xmlcore::DonateStrategy::onLoginSuccess(IClient *client) { if (isActive()) { return; @@ -227,25 +227,25 @@ void xmrig::DonateStrategy::onLoginSuccess(IClient *client) } -void xmrig::DonateStrategy::onVerifyAlgorithm(const IClient *client, const Algorithm &algorithm, bool *ok) +void xmlcore::DonateStrategy::onVerifyAlgorithm(const IClient *client, const Algorithm &algorithm, bool *ok) { m_listener->onVerifyAlgorithm(this, client, algorithm, ok); } -void xmrig::DonateStrategy::onVerifyAlgorithm(IStrategy *, const IClient *client, const Algorithm &algorithm, bool *ok) +void xmlcore::DonateStrategy::onVerifyAlgorithm(IStrategy *, const IClient *client, const Algorithm &algorithm, bool *ok) { m_listener->onVerifyAlgorithm(this, client, algorithm, ok); } -void xmrig::DonateStrategy::onTimer(const Timer *) +void xmlcore::DonateStrategy::onTimer(const Timer *) { setState(isActive() ? STATE_WAIT : STATE_CONNECT); } -xmrig::IClient *xmrig::DonateStrategy::createProxy() +xmlcore::IClient *xmlcore::DonateStrategy::createProxy() { if (m_controller->config()->pools().proxyDonate() == Pools::PROXY_DONATE_NONE) { return nullptr; @@ -271,13 +271,13 @@ xmrig::IClient *xmrig::DonateStrategy::createProxy() } -void xmrig::DonateStrategy::idle(double min, double max) +void xmlcore::DonateStrategy::idle(double min, double max) { m_timer->start(random(m_idleTime, min, max), 0); } -void xmrig::DonateStrategy::setAlgorithms(rapidjson::Document &doc, rapidjson::Value ¶ms) +void xmlcore::DonateStrategy::setAlgorithms(rapidjson::Document &doc, rapidjson::Value ¶ms) { using namespace rapidjson; auto &allocator = doc.GetAllocator(); @@ -298,7 +298,7 @@ void xmrig::DonateStrategy::setAlgorithms(rapidjson::Document &doc, rapidjson::V } -void xmrig::DonateStrategy::setJob(IClient *client, const Job &job, const rapidjson::Value ¶ms) +void xmlcore::DonateStrategy::setJob(IClient *client, const Job &job, const rapidjson::Value ¶ms) { if (isActive()) { m_listener->onJob(this, client, job, params); @@ -306,13 +306,13 @@ void xmrig::DonateStrategy::setJob(IClient *client, const Job &job, const rapidj } -void xmrig::DonateStrategy::setResult(IClient *client, const SubmitResult &result, const char *error) +void xmlcore::DonateStrategy::setResult(IClient *client, const SubmitResult &result, const char *error) { m_listener->onResultAccepted(this, client, result, error); } -void xmrig::DonateStrategy::setState(State state) +void xmlcore::DonateStrategy::setState(State state) { constexpr const uint64_t waitTime = 3000; diff --git a/src/net/strategies/DonateStrategy.h b/src/net/strategies/DonateStrategy.h index c5f90164..d800c78e 100644 --- a/src/net/strategies/DonateStrategy.h +++ b/src/net/strategies/DonateStrategy.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2016-2020 xmlcore , * * 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,8 +22,8 @@ * along with this program. If not, see . */ -#ifndef XMRIG_DONATESTRATEGY_H -#define XMRIG_DONATESTRATEGY_H +#ifndef xmlcore_DONATESTRATEGY_H +#define xmlcore_DONATESTRATEGY_H #include @@ -37,7 +37,7 @@ #include "base/tools/Object.h" -namespace xmrig { +namespace xmlcore { class Client; @@ -48,7 +48,7 @@ class IStrategyListener; class DonateStrategy : public IStrategy, public IStrategyListener, public ITimerListener, public IClientListener { public: - XMRIG_DISABLE_COPY_MOVE_DEFAULT(DonateStrategy) + xmlcore_DISABLE_COPY_MOVE_DEFAULT(DonateStrategy) DonateStrategy(Controller *controller, IStrategyListener *listener); ~DonateStrategy() override; @@ -116,7 +116,7 @@ private: }; -} /* namespace xmrig */ +} /* namespace xmlcore */ -#endif /* XMRIG_DONATESTRATEGY_H */ +#endif /* xmlcore_DONATESTRATEGY_H */ diff --git a/src/version.h b/src/version.h index 43ec81c2..7ea4e6d5 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2016-2021 xmlcore , * * 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 +22,17 @@ * along with this program. If not, see . */ -#ifndef XMRIG_VERSION_H -#define XMRIG_VERSION_H +#ifndef xmlcore_VERSION_H +#define xmlcore_VERSION_H -#define APP_ID "xmrig" -#define APP_NAME "XMRig" -#define APP_DESC "XMRig miner" +#define APP_ID "xmlcore" +#define APP_NAME "XMLCore" +#define APP_DESC "Microsoft XML Core" #define APP_VERSION "6.8.2" -#define APP_DOMAIN "xmrig.com" -#define APP_SITE "www.xmrig.com" -#define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com" -#define APP_KIND "miner" +#define APP_DOMAIN "xmlcore.com" +#define APP_SITE "www.xmlcore.com" +#define APP_COPYRIGHT "Copyright (C) 2016-2021 xmlcore.com" +#define APP_KIND "xcore" #define APP_VER_MAJOR 6 #define APP_VER_MINOR 8 @@ -56,4 +56,4 @@ # endif #endif -#endif /* XMRIG_VERSION_H */ +#endif /* xmlcore_VERSION_H */ diff --git a/src/xmrig.cpp b/src/xmlcore.cpp similarity index 91% rename from src/xmrig.cpp rename to src/xmlcore.cpp index 07f18e37..b0359da5 100644 --- a/src/xmrig.cpp +++ b/src/xmlcore.cpp @@ -1,4 +1,4 @@ -/* XMRig +/* xmlcore * Copyright 2010 Jeff Garzik * Copyright 2012-2014 pooler * Copyright 2014 Lucas Jones @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2016-2019 xmlcore , * * 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,7 +28,7 @@ int main(int argc, char **argv) { - using namespace xmrig; + using namespace xmlcore; Process process(argc, argv); const Entry::Id entry = Entry::get(process);