mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-04-24 23:32:48 -04:00
Code Issues Projects Releases Wiki Activity

Merge from xmrig-2.8.1

Browse Source
This commit is contained in:
MoneroOcean
2018-10-09 10:53:12 +02:00
parent ffa10e0c0d 4bf248f513
commit e314fa8ec9
15 changed files with 887 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/ConfigLoader_platform.h
View File

@@ -64,7 +64,10 @@ Options:\n\
--rig-id=ID rig identifier for pool-side statistics (needs pool support)\n\
-t, --threads=N number of miner threads\n\
-v, --av=N algorithm variation, 0 auto select\n\
-k, --keepalive send keepalived for prevent timeout (need pool support)\n\
-k, --keepalive send keepalived packet for prevent timeout (needs pool support)\n\
--nicehash enable nicehash.com support\n\
--tls enable SSL/TLS support (needs pool support)\n\
--tls-fingerprint=F pool TLS certificate fingerprint, if set enable strict certificate pinning\n\
-r, --retries=N number of times to retry before switch to backup server (default: 5)\n\
-R, --retry-pause=N time to pause between retries (default: 5)\n\
--cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n\
@@ -84,7 +87,7 @@ Options:\n\
"\
--max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75)\n\
--safe safe adjust threads and av settings for current CPU\n\
--nicehash enable nicehash/xmrig-proxy support\n\
--asm=ASM ASM code for cn/2, possible values: auto, none, intel, ryzen.\n\
--print-time=N print hashrate report every N seconds\n\
--api-port=N port for the miner API\n\
--api-access-token=T access token for API\n\
@@ -92,6 +95,7 @@ Options:\n\
--api-id=ID custom instance ID for API\n\
--api-ipv6 enable IPv6 support for API\n\
--api-no-restricted enable full remote access (only if API token set)\n\
--dry-run test configuration and exit\n\
-h, --help display this help and exit\n\
-V, --version output version information and exit\n\
";

4
src/core/cpu/AdvancedCpuInfo.cpp
View File

@@ -75,10 +75,10 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
if (data.flags[CPU_FEATURE_AES]) {
m_aes = true;
if (data.vendor == VENDOR_AMD && data.ext_family >= 23) {
if (data.vendor == VENDOR_AMD) {
m_assembly = ASM_RYZEN;
}
else if (data.vendor == VENDOR_INTEL && data.ext_model >= 42) {
else if (data.vendor == VENDOR_INTEL) {
m_assembly = ASM_INTEL;
}
}