From ee341118ce43fc9eea057090d55822f133f9c5f3 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 19 Feb 2021 23:35:30 +0700 Subject: [PATCH] #2104 Added user configurable idle time. --- src/base/kernel/Platform.cpp | 4 +- src/base/kernel/Platform.h | 9 +++-- src/base/kernel/Platform_mac.cpp | 10 ++--- src/base/kernel/Platform_unix.cpp | 10 ++--- src/base/kernel/Platform_win.cpp | 13 ++++--- src/base/kernel/config/BaseConfig.cpp | 14 +------ src/base/kernel/config/BaseConfig.h | 18 ++------- src/base/kernel/config/BaseTransform.cpp | 18 +-------- src/base/kernel/config/BaseTransform.h | 10 +---- src/core/Miner.cpp | 11 +++--- src/core/config/Config.cpp | 49 +++++++++++++++++++----- src/core/config/Config.h | 17 ++++---- src/core/config/ConfigTransform.cpp | 16 ++++---- src/core/config/ConfigTransform.h | 10 +---- src/core/config/Config_platform.h | 2 +- src/core/config/usage.h | 2 +- 16 files changed, 99 insertions(+), 114 deletions(-) diff --git a/src/base/kernel/Platform.cpp b/src/base/kernel/Platform.cpp index 955a4eac..ef2b67eb 100644 --- a/src/base/kernel/Platform.cpp +++ b/src/base/kernel/Platform.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 diff --git a/src/base/kernel/Platform.h b/src/base/kernel/Platform.h index f3880489..04c212e6 100644 --- a/src/base/kernel/Platform.h +++ b/src/base/kernel/Platform.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -46,10 +46,11 @@ public: static void setProcessPriority(int priority); static void setThreadPriority(int priority); - static inline const String &userAgent() { return m_userAgent; } + static inline bool isUserActive(uint64_t ms) { return idleTime() < ms; } + static inline const String &userAgent() { return m_userAgent; } static bool isOnBatteryPower(); - static bool isUserActive(); + static uint64_t idleTime(); private: static char *createUserAgent(); diff --git a/src/base/kernel/Platform_mac.cpp b/src/base/kernel/Platform_mac.cpp index 7715b8d7..efbbf3ad 100644 --- a/src/base/kernel/Platform_mac.cpp +++ b/src/base/kernel/Platform_mac.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -25,6 +25,7 @@ #include #include #include +#include #include "base/kernel/Platform.h" @@ -109,8 +110,7 @@ bool xmrig::Platform::isOnBatteryPower() } -bool xmrig::Platform::isUserActive() +uint64_t xmrig::Platform::idleTime() { - // TODO - return false; + return std::numeric_limits::max(); } diff --git a/src/base/kernel/Platform_unix.cpp b/src/base/kernel/Platform_unix.cpp index cf7d37ca..f5bbc193 100644 --- a/src/base/kernel/Platform_unix.cpp +++ b/src/base/kernel/Platform_unix.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -34,6 +34,7 @@ #include #include #include +#include #include "base/kernel/Platform.h" @@ -160,8 +161,7 @@ bool xmrig::Platform::isOnBatteryPower() } -bool xmrig::Platform::isUserActive() +uint64_t xmrig::Platform::idleTime() { - // TODO - return false; + return std::numeric_limits::max(); } diff --git a/src/base/kernel/Platform_win.cpp b/src/base/kernel/Platform_win.cpp index 7667691b..75f81041 100644 --- a/src/base/kernel/Platform_win.cpp +++ b/src/base/kernel/Platform_win.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -21,6 +21,7 @@ #include #include #include +#include #include "base/kernel/Platform.h" @@ -163,14 +164,14 @@ bool xmrig::Platform::isOnBatteryPower() } -bool xmrig::Platform::isUserActive() +uint64_t xmrig::Platform::idleTime() { - LASTINPUTINFO info; + LASTINPUTINFO info{}; info.cbSize = sizeof(LASTINPUTINFO); if (!GetLastInputInfo(&info)) { - return false; + return std::numeric_limits::max(); } - return static_cast(GetTickCount() - info.dwTime) < 60 * 1000; + return static_cast(GetTickCount() - info.dwTime); } diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp index c2f4196e..1f2b09cb 100644 --- a/src/base/kernel/config/BaseConfig.cpp +++ b/src/base/kernel/config/BaseConfig.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -61,8 +55,6 @@ const char *BaseConfig::kColors = "colors"; const char *BaseConfig::kDryRun = "dry-run"; const char *BaseConfig::kHttp = "http"; const char *BaseConfig::kLogFile = "log-file"; -const char *BaseConfig::kPauseOnBattery = "pause-on-battery"; -const char *BaseConfig::kPauseOnActive = "pause-on-active"; const char *BaseConfig::kPrintTime = "print-time"; const char *BaseConfig::kSyslog = "syslog"; const char *BaseConfig::kTitle = "title"; @@ -92,8 +84,6 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName) m_dryRun = reader.getBool(kDryRun, m_dryRun); m_syslog = reader.getBool(kSyslog, m_syslog); m_watch = reader.getBool(kWatch, m_watch); - m_pauseOnBattery = reader.getBool(kPauseOnBattery, m_pauseOnBattery); - m_pauseOnActive = reader.getBool(kPauseOnActive, m_pauseOnActive); m_logFile = reader.getString(kLogFile); m_userAgent = reader.getString(kUserAgent); m_printTime = std::min(reader.getUint(kPrintTime, m_printTime), 3600U); diff --git a/src/base/kernel/config/BaseConfig.h b/src/base/kernel/config/BaseConfig.h index 4f28cadf..37d4641f 100644 --- a/src/base/kernel/config/BaseConfig.h +++ b/src/base/kernel/config/BaseConfig.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -55,8 +49,6 @@ public: static const char *kDryRun; static const char *kHttp; static const char *kLogFile; - static const char *kPauseOnBattery; - static const char *kPauseOnActive; static const char *kPrintTime; static const char *kSyslog; static const char *kTitle; @@ -73,8 +65,6 @@ public: inline bool isAutoSave() const { return m_autoSave; } inline bool isBackground() const { return m_background; } inline bool isDryRun() const { return m_dryRun; } - inline bool isPauseOnBattery() const { return m_pauseOnBattery; } - inline bool isPauseOnActive() const { return m_pauseOnActive; } inline bool isSyslog() const { return m_syslog; } inline const char *logFile() const { return m_logFile.data(); } inline const char *userAgent() const { return m_userAgent.data(); } @@ -102,8 +92,6 @@ protected: bool m_autoSave = true; bool m_background = false; bool m_dryRun = false; - bool m_pauseOnBattery = false; - bool m_pauseOnActive = false; bool m_syslog = false; bool m_upgrade = false; bool m_watch = true; @@ -115,7 +103,7 @@ protected: String m_logFile; String m_userAgent; Title m_title; - uint32_t m_printTime = 60; + uint32_t m_printTime = 60; # ifdef XMRIG_FEATURE_TLS TlsConfig m_tls; diff --git a/src/base/kernel/config/BaseTransform.cpp b/src/base/kernel/config/BaseTransform.cpp index e6dc4e2e..55e082b6 100644 --- a/src/base/kernel/config/BaseTransform.cpp +++ b/src/base/kernel/config/BaseTransform.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -262,8 +256,6 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch case IConfig::DaemonKey: /* --daemon */ case IConfig::SubmitToOriginKey: /* --submit-to-origin */ case IConfig::VerboseKey: /* --verbose */ - case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ - case IConfig::PauseOnActiveKey: /* --pause-on-active */ return transformBoolean(doc, key, true); case IConfig::ColorKey: /* --no-color */ @@ -324,12 +316,6 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b case IConfig::NoTitleKey: /* --no-title */ return set(doc, BaseConfig::kTitle, enable); - case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ - return set(doc, BaseConfig::kPauseOnBattery, enable); - - case IConfig::PauseOnActiveKey: /* --pause-on-active */ - return set(doc, BaseConfig::kPauseOnActive, enable); - default: break; } diff --git a/src/base/kernel/config/BaseTransform.h b/src/base/kernel/config/BaseTransform.h index d6c08821..0ddcebc8 100644 --- a/src/base/kernel/config/BaseTransform.h +++ b/src/base/kernel/config/BaseTransform.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 diff --git a/src/core/Miner.cpp b/src/core/Miner.cpp index 60cc7966..b9e4fbad 100644 --- a/src/core/Miner.cpp +++ b/src/core/Miner.cpp @@ -601,7 +601,8 @@ void xmrig::Miner::onConfigChanged(Config *config, Config *previousConfig) void xmrig::Miner::onTimer(const Timer *) { double maxHashrate = 0.0; - const auto healthPrintTime = d_ptr->controller->config()->healthPrintTime(); + const auto config = d_ptr->controller->config(); + const auto healthPrintTime = config->healthPrintTime(); bool stopMiner = false; @@ -621,7 +622,7 @@ void xmrig::Miner::onTimer(const Timer *) d_ptr->maxHashrate[d_ptr->algorithm] = std::max(d_ptr->maxHashrate[d_ptr->algorithm], maxHashrate); - const auto printTime = d_ptr->controller->config()->printTime(); + const auto printTime = config->printTime(); if (printTime && d_ptr->ticks && (d_ptr->ticks % (printTime * 2)) == 0) { d_ptr->printHashrate(false); } @@ -638,12 +639,12 @@ void xmrig::Miner::onTimer(const Timer *) } }; - if (d_ptr->controller->config()->isPauseOnBattery()) { + if (config->isPauseOnBattery()) { autoPause(d_ptr->battery_power, Platform::isOnBatteryPower(), YELLOW_BOLD("on battery power"), GREEN_BOLD("on AC power")); } - if (d_ptr->controller->config()->isPauseOnActive()) { - autoPause(d_ptr->user_active, Platform::isUserActive(), YELLOW_BOLD("user active"), GREEN_BOLD("user inactive")); + if (config->isPauseOnActive()) { + autoPause(d_ptr->user_active, Platform::isUserActive(config->idleTime()), YELLOW_BOLD("user active"), GREEN_BOLD("user inactive")); } if (stopMiner) { diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index f2a0c4a9..2b27ae58 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -22,6 +16,7 @@ * along with this program. If not, see . */ + #include #include #include @@ -54,6 +49,13 @@ namespace xmrig { +constexpr static uint32_t kIdleTime = 60U; + + +const char *Config::kPauseOnBattery = "pause-on-battery"; +const char *Config::kPauseOnActive = "pause-on-active"; + + #ifdef XMRIG_FEATURE_OPENCL const char *Config::kOcl = "opencl"; #endif @@ -74,7 +76,9 @@ const char *Config::kDMI = "dmi"; class ConfigPrivate { public: + bool pauseOnBattery = false; CpuConfig cpu; + uint32_t idleTime = 0; # ifdef XMRIG_ALGO_RANDOMX RxConfig rx; @@ -89,12 +93,22 @@ public: # endif # if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) - uint32_t healthPrintTime = 60; + uint32_t healthPrintTime = 60U; # endif # ifdef XMRIG_FEATURE_DMI bool dmi = true; # endif + + void setIdleTime(const rapidjson::Value &value) + { + if (value.IsBool()) { + idleTime = value.GetBool() ? kIdleTime : 0U; + } + else if (value.IsUint()) { + idleTime = value.GetUint(); + } + } }; } @@ -112,12 +126,24 @@ xmrig::Config::~Config() } +bool xmrig::Config::isPauseOnBattery() const +{ + return d_ptr->pauseOnBattery; +} + + const xmrig::CpuConfig &xmrig::Config::cpu() const { return d_ptr->cpu; } +uint32_t xmrig::Config::idleTime() const +{ + return d_ptr->idleTime * 1000U; +} + + #ifdef XMRIG_FEATURE_OPENCL const xmrig::OclConfig &xmrig::Config::cl() const { @@ -186,6 +212,9 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName) return false; } + d_ptr->pauseOnBattery = reader.getBool(kPauseOnBattery, d_ptr->pauseOnBattery); + d_ptr->setIdleTime(reader.getValue(kPauseOnActive)); + d_ptr->cpu.read(reader.getValue(CpuConfig::kField)); # ifdef XMRIG_ALGO_RANDOMX @@ -270,5 +299,5 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const doc.AddMember(StringRef(kVerbose), Log::verbose(), allocator); doc.AddMember(StringRef(kWatch), m_watch, allocator); doc.AddMember(StringRef(kPauseOnBattery), isPauseOnBattery(), allocator); - doc.AddMember(StringRef(kPauseOnActive), isPauseOnActive(), allocator); + doc.AddMember(StringRef(kPauseOnActive), (d_ptr->idleTime == 0U || d_ptr->idleTime == kIdleTime) ? Value(isPauseOnActive()) : Value(d_ptr->idleTime), allocator); } diff --git a/src/core/config/Config.h b/src/core/config/Config.h index d8433beb..c2da8523 100644 --- a/src/core/config/Config.h +++ b/src/core/config/Config.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -50,6 +44,9 @@ class Config : public BaseConfig public: XMRIG_DISABLE_COPY_MOVE(Config); + static const char *kPauseOnBattery; + static const char *kPauseOnActive; + # ifdef XMRIG_FEATURE_OPENCL static const char *kOcl; # endif @@ -69,7 +66,11 @@ public: Config(); ~Config() override; + inline bool isPauseOnActive() const { return idleTime() > 0; } + + bool isPauseOnBattery() const; const CpuConfig &cpu() const; + uint32_t idleTime() const; # ifdef XMRIG_FEATURE_OPENCL const OclConfig &cl() const; diff --git a/src/core/config/ConfigTransform.cpp b/src/core/config/ConfigTransform.cpp index 7140837a..dce9d326 100644 --- a/src/core/config/ConfigTransform.cpp +++ b/src/core/config/ConfigTransform.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 @@ -150,6 +144,12 @@ void xmrig::ConfigTransform::transform(rapidjson::Document &doc, int key, const case IConfig::YieldKey: /* --cpu-no-yield */ return set(doc, CpuConfig::kField, CpuConfig::kYield, false); + case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ + return set(doc, Config::kPauseOnBattery, true); + + case IConfig::PauseOnActiveKey: /* --pause-on-active */ + return set(doc, Config::kPauseOnActive, static_cast(strtol(arg, nullptr, 10))); + # ifdef XMRIG_ALGO_ARGON2 case IConfig::Argon2ImplKey: /* --argon2-impl */ return set(doc, CpuConfig::kField, CpuConfig::kArgon2Impl, arg); diff --git a/src/core/config/ConfigTransform.h b/src/core/config/ConfigTransform.h index 8fd2505c..db25b0a0 100644 --- a/src/core/config/ConfigTransform.h +++ b/src/core/config/ConfigTransform.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 XMRig , * * 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 diff --git a/src/core/config/Config_platform.h b/src/core/config/Config_platform.h index dbe2a4d8..d5429975 100644 --- a/src/core/config/Config_platform.h +++ b/src/core/config/Config_platform.h @@ -93,7 +93,7 @@ static const option options[] = { { "title", 1, nullptr, IConfig::TitleKey }, { "no-title", 0, nullptr, IConfig::NoTitleKey }, { "pause-on-battery", 0, nullptr, IConfig::PauseOnBatteryKey }, - { "pause-on-active", 0, nullptr, IConfig::PauseOnActiveKey }, + { "pause-on-active", 1, nullptr, IConfig::PauseOnActiveKey }, # ifdef XMRIG_FEATURE_BENCHMARK { "stress", 0, nullptr, IConfig::StressKey }, { "bench", 1, nullptr, IConfig::BenchKey }, diff --git a/src/core/config/usage.h b/src/core/config/usage.h index 8b8ec533..fb887206 100644 --- a/src/core/config/usage.h +++ b/src/core/config/usage.h @@ -181,7 +181,7 @@ static inline const std::string &usage() u += " --no-title disable setting console window title\n"; # endif u += " --pause-on-battery pause mine on battery power\n"; - u += " --pause-on-active pause mine when mouse or keyboard is touched\n"; + u += " --pause-on-active=N pause mine when the user is active (resume after N seconds of last activity)\n"; # ifdef XMRIG_FEATURE_BENCHMARK u += " --stress run continuous stress test to check system stability\n";