From 8b7a737ceb14871fd09ad4b190cd126e079852d9 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 5 Jan 2018 17:23:39 +0700 Subject: [PATCH 1/6] Fix recent MSVC 2017 version detection. --- src/version.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/version.h b/src/version.h index c362e7be..f869db8a 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig + * Copyright 2016-2018 XMRig * * * This program is free software: you can redistribute it and/or modify @@ -27,10 +27,10 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.4.3" +#define APP_VERSION "2.4.4" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" -#define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" +#define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com" #define APP_KIND "cpu" #define APP_VER_MAJOR 2 @@ -39,7 +39,7 @@ #define APP_VER_REV 0 #ifdef _MSC_VER -# if (_MSC_VER == 1910 || _MSC_VER == 1911) +# if (_MSC_VER >= 1910) # define MSVC_VERSION 2017 # elif _MSC_VER == 1900 # define MSVC_VERSION 2015 From 49b45ddd18461558e80b3e7c0eb741409072fd78 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 5 Jan 2018 19:41:19 +0700 Subject: [PATCH 2/6] Add libmicrohttpd version to --version output. --- src/Options.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Options.cpp b/src/Options.cpp index b1197223..3eaf07ce 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -33,6 +33,11 @@ #endif +#ifndef XMRIG_NO_HTTPD +# include +#endif + + #include "Cpu.h" #include "donate.h" #include "net/Url.h" @@ -665,6 +670,10 @@ void Options::showVersion() "\n"); printf("\nlibuv/%s\n", uv_version_string()); + +# ifndef XMRIG_NO_HTTPD + printf("libmicrohttpd/%s\n", MHD_get_version()); +# endif } From d73bee81abe74c962a423053c19c834300de5268 Mon Sep 17 00:00:00 2001 From: xmrig Date: Sun, 7 Jan 2018 21:36:49 +0700 Subject: [PATCH 3/6] Update README.md --- README.md | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index b4880b38..6ab4b6a2 100644 --- a/README.md +++ b/README.md @@ -50,31 +50,34 @@ For failover you can add multiple pools, maximum count not limited. ### Options ``` - -a, --algo=ALGO cryptonight (default) or cryptonight-lite - -o, --url=URL URL of mining server - -O, --userpass=U:P username:password pair for mining server - -u, --user=USERNAME username for mining server - -p, --pass=PASSWORD password for mining server - -t, --threads=N number of miner threads - -v, --av=N algorithm variation, 0 auto select - -k, --keepalive send keepalived for prevent timeout (need pool support) - -r, --retries=N number of times to retry before switch to backup server (default: 5) - -R, --retry-pause=N time to pause between retries (default: 5) - --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1 - --cpu-priority set process priority (0 idle, 2 normal to 5 highest) - --no-huge-pages disable huge pages support - --no-color disable colored output - --donate-level=N donate level, default 5% (5 minutes in 100 minutes) - --user-agent set custom user-agent string for pool - -B, --background run the miner in the background - -c, --config=FILE load a JSON-format configuration file - -l, --log-file=FILE log all output to a file - --max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75) - --safe safe adjust threads and av settings for current CPU - --nicehash enable nicehash support - --print-time=N print hashrate report every N seconds - -h, --help display this help and exit - -V, --version output version information and exit + -a, --algo=ALGO cryptonight (default) or cryptonight-lite + -o, --url=URL URL of mining server + -O, --userpass=U:P username:password pair for mining server + -u, --user=USERNAME username for mining server + -p, --pass=PASSWORD password for mining server + -t, --threads=N number of miner threads + -v, --av=N algorithm variation, 0 auto select + -k, --keepalive send keepalived for prevent timeout (need pool support) + -r, --retries=N number of times to retry before switch to backup server (default: 5) + -R, --retry-pause=N time to pause between retries (default: 5) + --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1 + --cpu-priority set process priority (0 idle, 2 normal to 5 highest) + --no-huge-pages disable huge pages support + --no-color disable colored output + --donate-level=N donate level, default 5% (5 minutes in 100 minutes) + --user-agent set custom user-agent string for pool + -B, --background run the miner in the background + -c, --config=FILE load a JSON-format configuration file + -l, --log-file=FILE log all output to a file + --max-cpu-usage=N maximum CPU usage for automatic threads mode (default 75) + --safe safe adjust threads and av settings for current CPU + --nicehash enable nicehash/xmrig-proxy support + --print-time=N print hashrate report every N seconds + --api-port=N port for the miner API + --api-access-token=T access token for API + --api-worker-id=ID custom worker-id for API + -h, --help display this help and exit + -V, --version output version information and exit ``` Also you can use configuration via config file, default **config.json**. You can load multiple config files and combine it with command line options. From 038bb1f6bc2c422a7c7c5a4c23bc2129de4cdbf0 Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 10 Jan 2018 16:56:08 +0700 Subject: [PATCH 4/6] Fix version. --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index f869db8a..52058eec 100644 --- a/src/version.h +++ b/src/version.h @@ -35,7 +35,7 @@ #define APP_VER_MAJOR 2 #define APP_VER_MINOR 4 -#define APP_VER_BUILD 3 +#define APP_VER_BUILD 4 #define APP_VER_REV 0 #ifdef _MSC_VER From e6540229cba5bdb52c3a80615bb0f5266f63d4db Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 10 Jan 2018 22:55:45 +0700 Subject: [PATCH 5/6] #328 Added guard to prevent paused message spam and crash. --- src/App.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index c08a8be2..1c00e4fb 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -166,8 +166,10 @@ void App::onConsoleCommand(char command) case 'p': case 'P': - LOG_INFO(m_options->colors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume"); - Workers::setEnabled(false); + if (Workers::isEnabled()) { + LOG_INFO(m_options->colors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume"); + Workers::setEnabled(false); + } break; case 'r': From 916cf0ae0da6ac9a59bebb86a6106d0e34d3eb96 Mon Sep 17 00:00:00 2001 From: xmrig Date: Thu, 11 Jan 2018 15:08:24 +0700 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54314eca..878ff984 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v2.4.4 + - Added libmicrohttpd version to --version output. + - Fixed bug in singal handler, in some cases miner wasn't shutdown properly. + - Fixed recent MSVC 2017 version detection. + - [#279](https://github.com/xmrig/xmrig/pull/279) Fixed build on some macOS versions. + # v2.4.3 - [#94](https://github.com/xmrig/xmrig/issues/94#issuecomment-342019257) [#216](https://github.com/xmrig/xmrig/issues/216) Added **ARMv8** and **ARMv7** support. Hardware AES supported, thanks [Imran Yusuff](https://github.com/imranyusuff). - [#157](https://github.com/xmrig/xmrig/issues/157) [#196](https://github.com/xmrig/xmrig/issues/196) Fixed Linux compile issues.