Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2024-12-23 03:59:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
XMRig 2020-04-23 12:46:41 +07:00
commit a8e91bb888
No known key found for this signature in database
GPG key ID: 446A53638BE94409
20 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,3 +1,8 @@
# 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.
# 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.

1
CMakeLists.txt
View file

@ -67,6 +67,7 @@ set(HEADERS_CRYPTO
src/crypto/cn/c_groestl.h
src/crypto/cn/c_jh.h
src/crypto/cn/c_skein.h
src/crypto/cn/CnAlgo.h
src/crypto/cn/CnCtx.h
src/crypto/cn/CnHash.h
src/crypto/cn/CryptoNight_monero.h

2
src/backend/common/Threads.cpp
View file

@ -25,7 +25,7 @@
#include "backend/common/Threads.h"
#include "backend/cpu/CpuThreads.h"
#include "base/crypto/CnAlgo.h"
#include "crypto/cn/CnAlgo.h"
#include "rapidjson/document.h"

2
src/backend/opencl/generators/ocl_generic_cn_generator.cpp
View file

@ -27,7 +27,7 @@
#include "backend/opencl/OclThreads.h"
#include "backend/opencl/wrappers/OclDevice.h"
#include "base/crypto/Algorithm.h"
#include "base/crypto/CnAlgo.h"
#include "crypto/cn/CnAlgo.h"
#include <algorithm>

2
src/backend/opencl/generators/ocl_vega_cn_generator.cpp
View file

@ -27,7 +27,7 @@
#include "backend/opencl/OclThreads.h"
#include "backend/opencl/wrappers/OclDevice.h"
#include "base/crypto/Algorithm.h"
#include "base/crypto/CnAlgo.h"
#include "crypto/cn/CnAlgo.h"
#include <algorithm>

2
src/backend/opencl/runners/OclCnRunner.cpp
View file

@ -31,9 +31,9 @@
#include "backend/opencl/OclLaunchData.h"
#include "backend/opencl/runners/tools/OclCnR.h"
#include "backend/opencl/wrappers/OclLib.h"
#include "base/crypto/CnAlgo.h"
#include "base/io/log/Log.h"
#include "base/net/stratum/Job.h"
#include "crypto/cn/CnAlgo.h"
xmrig::OclCnRunner::OclCnRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data)

2
src/backend/opencl/runners/OclRyoRunner.cpp
View file

@ -31,9 +31,9 @@
#include "backend/opencl/kernels/CnBranchKernel.h"
#include "backend/opencl/OclLaunchData.h"
#include "backend/opencl/wrappers/OclLib.h"
#include "base/crypto/CnAlgo.h"
#include "base/io/log/Log.h"
#include "base/net/stratum/Job.h"
#include "crypto/cn/CnAlgo.h"
xmrig::OclRyoRunner::OclRyoRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data)

1
src/base/base.cmake
View file

@ -1,7 +1,6 @@
set(HEADERS_BASE
src/base/api/interfaces/IApiListener.h
src/base/crypto/Algorithm.h
src/base/crypto/CnAlgo.h
src/base/crypto/Coin.h
src/base/crypto/keccak.h
src/base/io/Console.h

6
src/base/kernel/Entry.cpp
View file

@ -79,10 +79,14 @@ static int showVersion()
printf("\nlibuv/%s\n", uv_version_string());
# if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
# if defined(XMRIG_FEATURE_TLS)
{
# if defined(LIBRESSL_VERSION_TEXT)
printf("LibreSSL/%s\n", LIBRESSL_VERSION_TEXT + 9);
# elif defined(OPENSSL_VERSION_TEXT)
constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
printf("OpenSSL/%.*s\n", static_cast<int>(strchr(v, ' ') - v), v);
# endif
}
# endif

7
src/base/kernel/config/BaseConfig.cpp
View file

@ -145,11 +145,16 @@ void xmrig::BaseConfig::printVersions()
std::string libs;
# if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
# if defined(XMRIG_FEATURE_TLS)
{
# if defined(LIBRESSL_VERSION_TEXT)
snprintf(buf, sizeof buf, "LibreSSL/%s ", LIBRESSL_VERSION_TEXT + 9);
libs += buf;
# elif defined(OPENSSL_VERSION_TEXT)
constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
snprintf(buf, sizeof buf, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
libs += buf;
# endif
}
# endif

7
src/base/net/stratum/Client.cpp
View file

@ -293,7 +293,7 @@ void xmrig::Client::tick(uint64_t now)
}
if (m_state == ConnectingState && m_expire && now > m_expire) {
return reconnect();
close();
}
}
@ -744,6 +744,7 @@ void xmrig::Client::parseExtensions(const rapidjson::Value &result)
}
else if (strcmp(name, "keepalive") == 0) {
setExtension(EXT_KEEPALIVE, true);
startTimeout();
}
# ifdef XMRIG_FEATURE_TLS
else if (strcmp(name, "tls") == 0) {
@ -974,7 +975,7 @@ void xmrig::Client::onConnect(uv_connect_t *req, int status)
LOG_ERR("[%s] connect error: \"%s\"", client->url(), uv_strerror(status));
}
if (client->state() == ReconnectingState) {
if (client->state() == ReconnectingState || client->state() == ClosingState) {
return;
}
@ -991,7 +992,7 @@ void xmrig::Client::onConnect(uv_connect_t *req, int status)
}
if (client->state() == ConnectedState) {
LOG_ERR("[%s] already connected");
LOG_ERR("[%s] already connected", client->url());
return;
}

4
src/base/net/tls/TlsContext.cpp
View file

@ -156,7 +156,7 @@ bool xmrig::TlsContext::load(const TlsConfig &config)
SSL_CTX_set_options(m_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
SSL_CTX_set_options(m_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
# if OPENSSL_VERSION_NUMBER >= 0x1010100fL
# if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CTX_set_max_early_data(m_ctx, 0);
# endif
@ -184,7 +184,7 @@ bool xmrig::TlsContext::setCipherSuites(const char *ciphersuites)
return true;
}
# if OPENSSL_VERSION_NUMBER >= 0x1010100fL
# if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
if (SSL_CTX_set_ciphersuites(m_ctx, ciphersuites) == 1) {
return true;
}

0
src/base/crypto/CnAlgo.h → src/crypto/cn/CnAlgo.h
View file

2
src/crypto/cn/CnHash.h
View file

@ -31,7 +31,7 @@
#include <cstdint>
#include "base/crypto/CnAlgo.h"
#include "crypto/cn/CnAlgo.h"
#include "crypto/common/Assembly.h"

2
src/crypto/cn/CryptoNight_arm.h
View file

@ -28,8 +28,8 @@
#define XMRIG_CRYPTONIGHT_ARM_H
#include "base/crypto/CnAlgo.h"
#include "base/crypto/keccak.h"
#include "crypto/cn/CnAlgo.h"
#include "crypto/cn/CryptoNight_monero.h"
#include "crypto/cn/CryptoNight.h"
#include "crypto/cn/soft_aes.h"

2
src/crypto/cn/CryptoNight_x86.h
View file

@ -36,8 +36,8 @@
#include "backend/cpu/Cpu.h"
#include "base/crypto/CnAlgo.h"
#include "base/crypto/keccak.h"
#include "crypto/cn/CnAlgo.h"
#include "crypto/cn/CryptoNight_monero.h"
#include "crypto/cn/CryptoNight.h"
#include "crypto/cn/soft_aes.h"

2
src/crypto/cn/gpu/cn_gpu_avx.cpp
View file

@ -23,7 +23,7 @@
*/
#include "base/crypto/CnAlgo.h"
#include "crypto/cn/CnAlgo.h"
#ifdef __GNUC__

2
src/crypto/cn/gpu/cn_gpu_ssse3.cpp
View file

@ -23,7 +23,7 @@
*/
#include "base/crypto/CnAlgo.h"
#include "crypto/cn/CnAlgo.h"
#ifdef __GNUC__

12
src/crypto/randomx/jit_compiler_x86.cpp
View file

@ -1048,9 +1048,9 @@ namespace randomx {
if (vm_flags & RANDOMX_FLAG_AMD) {
*(uint64_t*)(p + pos + 7) = 0x742024443B0CE083ULL;
*(uint8_t*)(p + pos + 15) = 8;
*(uint64_t*)(p + pos + 16) = 0x202444890414AE0FULL;
pos += 24;
*(uint64_t*)(p + pos + 15) = 0x8900EB0414AE0F0AULL;
*(uint32_t*)(p + pos + 23) = 0x202444;
pos += 26;
}
else {
*(uint64_t*)(p + pos + 7) = 0x0414AE0F0CE083ULL;
@ -1071,9 +1071,9 @@ namespace randomx {
if (vm_flags & RANDOMX_FLAG_AMD) {
*(uint64_t*)(p + pos + 6) = 0x742024443B0CE083ULL;
*(uint8_t*)(p + pos + 14) = 8;
*(uint64_t*)(p + pos + 15) = 0x202444890414AE0FULL;
pos += 23;
*(uint64_t*)(p + pos + 14) = 0x8900EB0414AE0F0AULL;
*(uint32_t*)(p + pos + 22) = 0x202444;
pos += 25;
}
else {
*(uint64_t*)(p + pos + 6) = 0x0414AE0F0CE083ULL;

4
src/version.h
View file

@ -28,7 +28,7 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "XMRig miner"
#define APP_VERSION "5.11.0"
#define APP_VERSION "5.11.1"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com"
@ -36,7 +36,7 @@
#define APP_VER_MAJOR 5
#define APP_VER_MINOR 11
#define APP_VER_PATCH 0
#define APP_VER_PATCH 1
#ifdef _MSC_VER
# if (_MSC_VER >= 1920)