Move files.

CMakeLists.txt

@@ -20,6 +20,15 @@ set(HEADERS
     src/common/Console.h
     src/common/crypto/Algorithm.h
     src/common/crypto/keccak.h
+    src/common/interfaces/IClientListener.h
+    src/common/interfaces/IConfig.h
+    src/common/interfaces/IConfigCreator.h
+    src/common/interfaces/IConsoleListener.h
+    src/common/interfaces/IControllerListener.h
+    src/common/interfaces/ILogBackend.h
+    src/common/interfaces/IStrategy.h
+    src/common/interfaces/IStrategyListener.h
+    src/common/interfaces/IWatcherListener.h
     src/common/log/ConsoleLog.h
     src/common/log/FileLog.h
     src/common/log/Log.h
@@ -38,17 +47,8 @@ set(HEADERS
     src/core/ConfigLoader_platform.h
     src/core/Controller.h
     src/Cpu.h
-    src/interfaces/IClientListener.h
-    src/interfaces/IConfig.h
-    src/interfaces/IConfigCreator.h
-    src/interfaces/IConsoleListener.h
-    src/interfaces/IControllerListener.h
     src/interfaces/IJobResultListener.h
-    src/interfaces/ILogBackend.h
-    src/interfaces/IStrategy.h
-    src/interfaces/IStrategyListener.h
     src/interfaces/IThread.h
-    src/interfaces/IWatcherListener.h
     src/interfaces/IWorker.h
     src/Mem.h
     src/net/JobResult.h

src/App.h

@@ -28,7 +28,7 @@
 #include <uv.h>
 
 
-#include "interfaces/IConsoleListener.h"
+#include "common/interfaces/IConsoleListener.h"
 
 
 class Console;

src/api/ApiRouter.h

@@ -26,7 +26,7 @@
 
 
 #include "api/NetworkState.h"
-#include "interfaces/IControllerListener.h"
+#include "common/interfaces/IControllerListener.h"
 #include "rapidjson/fwd.h"
 
 

src/common/config/CommonConfig.h

@@ -28,10 +28,10 @@
 #include <vector>
 
 
+#include "common/interfaces/IConfig.h"
 #include "common/net/Pool.h"
 #include "common/utils/c_str.h"
 #include "common/xmrig.h"
-#include "interfaces/IConfig.h"
 
 
 namespace xmrig {

src/common/config/ConfigLoader.cpp

@@ -34,12 +34,12 @@
 
 #include "common/config/ConfigLoader.h"
 #include "common/config/ConfigWatcher.h"
+#include "common/interfaces/IConfig.h"
+#include "common/interfaces/IWatcherListener.h"
 #include "common/net/Pool.h"
 #include "common/Platform.h"
 #include "core/ConfigCreator.h"
 #include "core/ConfigLoader_platform.h"
-#include "interfaces/IConfig.h"
-#include "interfaces/IWatcherListener.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"
 #include "rapidjson/filereadstream.h"

src/common/config/ConfigWatcher.cpp

@@ -27,9 +27,9 @@
 
 #include "common/config/ConfigLoader.h"
 #include "common/config/ConfigWatcher.h"
+#include "common/interfaces/IWatcherListener.h"
 #include "common/log/Log.h"
 #include "core/ConfigCreator.h"
-#include "interfaces/IWatcherListener.h"
 
 
 xmrig::ConfigWatcher::ConfigWatcher(const char *path, IConfigCreator *creator, IWatcherListener *listener) :

src/common/interfaces/IConfig.h

@@ -78,6 +78,12 @@ public:
         ThreadsKey        = 't',
         HardwareAESKey    = 1011,
 
+        // xmrig amd
+        OclPlatform       = 1400,
+        OclAffinity       = 1401,
+        OclDevices        = 1402,
+        OclLaunch         = 1403,
+
         // xmrig-proxy
         AccessLogFileKey  = 'A',
         BindKey           = 'b',

src/common/interfaces/ILogBackend.h

@@ -40,7 +40,11 @@ public:
         DEBUG
     };
 
+#   ifdef APP_DEBUG
+    constexpr static const size_t kBufferSize = 1024;
+#   else
     constexpr static const size_t kBufferSize = 512;
+#   endif
 
     virtual ~ILogBackend() {}
 

src/common/log/ConsoleLog.h

@@ -28,7 +28,7 @@
 #include <uv.h>
 
 
-#include "interfaces/ILogBackend.h"
+#include "common/interfaces/ILogBackend.h"
 
 
 namespace xmrig {

src/common/log/FileLog.h

@@ -28,7 +28,7 @@
 #include <uv.h>
 
 
-#include "interfaces/ILogBackend.h"
+#include "common/interfaces/ILogBackend.h"
 
 
 namespace xmrig {

src/common/log/Log.cpp

@@ -29,8 +29,8 @@
 #include <time.h>
 
 
+#include "common/interfaces/ILogBackend.h"
 #include "common/log/Log.h"
-#include "interfaces/ILogBackend.h"
 
 
 Log *Log::m_self = nullptr;

src/common/log/Log.h

@@ -30,7 +30,7 @@
 #include <vector>
 
 
-#include "interfaces/ILogBackend.h"
+#include "common/interfaces/ILogBackend.h"
 
 
 class Log

src/common/net/Client.cpp

@@ -29,9 +29,9 @@
 #include <utility>
 
 
+#include "common/interfaces/IClientListener.h"
 #include "common/log/Log.h"
 #include "common/net/Client.h"
-#include "interfaces/IClientListener.h"
 #include "net/JobResult.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"

src/common/net/Pool.cpp

@@ -101,6 +101,12 @@ bool Pool::isCompatible(const xmrig::Algorithm &algorithm) const
         }
     }
 
+#   ifdef XMRIG_PROXY_PROJECT
+    if (m_algorithm.algo() == xmrig::CRYPTONIGHT && algorithm.algo() == xmrig::CRYPTONIGHT && m_algorithm.variant() == xmrig::VARIANT_XTL) {
+        return true;
+    }
+#   endif
+
     return false;
 }
 

src/common/net/strategies/FailoverStrategy.cpp

@@ -22,10 +22,10 @@
  */
 
 
+#include "common/interfaces/IStrategyListener.h"
 #include "common/net/Client.h"
 #include "common/net/strategies/FailoverStrategy.h"
 #include "common/Platform.h"
-#include "interfaces/IStrategyListener.h"
 
 
 FailoverStrategy::FailoverStrategy(const std::vector<Pool> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet) :

src/common/net/strategies/FailoverStrategy.h

@@ -28,9 +28,9 @@
 #include <vector>
 
 
+#include "common/interfaces/IClientListener.h"
+#include "common/interfaces/IStrategy.h"
 #include "common/net/Pool.h"
-#include "interfaces/IClientListener.h"
-#include "interfaces/IStrategy.h"
 
 
 class Client;

src/common/net/strategies/SinglePoolStrategy.cpp

@@ -22,10 +22,10 @@
  */
 
 
+#include "common/interfaces/IStrategyListener.h"
 #include "common/net/Client.h"
 #include "common/net/strategies/SinglePoolStrategy.h"
 #include "common/Platform.h"
-#include "interfaces/IStrategyListener.h"
 
 
 SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet) :

src/common/net/strategies/SinglePoolStrategy.h

@@ -25,8 +25,8 @@
 #define __SINGLEPOOLSTRATEGY_H__
 
 
-#include "interfaces/IClientListener.h"
+#include "common/interfaces/IClientListener.h"
-#include "interfaces/IStrategy.h"
+#include "common/interfaces/IStrategy.h"
 
 
 class Client;

src/core/ConfigCreator.h

@@ -24,8 +24,8 @@
 #define __CONFIGCREATOR_H__
 
 
+#include "common/interfaces/IConfigCreator.h"
 #include "core/Config.h"
-#include "interfaces/IConfigCreator.h"
 
 
 namespace xmrig {

src/core/ConfigLoader_platform.h

@@ -33,8 +33,8 @@
 #endif
 
 
+#include "common/interfaces/IConfig.h"
 #include "version.h"
-#include "interfaces/IConfig.h"
 
 
 namespace xmrig {

src/core/Controller.cpp

@@ -26,6 +26,7 @@
 
 
 #include "common/config/ConfigLoader.h"
+#include "common/interfaces/IControllerListener.h"
 #include "common/log/ConsoleLog.h"
 #include "common/log/FileLog.h"
 #include "common/log/Log.h"
@@ -33,7 +34,6 @@
 #include "core/Config.h"
 #include "core/Controller.h"
 #include "Cpu.h"
-#include "interfaces/IControllerListener.h"
 #include "net/Network.h"
 
 

src/core/Controller.h

@@ -25,7 +25,7 @@
 #define __CONTROLLER_H__
 
 
-#include "interfaces/IWatcherListener.h"
+#include "common/interfaces/IWatcherListener.h"
 
 
 class Network;

src/net/Network.h

@@ -30,8 +30,8 @@
 
 
 #include "api/NetworkState.h"
+#include "common/interfaces/IStrategyListener.h"
 #include "interfaces/IJobResultListener.h"
-#include "interfaces/IStrategyListener.h"
 
 
 class IStrategy;

src/net/strategies/DonateStrategy.cpp

@@ -23,13 +23,13 @@
 
 
 #include "common/crypto/keccak.h"
+#include "common/interfaces/IStrategyListener.h"
 #include "common/net/Client.h"
 #include "common/net/Job.h"
 #include "common/net/strategies/FailoverStrategy.h"
 #include "common/net/strategies/SinglePoolStrategy.h"
 #include "common/Platform.h"
 #include "common/xmrig.h"
-#include "interfaces/IStrategyListener.h"
 #include "net/strategies/DonateStrategy.h"
 
 

src/net/strategies/DonateStrategy.h

@@ -30,9 +30,9 @@
 
 
 #include "common/net/Pool.h"
-#include "interfaces/IClientListener.h"
+#include "common/interfaces/IClientListener.h"
-#include "interfaces/IStrategy.h"
+#include "common/interfaces/IStrategy.h"
-#include "interfaces/IStrategyListener.h"
+#include "common/interfaces/IStrategyListener.h"
 
 
 class Client;