Fixed command line config and removed --max-cpu-usage and --safe.

src/backend/common/Threads.cpp

@@ -28,6 +28,15 @@
 #include "rapidjson/document.h"
 
 
+namespace xmrig {
+
+
+static const char *kAsterisk = "*";
+
+
+} // namespace xmrig
+
+
 template <class T>
 const std::vector<T> &xmrig::Threads<T>::get(const String &profileName) const
 {
@@ -41,34 +50,7 @@ const std::vector<T> &xmrig::Threads<T>::get(const String &profileName) const
 
 
 template <class T>
-xmrig::String xmrig::Threads<T>::profileName(const Algorithm &algorithm, bool strict) const
+size_t xmrig::Threads<T>::read(const rapidjson::Value &value)
-{
-    if (isDisabled(algorithm)) {
-        return String();
-    }
-
-    const String name = algorithm.shortName();
-    if (has(name)) {
-        return name;
-    }
-
-    if (m_aliases.count(algorithm) > 0) {
-        return m_aliases.at(algorithm);
-    }
-
-    if (!strict && name.contains("/")) {
-        const String base = name.split('/').at(0);
-        if (has(base)) {
-            return base;
-        }
-    }
-
-    return String();
-}
-
-
-template <class T>
-void xmrig::Threads<T>::read(const rapidjson::Value &value)
 {
     using namespace rapidjson;
 
@@ -109,6 +91,43 @@ void xmrig::Threads<T>::read(const rapidjson::Value &value)
             }
         }
     }
+
+    return m_profiles.size();
+}
+
+
+template <class T>
+xmrig::String xmrig::Threads<T>::profileName(const Algorithm &algorithm, bool strict) const
+{
+    if (isDisabled(algorithm)) {
+        return String();
+    }
+
+    const String name = algorithm.shortName();
+    if (has(name)) {
+        return name;
+    }
+
+    if (m_aliases.count(algorithm) > 0) {
+        return m_aliases.at(algorithm);
+    }
+
+    if (strict) {
+        return String();
+    }
+
+    if (name.contains("/")) {
+        const String base = name.split('/').at(0);
+        if (has(base)) {
+            return base;
+        }
+    }
+
+    if (has(kAsterisk)) {
+        return kAsterisk;
+    }
+
+    return String();
 }
 
 

src/backend/common/Threads.h

@@ -50,8 +50,8 @@ public:
     inline void move(const char *profile, std::vector<T> &&threads)                    { m_profiles.insert({ profile, threads }); }
 
     const std::vector<T> &get(const String &profileName) const;
+    size_t read(const rapidjson::Value &value);
     String profileName(const Algorithm &algorithm, bool strict = false) const;
-    void read(const rapidjson::Value &value);
     void toJSON(rapidjson::Value &out, rapidjson::Document &doc) const;
 
 private:

src/backend/cpu/CpuConfig.cpp

@@ -132,12 +132,21 @@ void xmrig::CpuConfig::read(const rapidjson::Value &value)
         m_assembly = Json::getValue(value, kAsm);
 #       endif
 
-        m_threads.read(value);
+        if (!m_threads.read(value)) {
+            generate();
+        }
     }
     else if (value.IsBool() && value.IsFalse()) {
         m_enabled = false;
     }
     else {
+        generate();
+    }
+}
+
+
+void xmrig::CpuConfig::generate()
+{
     m_shouldSave = true;
 
     m_threads.disable(Algorithm::CN_0);
@@ -165,7 +174,6 @@ void xmrig::CpuConfig::read(const rapidjson::Value &value)
     m_threads.move(kRxWOW, Cpu::info()->threads(Algorithm::RX_WOW));
 #   endif
 }
-}
 
 
 void xmrig::CpuConfig::setAesMode(const rapidjson::Value &aesMode)
@@ -177,9 +185,3 @@ void xmrig::CpuConfig::setAesMode(const rapidjson::Value &aesMode)
         m_aes = AES_AUTO;
     }
 }
-
-
-void xmrig::CpuConfig::setPriority(int priority)
-{
-    m_priority = (priority >= -1 && priority <= 5) ? priority : -1;
-}

src/backend/cpu/CpuConfig.h

@@ -59,8 +59,10 @@ public:
     inline int priority() const                      { return m_priority; }
 
 private:
+    void generate();
     void setAesMode(const rapidjson::Value &aesMode);
-    void setPriority(int priority);
+
+    inline void setPriority(int priority)   { m_priority = (priority >= -1 && priority <= 5) ? priority : -1; }
 
     AesMode m_aes        = AES_AUTO;
     Assembly m_assembly;

src/backend/cpu/CpuWorker.cpp

@@ -273,7 +273,7 @@ template<size_t N>
 void xmrig::CpuWorker<N>::allocateCnCtx()
 {
     if (m_ctx[0] == nullptr) {
-        CnCtx::create(m_ctx, m_memory->scratchpad(), m_memory->size(), N);
+        CnCtx::create(m_ctx, m_memory->scratchpad(), m_algorithm.memory(), N);
     }
 }
 

src/base/base.cmake

@@ -146,5 +146,3 @@ else()
     remove_definitions(/DXMRIG_FEATURE_HTTP)
     remove_definitions(/DXMRIG_FEATURE_API)
 endif()
-
-add_definitions(/DXMRIG_DEPRECATED)

src/base/kernel/config/BaseConfig.cpp

@@ -139,20 +139,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
         m_apiWorkerId = Json::getString(api, "worker-id");
     }
 
-#   ifdef XMRIG_DEPRECATED
-    if (api.IsObject() && api.HasMember("port")) {
-        m_upgrade = true;
-        m_http.load(api);
-        m_http.setEnabled(Json::getUint(api, "port") > 0);
-        m_http.setHost("0.0.0.0");
-    }
-    else {
     m_http.load(reader.getObject("http"));
-    }
-#   else
-    m_http.load(chain.getObject("http"));
-#   endif
-
     m_pools.load(reader);
 
     return m_pools.active() > 0;

src/base/kernel/config/BaseTransform.cpp

@@ -87,15 +87,31 @@ void xmrig::BaseTransform::load(JsonChain &chain, Process *process, IConfigTrans
         LOG_WARN("%s: unsupported non-option argument '%s'", argv[0], argv[optind]);
     }
 
+    transform.finalize(doc);
     chain.add(std::move(doc));
 }
 
 
+void xmrig::BaseTransform::finalize(rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+    auto &allocator = doc.GetAllocator();
+
+    if (m_algorithm.isValid() && doc.HasMember(kPools)) {
+        auto &pools = doc[kPools];
+        for (Value &pool : pools.GetArray()) {
+            pool.AddMember(StringRef("algo"), m_algorithm.toJSON(), allocator);
+        }
+    }
+}
+
+
 void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const char *arg)
 {
     switch (key) {
     case IConfig::AlgorithmKey: /* --algo */
-        return set(doc, "algo", arg);
+        m_algorithm = arg;
+        break;
 
     case IConfig::UserpassKey: /* --userpass */
         {
@@ -134,13 +150,6 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
     case IConfig::LogFileKey: /* --log-file */
         return set(doc, "log-file", arg);
 
-#   ifdef XMRIG_DEPRECATED
-    case IConfig::ApiAccessTokenKey: /* --api-access-token */
-        fputs("option \"--api-access-token\" deprecated, use \"--http-access-token\" instead.\n", stderr);
-        fflush(stdout);
-        return set(doc, kHttp, "access-token", arg);
-#   endif
-
     case IConfig::HttpAccessTokenKey: /* --http-access-token */
         return set(doc, kHttp, "access-token", arg);
 
@@ -162,9 +171,6 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
     case IConfig::HttpPort:       /* --http-port */
     case IConfig::DonateLevelKey: /* --donate-level */
     case IConfig::DaemonPollKey:  /* --daemon-poll-interval */
-#   ifdef XMRIG_DEPRECATED
-    case IConfig::ApiPort:       /* --api-port */
-#   endif
         return transformUint64(doc, key, static_cast<uint64_t>(strtol(arg, nullptr, 10)));
 
     case IConfig::BackgroundKey:  /* --background */
@@ -179,10 +185,6 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
 
     case IConfig::ColorKey:          /* --no-color */
     case IConfig::HttpRestrictedKey: /* --http-no-restricted */
-#   ifdef XMRIG_DEPRECATED
-    case IConfig::ApiRestrictedKey: /* --api-no-restricted */
-    case IConfig::ApiIPv6Key:       /* --api-ipv6 */
-#   endif
         return transformBoolean(doc, key, false);
 
     default:
@@ -217,16 +219,6 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b
     case IConfig::ColorKey: /* --no-color */
         return set(doc, "colors", enable);
 
-#   ifdef XMRIG_DEPRECATED
-    case IConfig::ApiIPv6Key: /* --api-ipv6 */
-        break;
-
-    case IConfig::ApiRestrictedKey: /* --api-no-restricted */
-        fputs("option \"--api-no-restricted\" deprecated, use \"--http-no-restricted\" instead.\n", stderr);
-        fflush(stdout);
-        return set(doc, kHttp, "restricted", enable);
-#   endif
-
     case IConfig::HttpRestrictedKey: /* --http-no-restricted */
         return set(doc, kHttp, "restricted", enable);
 
@@ -257,13 +249,6 @@ void xmrig::BaseTransform::transformUint64(rapidjson::Document &doc, int key, ui
     case IConfig::ProxyDonateKey: /* --donate-over-proxy */
         return set(doc, "donate-over-proxy", arg);
 
-#   ifdef XMRIG_DEPRECATED
-    case IConfig::ApiPort: /* --api-port */
-        fputs("option \"--api-port\" deprecated, use \"--http-port\" instead.\n", stderr);
-        fflush(stdout);
-        return set(doc, kHttp, "port", arg);
-#   endif
-
     case IConfig::HttpPort: /* --http-port */
         return set(doc, kHttp, "port", arg);
 

src/base/kernel/config/BaseTransform.h

@@ -49,6 +49,7 @@ public:
     static void load(JsonChain &chain, Process *process, IConfigTransform &transform);
 
 protected:
+    void finalize(rapidjson::Document &doc) override;
     void transform(rapidjson::Document &doc, int key, const char *arg) override;
 
 
@@ -96,6 +97,9 @@ protected:
         }
     }
 
+protected:
+    Algorithm m_algorithm;
+
 
 private:
     void transformBoolean(rapidjson::Document &doc, int key, bool enable);

src/base/kernel/interfaces/IConfig.h

@@ -73,13 +73,6 @@ public:
         DaemonKey            = 1018,
         DaemonPollKey        = 1019,
 
-#       ifdef XMRIG_DEPRECATED
-        ApiPort              = 4000,
-        ApiAccessTokenKey    = 4001,
-        ApiIPv6Key           = 4003,
-        ApiRestrictedKey     = 4004,
-#       endif
-
         // xmrig common
         CPUPriorityKey       = 1021,
         NicehashKey          = 1006,
@@ -90,8 +83,6 @@ public:
         CPUAffinityKey       = 1020,
         DryRunKey            = 5000,
         HugePagesKey         = 1009,
-        MaxCPUUsageKey       = 1004,
-        SafeKey              = 1005,
         ThreadsKey           = 't',
 //        HardwareAESKey       = 1011,
         AssemblyKey          = 1015,

src/base/kernel/interfaces/IConfigTransform.h

@@ -42,6 +42,7 @@ class IConfigTransform
 public:
     virtual ~IConfigTransform() = default;
 
+    virtual void finalize(rapidjson::Document &doc)                             = 0;
     virtual void transform(rapidjson::Document &doc, int key, const char *arg)  = 0;
 };
 

src/core/config/ConfigTransform.cpp

@@ -23,27 +23,189 @@
  */
 
 
-#include "core/config/ConfigTransform.h"
 #include "base/kernel/interfaces/IConfig.h"
+#include "core/config/ConfigTransform.h"
+#include "crypto/cn/CnHash.h"
 
 
-xmrig::ConfigTransform::ConfigTransform()
+namespace xmrig
 {
 
+
+static const char *kAffinity    = "affinity";
+static const char *kAsterisk    = "*";
+static const char *kCpu         = "cpu";
+static const char *kIntensity   = "intensity";
+
+
+static inline uint64_t intensity(uint64_t av)
+{
+    switch (av) {
+    case CnHash::AV_SINGLE:
+    case CnHash::AV_SINGLE_SOFT:
+        return 1;
+
+    case CnHash::AV_DOUBLE_SOFT:
+    case CnHash::AV_DOUBLE:
+        return 2;
+
+    case CnHash::AV_TRIPLE_SOFT:
+    case CnHash::AV_TRIPLE:
+        return 3;
+
+    case CnHash::AV_QUAD_SOFT:
+    case CnHash::AV_QUAD:
+        return 4;
+
+    case CnHash::AV_PENTA_SOFT:
+    case CnHash::AV_PENTA:
+        return 5;
+
+    default:
+        break;
+    }
+
+    return 1;
+}
+
+
+static inline bool isHwAes(uint64_t av)
+{
+    return av == CnHash::AV_SINGLE || av == CnHash::AV_DOUBLE || (av > CnHash::AV_DOUBLE_SOFT && av < CnHash::AV_TRIPLE_SOFT);
+}
+
+
+static inline int64_t affinity(uint64_t index, int64_t affinity)
+{
+    if (affinity == -1L) {
+        return -1L;
+    }
+
+    size_t idx = 0;
+
+    for (size_t i = 0; i < 64; i++) {
+        if (!(static_cast<uint64_t>(affinity) & (1ULL << i))) {
+            continue;
+        }
+
+        if (idx == index) {
+            return static_cast<int64_t>(i);
+        }
+
+        idx++;
+    }
+
+    return -1L;
+}
+
+
+}
+
+
+xmrig::ConfigTransform::ConfigTransform() : BaseTransform()
+{
+}
+
+
+void xmrig::ConfigTransform::finalize(rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+    auto &allocator = doc.GetAllocator();
+
+    BaseTransform::finalize(doc);
+
+    if (m_threads) {
+        if (!doc.HasMember(kCpu)) {
+            doc.AddMember(StringRef(kCpu), Value(kObjectType), allocator);
+        }
+
+        Value threads(kArrayType);
+
+        if (m_intensity > 1) {
+            for (uint64_t i = 0; i < m_threads; ++i) {
+                Value thread(kObjectType);
+                thread.AddMember(StringRef(kIntensity), m_intensity, allocator);
+                thread.AddMember(StringRef(kAffinity), affinity(i, m_affinity), allocator);
+
+                threads.PushBack(thread, doc.GetAllocator());
+            }
+        }
+        else {
+            for (uint64_t i = 0; i < m_threads; ++i) {
+                threads.PushBack(affinity(i, m_affinity), doc.GetAllocator());
+            }
+        }
+
+        doc[kCpu].AddMember(StringRef(kAsterisk), threads, doc.GetAllocator());
+    }
 }
 
 
 void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const char *arg)
 {
     BaseTransform::transform(doc, key, arg);
+
+    switch (key) {
+    case IConfig::AVKey:          /* --av */
+    case IConfig::CPUPriorityKey: /* --cpu-priority */
+    case IConfig::ThreadsKey:     /* --threads */
+        return transformUint64(doc, key, static_cast<uint64_t>(strtol(arg, nullptr, 10)));
+
+    case IConfig::HugePagesKey: /* --no-huge-pages */
+        return transformBoolean(doc, key, false);
+
+    case IConfig::CPUAffinityKey: /* --cpu-affinity */
+        {
+            const char *p  = strstr(arg, "0x");
+            return transformUint64(doc, key, p ? strtoull(p, nullptr, 16) : strtoull(arg, nullptr, 10));
+        }
+
+#   ifndef XMRIG_NO_ASM
+    case IConfig::AssemblyKey: /* --asm */
+        return set(doc, kCpu, "asm", arg);
+#   endif
+
+    default:
+        break;
+    }
 }
 
 
 void xmrig::ConfigTransform::transformBoolean(rapidjson::Document &doc, int key, bool enable)
 {
+    switch (key) {
+    case IConfig::HugePagesKey: /* --no-huge-pages */
+        return set(doc, kCpu, "huge-pages", enable);
+
+    default:
+        break;
+    }
 }
 
 
 void xmrig::ConfigTransform::transformUint64(rapidjson::Document &doc, int key, uint64_t arg)
 {
+    using namespace rapidjson;
+
+    switch (key) {
+    case IConfig::CPUAffinityKey: /* --cpu-affinity */
+        m_affinity = static_cast<int64_t>(arg);
+        break;
+
+    case IConfig::ThreadsKey: /* --threads */
+        m_threads = arg;
+        break;
+
+    case IConfig::AVKey: /* --av */
+        m_intensity = intensity(arg);
+        set(doc, kCpu, "hw-aes", isHwAes(arg));
+        break;
+
+    case IConfig::CPUPriorityKey: /* --cpu-priority */
+        return set(doc, kCpu, "priority", arg);
+
+    default:
+        break;
     }
+}
+

src/core/config/ConfigTransform.h

@@ -5,7 +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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 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
@@ -37,11 +38,16 @@ public:
     ConfigTransform();
 
 protected:
+    void finalize(rapidjson::Document &doc) override;
     void transform(rapidjson::Document &doc, int key, const char *arg) override;
 
 private:
     void transformBoolean(rapidjson::Document &doc, int key, bool enable);
     void transformUint64(rapidjson::Document &doc, int key, uint64_t arg);
+
+    int64_t m_affinity      = -1;
+    uint64_t m_intensity    = 1;
+    uint64_t m_threads      = 0;
 };
 
 

src/core/config/Config_platform.h

@@ -62,7 +62,6 @@ static const option options[] = {
     { "dry-run",               0, nullptr, IConfig::DryRunKey             },
     { "keepalive",             0, nullptr, IConfig::KeepAliveKey          },
     { "log-file",              1, nullptr, IConfig::LogFileKey            },
-    { "max-cpu-usage",         1, nullptr, IConfig::MaxCPUUsageKey        },
     { "nicehash",              0, nullptr, IConfig::NicehashKey           },
     { "no-color",              0, nullptr, IConfig::ColorKey              },
     { "no-huge-pages",         0, nullptr, IConfig::HugePagesKey          },
@@ -71,7 +70,6 @@ static const option options[] = {
     { "print-time",            1, nullptr, IConfig::PrintTimeKey          },
     { "retries",               1, nullptr, IConfig::RetriesKey            },
     { "retry-pause",           1, nullptr, IConfig::RetryPauseKey         },
-    { "safe",                  0, nullptr, IConfig::SafeKey               },
     { "syslog",                0, nullptr, IConfig::SyslogKey             },
     { "threads",               1, nullptr, IConfig::ThreadsKey            },
     { "url",                   1, nullptr, IConfig::UrlKey                },
@@ -84,39 +82,6 @@ static const option options[] = {
     { "asm",                   1, nullptr, IConfig::AssemblyKey           },
     { "daemon",                0, nullptr, IConfig::DaemonKey             },
     { "daemon-poll-interval",  1, nullptr, IConfig::DaemonPollKey         },
-
-#   ifdef XMRIG_DEPRECATED
-    { "api-port",              1, nullptr, IConfig::ApiPort               },
-    { "api-access-token",      1, nullptr, IConfig::ApiAccessTokenKey     },
-    { "api-no-restricted",     0, nullptr, IConfig::ApiRestrictedKey      },
-    { "api-ipv6",              0, nullptr, IConfig::ApiIPv6Key            },
-#   endif
-
-    { nullptr,                 0, nullptr, 0 }
-};
-
-
-static struct option const config_options[] = {
-    { "algo",              1, nullptr, IConfig::AlgorithmKey   },
-    { "av",                1, nullptr, IConfig::AVKey          },
-    { "background",        0, nullptr, IConfig::BackgroundKey  },
-    { "colors",            0, nullptr, IConfig::ColorKey       },
-    { "cpu-affinity",      1, nullptr, IConfig::CPUAffinityKey },
-    { "cpu-priority",      1, nullptr, IConfig::CPUPriorityKey },
-    { "donate-level",      1, nullptr, IConfig::DonateLevelKey },
-    { "donate-over-proxy", 1, nullptr, IConfig::ProxyDonateKey },
-    { "dry-run",           0, nullptr, IConfig::DryRunKey      },
-    { "huge-pages",        0, nullptr, IConfig::HugePagesKey   },
-    { "log-file",          1, nullptr, IConfig::LogFileKey     },
-    { "max-cpu-usage",     1, nullptr, IConfig::MaxCPUUsageKey },
-    { "print-time",        1, nullptr, IConfig::PrintTimeKey   },
-    { "retries",           1, nullptr, IConfig::RetriesKey     },
-    { "retry-pause",       1, nullptr, IConfig::RetryPauseKey  },
-    { "safe",              0, nullptr, IConfig::SafeKey        },
-    { "syslog",            0, nullptr, IConfig::SyslogKey      },
-    { "threads",           1, nullptr, IConfig::ThreadsKey     },
-    { "user-agent",        1, nullptr, IConfig::UserAgentKey   },
-    { "asm",               1, nullptr, IConfig::AssemblyKey    },
     { nullptr,                 0, nullptr, 0 }
 };
 

src/core/config/usage.h

@@ -87,8 +87,6 @@ Options:\n\
   -S, --syslog                  use system log for output messages\n"
 # endif
 "\
-      --max-cpu-usage=N         maximum CPU usage for automatic threads mode (default: 100)\n\
-      --safe                    safe adjust threads and av settings for current CPU\n\
       --asm=ASM                 ASM optimizations, possible values: auto, none, intel, ryzen, bulldozer.\n\
       --print-time=N            print hashrate report every N seconds\n"
 #ifdef XMRIG_FEATURE_HTTP