Merge branch 'base-update' into dev

src/App.cpp

@@ -32,7 +32,7 @@
 #include "backend/cpu/Cpu.h"
 #include "base/io/Console.h"
 #include "base/io/log/Log.h"
-#include "base/kernel/Signals.h"
+#include "base/io/Signals.h"
 #include "base/kernel/Platform.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"

src/backend/common/Hashrate.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -30,10 +30,10 @@
 
 
 #include "backend/common/Hashrate.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 #include "base/tools/Chrono.h"
 #include "base/tools/Handle.h"
-#include "rapidjson/document.h"
 
 
 inline static const char *format(double h, char *buf, size_t size)

src/backend/common/Hashrate.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 #include <cstdint>
 
 
+#include "3rdparty/rapidjson/fwd.h"
 #include "base/tools/Object.h"
-#include "rapidjson/fwd.h"
 
 
 namespace xmrig {

src/backend/common/Threads.cpp

@@ -24,9 +24,9 @@
 
 
 #include "backend/common/Threads.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/cpu/CpuThreads.h"
 #include "crypto/cn/CnAlgo.h"
-#include "rapidjson/document.h"
 
 
 #ifdef XMRIG_FEATURE_OPENCL

src/backend/common/Threads.h

@@ -30,9 +30,9 @@
 #include <set>
 
 
+#include "3rdparty/rapidjson/fwd.h"
 #include "base/crypto/Algorithm.h"
 #include "base/tools/String.h"
-#include "rapidjson/fwd.h"
 
 
 namespace xmrig {

src/backend/common/common.cmake

@@ -4,7 +4,6 @@ set(HEADERS_BACKEND_COMMON
     src/backend/common/interfaces/IBackend.h
     src/backend/common/interfaces/IRxListener.h
     src/backend/common/interfaces/IRxStorage.h
-    src/backend/common/interfaces/IThread.h
     src/backend/common/interfaces/IWorker.h
     src/backend/common/misc/PciTopology.h
     src/backend/common/Thread.h

src/backend/common/interfaces/IBackend.h

@@ -29,7 +29,7 @@
 #include <cstdint>
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/backend/common/interfaces/IThread.h

@@ -1,77 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2018 XMRig       <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_ITHREAD_H
-#define XMRIG_ITHREAD_H
-
-
-#include <stdint.h>
-
-
-#include "crypto/common/Algorithm.h"
-#include "rapidjson/fwd.h"
-
-
-namespace xmrig {
-
-
-class IThread
-{
-public:
-    enum Type {
-        CPU,
-        OpenCL,
-        CUDA
-    };
-
-    enum Multiway {
-        SingleWay = 1,
-        DoubleWay,
-        TripleWay,
-        QuadWay,
-        PentaWay
-    };
-
-    virtual ~IThread() = default;
-
-    virtual Algorithm algorithm() const                               = 0;
-    virtual int priority() const                                      = 0;
-    virtual int64_t affinity() const                                  = 0;
-    virtual Multiway multiway() const                                 = 0;
-    virtual rapidjson::Value toConfig(rapidjson::Document &doc) const = 0;
-    virtual size_t index() const                                      = 0;
-    virtual Type type() const                                         = 0;
-
-#   ifdef XMRIG_FEATURE_API
-    virtual rapidjson::Value toAPI(rapidjson::Document &doc) const = 0;
-#   endif
-
-#   ifdef APP_DEBUG
-    virtual void print() const = 0;
-#   endif
-};
-
-
-} /* namespace xmrig */
-
-
-#endif // XMRIG_ITHREAD_H

src/backend/cpu/Cpu.cpp

@@ -27,7 +27,7 @@
 
 
 #include "backend/cpu/Cpu.h"
-#include "rapidjson/document.h"
+#include "3rdparty/rapidjson/document.h"
 
 
 #if defined(XMRIG_FEATURE_HWLOC)

src/backend/cpu/CpuBackend.cpp

@@ -26,12 +26,13 @@
 #include <mutex>
 
 
+#include "backend/cpu/CpuBackend.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/common/Hashrate.h"
 #include "backend/common/interfaces/IWorker.h"
 #include "backend/common/Tags.h"
 #include "backend/common/Workers.h"
 #include "backend/cpu/Cpu.h"
-#include "backend/cpu/CpuBackend.h"
 #include "base/io/log/Log.h"
 #include "base/net/stratum/Job.h"
 #include "base/tools/Chrono.h"
@@ -41,7 +42,6 @@
 #include "crypto/common/VirtualMemory.h"
 #include "crypto/rx/Rx.h"
 #include "crypto/rx/RxDataset.h"
-#include "rapidjson/document.h"
 
 
 #ifdef XMRIG_FEATURE_API

src/backend/cpu/CpuConfig.cpp

@@ -24,10 +24,10 @@
 
 
 #include "backend/cpu/CpuConfig.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/cpu/CpuConfig_gen.h"
 #include "backend/cpu/Cpu.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 #include <algorithm>
 

src/backend/cpu/CpuThread.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 
 
 #include "backend/cpu/CpuThread.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 
 xmrig::CpuThread::CpuThread(const rapidjson::Value &value)

src/backend/cpu/CpuThread.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #define XMRIG_CPUTHREAD_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/backend/cpu/CpuThreads.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
 
 
 #include "backend/cpu/CpuThreads.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 
 namespace xmrig {

src/backend/cpu/CpuThreads.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/backend/cuda/CudaBackend.cpp

@@ -28,6 +28,7 @@
 
 
 #include "backend/cuda/CudaBackend.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/common/Hashrate.h"
 #include "backend/common/interfaces/IWorker.h"
 #include "backend/common/Tags.h"
@@ -43,7 +44,6 @@
 #include "base/tools/String.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
-#include "rapidjson/document.h"
 
 
 #ifdef XMRIG_ALGO_ASTROBWT

src/backend/cuda/CudaConfig.cpp

@@ -24,12 +24,12 @@
 
 
 #include "backend/cuda/CudaConfig.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/common/Tags.h"
 #include "backend/cuda/CudaConfig_gen.h"
 #include "backend/cuda/wrappers/CudaLib.h"
 #include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
-#include "rapidjson/document.h"
 
 
 namespace xmrig {

src/backend/cuda/CudaThread.cpp

@@ -24,9 +24,9 @@
 
 
 #include "backend/cuda/CudaThread.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/cuda/wrappers/CudaLib.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 
 #include <algorithm>

src/backend/cuda/CudaThread.h

@@ -29,7 +29,7 @@
 using nvid_ctx = struct nvid_ctx;
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 namespace xmrig {

src/backend/cuda/CudaThreads.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 
 
 #include "backend/cuda/CudaThreads.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 
 #include <algorithm>

src/backend/cuda/CudaThreads.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/backend/cuda/wrappers/CudaDevice.cpp

@@ -24,11 +24,12 @@
 
 
 #include "backend/cuda/wrappers/CudaDevice.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/cuda/CudaThreads.h"
 #include "backend/cuda/wrappers/CudaLib.h"
 #include "base/crypto/Algorithm.h"
 #include "base/io/log/Log.h"
-#include "rapidjson/document.h"
+
 
 #ifdef XMRIG_FEATURE_NVML
 #   include "backend/cuda/wrappers/NvmlLib.h"

src/backend/cuda/wrappers/CudaLib.cpp

@@ -28,7 +28,7 @@
 
 
 #include "backend/cuda/wrappers/CudaLib.h"
-#include "base/kernel/Env.h"
+#include "base/io/Env.h"
 #include "crypto/rx/RxAlgo.h"
 
 

src/backend/opencl/OclBackend.cpp

@@ -28,6 +28,7 @@
 
 
 #include "backend/opencl/OclBackend.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/common/Hashrate.h"
 #include "backend/common/interfaces/IWorker.h"
 #include "backend/common/Tags.h"
@@ -45,7 +46,6 @@
 #include "base/tools/String.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
-#include "rapidjson/document.h"
 
 
 #ifdef XMRIG_FEATURE_API

src/backend/opencl/OclConfig.cpp

@@ -24,12 +24,12 @@
 
 
 #include "backend/opencl/OclConfig.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/common/Tags.h"
 #include "backend/opencl/OclConfig_gen.h"
 #include "backend/opencl/wrappers/OclLib.h"
 #include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
-#include "rapidjson/document.h"
 
 
 namespace xmrig {

src/backend/opencl/OclThread.cpp

@@ -24,8 +24,8 @@
 
 
 #include "backend/opencl/OclThread.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 
 #include <algorithm>

src/backend/opencl/OclThread.h

@@ -26,7 +26,7 @@
 #define XMRIG_OCLTHREAD_H
 
 
-#include "rapidjson/fwd.h"
+#include "3rdparty/rapidjson/fwd.h"
 
 
 #include <bitset>

src/backend/opencl/OclThreads.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
 
 
 #include "backend/opencl/OclThreads.h"
+#include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
-#include "rapidjson/document.h"
 
 
 xmrig::OclThreads::OclThreads(const rapidjson::Value &value)

src/backend/opencl/OclThreads.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/backend/opencl/wrappers/OclDevice.cpp

@@ -24,11 +24,12 @@
 
 
 #include "backend/opencl/wrappers/OclDevice.h"
+#include "3rdparty/rapidjson/document.h"
 #include "backend/opencl/OclGenerator.h"
 #include "backend/opencl/OclThreads.h"
 #include "backend/opencl/wrappers/OclLib.h"
 #include "base/io/log/Log.h"
-#include "rapidjson/document.h"
+
 
 #ifdef XMRIG_FEATURE_ADL
 #   include "backend/opencl/wrappers/AdlLib.h"